Fixing minor problems in code. Clean up. Fixing and adding some print…

… to builder-tool.sh

core-builder-tool/builder-tool.sh

@@ -114,6 +114,11 @@ while IFS=, read -r protocol destination source; do
 
     case "$protocol" in
         "git+https")
+            echo "Protocol: $protocol"
+            echo "Downloading $rebuilt_url"
+            echo "to $destination_dir/$destination"
+
+
             username=$GIT_USERNAME
             password=$GIT_PASSWORD
             token=$GIT_TOKEN
@@ -137,10 +142,16 @@ while IFS=, read -r protocol destination source; do
 	    ;;
         "zip+s3") # for now accept a zip file - check if file is a zip, unpack zip
 	    mc alias set $minio $S3_ENDPOINT_URL $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY
-            mc cp "$minio/$source" "$destination_dir/$destination"
+	          echo "Protocol: $protocol"
+            echo "Downloading $minio/$rebuilt_url"
+            echo "to $destination_dir/$destination"
+            mc cp "$minio/$rebuilt_url" "$destination_dir/$destination"
             unzip "$destination_dir/$destination"
             ;;
         "http" | "https") # for now accept only zip file - check if file is a zip. unpack zip
+            echo "Protocol: $protocol"
+            echo "Downloading $source"
+            echo "to $destination_dir/$destination"
             curl -o "$destination_dir/$destination" -L "$source"
             unzip "$destination_dir/$destination"
             ;;
@@ -153,4 +164,3 @@ while IFS=, read -r protocol destination source; do
 done < "$source_dir/context-refs.txt"
 
 ls "$destination_dir"
-

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/events/RunnableMonitorObject.java

@@ -14,7 +14,9 @@
 @Builder
 public class RunnableMonitorObject implements Serializable {
 
-    //TODO send run event to RunManager(todo) create an object of type RunState with stateId, runId, project, framework....
+    //TODO send run event to RunManager(todo)
+    // create an object of type RunState with stateId, runId, project, framework....
+
     private String runId;
     private String stateId;
     private String project;

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/jackson/JacksonMapper.java

@@ -2,7 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import it.smartcommunitylabdhub.commons.jackson.mixins.ConcreteSpecMixin;
@@ -13,7 +18,8 @@
 public class JacksonMapper {
 
     public static final ObjectMapper CUSTOM_OBJECT_MAPPER = new ObjectMapper();
-    public static final TypeReference<HashMap<String, Object>> typeRef = new TypeReference<>() {};
+    public static final TypeReference<HashMap<String, Object>> typeRef = new TypeReference<>() {
+    };
     public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
     public static final ObjectMapper CBOR_OBJECT_MAPPER = new ObjectMapper(new CBORFactory());
 

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/State.java

@@ -23,5 +23,5 @@ public enum State {
     STOP,
     UNKNOWN,
     NONE,
-    RUN_ERROR,
+    RUN_ERROR
 }

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/queries/SearchCriteria.java

@@ -5,7 +5,9 @@
 
 public interface SearchCriteria<T> extends Specification<T> {
     String getField();
+
     Serializable getValue();
+
     Operation getOperation();
 
     Specification<T> toSpecification();
@@ -14,6 +16,6 @@ public enum Operation {
         equal,
         gt,
         lt,
-        like,
+        like
     }
 }

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/queries/SearchFilter.java

@@ -12,6 +12,6 @@ public interface SearchFilter<T> {
 
     enum Condition {
         and,
-        or,
+        or
     }
 }

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/utils/RunUtils.java

@@ -14,16 +14,22 @@ public class RunUtils {
 
     public static final Pattern TASK_PATTERN = Pattern.compile(Keys.PATH_PATTERN);
 
-    private RunUtils() {}
+    private static final int first = 1;
+    private static final int second = 2;
+    private static final int third = 3;
+    private static final int fourth = 4;
+
+    private RunUtils() {
+    }
 
     //TODO this goes into the accessor, via a with()
     public static RunSpecAccessor parseTask(String value) {
         Matcher matcher = TASK_PATTERN.matcher(value);
         if (matcher.matches()) {
-            String task = matcher.group(1);
-            String project = matcher.group(2);
-            String function = matcher.group(3);
-            String version = matcher.group(4);
+            String task = matcher.group(first);
+            String project = matcher.group(second);
+            String function = matcher.group(third);
+            String version = matcher.group(fourth);
 
             Map<String, String> map = new HashMap<>();
             map.put("task", task);
@@ -50,6 +56,6 @@ public static String buildTaskString(@NotNull Task task) {
             throw new IllegalArgumentException("invalid or missing function in task spec");
         }
 
-        return (task.getKind() + "://" + matcher.group(2) + "/" + matcher.group(3) + ":" + matcher.group(4));
+        return (task.getKind() + "://" + matcher.group(second) + "/" + matcher.group(third) + ":" + matcher.group(fourth));
     }
 }

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/utils/TaskUtils.java

@@ -3,8 +3,6 @@
 import it.smartcommunitylabdhub.commons.Keys;
 import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor;
 import it.smartcommunitylabdhub.commons.models.base.Executable;
-import it.smartcommunitylabdhub.commons.models.entities.function.Function;
-import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -14,16 +12,22 @@ public class TaskUtils {
 
     private static final Pattern FUNCTION_PATTERN = Pattern.compile(Keys.PATH_PATTERN);
 
-    private TaskUtils() {}
+    private static final int first = 1;
+    private static final int second = 2;
+    private static final int third = 3;
+    private static final int fourth = 4;
+
+    private TaskUtils() {
+    }
 
     //TODO this goes into the accessor, via a with()
     public static TaskSpecAccessor parseFunction(String taskString) {
         Matcher matcher = FUNCTION_PATTERN.matcher(taskString);
         if (matcher.matches()) {
-            String runtime = matcher.group(1);
-            String project = matcher.group(2);
-            String function = matcher.group(3);
-            String version = matcher.group(4);
+            String runtime = matcher.group(first);
+            String project = matcher.group(second);
+            String function = matcher.group(third);
+            String version = matcher.group(fourth);
 
             Map<String, String> map = new HashMap<>();
             map.put("runtime", runtime);

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/DateUtils.java

@@ -10,6 +10,8 @@
  */
 public class DateUtils {
 
+    private final static long MULTIPLIER = 1000;
+
     /**
      * Parse a timestamp string into a Date object.
      *
@@ -19,7 +21,7 @@ public class DateUtils {
      */
     public static Date parseDateFromTimestamp(String timestampStr, boolean isMilliseconds) {
         long timestamp = Long.parseLong(timestampStr);
-        return isMilliseconds ? new Date(timestamp) : new Date(timestamp * 1000);
+        return isMilliseconds ? new Date(timestamp) : new Date(timestamp * MULTIPLIER);
     }
 
     /**
@@ -31,7 +33,7 @@ public static Date parseDateFromTimestamp(String timestampStr, boolean isMillise
      * @throws IllegalArgumentException if the date interval format is invalid.
      */
     public static DateInterval parseDateIntervalFromTimestamps(String intervalStr, boolean isMilliseconds)
-        throws IllegalArgumentException {
+            throws IllegalArgumentException {
         String[] timestampArray = intervalStr.split(",");
 
         if (timestampArray.length != 2) {
@@ -41,8 +43,8 @@ public static DateInterval parseDateIntervalFromTimestamps(String intervalStr, b
         long startTimestamp = Long.parseLong(timestampArray[0]);
         long endTimestamp = Long.parseLong(timestampArray[1]);
 
-        Date startDate = isMilliseconds ? new Date(startTimestamp) : new Date(startTimestamp * 1000);
-        Date endDate = isMilliseconds ? new Date(endTimestamp) : new Date(endTimestamp * 1000);
+        Date startDate = isMilliseconds ? new Date(startTimestamp) : new Date(startTimestamp * MULTIPLIER);
+        Date endDate = isMilliseconds ? new Date(endTimestamp) : new Date(endTimestamp * MULTIPLIER);
 
         return new DateInterval(startDate, endDate);
     }
@@ -86,5 +88,6 @@ public static DateInterval parseDateInterval(String intervalStr, String format)
     /**
      * A record representing a date interval with start and end dates.
      */
-    public record DateInterval(Date startDate, Date endDate) {}
+    public record DateInterval(Date startDate, Date endDate) {
+    }
 }