From: James Forsyth <jf2512@att.com>
Date: Thu, 15 Aug 2019 13:37:43 +0000 (+0000)
Subject: Merge "Added sonar fixes"
X-Git-Tag: 1.6.0~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=76796c55198d8b7865c60a05654ef1a7975b0fb9;hp=23dc949b6f0f4635c21ae8969ad1c5f0efa46aff;p=aai%2Fchamp.git

Merge "Added sonar fixes"
---

diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampBulkPayload.java b/champ-service/src/main/java/org/onap/champ/entity/ChampBulkPayload.java
index 9ee9349..aa09306 100644
--- a/champ-service/src/main/java/org/onap/champ/entity/ChampBulkPayload.java
+++ b/champ-service/src/main/java/org/onap/champ/entity/ChampBulkPayload.java
@@ -5,6 +5,8 @@
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * Copyright © 2017-2018 Amdocs
  * ================================================================================
+ * Modifications Copyright (C) 2019 IBM.
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -30,10 +32,10 @@ import java.util.List;
 
 public class ChampBulkPayload {
 
-  public static String ADD_OP = "add";
-  public static String UPDATE_OP = "modify";
-  public static String DELETE_OP = "delete";
-  public static String PATCH_OP = "patch";
+  public static final String ADD_OP = "add";
+  public static final String UPDATE_OP = "modify";
+  public static final String DELETE_OP = "delete";
+  public static final String PATCH_OP = "patch";
 
   private List<ChampBulkOp> edgeDeleteOps = new ArrayList<ChampBulkOp>();
   private List<ChampBulkOp> vertexDeleteOps = new ArrayList<ChampBulkOp>();
diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java b/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java
index 9dc7233..e9a4e00 100644
--- a/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java
+++ b/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java
@@ -5,6 +5,8 @@
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * Copyright © 2017-2018 Amdocs
  * ===================================================================
+ * Modifications Copyright (C) 2019 IBM.
+ * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -60,8 +62,7 @@ public class ChampTransactionCache {
               graphImpl.rollbackTransaction((ChampTransaction) notification.getValue());
               logger.info(ChampMsgs.CHAMP_TX_CACHE, "Transaction rolledback successfully :" + notification.getKey());
             } catch (ChampTransactionException e) {
-              // TODO Auto-generated catch block
-              e.printStackTrace();
+              logger.error(ChampMsgs.CHAMP_DATA_SERVICE_ERROR, e, "Transaction rolledback failed :");
             }
             }
           }
diff --git a/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java b/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java
index 74b761e..1aeb5cf 100644
--- a/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java
+++ b/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java
@@ -5,6 +5,8 @@
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * Copyright © 2017-2018 Amdocs
  * ===================================================================
+ * Modifications Copyright (C) 2019 IBM.
+ * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -25,8 +27,13 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.champ.service.logging.ChampMsgs;
 
 public class ChampProperties {
+	
+	private static Logger logger = LoggerFactory.getInstance().getLogger(ChampProperties.class.getName());
 
     private static Properties properties;
 
@@ -37,7 +44,7 @@ public class ChampProperties {
         ) {
             properties.load(fileInputStream);
         } catch (IOException e) {
-            e.printStackTrace();
+        	logger.error(ChampMsgs.CHAMP_DATA_SERVICE_ERROR, "Error while loading properties ", e.getMessage());
             Runtime.getRuntime().halt(1);
         }
     }
@@ -57,7 +64,7 @@ public class ChampProperties {
         ) {
             properties.store(fileOut, "Added property: " + key);
         } catch (Exception e) {
-            e.printStackTrace();
+        	logger.error(ChampMsgs.CHAMP_DATA_SERVICE_ERROR, "Error while setting properties ", e.getMessage());
         }
     }