Change over to map setters for entities endpoints

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

@@ -0,0 +1,15 @@
+package com.deftdevs.bootstrapi.commons.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.xml.bind.annotation.XmlElement;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public abstract class AbstractDirectoryExternalModel extends AbstractDirectoryModel {
+
+    @XmlElement
+    private Boolean testConnection;
+
+}

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/model/ApplicationLinkModel.java

@@ -4,7 +4,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.net.URI;
@@ -43,19 +42,15 @@ public enum ApplicationLinkStatus {
     private UUID uuid;
 
     @XmlElement
-    @NotNull
     private String name;
 
     @XmlElement
-    @NotNull
     private ApplicationLinkType type;
 
     @XmlElement
-    @NotNull
     private URI displayUrl;
 
     @XmlElement
-    @NotNull
     private URI rpcUrl;
 
     @XmlElement
@@ -65,11 +60,14 @@ public enum ApplicationLinkStatus {
     private ApplicationLinkAuthType incomingAuthType;
 
     @XmlElement
-    private boolean primary;
+    private Boolean primary;
 
     @XmlElement
     private ApplicationLinkStatus status;
 
+    @XmlElement
+    private Boolean ignoreSetupErrors;
+
     // Example instances for documentation and tests
 
     public static final ApplicationLinkModel EXAMPLE_1;

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

@@ -17,7 +17,7 @@
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @XmlRootElement(name = BootstrAPI.DIRECTORY + '-' + BootstrAPI.DIRECTORY_CROWD)
-public class DirectoryCrowdModel extends AbstractDirectoryModel {
+public class DirectoryCrowdModel extends AbstractDirectoryExternalModel {
 
     @XmlElement
     private DirectoryCrowdServer server;

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

@@ -13,7 +13,7 @@
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @XmlRootElement(name = BootstrAPI.DIRECTORY + '-' + BootstrAPI.DIRECTORY_DELEGATING)
-public class DirectoryDelegatingModel extends AbstractDirectoryModel {
+public class DirectoryDelegatingModel extends AbstractDirectoryExternalModel {
 
     @XmlElement
     private DirectoryDelegatingConnector connector;

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

@@ -16,7 +16,7 @@
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @XmlRootElement(name = BootstrAPI.DIRECTORY + '-' + BootstrAPI.DIRECTORY_LDAP)
-public class DirectoryLdapModel extends AbstractDirectoryModel {
+public class DirectoryLdapModel extends AbstractDirectoryExternalModel {
 
     @XmlElement
     private DirectoryLdapServer server;

commons/src/main/java/com/deftdevs/bootstrapi/commons/model/util/ApplicationLinkModelUtil.java

@@ -79,7 +79,7 @@ public static ApplicationLinkDetails toApplicationLinkDetails(
                 .name(applicationLinkModel.getName())
                 .displayUrl(applicationLinkModel.getDisplayUrl())
                 .rpcUrl(applicationLinkModel.getRpcUrl())
-                .isPrimary(applicationLinkModel.isPrimary())
+                .isPrimary(applicationLinkModel.getPrimary())
                 .build();
     }
 

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

@@ -4,7 +4,6 @@
 import com.deftdevs.bootstrapi.commons.rest.api.ApplicationLinkResource;
 import com.deftdevs.bootstrapi.commons.service.api.ApplicationLinksService;
 
-import javax.ws.rs.core.Response;
 import java.util.UUID;
 
 public abstract class AbstractApplicationLinkResourceImpl implements ApplicationLinkResource {
@@ -18,39 +17,31 @@ public AbstractApplicationLinkResourceImpl(
     }
 
     @Override
-    public Response getApplicationLink(
+    public ApplicationLinkModel getApplicationLink(
             final UUID uuid) {
 
-        final ApplicationLinkModel linkModel = applicationLinksService.getApplicationLink(uuid);
-        return Response.ok(linkModel).build();
+        return applicationLinksService.getApplicationLink(uuid);
     }
 
     @Override
-    public Response createApplicationLink(
-            final boolean ignoreSetupErrors,
-            final ApplicationLinkModel linkModel) {
+    public ApplicationLinkModel createApplicationLink(
+            final ApplicationLinkModel applicationLinkModel) {
 
-        final ApplicationLinkModel addedApplicationLink = applicationLinksService.addApplicationLink(
-                linkModel, ignoreSetupErrors);
-        return Response.ok(addedApplicationLink).build();
+        return applicationLinksService.addApplicationLink(applicationLinkModel);
     }
 
     @Override
-    public Response updateApplicationLink(
+    public ApplicationLinkModel updateApplicationLink(
             final UUID uuid,
-            final boolean ignoreSetupErrors,
-            final ApplicationLinkModel linkModel) {
+            final ApplicationLinkModel applicationLinkModel) {
 
-        final ApplicationLinkModel updatedLinkModel = applicationLinksService.setApplicationLink(
-                uuid, linkModel, ignoreSetupErrors);
-        return Response.ok(updatedLinkModel).build();
+        return applicationLinksService.setApplicationLink(uuid, applicationLinkModel);
     }
 
     @Override
-    public Response deleteApplicationLink(
+    public void deleteApplicationLink(
             final UUID uuid) {
 
         applicationLinksService.deleteApplicationLink(uuid);
-        return Response.ok().build();
     }
 }

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

@@ -4,8 +4,7 @@
 import com.deftdevs.bootstrapi.commons.rest.api.ApplicationLinksResource;
 import com.deftdevs.bootstrapi.commons.service.api.ApplicationLinksService;
 
-import javax.ws.rs.core.Response;
-import java.util.List;
+import java.util.Map;
 
 public abstract class AbstractApplicationLinksResourceImpl implements ApplicationLinksResource {
 
@@ -18,26 +17,21 @@ public AbstractApplicationLinksResourceImpl(
     }
 
     @Override
-    public Response getApplicationLinks() {
-        final List<ApplicationLinkModel> applicationLinkModels = applicationLinksService.getApplicationLinks();
-        return Response.ok(applicationLinkModels).build();
+    public Map<String, ApplicationLinkModel> getApplicationLinks() {
+        return applicationLinksService.getApplicationLinks();
     }
 
     @Override
-    public Response setApplicationLinks(
-            final boolean ignoreSetupErrors,
-            final List<ApplicationLinkModel> applicationLinkModels) {
+    public Map<String, ApplicationLinkModel> setApplicationLinks(
+            final Map<String, ApplicationLinkModel> applicationLinkModels) {
 
-        final List<ApplicationLinkModel> updatedApplicationLinkModels = applicationLinksService.setApplicationLinks(
-                applicationLinkModels, ignoreSetupErrors);
-        return Response.ok(updatedApplicationLinkModels).build();
+        return applicationLinksService.setApplicationLinks(applicationLinkModels);
     }
 
     @Override
-    public Response deleteApplicationLinks(
+    public void deleteApplicationLinks(
             final boolean force) {
 
         applicationLinksService.deleteApplicationLinks(force);
-        return Response.ok().build();
     }
 }

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

@@ -5,11 +5,10 @@
 import com.deftdevs.bootstrapi.commons.rest.api.AuthenticationResource;
 import com.deftdevs.bootstrapi.commons.service.api.AuthenticationService;
 
-import javax.ws.rs.core.Response;
-import java.util.List;
+import java.util.Map;
 
-public abstract class AbstractAuthenticationResourceImpl<IB extends AbstractAuthenticationIdpModel, SB extends AuthenticationSsoModel, S extends AuthenticationService<IB, SB>>
-        implements AuthenticationResource<IB, SB> {
+public abstract class AbstractAuthenticationResourceImpl<IM extends AbstractAuthenticationIdpModel, SM extends AuthenticationSsoModel, S extends AuthenticationService<IM, SM>>
+        implements AuthenticationResource<IM, SM> {
 
     private final S authenticationService;
 
@@ -20,31 +19,27 @@ protected AbstractAuthenticationResourceImpl(
     }
 
     @Override
-    public Response getAuthenticationIdps() {
-        final List<IB> resultAuthenticationIdpModels = authenticationService.getAuthenticationIdps();
-        return Response.ok(resultAuthenticationIdpModels).build();
+    public Map<String, ? extends IM> getAuthenticationIdps() {
+        return authenticationService.getAuthenticationIdps();
     }
 
     @Override
-    public Response setAuthenticationIdps(
-            final List<IB> authenticationIdpModels) {
+    public Map<String, ? extends IM> setAuthenticationIdps(
+            final Map<String, ? extends IM> authenticationIdpModels) {
 
-        final List<IB> resultAuthenticationIdpModels = authenticationService.setAuthenticationIdps(authenticationIdpModels);
-        return Response.ok(resultAuthenticationIdpModels).build();
+        return authenticationService.setAuthenticationIdps(authenticationIdpModels);
     }
 
     @Override
-    public Response getAuthenticationSso() {
-        final SB resultAuthenticationSsoModel = authenticationService.getAuthenticationSso();
-        return Response.ok(resultAuthenticationSsoModel).build();
+    public SM getAuthenticationSso() {
+        return authenticationService.getAuthenticationSso();
     }
 
     @Override
-    public Response setAuthenticationSso(
-            final SB authenticationSsoModel) {
+    public SM setAuthenticationSso(
+            final SM authenticationSsoModel) {
 
-        final SB resultAuthenticationSsoModel = authenticationService.setAuthenticationSso(authenticationSsoModel);
-        return Response.ok(resultAuthenticationSsoModel).build();
+        return authenticationService.setAuthenticationSso(authenticationSsoModel);
     }
 
 }

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/AbstractDirectoryResourceImpl.java

@@ -15,35 +15,31 @@ public AbstractDirectoryResourceImpl(DirectoriesService directoriesService) {
     }
 
     @Override
-    public Response getDirectory(
+    public AbstractDirectoryModel getDirectory(
             final long id) {
-        final AbstractDirectoryModel directoryModel = directoriesService.getDirectory(id);
-        return Response.ok(directoryModel).build();
+
+        return directoriesService.getDirectory(id);
     }
 
     @Override
-    public Response updateDirectory(
+    public AbstractDirectoryModel updateDirectory(
             final long id,
-            final boolean testConnection,
             final AbstractDirectoryModel directory) {
 
-        AbstractDirectoryModel resultDirectoryModel  = directoriesService.setDirectory(id, directory, testConnection);
-        return Response.ok(resultDirectoryModel).build();
+        return directoriesService.setDirectory(id, directory);
     }
 
     @Override
-    public Response createDirectory(
-            final boolean testConnection,
+    public AbstractDirectoryModel createDirectory(
             final AbstractDirectoryModel directory) {
 
-        AbstractDirectoryModel addedDirectoryModel = directoriesService.addDirectory(directory, testConnection);
-        return Response.ok(addedDirectoryModel).build();
+        return directoriesService.addDirectory(directory);
     }
 
     @Override
-    public Response deleteDirectory(
+    public void deleteDirectory(
             final long id) {
+
         directoriesService.deleteDirectory(id);
-        return Response.ok().build();
     }
 }