Format files

scc-digitalhub · Feb 13, 2024 · 70fbf99 · 70fbf99
1 parent 9aff2ee
commit 70fbf99
Show file tree

Hide file tree

Showing 68 changed files with 1,657 additions and 1,752 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,8 @@ build/
 ### Env variable ###
 .env
 
+node_modules
+
 ### Checkstyle folder###
 /src/checkstyle
 

diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -1,4 +1,6 @@
 # Prettier configuration
+plugins:
+  - prettier-plugin-java
 overrides:
   - files:
       - "*.java"

diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/annotations/ApiVersion.java b/application/src/main/java/it/smartcommunitylabdhub/core/annotations/ApiVersion.java
@@ -1,10 +1,9 @@
 package it.smartcommunitylabdhub.core.annotations;
 
-import org.springframework.web.bind.annotation.Mapping;
-
 import java.lang.annotation.*;
+import org.springframework.web.bind.annotation.Mapping;
 
-@Target({ElementType.TYPE, ElementType.METHOD})
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Mapping

diff --git a/...artcommunitylabdhub/core/components/infrastructure/factories/builders/BuilderFactory.java b/...artcommunitylabdhub/core/components/infrastructure/factories/builders/BuilderFactory.java
@@ -18,7 +18,10 @@
 
 public class BuilderFactory {
 
-    private final Map<String, ? extends Builder<? extends FunctionBaseSpec, ? extends TaskBaseSpec, ? extends RunBaseSpec>> builderMap;
+    private final Map<
+        String,
+        ? extends Builder<? extends FunctionBaseSpec, ? extends TaskBaseSpec, ? extends RunBaseSpec>
+    > builderMap;
 
     /**
      * Constructor to create the BuilderFactory with a list of Builders.
@@ -72,9 +75,10 @@ > String getBuilderFromAnnotation(B builder) {
         return concreteBuilder;
     }
 
-    public Map<String, ? extends Builder<? extends FunctionBaseSpec, ? extends TaskBaseSpec, ? extends RunBaseSpec>> getBuilders(
-        String runtime
-    ) {
+    public Map<
+        String,
+        ? extends Builder<? extends FunctionBaseSpec, ? extends TaskBaseSpec, ? extends RunBaseSpec>
+    > getBuilders(String runtime) {
         return builderMap
             .entrySet()
             .stream()

diff --git a/...artcommunitylabdhub/core/components/infrastructure/factories/runtimes/RuntimeFactory.java b/...artcommunitylabdhub/core/components/infrastructure/factories/runtimes/RuntimeFactory.java
@@ -18,7 +18,10 @@
 
 public class RuntimeFactory {
 
-    private final Map<String, Runtime<? extends FunctionBaseSpec, ? extends RunBaseSpec, ? extends Runnable>> runtimeMap;
+    private final Map<
+        String,
+        Runtime<? extends FunctionBaseSpec, ? extends RunBaseSpec, ? extends Runnable>
+    > runtimeMap;
 
     /**
      * Constructor to create the RuntimeFactory with a list of Runtimes.

diff --git a/.../src/main/java/it/smartcommunitylabdhub/core/config/handlers/VersionedHandlerMapping.java b/.../src/main/java/it/smartcommunitylabdhub/core/config/handlers/VersionedHandlerMapping.java
@@ -2,6 +2,9 @@
 
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import jakarta.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Optional;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,10 +17,6 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.util.pattern.PathPattern;
 
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.Optional;
-
 public class VersionedHandlerMapping extends RequestMappingHandlerMapping {
 
     private static final String VERSION_ATTRIBUTE = "version";
@@ -69,12 +68,12 @@ private RequestMappingInfo createVersionedMappingInfo(RequestMappingInfo mapping
         // .getPatternString();
 
         String originalPattern = Optional
-                .ofNullable(mappingInfo)
-                .map(RequestMappingInfo::getPathPatternsCondition)
-                .map(PathPatternsRequestCondition::getPatterns)
-                .flatMap(patterns -> patterns.stream().findFirst())
-                .map(PathPattern::getPatternString)
-                .orElse("/error");
+            .ofNullable(mappingInfo)
+            .map(RequestMappingInfo::getPathPatternsCondition)
+            .map(PathPatternsRequestCondition::getPatterns)
+            .flatMap(patterns -> patterns.stream().findFirst())
+            .map(PathPattern::getPatternString)
+            .orElse("/error");
 
         String versionedPattern = "/api/" + version + originalPattern;
 
@@ -84,13 +83,13 @@ private RequestMappingInfo createVersionedMappingInfo(RequestMappingInfo mapping
 
         if (mappingInfo != null) {
             RequestMappingInfo.Builder builder = mappingInfo
-                    .mutate()
-                    .paths(versionedPattern)
-                    .methods(mappingInfo.getMethodsCondition().getMethods().toArray(RequestMethod[]::new))
-                    .params(mappingInfo.getParamsCondition().getExpressions().toArray(String[]::new))
-                    .headers(mappingInfo.getHeadersCondition().getExpressions().toArray(String[]::new))
-                    .consumes(getMediaTypeStrings(mappingInfo.getConsumesCondition()))
-                    .produces(getMediaTypeStrings(mappingInfo.getProducesCondition()));
+                .mutate()
+                .paths(versionedPattern)
+                .methods(mappingInfo.getMethodsCondition().getMethods().toArray(RequestMethod[]::new))
+                .params(mappingInfo.getParamsCondition().getExpressions().toArray(String[]::new))
+                .headers(mappingInfo.getHeadersCondition().getExpressions().toArray(String[]::new))
+                .consumes(getMediaTypeStrings(mappingInfo.getConsumesCondition()))
+                .produces(getMediaTypeStrings(mappingInfo.getProducesCondition()));
 
             if (mappingInfo.getName() != null) {
                 builder.mappingName(mappingInfo.getName());
@@ -119,7 +118,7 @@ protected void handleMatch(RequestMappingInfo info, String lookupPath, HttpServl
         String version = (String) request.getAttribute(VERSION_ATTRIBUTE);
         if (version != null) {
             Map<String, String> uriTemplateVariables = (Map<String, String>) request.getAttribute(
-                    HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE
+                HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE
             );
             if (uriTemplateVariables != null) {
                 uriTemplateVariables.put("version", version);

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java b/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java
@@ -7,6 +7,7 @@
 import it.smartcommunitylabdhub.commons.services.interfaces.ArtifactService;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import jakarta.validation.Valid;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -15,8 +16,6 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 @RestController
 @RequestMapping("/artifacts")
 @ApiVersion("v1")
@@ -35,9 +34,9 @@ public ResponseEntity<Page<Artifact>> getArtifacts(@RequestParam Map<String, Str
 
     @Operation(summary = "Create artifact", description = "Create an artifact and return")
     @PostMapping(
-            value = "",
-            consumes = {MediaType.APPLICATION_JSON_VALUE, "application/x-yaml"},
-            produces = "application/json; charset=UTF-8"
+        value = "",
+        consumes = { MediaType.APPLICATION_JSON_VALUE, "application/x-yaml" },
+        produces = "application/json; charset=UTF-8"
     )
     public ResponseEntity<Artifact> createArtifact(@Valid @RequestBody Artifact artifactDTO) {
         return ResponseEntity.ok(this.artifactService.createArtifact(artifactDTO));
@@ -46,20 +45,20 @@ public ResponseEntity<Artifact> createArtifact(@Valid @RequestBody Artifact arti
     @Operation(summary = "Get an artifact by uuid", description = "Return an artifact")
     @GetMapping(path = "/{uuid}", produces = "application/json; charset=UTF-8")
     public ResponseEntity<Artifact> getArtifact(
-            @ValidateField @PathVariable(name = "uuid", required = true) String uuid
+        @ValidateField @PathVariable(name = "uuid", required = true) String uuid
     ) {
         return ResponseEntity.ok(this.artifactService.getArtifact(uuid));
     }
 
     @Operation(summary = "Update specific artifact", description = "Update and return the artifact")
     @PutMapping(
-            path = "/{uuid}",
-            consumes = {MediaType.APPLICATION_JSON_VALUE, "application/x-yaml"},
-            produces = "application/json; charset=UTF-8"
+        path = "/{uuid}",
+        consumes = { MediaType.APPLICATION_JSON_VALUE, "application/x-yaml" },
+        produces = "application/json; charset=UTF-8"
     )
     public ResponseEntity<Artifact> updateArtifact(
-            @Valid @RequestBody Artifact artifactDTO,
-            @ValidateField @PathVariable String uuid
+        @Valid @RequestBody Artifact artifactDTO,
+        @ValidateField @PathVariable String uuid
     ) {
         return ResponseEntity.ok(this.artifactService.updateArtifact(artifactDTO, uuid));
     }

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java b/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java
@@ -7,6 +7,7 @@
 import it.smartcommunitylabdhub.commons.services.interfaces.DataItemService;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import jakarta.validation.Valid;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -15,8 +16,6 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 @RestController
 @RequestMapping("/dataitems")
 @ApiVersion("v1")
@@ -35,9 +34,9 @@ public ResponseEntity<Page<DataItem>> getDataItems(@RequestParam Map<String, Str
 
     @Operation(summary = "Create dataItem", description = "Create an dataItem and return")
     @PostMapping(
-            value = "",
-            consumes = {MediaType.APPLICATION_JSON_VALUE, "application/x-yaml"},
-            produces = "application/json; charset=UTF-8"
+        value = "",
+        consumes = { MediaType.APPLICATION_JSON_VALUE, "application/x-yaml" },
+        produces = "application/json; charset=UTF-8"
     )
     public ResponseEntity<DataItem> createDataItem(@Valid @RequestBody DataItem dataItemDTO) {
         return ResponseEntity.ok(this.dataItemService.createDataItem(dataItemDTO));
@@ -46,20 +45,20 @@ public ResponseEntity<DataItem> createDataItem(@Valid @RequestBody DataItem data
     @Operation(summary = "Get a dataItem by uuid", description = "Return an dataItem")
     @GetMapping(path = "/{uuid}", produces = "application/json; charset=UTF-8")
     public ResponseEntity<DataItem> getDataItem(
-            @ValidateField @PathVariable(name = "uuid", required = true) String uuid
+        @ValidateField @PathVariable(name = "uuid", required = true) String uuid
     ) {
         return ResponseEntity.ok(this.dataItemService.getDataItem(uuid));
     }
 
     @Operation(summary = "Update specific dataItem", description = "Update and return the dataItem")
     @PutMapping(
-            path = "/{uuid}",
-            consumes = {MediaType.APPLICATION_JSON_VALUE, "application/x-yaml"},
-            produces = "application/json; charset=UTF-8"
+        path = "/{uuid}",
+        consumes = { MediaType.APPLICATION_JSON_VALUE, "application/x-yaml" },
+        produces = "application/json; charset=UTF-8"
     )
     public ResponseEntity<DataItem> updateDataItem(
-            @Valid @RequestBody DataItem dataItemDTO,
-            @ValidateField @PathVariable String uuid
+        @Valid @RequestBody DataItem dataItemDTO,
+        @ValidateField @PathVariable String uuid
     ) {
         return ResponseEntity.ok(this.dataItemService.updateDataItem(dataItemDTO, uuid));
     }

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java b/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java
@@ -8,6 +8,8 @@
 import it.smartcommunitylabdhub.commons.services.interfaces.FunctionService;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import jakarta.validation.Valid;
+import java.util.List;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -16,9 +18,6 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Map;
-
 @RestController
 @RequestMapping("/functions")
 @ApiVersion("v1")
@@ -37,9 +36,9 @@ public ResponseEntity<Page<Function>> getFunctions(@RequestParam Map<String, Str
 
     @Operation(summary = "Create function", description = "Create an function and return")
     @PostMapping(
-            value = "",
-            consumes = {MediaType.APPLICATION_JSON_VALUE, "application/x-yaml"},
-            produces = "application/json; charset=UTF-8"
+        value = "",
+        consumes = { MediaType.APPLICATION_JSON_VALUE, "application/x-yaml" },
+        produces = "application/json; charset=UTF-8"
     )
     public ResponseEntity<Function> createFunction(@Valid @RequestBody Function functionDTO) {
         return ResponseEntity.ok(this.functionService.createFunction(functionDTO));
@@ -48,29 +47,29 @@ public ResponseEntity<Function> createFunction(@Valid @RequestBody Function func
     @Operation(summary = "Get a function by uuid", description = "Return an function")
     @GetMapping(path = "/{uuid}", produces = "application/json; charset=UTF-8")
     public ResponseEntity<Function> getFunction(
-            @ValidateField @PathVariable(name = "uuid", required = true) String uuid
+        @ValidateField @PathVariable(name = "uuid", required = true) String uuid
     ) {
         return ResponseEntity.ok(this.functionService.getFunction(uuid));
     }
 
     @Operation(summary = "Update specific function", description = "Update and return the function")
     @PutMapping(
-            path = "/{uuid}",
-            consumes = {MediaType.APPLICATION_JSON_VALUE, "application/x-yaml"},
-            produces = "application/json; charset=UTF-8"
+        path = "/{uuid}",
+        consumes = { MediaType.APPLICATION_JSON_VALUE, "application/x-yaml" },
+        produces = "application/json; charset=UTF-8"
     )
     public ResponseEntity<Function> updateFunction(
-            @Valid @RequestBody Function functionDTO,
-            @ValidateField @PathVariable String uuid
+        @Valid @RequestBody Function functionDTO,
+        @ValidateField @PathVariable String uuid
     ) {
         return ResponseEntity.ok(this.functionService.updateFunction(functionDTO, uuid));
     }
 
     @Operation(summary = "Delete a function", description = "Delete a specific function")
     @DeleteMapping(path = "/{uuid}")
     public ResponseEntity<Boolean> deleteFunction(
-            @ValidateField @PathVariable String uuid,
-            @RequestParam(value = "cascade", defaultValue = "false") Boolean cascade
+        @ValidateField @PathVariable String uuid,
+        @RequestParam(value = "cascade", defaultValue = "false") Boolean cascade
     ) {
         return ResponseEntity.ok(this.functionService.deleteFunction(uuid, cascade));
     }