X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdnr%2Fwt%2Fdata-provider%2Fdblib%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fccsdk%2Ffeatures%2Fsdnr%2Fwt%2Fdataprovider%2Fdatabase%2Fsqldb%2Fquery%2FSelectQuery.java;fp=sdnr%2Fwt%2Fdata-provider%2Fdblib%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fccsdk%2Ffeatures%2Fsdnr%2Fwt%2Fdataprovider%2Fdatabase%2Fsqldb%2Fquery%2FSelectQuery.java;h=6403a5c1d291f46e1d70ea761961de0db7efda0f;hb=eb2a7c97c0007b013bd1784ac17d57be02b63d03;hp=2b3f9f3facadb1e961bfaa77fe6f6a78eaa9bf19;hpb=3c74361514bb920ed441d105f66ca978bd074ced;p=ccsdk%2Ffeatures.git

diff --git a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SelectQuery.java b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SelectQuery.java
index 2b3f9f3fa..6403a5c1d 100644
--- a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SelectQuery.java
+++ b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SelectQuery.java
@@ -54,9 +54,11 @@ public class SelectQuery implements SqlQuery {
     private final List<String> groups;
 
     public SelectQuery(String tableName) {
-        this(tableName, Arrays.asList("*"), null);
+        this(tableName, (String)null);
+    }
+    public SelectQuery(String tableName, String controllerId) {
+        this(tableName, Arrays.asList("*"), controllerId);
     }
-
     public SelectQuery(String tableName, List<String> fields, String controllerId) {
         this.tableName = tableName;
         this.fields = fields;
@@ -105,18 +107,21 @@ public class SelectQuery implements SqlQuery {
 
     }
 
-    public void addFilter(String property, String filtervalue) {
+    public SelectQuery addFilter(String property, String filtervalue) {
         this.addFilter(new FilterBuilder().setProperty(property).setFiltervalue(filtervalue).build());
+        return this;
     }
 
     private static Filter cleanFilter(Filter filter) {
-        if (filter.getFiltervalue() != null
-                && (filter.getFiltervalues() == null || filter.getFiltervalues().isEmpty())) {
+        final String sFilter = filter.getFiltervalue();
+        final List<String> sFilters = filter.getFiltervalues();
+        //if only single filter value is set
+        if (sFilter != null && (sFilters == null || sFilter.isEmpty())) {
             return "*".equals(filter.getFiltervalue()) ? null : filter;
         } else {
             List<String> list = new ArrayList<>(filter.getFiltervalues());
-            if (filter.getFiltervalue() != null && !filter.getFiltervalue().isEmpty()) {
-                list.add(filter.getFiltervalue());
+            if (sFilter != null && !sFilter.isEmpty()) {
+                list.add(sFilter);
             }
             if (list.size() == 1 && "*".equals(list.get(0))) {
                 return null;