diff --git a/Dockerfile b/Dockerfile index 62db9c5..e567ddd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,7 @@ FROM openjdk:8-jdk-alpine -VOLUME /tmp -VOLUME /mnt/config -VOLUME /mnt/logs - COPY build/libs/*-SNAPSHOT.jar app.jar -RUN ln -s /mnt/config/application.properties ./application.properties +EXPOSE 1880 -ENTRYPOINT ["java","-jar","/app.jar", "--config.location=application.properties"] +ENTRYPOINT ["java","-jar","/app.jar", "--spring.config.location=file:///mnt/config/application.properties"] diff --git a/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java b/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java index b0309e9..0a3fd41 100644 --- a/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java +++ b/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java @@ -12,7 +12,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @Repository -public final class ImpalaConnector { +public class ImpalaConnector { private static final Logger logger = LoggerFactory.getLogger(ImpalaConnector.class); diff --git a/src/main/java/eu/openaire/urls_controller/controllers/TestController.java b/src/main/java/eu/openaire/urls_controller/controllers/TestController.java index 457f121..1eeb0ed 100644 --- a/src/main/java/eu/openaire/urls_controller/controllers/TestController.java +++ b/src/main/java/eu/openaire/urls_controller/controllers/TestController.java @@ -14,6 +14,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.sql.Timestamp; @@ -21,6 +22,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicLong; @RestController +@RequestMapping("/test") public class TestController extends GeneralController { private static final Logger logger = LoggerFactory.getLogger(TestController.class); diff --git a/src/main/java/eu/openaire/urls_controller/util/TestFileUtils.java b/src/main/java/eu/openaire/urls_controller/util/TestFileUtils.java index 8645ed3..fd10b39 100644 --- a/src/main/java/eu/openaire/urls_controller/util/TestFileUtils.java +++ b/src/main/java/eu/openaire/urls_controller/util/TestFileUtils.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.configurationprocessor.json.JSONException; import org.springframework.boot.configurationprocessor.json.JSONObject; import org.springframework.core.io.Resource; +import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Component; import java.io.File; @@ -20,8 +21,7 @@ public class TestFileUtils { private static final Logger logger = LoggerFactory.getLogger(TestFileUtils.class); - @Value("classpath:testInputFiles/orderedList1000.json") - Resource testResource; + Resource testResource = new ClassPathResource("testInputFiles/orderedList1000.json"); public ThreadLocal duplicateIdUrlEntries = new ThreadLocal<>(); public ThreadLocal inputScanner = new ThreadLocal<>(); // Every Thread has its own variable. diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml deleted file mode 100644 index 86ba426..0000000 --- a/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - logs/UrlsController.log - - - logs/UrlsController.%i.log.zip - 1 - 20 - - - - 50MB - - - - UTF-8 - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}.%M\(@%line\) - %msg%n - - - - - - UTF-8 - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{36}.%M\(@%line\)) - %msg%n - - - - - - - - \ No newline at end of file