Merge "Sonar Fix: Removed commented out lines of code"

diff --git a/pom.xml b/pom.xml
index a0e7c75..085d3b7 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC</artifactId>
     <packaging>jar</packaging>
-    <version>3.2.34-SNAPSHOT</version>
+    <version>3.2.35-SNAPSHOT</version>
     <description>
             This is the MUSIC REST interface, packaged as a Springboot jar file.
     </description>

diff --git a/releases/3.2.34.yaml b/releases/3.2.34.yaml
new file mode 100644 (file)
index 0000000..572f8a2
--- /dev/null
+++ b/releases/3.2.34.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '3.2.34'
+project: 'music'
+log_dir: 'music-maven-stage-master/103/'

diff --git a/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java b/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java
index 0f078a9..1cac773 100644 (file)
--- a/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java
+++ b/src/main/java/org/onap/music/eelf/logging/MusicLoggingServletFilter.java
@@ -172,7 +172,7 @@ public class MusicLoggingServletFilter implements Filter {
     }
 
     private void populateMDCAndResponseHeader(Map<String, String> headerMap, String idKey, String mdcKey,
-            boolean isRequired, HttpServletResponse httpResponse) throws ServletException, IOException {
+            boolean isRequired, HttpServletResponse httpResponse) throws  IOException {
 
         idKey = idKey.trim().toUpperCase();
 

diff --git a/src/main/java/org/onap/music/service/impl/MusicCassaCore.java b/src/main/java/org/onap/music/service/impl/MusicCassaCore.java
index 04fcfd2..5c02d34 100644 (file)
--- a/src/main/java/org/onap/music/service/impl/MusicCassaCore.java
+++ b/src/main/java/org/onap/music/service/impl/MusicCassaCore.java
@@ -128,7 +128,7 @@ public class MusicCassaCore implements MusicCoreService {
         try {
             lockReference = "" + getLockingServiceHandle().genLockRefandEnQueue(keyspace, table, lockName, locktype);
         } catch (MusicLockingException | MusicServiceException | MusicQueryException e) {
-            e.printStackTrace();
+            logger.error(EELFLoggerDelegate.applicationLogger, e);
             throw new MusicLockingException("Unable to create lock reference. " + e.getMessage());
         } catch (Exception e) {
             logger.error(EELFLoggerDelegate.applicationLogger, e);
@@ -191,7 +191,7 @@ public class MusicCassaCore implements MusicCoreService {
         PreparedQueryObject readQueryObject = new PreparedQueryObject();
         readQueryObject.appendQueryString(query);
         ResultSet results = MusicDataStoreHandle.getDSHandle().executeQuorumConsistencyGet(readQueryObject);
-        if (results.all().size() != 0) {
+        if (!results.all().isEmpty()) {
             logger.info("In acquire lock: Since there was a forcible release, need to sync quorum!");
             try {
                 syncQuorum(keyspace, table, primaryKeyValue);

diff --git a/version.properties b/version.properties
index ba44c86..c9da85e 100755 (executable)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=3
 minor=2
-patch=34
+patch=35
 
 base_version=${major}.${minor}.${patch}