summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jar/pom.xml5
-rwxr-xr-xpom.xml4
-rw-r--r--src/main/java/org/onap/music/datastore/MusicDataStore.java2
-rw-r--r--src/test/java/org/onap/music/unittests/jsonobjects/JSONObjectTest.java44
-rwxr-xr-xversion.properties2
5 files changed, 48 insertions, 9 deletions
diff --git a/jar/pom.xml b/jar/pom.xml
index b068aee6..e5b9d802 100644
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -185,7 +185,6 @@
<scope>provided</scope>
</dependency>
<!-- /Development -->
-
<!-- Logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -215,7 +214,6 @@
<version>1.0.1-oss</version>
</dependency>
<!-- End Logging -->
-
<!-- Cassandra -->
<dependency>
<groupId>com.datastax.cassandra</groupId>
@@ -223,7 +221,6 @@
<version>${cassandra.version}</version>
</dependency>
<!-- /Cassandra -->
-
<!-- Zookeeper -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -237,7 +234,6 @@
</exclusions>
</dependency>
<!-- /Zookeeper -->
-
<!-- Jersey -->
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -331,7 +327,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
-
</dependency>
<dependency>
<groupId>org.mindrot</groupId>
diff --git a/pom.xml b/pom.xml
index d370856d..3da9223d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.onap.music</groupId>
<artifactId>MUSIC</artifactId>
<packaging>war</packaging>
- <version>3.0.19-SNAPSHOT</version>
+ <version>3.0.21-SNAPSHOT</version>
<description>
This is the MUSIC REST interface, packaged as a war file.
</description>
@@ -312,7 +312,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.0.56.Final</version>
+ <version>4.1.30.Final</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/main/java/org/onap/music/datastore/MusicDataStore.java b/src/main/java/org/onap/music/datastore/MusicDataStore.java
index 21b0053f..0154ad28 100644
--- a/src/main/java/org/onap/music/datastore/MusicDataStore.java
+++ b/src/main/java/org/onap/music/datastore/MusicDataStore.java
@@ -315,7 +315,7 @@ public class MusicDataStore {
DataType colType = colInfo.getType(colName);
Object columnValue = getColValue(row, colName, colType);
Object conditionValue = MusicUtil.convertToActualDataType(colType, entry.getValue());
- if (columnValue.equals(conditionValue))
+ if (!columnValue.equals(conditionValue))
return false;
}
return true;
diff --git a/src/test/java/org/onap/music/unittests/jsonobjects/JSONObjectTest.java b/src/test/java/org/onap/music/unittests/jsonobjects/JSONObjectTest.java
new file mode 100644
index 00000000..7f6af4c5
--- /dev/null
+++ b/src/test/java/org/onap/music/unittests/jsonobjects/JSONObjectTest.java
@@ -0,0 +1,44 @@
+/*
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ * Copyright (c) 2017 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+
+package org.onap.music.unittests.jsonobjects;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.onap.music.datastore.jsonobjects.JSONObject;
+
+public class JSONObjectTest {
+ private JSONObject jsonObject;
+
+ @Before
+ public void setUp() {
+ jsonObject = new JSONObject();
+ }
+
+ @Test
+ public void testGetSetData() {
+ jsonObject.setData("data");
+ Assert.assertEquals("data", jsonObject.getData());
+ }
+}
diff --git a/version.properties b/version.properties
index 0b918c88..b5dfb335 100755
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=3
minor=0
-patch=19
+patch=21
base_version=${major}.${minor}.${patch}