Merge pull request #114 from deftdevs/separate-single-and-multi-entit…

…y-endpoints

Separate endpoints for single and multiple entities

commons/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>com.deftdevs</groupId>
  <artifactId>bootstrapi-parent</artifactId>
- <version>0.8.3-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>bootstrapi-commons</artifactId>

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

@@ -0,0 +1,56 @@
+package com.deftdevs.bootstrapi.commons.rest;
+
+import com.deftdevs.bootstrapi.commons.model.ApplicationLinkBean;
+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 {
+
+ private final ApplicationLinksService applicationLinksService;
+
+ public AbstractApplicationLinkResourceImpl(
+ final ApplicationLinksService applicationLinksService) {
+
+ this.applicationLinksService = applicationLinksService;
+ }
+
+ @Override
+ public Response getApplicationLink(
+ final UUID uuid) {
+
+ final ApplicationLinkBean linkBean = applicationLinksService.getApplicationLink(uuid);
+ return Response.ok(linkBean).build();
+ }
+
+ @Override
+ public Response createApplicationLink(
+ final boolean ignoreSetupErrors,
+ final ApplicationLinkBean linkBean) {
+
+ final ApplicationLinkBean addedApplicationLink = applicationLinksService.addApplicationLink(
+ linkBean, ignoreSetupErrors);
+ return Response.ok(addedApplicationLink).build();
+ }
+
+ @Override
+ public Response updateApplicationLink(
+ final UUID uuid,
+ final boolean ignoreSetupErrors,
+ final ApplicationLinkBean linkBean) {
+
+ final ApplicationLinkBean updatedLinkBean = applicationLinksService.setApplicationLink(
+ uuid, linkBean, ignoreSetupErrors);
+ return Response.ok(updatedLinkBean).build();
+ }
+
+ @Override
+ public Response deleteApplicationLink(
+ final UUID uuid) {
+
+ applicationLinksService.deleteApplicationLink(uuid);
+ return Response.ok().build();
+ }
+}

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

@@ -6,8 +6,6 @@
 
 import javax.ws.rs.core.Response;
 import java.util.List;
-import java.util.List;
-import java.util.UUID;
 
 public abstract class AbstractApplicationLinksResourceImpl implements ApplicationLinksResource {
 
@@ -25,14 +23,6 @@ public Response getApplicationLinks() {
  return Response.ok(applicationLinkBeans).build();
  }
 
- @Override
- public Response getApplicationLink(
- final UUID uuid) {
-
- final ApplicationLinkBean linkBean = applicationLinksService.getApplicationLink(uuid);
- return Response.ok(linkBean).build();
- }
-
  @Override
  public Response setApplicationLinks(
  final boolean ignoreSetupErrors,
@@ -43,40 +33,11 @@ public Response setApplicationLinks(
  return Response.ok(updatedApplicationLinkBeans).build();
  }
 
- @Override
- public Response updateApplicationLink(
- final UUID uuid,
- final boolean ignoreSetupErrors,
- final ApplicationLinkBean linkBean) {
-
- final ApplicationLinkBean updatedLinkBean = applicationLinksService.setApplicationLink(
- uuid, linkBean, ignoreSetupErrors);
- return Response.ok(updatedLinkBean).build();
- }
-
- @Override
- public Response createApplicationLink(
- final boolean ignoreSetupErrors,
- final ApplicationLinkBean linkBean) {
-
- final ApplicationLinkBean addedApplicationLink = applicationLinksService.addApplicationLink(
- linkBean, ignoreSetupErrors);
- return Response.ok(addedApplicationLink).build();
- }
-
  @Override
  public Response deleteApplicationLinks(
  final boolean force) {
 
  applicationLinksService.deleteApplicationLinks(force);
  return Response.ok().build();
  }
-
- @Override
- public Response deleteApplicationLink(
- final UUID uuid) {
-
- applicationLinksService.deleteApplicationLink(uuid);
- return Response.ok().build();
- }
 }

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

@@ -21,13 +21,6 @@ public Response getDirectories() {
  return Response.ok(directoryBeans).build();
  }
 
- @Override
- public Response getDirectory(
- final long id) {
- final AbstractDirectoryBean directoryBean = directoriesService.getDirectory(id);
- return Response.ok(directoryBean).build();
- }
-
  @Override
  public Response setDirectories (
  final boolean testConnection,
@@ -37,36 +30,11 @@ public Response setDirectories (
  return Response.ok(directoryBeans).build();
  }
 
- @Override
- public Response updateDirectory(
- final long id,
- final boolean testConnection,
- final AbstractDirectoryBean directory) {
-
- AbstractDirectoryBean resultDirectoryBean = directoriesService.setDirectory(id, directory, testConnection);
- return Response.ok(resultDirectoryBean).build();
- }
-
- @Override
- public Response createDirectory(
- final boolean testConnection,
- final AbstractDirectoryBean directory) {
-
- AbstractDirectoryBean addedDirectoryBean = directoriesService.addDirectory(directory, testConnection);
- return Response.ok(addedDirectoryBean).build();
- }
-
  @Override
  public Response deleteDirectories(
  final boolean force) {
  directoriesService.deleteDirectories(force);
  return Response.ok().build();
  }
 
- @Override
- public Response deleteDirectory(
- final long id) {
- directoriesService.deleteDirectory(id);
- return Response.ok().build();
- }
 }

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

@@ -0,0 +1,49 @@
+package com.deftdevs.bootstrapi.commons.rest;
+
+import com.deftdevs.bootstrapi.commons.model.AbstractDirectoryBean;
+import com.deftdevs.bootstrapi.commons.rest.api.DirectoryResource;
+import com.deftdevs.bootstrapi.commons.service.api.DirectoriesService;
+
+import javax.ws.rs.core.Response;
+
+public abstract class AbstractDirectoryResourceImpl implements DirectoryResource {
+
+ private final DirectoriesService directoriesService;
+
+ public AbstractDirectoryResourceImpl(DirectoriesService directoriesService) {
+ this.directoriesService = directoriesService;
+ }
+
+ @Override
+ public Response getDirectory(
+ final long id) {
+ final AbstractDirectoryBean directoryBean = directoriesService.getDirectory(id);
+ return Response.ok(directoryBean).build();
+ }
+
+ @Override
+ public Response updateDirectory(
+ final long id,
+ final boolean testConnection,
+ final AbstractDirectoryBean directory) {
+
+ AbstractDirectoryBean resultDirectoryBean = directoriesService.setDirectory(id, directory, testConnection);
+ return Response.ok(resultDirectoryBean).build();
+ }
+
+ @Override
+ public Response createDirectory(
+ final boolean testConnection,
+ final AbstractDirectoryBean directory) {
+
+ AbstractDirectoryBean addedDirectoryBean = directoriesService.addDirectory(directory, testConnection);
+ return Response.ok(addedDirectoryBean).build();
+ }
+
+ @Override
+ public Response deleteDirectory(
+ final long id) {
+ directoriesService.deleteDirectory(id);
+ return Response.ok().build();
+ }
+}

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

@@ -0,0 +1,47 @@
+package com.deftdevs.bootstrapi.commons.rest;
+
+import com.deftdevs.bootstrapi.commons.model.GadgetBean;
+import com.deftdevs.bootstrapi.commons.rest.api.GadgetResource;
+import com.deftdevs.bootstrapi.commons.service.api.GadgetsService;
+
+import javax.ws.rs.core.Response;
+
+public abstract class AbstractGadgetResourceImpl implements GadgetResource {
+
+ private final GadgetsService gadgetsService;
+
+ public AbstractGadgetResourceImpl(final GadgetsService gadgetsService) {
+ this.gadgetsService = gadgetsService;
+ }
+
+ @Override
+ public Response getGadget(
+ final long id) {
+ final GadgetBean gadgetBean = gadgetsService.getGadget(id);
+ return Response.ok(gadgetBean).build();
+ }
+
+ @Override
+ public Response updateGadget(
+ final long id,
+ final GadgetBean gadgetBean) {
+ GadgetBean updatedGadgetBean = gadgetsService.setGadget(
+ id,
+ gadgetBean);
+ return Response.ok(updatedGadgetBean).build();
+ }
+
+ @Override
+ public Response createGadget(
+ final GadgetBean gadgetBean) {
+ GadgetBean addedGadgetBean = gadgetsService.addGadget(gadgetBean);
+ return Response.ok(addedGadgetBean).build();
+ }
+
+ @Override
+ public Response deleteGadget(
+ final long id) {
+ gadgetsService.deleteGadget(id);
+ return Response.ok().build();
+ }
+}

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

@@ -21,48 +21,18 @@ public Response getGadgets() {
  return Response.ok(gadgetBeans).build();
  }
 
- @Override
- public Response getGadget(
- final long id) {
- final GadgetBean gadgetBean = gadgetsService.getGadget(id);
- return Response.ok(gadgetBean).build();
- }
-
  @Override
  public Response setGadgets(
  final List<GadgetBean> gadgetBeans) {
  List<GadgetBean> updatedGadgetBeans = gadgetsService.setGadgets(gadgetBeans);
  return Response.ok(updatedGadgetBeans).build();
  }
 
- @Override
- public Response updateGadget(
- final long id,
- final GadgetBean gadgetBean) {
- GadgetBean updatedGadgetBean = gadgetsService.setGadget(
- id,
- gadgetBean);
- return Response.ok(updatedGadgetBean).build();
- }
-
- @Override
- public Response createGadget(
- final GadgetBean gadgetBean) {
- GadgetBean addedGadgetBean = gadgetsService.addGadget(gadgetBean);
- return Response.ok(addedGadgetBean).build();
- }
-
  @Override
  public Response deleteGadgets(
  final boolean force) {
  gadgetsService.deleteGadgets(force);
  return Response.ok().build();
  }
 
- @Override
- public Response deleteGadget(
- final long id) {
- gadgetsService.deleteGadget(id);
- return Response.ok().build();
- }
 }

commons/src/main/java/com/deftdevs/bootstrapi/commons/rest/AbstractUsersResourceImpl.java → commons/src/main/java/com/deftdevs/bootstrapi/commons/rest/AbstractUserResourceImpl.java

@@ -1,16 +1,16 @@
 package com.deftdevs.bootstrapi.commons.rest;
 
 import com.deftdevs.bootstrapi.commons.model.UserBean;
-import com.deftdevs.bootstrapi.commons.rest.api.UsersResource;
+import com.deftdevs.bootstrapi.commons.rest.api.UserResource;
 import com.deftdevs.bootstrapi.commons.service.api.UsersService;
 
 import javax.ws.rs.core.Response;
 
-public class AbstractUsersResourceImpl implements UsersResource {
+public class AbstractUserResourceImpl implements UserResource {
 
  private final UsersService usersService;
 
- public AbstractUsersResourceImpl(final UsersService usersService) {
+ public AbstractUserResourceImpl(final UsersService usersService) {
  this.usersService = usersService;
  }