Fixing a couple bugs based on Polaris issues

Author: rjrudin

marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoRepositoryImpl.java

@@ -412,24 +412,24 @@ private void findId() {
             break;
           }
         }
-        if ( property.hasGetter() ) {
-          Method getter = property.getGetter().getAnnotated();
-          if ( getter.getAnnotation(Id.class) != null ) {
-            idPropertyName = property.getName();
-            idMethod = getter;
-            break;
-          }
-          if ( property.hasSetter() ) {
-            Method setter = property.getSetter().getAnnotated();
-            if ( setter.getAnnotation(Id.class) != null ) {
-              idPropertyName = property.getName();
-              idMethod = getter;
-              break;
-            }
-          }
-        }
-        // setter only doesn't work because it gives us no value accessor
-      }
+		  if (property.hasGetter()) {
+			  Method getter = property.getGetter().getAnnotated();
+			  if (getter.getAnnotation(Id.class) != null) {
+				  idPropertyName = property.getName();
+				  idMethod = getter;
+			  }
+			  else if (property.hasSetter()) {
+				  Method setter = property.getSetter().getAnnotated();
+				  if (setter.getAnnotation(Id.class) != null) {
+					  idPropertyName = property.getName();
+					  // Polaris thinks this might be a copy/paste issue, but based on the tests -
+					  // TestPOJOMissingIdGetSetMethod - it appears to be correct.
+					  idMethod = getter;
+				  }
+			  }
+		  }
+		  // setter only doesn't work because it gives us no value accessor
+	  }
     }
     // Jackson's introspect approach should find it, but our old approach below
     // gives some helpful errors

marklogic-client-api/src/main/java/com/marklogic/client/impl/SemValueImpl.java

@@ -41,11 +41,11 @@ public SemStoreExpr store(XsStringSeqVal options, CtsQueryExpr query) {
   }
   @Override
   public SemStoreExpr rulesetStore(String... locations) {
-    return rulesetStore(new XsValueImpl.StringSeqValImpl(locations), (SemStoreSeqExpr) null, (String[]) null);
+    return rulesetStore(new XsValueImpl.StringSeqValImpl(locations), (SemStoreSeqExpr) null);
   }
   @Override
   public SemStoreExpr rulesetStore(XsStringSeqVal locations, SemStoreExpr... stores) {
-    return rulesetStore(locations, stores(stores), (String[]) null);
+    return rulesetStore(locations, stores(stores));
   }
   @Override
   public SemStoreExpr rulesetStore(XsStringSeqVal locations, SemStoreSeqExpr stores, String... options) {