Various cleanups (#370)

Author: johnksv

.java-version

@@ -0,0 +1 @@
+21.0

onyxia-api/src/main/java/fr/insee/onyxia/api/configuration/CatalogWrapper.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import fr.insee.onyxia.model.catalog.CatalogStatus;
+import fr.insee.onyxia.model.helm.Repository;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +16,7 @@
 public class CatalogWrapper {
 
     @Schema(description = "Catalog")
-    private fr.insee.onyxia.model.catalog.CatalogWrapper catalog;
+    private fr.insee.onyxia.model.catalog.CatalogWrapper catalog = new Repository();
 
     @Schema(description = "Catalog id")
     private String id;

onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/mylab/MyLabController.java

@@ -50,7 +50,6 @@ public MyLabController(
                     "List the services installed in a namespace. With a Kubernetes backend, utilize Helm to list all installed services in a namespace.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",
@@ -62,7 +61,6 @@ public MyLabController(
                                         description = "Generated project id.",
                                         example = "project-id-example")),
                 @Parameter(
-                        required = false,
                         name = "groupId",
                         description = "Deprectated.",
                         deprecated = true,
@@ -104,7 +102,6 @@ public Catalogs getMyCatalogs(@Parameter(hidden = true) Region region) {
                     "Get the description of an installed service in the namespace. With Kubernetes backend, an installed service can be seen as a Helm chart. Its unique identifier will be the release name on the namespace.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",
@@ -122,7 +119,7 @@ public Catalogs getMyCatalogs(@Parameter(hidden = true) Region region) {
                         in = ParameterIn.QUERY)
             })
     @GetMapping("/app")
-    public @ResponseBody Service getApp(
+    public Service getApp(
             @Parameter(hidden = true) Region region,
             @Parameter(hidden = true) Project project,
             @RequestParam("serviceId") String serviceId)
@@ -140,7 +137,6 @@ public Catalogs getMyCatalogs(@Parameter(hidden = true) Region region) {
                     "Get the logs of a task in an installed service. With Kubernetes backend, it can be seen as the logs of a pod in the service.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",
@@ -163,7 +159,7 @@ public Catalogs getMyCatalogs(@Parameter(hidden = true) Region region) {
                         in = ParameterIn.QUERY)
             })
     @GetMapping("/app/logs")
-    public @ResponseBody String getLogs(
+    public String getLogs(
             @Parameter(hidden = true) Region region,
             @Parameter(hidden = true) Project project,
             @RequestParam("serviceId") String serviceId,
@@ -181,7 +177,6 @@ public Catalogs getMyCatalogs(@Parameter(hidden = true) Region region) {
                     "Delete an installed service launched through Onyxia on the namespace given the path, or delete *ALL* installed services on the namespace on bulk deletes. It will prioritize the bulk parameter.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",
@@ -195,13 +190,11 @@ public Catalogs getMyCatalogs(@Parameter(hidden = true) Region region) {
                 @Parameter(
                         name = "path",
                         description = "Path to the installed service in that namespace.",
-                        required = false,
                         in = ParameterIn.QUERY),
                 @Parameter(
                         name = "bulk",
                         description =
                                 "Wheather to delete all services in a namespace, if set to true, or to look at path.",
-                        required = false,
                         in = ParameterIn.QUERY)
             })
     @DeleteMapping("/app")
@@ -224,7 +217,6 @@ public UninstallService destroyApp(
                     "Launch a service package through Onyxia in the namespace, given its catalog, package and configurations out of the available services in this Onyxia instance. More information of available catalogs and packages can be found in the public endpoints.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",

onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/mylab/QuotaController.java

@@ -51,7 +51,6 @@ public QuotaController(KubernetesService kubernetesService, UserProvider userPro
                     "Obtain both the quota limit for a namespace and the current quota usage, if quota limits are enabled on Onyxia.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",
@@ -97,7 +96,6 @@ public QuotaUsage getQuota(
                     "Change the quota for a namespace if the quota changing option is enabled.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",
@@ -129,7 +127,6 @@ public void applyQuota(
                     "Reset the quota for a namespace to the default value if the quota changing option is enabled.",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-PROJECT",
                         description =
                                 "Project associated with the namespace, defaults to user project.",

onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/onboarding/OnboardingController.java

@@ -40,7 +40,6 @@ public OnboardingController(KubernetesService kubernetesService, UserProvider us
                     "create or replace the namespace of the user or the namespace of a group if the user is in the requested group and the according rbac policies. with the group prefix / user prefix of the region",
             parameters = {
                 @Parameter(
-                        required = false,
                         name = "ONYXIA-REGION",
                         description =
                                 "The region used by the user, if not provided default to the first region configured.",
@@ -82,8 +81,7 @@ private void checkPermissions(Region region, OnboardingRequest request)
                     "Specification on which namespace to create. If group is provided, create a group namespace, otherwise create the user namespace.")
     public static class OnboardingRequest {
 
-        @Schema(required = false)
-        private String group;
+        @Schema private String group;
 
         public String getGroup() {
             return group;

onyxia-api/src/main/java/fr/insee/onyxia/api/dao/universe/CatalogLoader.java

@@ -23,7 +23,6 @@
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -35,11 +34,15 @@ public class CatalogLoader {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CatalogLoader.class);
 
-    @Autowired private ResourceLoader resourceLoader;
+    private final ResourceLoader resourceLoader;
 
-    @Autowired
-    @Qualifier("helm")
-    private ObjectMapper mapperHelm;
+    private final ObjectMapper mapperHelm;
+
+    public CatalogLoader(
+            ResourceLoader resourceLoader, @Qualifier("helm") ObjectMapper mapperHelm) {
+        this.resourceLoader = resourceLoader;
+        this.mapperHelm = mapperHelm;
+    }
 
     public void updateCatalog(CatalogWrapper cw) {
         LOGGER.info("updating catalog with id :{} and type {}", cw.getId(), cw.getType());

onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java

@@ -10,7 +10,7 @@
 public abstract class CatalogWrapper {
 
     @Schema(description = "This entries are those from a standard helm repository")
-    private Map<String, List<Chart>> entries;
+    private Map<String, List<Chart>> entries = Map.of();
 
     public Optional<Chart> getPackageByName(String name) {
         return entries.get(name).stream().findFirst();

onyxia-model/src/main/java/fr/insee/onyxia/model/dto/CreateServiceDTO.java

@@ -8,7 +8,6 @@
 public class CreateServiceDTO {
     @Schema(
             description = "Catalog where the package of the service is taken from.",
-            required = false,
             defaultValue = "internal")
     String catalogId;
 
@@ -20,21 +19,17 @@ public class CreateServiceDTO {
 
     @Schema(
             description =
-                    "Version of the helm package, passe la version dans la création, si pas null",
-            required = false)
+                    "Version of the helm package, passe la version dans la création, si pas null")
     String packageVersion;
 
-    @Schema(
-            description = "A chosen name for the service, si null un nom est généré par helm",
-            required = false)
+    @Schema(description = "A chosen name for the service, si null un nom est généré par helm")
     String name;
 
     @Schema(description = "Contenu du values.yaml", required = true)
     Object options;
 
     @Schema(
             description = "when true nothing is run (mode dry run de helm) faux par défaut",
-            required = false,
             defaultValue = "false")
     boolean dryRun = false;