Fix: @Value does not work in Docker environment

Constructor autowiring seems like the safest bet at this point
seart-group · Jan 8, 2024 · 522154e · 522154e
1 parent ed8795e
commit 522154e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/src/main/java/ch/usi/si/seart/cloc/CLOCConnector.java b/src/main/java/ch/usi/si/seart/cloc/CLOCConnector.java
@@ -1,16 +1,15 @@
 package ch.usi.si.seart.cloc;
 
+import ch.usi.si.seart.config.properties.CLOCProperties;
 import ch.usi.si.seart.exception.StaticCodeAnalysisException;
 import ch.usi.si.seart.exception.TerminalExecutionException;
 import ch.usi.si.seart.io.ExternalProcess;
 import ch.usi.si.seart.stereotype.Connector;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.convert.ConversionService;
 
 import java.nio.file.Path;
@@ -21,15 +20,19 @@
  * Component responsible for performing static code analysis through CLOC.
  */
 @Connector(command = "cloc")
-@AllArgsConstructor(onConstructor_ = @Autowired)
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class CLOCConnector {
 
-    @Value("${ghs.cloc.analysis-timeout-duration}")
     Duration analysisTimeout;
 
     ConversionService conversionService;
 
+    @Autowired
+    public CLOCConnector(CLOCProperties properties, ConversionService conversionService) {
+        this.analysisTimeout = properties.getAnalysisTimeoutDuration();
+        this.conversionService = conversionService;
+    }
+
     /**
      * Performs static code analysis using CLOC.
      *

diff --git a/src/main/java/ch/usi/si/seart/git/GitConnector.java b/src/main/java/ch/usi/si/seart/git/GitConnector.java
@@ -1,18 +1,17 @@
 package ch.usi.si.seart.git;
 
+import ch.usi.si.seart.config.properties.GitProperties;
 import ch.usi.si.seart.exception.TerminalExecutionException;
 import ch.usi.si.seart.exception.git.GitException;
 import ch.usi.si.seart.exception.git.RemoteReferenceDisplayException;
 import ch.usi.si.seart.io.ExternalProcess;
 import ch.usi.si.seart.stereotype.Connector;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SystemUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.convert.ConversionService;
 
 import java.io.IOException;
@@ -27,18 +26,22 @@
  */
 @Slf4j
 @Connector(command = "git")
-@AllArgsConstructor(onConstructor_ = @Autowired)
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class GitConnector implements InitializingBean {
 
-    @Value("${ghs.git.folder-prefix}")
     String folderPrefix;
 
-    @Value("${ghs.git.clone-timeout-duration}")
     Duration cloneTimeout;
 
     ConversionService conversionService;
 
+    @Autowired
+    public GitConnector(GitProperties properties, ConversionService conversionService) {
+        this.folderPrefix = properties.getFolderPrefix();
+        this.cloneTimeout = properties.getCloneTimeoutDuration();
+        this.conversionService = conversionService;
+    }
+
     /**
      * Clones a git repository into a temporary folder
      * and returns a handle for the cloned repository.

diff --git a/src/main/java/ch/usi/si/seart/http/ClientURLConnector.java b/src/main/java/ch/usi/si/seart/http/ClientURLConnector.java
@@ -1,15 +1,14 @@
 package ch.usi.si.seart.http;
 
+import ch.usi.si.seart.config.properties.ClientURLProperties;
 import ch.usi.si.seart.exception.ClientURLException;
 import ch.usi.si.seart.exception.TerminalExecutionException;
 import ch.usi.si.seart.io.ExternalProcess;
 import ch.usi.si.seart.stereotype.Connector;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.net.ConnectException;
 import java.net.URL;
@@ -19,13 +18,16 @@
 
 @Slf4j
 @Connector(command = "curl")
-@AllArgsConstructor(onConstructor_ = @Autowired)
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class ClientURLConnector {
 
-    @Value("${ghs.curl.connect-timeout-duration}")
     Duration connectTimeout;
 
+    @Autowired
+    public ClientURLConnector(ClientURLProperties properties) {
+        this.connectTimeout = properties.getConnectTimeoutDuration();
+    }
+
     public boolean ping(URL url) throws ClientURLException {
         try {
             String[] command = {