WIP_DIRECTORIES

Author: pathob

commons/src/main/java/com/deftdevs/bootstrapi/commons/model/AbstractDirectoryModel.java

@@ -7,7 +7,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.Date;
@@ -44,7 +43,6 @@ public abstract class AbstractDirectoryModel {
     private Long id;
 
     @XmlElement
-    @NotNull
     private String name;
 
     @XmlElement

commons/src/main/java/com/deftdevs/bootstrapi/commons/rest/AbstractDirectoriesResourceImpl.java

@@ -4,37 +4,35 @@
 import com.deftdevs.bootstrapi.commons.rest.api.DirectoriesResource;
 import com.deftdevs.bootstrapi.commons.service.api.DirectoriesService;
 
-import javax.ws.rs.core.Response;
-import java.util.List;
+import java.util.Map;
 
 public abstract class AbstractDirectoriesResourceImpl implements DirectoriesResource {
 
     private final DirectoriesService directoriesService;
 
-    public AbstractDirectoriesResourceImpl(DirectoriesService directoriesService) {
+    public AbstractDirectoriesResourceImpl(
+            final DirectoriesService directoriesService) {
+
         this.directoriesService = directoriesService;
     }
 
     @Override
-    public Response getDirectories() {
-        final List<AbstractDirectoryModel> directoryModels = directoriesService.getDirectories();
-        return Response.ok(directoryModels).build();
+    public Map<String, ? extends AbstractDirectoryModel> getDirectories() {
+        return directoriesService.getDirectories();
     }
 
     @Override
-    public Response setDirectories (
-            final boolean testConnection,
-            final List<AbstractDirectoryModel> directories) {
+    public Map<String, ? extends AbstractDirectoryModel> setDirectories (
+            final Map<String, ? extends AbstractDirectoryModel> directories) {
 
-        List<AbstractDirectoryModel> directoryModels = directoriesService.setDirectories(directories, testConnection);
-        return Response.ok(directoryModels).build();
+        return directoriesService.setDirectories(directories);
     }
 
     @Override
-    public Response deleteDirectories(
+    public void deleteDirectories(
             final boolean force) {
+
         directoriesService.deleteDirectories(force);
-        return Response.ok().build();
     }
 
 }

commons/src/main/java/com/deftdevs/bootstrapi/commons/rest/api/DirectoriesResource.java

@@ -4,15 +4,18 @@
 import com.deftdevs.bootstrapi.commons.model.AbstractDirectoryModel;
 import com.deftdevs.bootstrapi.commons.model.ErrorCollection;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.util.List;
+import java.util.Map;
 
 public interface DirectoriesResource {
 
@@ -23,38 +26,37 @@ public interface DirectoriesResource {
             summary = "Get all user directories",
             responses = {
                     @ApiResponse(
-                            responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = AbstractDirectoryModel.class))),
-                            description = "Returns all directories."
+                            responseCode = "200", content = @Content(schema = @Schema(type = "object", additionalPropertiesSchema = AbstractDirectoryModel.class)),
+                            description = "Returns directories mapped by their name."
                     ),
                     @ApiResponse(
                             responseCode = "default", content = @Content(schema = @Schema(implementation = ErrorCollection.class)),
                             description = "Returns a list of error messages."
                     ),
             }
     )
-    Response getDirectories();
+    Map<String, ? extends AbstractDirectoryModel> getDirectories();
 
     @PUT
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Operation(
             tags = { BootstrAPI.DIRECTORIES },
-            summary = "Set a list of user directories",
+            summary = "Set directories mapped by their name.",
             description = "NOTE: All existing directories with the same 'name' attribute are updated.",
             responses = {
                     @ApiResponse(
-                            responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = AbstractDirectoryModel.class))),
-                            description = "Returns all directories."
+                            responseCode = "200", content = @Content(schema = @Schema(type = "object", additionalPropertiesSchema = AbstractDirectoryModel.class)),
+                            description = "Returns directories mapped by their name."
                     ),
                     @ApiResponse(
                             responseCode = "default", content = @Content(schema = @Schema(implementation = ErrorCollection.class)),
                             description = "Returns a list of error messages."
                     ),
             }
     )
-    Response setDirectories(
-            @QueryParam("test-connection") @DefaultValue("false") final boolean testConnection,
-            final List<AbstractDirectoryModel> directories);
+    Map<String, ? extends AbstractDirectoryModel> setDirectories(
+            final Map<String, ? extends AbstractDirectoryModel> directories);
 
     @DELETE
     @Operation(
@@ -72,7 +74,7 @@ Response setDirectories(
                     ),
             }
     )
-    Response deleteDirectories(
+    void deleteDirectories(
             @QueryParam("force") final boolean force);
 
 }

commons/src/main/java/com/deftdevs/bootstrapi/commons/service/AbstractDirectoriesService.java

@@ -0,0 +1,49 @@
+package com.deftdevs.bootstrapi.commons.service;
+
+import com.deftdevs.bootstrapi.commons.exception.web.BadRequestException;
+import com.deftdevs.bootstrapi.commons.model.AbstractDirectoryModel;
+import com.deftdevs.bootstrapi.commons.service.api.DirectoriesService;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public abstract class AbstractDirectoriesService implements DirectoriesService {
+
+    @Override
+    public Map<String, ? extends AbstractDirectoryModel> setDirectories(
+            final Map<String, ? extends AbstractDirectoryModel> directoryModels) {
+
+        final Map<String, AbstractDirectoryModel> existingDirectoriesByName = getDirectories().values().stream()
+                .collect(Collectors.toMap(AbstractDirectoryModel::getName, Function.identity()));
+
+        final Map<String, AbstractDirectoryModel> resultDirectories = new LinkedHashMap<>();
+
+        for (Map.Entry<String, ? extends AbstractDirectoryModel> directoryModelEntry : directoryModels.entrySet()) {
+            final AbstractDirectoryModel directoryModel = directoryModelEntry.getValue();
+
+            // Check if directoryModel is not an instance of any supported class
+            if (getSupportedClassesForUpdate().stream().noneMatch(clazz -> clazz.isInstance(directoryModel))) {
+                throw new BadRequestException(String.format("Updating directory type '%s' is not supported (yet)", directoryModel.getClass()));
+            }
+
+            final AbstractDirectoryModel existingDirectoryModel = existingDirectoriesByName.get(directoryModelEntry.getKey());
+            final AbstractDirectoryModel resultDirectoryModel;
+
+            if (existingDirectoryModel != null) {
+                resultDirectoryModel = setDirectory(existingDirectoryModel.getId(), directoryModelEntry.getValue(), false);
+            } else {
+                resultDirectoryModel = addDirectory(directoryModelEntry.getValue(), false);
+            }
+
+            resultDirectories.put(resultDirectoryModel.getName(), resultDirectoryModel);
+        }
+
+        return resultDirectories;
+    }
+
+    protected abstract Set<Class<? extends AbstractDirectoryModel>> getSupportedClassesForUpdate();
+
+}

commons/src/main/java/com/deftdevs/bootstrapi/commons/service/DefaultApplicationLinksServiceImpl.java

@@ -116,6 +116,11 @@ public List<ApplicationLinkModel> setApplicationLinks(
         return getApplicationLinks();
     }
 
+    @Override
+    public Map<String, ApplicationLinkModel> setApplicationLinks(Map<String, ApplicationLinkModel> applicationLinkModels) {
+        return Map.of();
+    }
+
     @Override
     public ApplicationLinkModel setApplicationLink(
             final UUID uuid,

commons/src/main/java/com/deftdevs/bootstrapi/commons/service/api/ApplicationLinksService.java

@@ -3,6 +3,7 @@
 import com.deftdevs.bootstrapi.commons.model.ApplicationLinkModel;
 
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 public interface ApplicationLinksService {
@@ -35,6 +36,15 @@ List<ApplicationLinkModel> setApplicationLinks(
             final List<ApplicationLinkModel> applicationLinkModels,
             boolean ignoreSetupErrors);
 
+    /**
+     * Sets or updates the given application links
+     *
+     * @param applicationLinkModels the application links to set / update
+     * @return the updated application links
+     */
+    Map<String, ApplicationLinkModel> setApplicationLinks(
+            final Map<String, ApplicationLinkModel> applicationLinkModels);
+
     /**
      * Updates the given application link
      *

commons/src/main/java/com/deftdevs/bootstrapi/commons/service/api/DirectoriesService.java

@@ -2,7 +2,7 @@
 
 import com.deftdevs.bootstrapi.commons.model.AbstractDirectoryModel;
 
-import java.util.List;
+import java.util.Map;
 
 /**
  * The User directory service interface.
@@ -14,7 +14,7 @@ public interface DirectoriesService {
      *
      * @return the directories
      */
-    List<AbstractDirectoryModel> getDirectories();
+    Map<String, ? extends AbstractDirectoryModel> getDirectories();
 
     /**
      * Gets a single directory.
@@ -26,38 +26,36 @@ AbstractDirectoryModel getDirectory(
             final long id);
 
     /**
-     * Adds or Updates directory configurations. Any existing configurations with the same 'name' property is updated.
+     * Adds or Updates directory configurations. Any existing configurations with the same key is updated.
      *
-     * @param directories    the directories
-     * @param testConnection whether to test connection
+     * @param directoryModels the directories
      * @return the directories
      */
-    List<AbstractDirectoryModel> setDirectories(
-            List<AbstractDirectoryModel> directories,
-            boolean testConnection);
+    Map<String, ? extends AbstractDirectoryModel> setDirectories(
+            Map<String, ? extends AbstractDirectoryModel> directoryModels);
 
     /**
      * Updates a single directory configuration. Any existing configuration with the same 'name' property is updated.
      *
      * @param id             the directory id to update
-     * @param directory      the directory
+     * @param directoryModel the directory
      * @param testConnection whether to test connection
      * @return the directories
      */
     AbstractDirectoryModel setDirectory(
             long id,
-            AbstractDirectoryModel directory,
+            AbstractDirectoryModel directoryModel,
             boolean testConnection);
 
     /**
      * Adds a new directory configuration.
      *
-     * @param directory      the directories
+     * @param directoryModel      the directories
      * @param testConnection whether to test connection
      * @return the added directory
      */
     AbstractDirectoryModel addDirectory(
-            AbstractDirectoryModel directory,
+            AbstractDirectoryModel directoryModel,
             boolean testConnection);
 
     /**

commons/src/main/java/com/deftdevs/bootstrapi/commons/service/api/UsersService.java

@@ -3,6 +3,7 @@
 import com.deftdevs.bootstrapi.commons.model.UserModel;
 
 import java.util.List;
+import java.util.Map;
 
 public interface UsersService {
 
@@ -48,6 +49,17 @@ List<UserModel> setUsers(
             final long directoryId,
             final List<UserModel> userModels);
 
+    /**
+     * Set (add or update) users.
+     *
+     * @param directoryId the directory id
+     * @param userModels the user beans
+     * @return the set user beans
+     */
+    Map<String, UserModel> setUsers(
+            final long directoryId,
+            final Map<String, UserModel> userModels);
+
     /**
      * Update the user.
      *

commons/src/test/java/com/deftdevs/bootstrapi/commons/rest/DirectoriesResourceTest.java

@@ -10,10 +10,11 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import javax.ws.rs.core.Response;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -35,27 +36,22 @@ public void setup() {
     @Test
     void testGetDirectories() {
         final DirectoryCrowdModel initialDirectoryModel = DirectoryCrowdModel.EXAMPLE_1;
-        final List<AbstractDirectoryModel> directoryModels = Collections.singletonList(initialDirectoryModel);
+        final Map<String, AbstractDirectoryModel> directoryModels = Collections.singletonMap(initialDirectoryModel.getName(), initialDirectoryModel);
         doReturn(directoryModels).when(directoriesService).getDirectories();
 
-        final Response response = resource.getDirectories();
-        assertEquals(200, response.getStatus());
-
-        final List<AbstractDirectoryModel> responseDirectoryModels = (List<AbstractDirectoryModel>) response.getEntity();
-        assertEquals(initialDirectoryModel, responseDirectoryModels.iterator().next());
+        final Map<String, ? extends AbstractDirectoryModel> responseDirectoryModels = resource.getDirectories();
+        assertEquals(initialDirectoryModel, responseDirectoryModels.values().iterator().next());
     }
 
     @Test
     void testSetDirectories() {
         final DirectoryCrowdModel directoryModel1 = DirectoryCrowdModel.EXAMPLE_1;
         final DirectoryCrowdModel directoryModel2 = DirectoryCrowdModel.EXAMPLE_3;
-        final List<AbstractDirectoryModel> directoryModels = Arrays.asList(directoryModel1, directoryModel2);
-        doReturn(directoryModels).when(directoriesService).setDirectories(directoryModels, false);
-
-        final Response response = resource.setDirectories(Boolean.FALSE, directoryModels);
-        assertEquals(200, response.getStatus());
+        final Map<String, ? extends AbstractDirectoryModel> directoryModels = Stream.of(directoryModel1, directoryModel2)
+                        .collect(Collectors.toMap(AbstractDirectoryModel::getName, Function.identity()));
+        doReturn(directoryModels).when(directoriesService).setDirectories(directoryModels);
 
-        final List<AbstractDirectoryModel> responseDirectoryModels = (List<AbstractDirectoryModel>) response.getEntity();
+        final Map<String, ? extends AbstractDirectoryModel> responseDirectoryModels = resource.setDirectories(directoryModels);
         assertEquals(directoryModels.size(), responseDirectoryModels.size());
     }