diff --git a/.gitignore b/.gitignore index bdb8342..440e0c6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ target/ !**/src/main/**/target/ !**/src/test/**/target/ .DS_Store +*/.DS_Store +**/.DS_Store + ### STS ### .apt_generated .classpath @@ -35,3 +38,5 @@ build/ ### VS Code ### .vscode/ + + diff --git a/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java b/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java index 043afd2..bbc8390 100644 --- a/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java +++ b/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java @@ -61,4 +61,5 @@ public class QRCodeTypeController { public ResponseEntity checkRedirects(@RequestBody QRCodePayload payload) { return ResponseEntity.ok(redirectCountService.countRedirects(payload).block()); } + } \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties deleted file mode 100644 index fb53d4d..0000000 --- a/src/main/resources/application-prod.properties +++ /dev/null @@ -1,21 +0,0 @@ -http.port=${HTTP_PORT} -server.port=${SERVER_PORT} -server.ssl.enabled=true -server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE} -server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION} -server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD} -server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS} -trust.store=${SERVER_SSL_TRUST_STORE_LOCATION} -trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD} - -spring.datasource.url=${SERVER_DB_URL} -spring.datasource.username=${SERVER_DB_USERNAME} -spring.datasource.password=${SERVER_DB_PASSWORD} -spring.datasource.driver-class-name=${SERVER_DB_DRIVER_CLASS_NAME} -#spring.jpa.database-platform=${SERVER_DB_DIALECT} -spring.jpa.hibernate.ddl-auto=update -spring.jpa.show-sql=true -spring.jpa.properties.hibernate.format_sql=true - -google.safebrowsing.api.key=${GOOGLE_SAFE_BROWSING_API_KEY} -virustotal.api.key=${VIRUSTOTAL_API_KEY} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6eac79d..fe5cab5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,23 @@ spring.application.name=SafeQR-app -spring.profiles.active=prod \ No newline at end of file +spring.profiles.active=local +http.port=${HTTP_PORT} +server.port=${SERVER_PORT} +server.ssl.enabled=true +server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE} +server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION} +server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD} +server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS} +trust.store=${SERVER_SSL_TRUST_STORE_LOCATION} +trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD} + +spring.datasource.url=${SERVER_DB_URL} +spring.datasource.username=${SERVER_DB_USERNAME} +spring.datasource.password=${SERVER_DB_PASSWORD} +spring.datasource.driver-class-name=${SERVER_DB_DRIVER_CLASS_NAME} +#spring.jpa.database-platform=${SERVER_DB_DIALECT} +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.format_sql=true + +google.safebrowsing.api.key=${GOOGLE_SAFE_BROWSING_API_KEY} +virustotal.api.key=${VIRUSTOTAL_API_KEY} \ No newline at end of file diff --git a/src/test/java/com/safeqr/app/SafeQrAppApplicationTests.java b/src/test/java/com/safeqr/app/SafeQrAppApplicationTests.java index a5049d2..ad6ad4b 100644 --- a/src/test/java/com/safeqr/app/SafeQrAppApplicationTests.java +++ b/src/test/java/com/safeqr/app/SafeQrAppApplicationTests.java @@ -4,9 +4,9 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -public class SafeQrAppApplicationTests { +class SafeQrAppApplicationTests { @Test - public void contextLoads() { + void contextLoads() { } }