Merge "Remove remaining Jackson"

diff --git a/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java b/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java
index 7702307..e5ef3c6 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java
+++ b/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java
@@ -26,7 +26,6 @@ package org.onap.clamp.clds.client;
 \r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
-import com.fasterxml.jackson.core.JsonProcessingException;\r
 \r
 import java.io.IOException;\r
 import java.util.Date;\r
@@ -83,7 +82,7 @@ public class DcaeInventoryServices {
      * @throws ParseException\r
      *         In case of DCAE Json parse exception\r
      */\r
-    public void setEventInventory(CldsModel cldsModel, String userId) throws ParseException, InterruptedException {\r
+    public void setEventInventory(CldsModel cldsModel, String userId) throws InterruptedException {\r
         String artifactName = cldsModel.getControlName();\r
         DcaeEvent dcaeEvent = new DcaeEvent();\r
         DcaeInventoryResponse dcaeResponse = null;\r
@@ -109,7 +108,7 @@ public class DcaeInventoryServices {
             dcaeEvent.setArtifactName(artifactName);\r
             dcaeEvent.setEvent(DcaeEvent.EVENT_DISTRIBUTION);\r
             LoggingUtils.setResponseContext("0", "Set inventory success", this.getClass().getName());\r
-        } catch (JsonProcessingException e) {\r
+        } catch (ParseException e) {\r
             LoggingUtils.setResponseContext("900", "Set inventory failed", this.getClass().getName());\r
             LoggingUtils.setErrorContext("900", "Set inventory error");\r
             logger.error("Error during JSON decoding", e);\r
@@ -154,8 +153,7 @@ public class DcaeInventoryServices {
         return totalCount.intValue();\r
     }\r
 \r
-    private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr)\r
-        throws ParseException {\r
+    private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr) throws ParseException {\r
         JSONParser parser = new JSONParser();\r
         Object obj0 = parser.parse(responseStr);\r
         JSONObject jsonObj = (JSONObject) obj0;\r

diff --git a/src/main/java/org/onap/clamp/clds/model/CldsDictionary.java b/src/main/java/org/onap/clamp/clds/model/CldsDictionary.java
index a9b003d..73f9590 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/CldsDictionary.java
+++ b/src/main/java/org/onap/clamp/clds/model/CldsDictionary.java
@@ -23,9 +23,6 @@
 
 package org.onap.clamp.clds.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,7 +31,7 @@ import org.onap.clamp.clds.dao.CldsDao;
 /**
  * Represents a CLDS Dictionary.
  */
-@JsonInclude(Include.NON_NULL)
+
 public class CldsDictionary {
 
     private String dictionaryId;

diff --git a/src/main/java/org/onap/clamp/clds/model/CldsDictionaryItem.java b/src/main/java/org/onap/clamp/clds/model/CldsDictionaryItem.java
index 87ba9fe..cb051b8 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/CldsDictionaryItem.java
+++ b/src/main/java/org/onap/clamp/clds/model/CldsDictionaryItem.java
@@ -23,9 +23,6 @@
 
 package org.onap.clamp.clds.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
 import java.util.List;
 
 import org.onap.clamp.clds.dao.CldsDao;
@@ -33,7 +30,6 @@ import org.onap.clamp.clds.dao.CldsDao;
 /**
  * Represents a CLDS Dictionary Item.
  */
-@JsonInclude(Include.NON_NULL)
 public class CldsDictionaryItem {
 
     private String dictElementId;

diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java b/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java
index 3b1dffa..74582a8 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java
+++ b/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java
@@ -19,17 +19,14 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 
 package org.onap.clamp.clds.model.dcae;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
 /**
  * This class maps the DCAE inventory answer to a nice pojo.
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class DcaeInventoryResponse {
 
     private String typeName;