Merge pull request #4 from FIWARE-TMForum/develop

Avoid including versions in hrefs
FIWARE-TMForum · Dec 13, 2017 · 8555b39 · 8555b39
2 parents 9447cef + a7cb3e0
commit 8555b39
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 63 deletions.
diff --git a/src/main/java/org/tmf/dsmapi/catalog/resource/Attachment.java b/src/main/java/org/tmf/dsmapi/catalog/resource/Attachment.java
@@ -102,27 +102,12 @@ public boolean equals(Object object) {
         }
 
         final Attachment other = (Attachment) object;
-        if (Utilities.areEqual(this.id, other.id) == false) {
-            return false;
-        }
-
-        if (Utilities.areEqual(this.href, other.href) == false) {
-            return false;
-        }
-
-        if (Utilities.areEqual(this.description, other.description) == false) {
-            return false;
-        }
-
-        if (Utilities.areEqual(this.type, other.type) == false) {
-            return false;
-        }
-
-        if (Utilities.areEqual(this.url, other.url) == false) {
-            return false;
-        }
 
-        return true;
+        return Utilities.areEqual(this.id, other.id) &&
+                Utilities.areEqual(this.href, other.href) &&
+                Utilities.areEqual(this.description, other.description) &&
+                Utilities.areEqual(this.type, other.type) &&
+                Utilities.areEqual(this.url, other.url);
     }
 
     @Override

diff --git a/src/main/java/org/tmf/dsmapi/catalog/resource/product/ProductSpecification.java b/src/main/java/org/tmf/dsmapi/catalog/resource/product/ProductSpecification.java
@@ -427,11 +427,11 @@ public boolean equals(Object object) {
             return false;
         }
 
-        if (Utilities.areEqual(this.attachment, other.attachment) == false) {
+        if (Utilities.areEqual(this.relatedParty, other.relatedParty) == false) {
             return false;
         }
 
-        if (Utilities.areEqual(this.relatedParty, other.relatedParty) == false) {
+        if (Utilities.areEqual(this.attachment, other.attachment) == false) {
             return false;
         }
 

diff --git a/src/main/java/org/tmf/dsmapi/catalog/service/AbstractFacade.java b/src/main/java/org/tmf/dsmapi/catalog/service/AbstractFacade.java
@@ -71,6 +71,10 @@ public void clear() {
         getEntityManager().clear();
     }
 
+    public void flush() {
+        getEntityManager().flush();
+    }
+
     public int count() {
         CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery();
         Root<T> rt = cq.from(entityClass);

diff --git a/src/main/java/org/tmf/dsmapi/catalog/service/AbstractFacadeREST.java b/src/main/java/org/tmf/dsmapi/catalog/service/AbstractFacadeREST.java
@@ -90,7 +90,7 @@ public String buildHref(UriInfo uriInfo, String id, ParsedVersion parsedVersion)
             return null;
         }
 
-        if (basePath.endsWith("/") == false) {
+        if (!basePath.endsWith("/")) {
             basePath += "/";
         }
 
@@ -112,7 +112,7 @@ public String buildHref(UriInfo uriInfo, String id, ParsedVersion parsedVersion)
      *
      */
     public Set<String> getFieldSet(QueryParameterParser queryParameterParser) {
-        Set<String> fieldSet = new HashSet<String>();
+        Set<String> fieldSet = new HashSet<>();
         if (queryParameterParser == null) {
             return fieldSet;
         }

diff --git a/src/main/java/org/tmf/dsmapi/catalog/service/catalog/CatalogFacadeREST.java b/src/main/java/org/tmf/dsmapi/catalog/service/catalog/CatalogFacadeREST.java
@@ -79,7 +79,7 @@ public Response create(CatalogEntity input, @Context UriInfo uriInfo) throws Ill
 
         input.setCreateDefaults();
 
-        if (input.isValid() == false) {
+        if (!input.isValid()) {
             logger.log(Level.FINE, "input is not valid");
             return Response.status(Response.Status.BAD_REQUEST).build();
         }

diff --git a/src/main/java/org/tmf/dsmapi/catalog/service/category/CategoryFacadeREST.java b/src/main/java/org/tmf/dsmapi/catalog/service/category/CategoryFacadeREST.java
@@ -92,7 +92,7 @@ public Response create(CategoryEntity input, @Context UriInfo uriInfo) throws Il
         input.configureCatalogIdentifier();
         manager.create(input);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.edit(input);
 
         publisher.createNotification(input, null, null);
@@ -279,7 +279,7 @@ private Response update_(String entityId, ParsedVersion entityVersion, CategoryE
         input.configureCatalogIdentifier();
 
         if (input.keysMatch(entity)) {
-            input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+            input.setHref(buildHref(uriInfo, input.getId(), null));
             manager.edit(input);
 
             publisher.updateNotification(input, null, null);
@@ -294,7 +294,7 @@ private Response update_(String entityId, ParsedVersion entityVersion, CategoryE
         manager.remove(entity);
         manager.create(input);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.edit(input);
 
         publisher.updateNotification(input, null, null);
@@ -333,7 +333,7 @@ private Response edit_(String entityId, ParsedVersion entityVersion, CategoryEnt
 
         if (input.getVersion() == null) {
             input.setVersion(entity.getVersion());
-            input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+            input.setHref(buildHref(uriInfo, input.getId(), null));
             manager.edit(input);
 
             publisher.valueChangedNotification(input, null, null);
@@ -347,7 +347,7 @@ private Response edit_(String entityId, ParsedVersion entityVersion, CategoryEnt
 
         manager.remove(entity);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.create(input);
 
         publisher.valueChangedNotification(input, null, null);

diff --git a/src/main/java/org/tmf/dsmapi/catalog/service/productOffering/ProductOfferingFacadeREST.java b/src/main/java/org/tmf/dsmapi/catalog/service/productOffering/ProductOfferingFacadeREST.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.ws.rs.Consumes;
@@ -94,7 +93,7 @@ public Response create(ProductOfferingEntity input, @Context UriInfo uriInfo) th
         input.configureCatalogIdentifier();
         manager.create(input);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.edit(input);
 
         publisher.createNotification(input, null, null);
@@ -290,7 +289,7 @@ private Response update_(String entityId, ParsedVersion entityVersion, ProductOf
         input.configureCatalogIdentifier();
 
         if (input.keysMatch(entity)) {
-            input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+            input.setHref(buildHref(uriInfo, input.getId(), null));
             manager.edit(input);
 
             publisher.updateNotification(input, null, null);
@@ -305,7 +304,7 @@ private Response update_(String entityId, ParsedVersion entityVersion, ProductOf
         manager.remove(entity);
         manager.create(input);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.edit(input);
 
         publisher.updateNotification(input, null, null);
@@ -344,7 +343,7 @@ private Response edit_(String entityId, ParsedVersion entityVersion, ProductOffe
 
         if (input.getVersion() == null) {
             input.setVersion(entity.getVersion());
-            input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+            input.setHref(buildHref(uriInfo, input.getId(), null));
             manager.edit(input);
 
             publisher.valueChangedNotification(input, null, null);
@@ -358,7 +357,7 @@ private Response edit_(String entityId, ParsedVersion entityVersion, ProductOffe
 
         manager.remove(entity);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.create(input);
 
         publisher.valueChangedNotification(input, null, null);

diff --git a/.../org/tmf/dsmapi/catalog/service/productOffering/ProductOfferingInCatalogIdFacadeREST.java b/.../org/tmf/dsmapi/catalog/service/productOffering/ProductOfferingInCatalogIdFacadeREST.java
@@ -106,7 +106,7 @@ public Response create(@PathParam("catalogId") String catalogId, ProductOffering
         input.configureCatalogIdentifier();
         input.setCatalogId(catalogId);
         manager.create(input);
-        String href = buildHref(uriInfo, input.getId(), input.getParsedVersion());
+        String href = buildHref(uriInfo, input.getId(), null);
         String rhref = href.replaceFirst("productOffering", "catalog/"+catalogId+ "/productOffering" );
 
         input.setHref(rhref);
@@ -324,7 +324,7 @@ private Response update_(String catalogId, String entityId, ParsedVersion entity
         if (input.keysMatch(entity)) {
 
 
-        String href = buildHref(uriInfo, input.getId(), input.getParsedVersion());
+        String href = buildHref(uriInfo, input.getId(), null);
         String rhref = href.replaceFirst("productOffering", "catalog/"+catalogId+ "/productOffering" );
         input.setHref(rhref);
             manager.edit(input);
@@ -342,7 +342,7 @@ private Response update_(String catalogId, String entityId, ParsedVersion entity
         manager.create(input);
 
 
-        String href = buildHref(uriInfo, input.getId(), input.getParsedVersion());
+        String href = buildHref(uriInfo, input.getId(), null);
         String rhref = href.replaceFirst("productOffering", "catalog/"+catalogId+ "/productOffering" );
         input.setHref(rhref);
 
@@ -384,7 +384,7 @@ private Response edit_(String catalogId, String entityId, ParsedVersion entityVe
 
         if (input.getVersion() == null) {
             input.setVersion(entity.getVersion());
-            String href = buildHref(uriInfo, input.getId(), input.getParsedVersion());
+            String href = buildHref(uriInfo, input.getId(), null);
         String rhref = href.replaceFirst("productOffering", "catalog/"+catalogId+ "/productOffering" );
         input.setHref(rhref);
             manager.edit(input);
@@ -400,7 +400,7 @@ private Response edit_(String catalogId, String entityId, ParsedVersion entityVe
 
         manager.remove(entity);
 
-       String href = buildHref(uriInfo, input.getId(), input.getParsedVersion());
+       String href = buildHref(uriInfo, input.getId(), null);
         String rhref = href.replaceFirst("productOffering", "catalog/"+catalogId+ "/productOffering" );
         input.setHref(rhref);
         manager.create(input);

diff --git a/...a/org/tmf/dsmapi/catalog/service/productSpecification/ProductSpecificationFacadeREST.java b/...a/org/tmf/dsmapi/catalog/service/productSpecification/ProductSpecificationFacadeREST.java
@@ -92,7 +92,7 @@ public Response create(ProductSpecificationEntity input, @Context UriInfo uriInf
         input.configureCatalogIdentifier();
         manager.create(input);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.edit(input);
 
         publisher.createNotification(input, null, null);
@@ -289,7 +289,7 @@ private Response update_(String entityId, ParsedVersion entityVersion, ProductSp
         input.configureCatalogIdentifier();
 
         if (input.keysMatch(entity)) {
-            input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+            input.setHref(buildHref(uriInfo, input.getId(), null));
             manager.edit(input);
             return Response.status(Response.Status.CREATED).entity(entity).build();
         }
@@ -304,7 +304,7 @@ private Response update_(String entityId, ParsedVersion entityVersion, ProductSp
         manager.remove(entity);
         manager.create(input);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.edit(input);
 
         publisher.updateNotification(input, null, null);
@@ -343,11 +343,15 @@ private Response edit_(String entityId, ParsedVersion entityVersion, ProductSpec
 
         if (input.getVersion() == null) {
             input.setVersion(entity.getVersion());
-            input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
-            manager.edit(input);
+
+            manager.remove(entity);
+            manager.flush();
+
+            input.setHref(buildHref(uriInfo, input.getId(), null));
+            manager.create(input);
 
             publisher.valueChangedNotification(input, null, null);
-            return Response.status(Response.Status.CREATED).entity(entity).build();
+            return Response.status(Response.Status.CREATED).entity(input).build();
         }
 
         if (input.hasHigherVersionThan(entity) == false) {
@@ -357,7 +361,7 @@ private Response edit_(String entityId, ParsedVersion entityVersion, ProductSpec
 
         manager.remove(entity);
 
-        input.setHref(buildHref(uriInfo, input.getId(), input.getParsedVersion()));
+        input.setHref(buildHref(uriInfo, input.getId(), null));
         manager.create(input);
 
         publisher.valueChangedNotification(input, null, null);

diff --git a/src/main/java/org/tmf/dsmapi/commons/Utilities.java b/src/main/java/org/tmf/dsmapi/commons/Utilities.java
@@ -14,30 +14,18 @@ private Utilities() {
 
     public static boolean areEqual(Object objectOne, Object objectTwo) {
         if (objectOne == null) {
-            return (objectTwo == null) ? true : false;
+            return objectTwo == null;
         }
 
         return objectOne.equals(objectTwo);
     }
 
     public static boolean hasValue(String input) {
-        if (input == null) {
-            return false;
-        }
-
-        if (input.trim().length() <= 0) {
-            return false;
-        }
-
-        return true;
+        return input != null && input.trim().length() > 0;
     }
 
     public static boolean hasContents(List<?> input) {
-        if (input == null || input.size() <= 0) {
-            return false;
-        }
-
-        return true;
+        return input != null && input.size() > 0;
     }
 
 }