Code cleanup

Author: akshaysonvane

marklogic-rdf4j/src/main/java/com/marklogic/semantics/rdf4j/MarkLogicRepositoryConnection.java

@@ -1073,7 +1073,7 @@ public void add(Iterable<? extends Statement> statements, Resource... contexts)
     	Iterator <? extends Statement> iter = statements.iterator();
 	    while(iter.hasNext()){
 	    	Statement st = iter.next();
-	        add(st, mergeResource(st.getContext(), contexts));
+	        add(st, contexts);
 	    }
 	}
 

marklogic-rdf4j/src/main/java/com/marklogic/semantics/rdf4j/client/TripleWriteCache.java

@@ -53,51 +53,40 @@ public TripleWriteCache(MarkLogicClient client, long cacheSize) {
 
     protected synchronized void flush() throws RepositoryException, MalformedQueryException, UpdateExecutionException, IOException {
         if (cache.isEmpty()) { return; }
-        StringBuffer entireQuery = new StringBuffer();
+        StringBuilder entireQuery = new StringBuilder();
         SPARQLQueryBindingSet bindingSet = new SPARQLQueryBindingSet();
 
         for (Namespace ns :cache.getNamespaces()){
-            entireQuery.append("PREFIX "+ns.getPrefix()+": <"+ns.getName()+">. ");
+            entireQuery.append("PREFIX ").append(ns.getPrefix()).append(": <").append(ns.getName()).append(">. ");
         }
         entireQuery.append("INSERT DATA { ");
 
-        Set<Resource> distinctCtx = new HashSet<Resource>();
-        for (Resource context :cache.contexts()) {
-            distinctCtx.add(context);
-        }
+        Set<Resource> distinctCtx = new HashSet<>();
+        distinctCtx.addAll(cache.contexts());
 
         for (Resource ctx : distinctCtx) {
                if (ctx != null) {
-                   entireQuery.append(" GRAPH <" + ctx + "> { ");
+                   entireQuery.append(" GRAPH <").append(ctx).append("> { ");
                }
                 for (Statement stmt : cache.filter(null, null, null, ctx)) {
-                    if (stmt.getSubject() instanceof org.eclipse.rdf4j.model.BNode) {
-                        entireQuery.append("<http://marklogic.com/semantics/blank/" + stmt.getSubject().stringValue() + "> ");
-                    }else {
-                        entireQuery.append("<" + stmt.getSubject().stringValue() + "> ");
-                    }
-                    if (stmt.getPredicate() instanceof org.eclipse.rdf4j.model.BNode) {
-                        entireQuery.append("<http://marklogic.com/semantics/blank/" + stmt.getPredicate().stringValue() + "> ");
-                    }else{
-                        entireQuery.append("<" + stmt.getPredicate().stringValue() + "> ");
-                    }
+
+                    entireQuery.append("<").append(stmt.getSubject().stringValue()).append("> ");
+
+                    entireQuery.append("<").append(stmt.getPredicate().stringValue()).append("> ");
+
                     Value object=stmt.getObject();
                     if (object instanceof Literal) {
                         Literal lit = (Literal) object;
                         entireQuery.append("\"");
                         entireQuery.append(SPARQLUtil.encodeString(lit.getLabel()));
                         entireQuery.append("\"");
                         if(null == lit.getLanguage().orElse(null)) {
-                            entireQuery.append("^^<" + lit.getDatatype().stringValue() + ">");
+                            entireQuery.append("^^<").append(lit.getDatatype().stringValue()).append(">");
                         }else{
-                            entireQuery.append("@" + lit.getLanguage().orElse(null));
+                            entireQuery.append("@").append(lit.getLanguage().orElse(null));
                         }
                     } else {
-                        if (stmt.getObject() instanceof org.eclipse.rdf4j.model.BNode) {
-                            entireQuery.append("<http://marklogic.com/semantics/blank/" + stmt.getObject().stringValue() + "> ");
-                        }else {
-                            entireQuery.append("<" + object.stringValue() + "> ");
-                        }
+                            entireQuery.append("<").append(object.stringValue()).append("> ");
                     }
                     entireQuery.append(".");
                 }

marklogic-rdf4j/src/test/java/com/marklogic/semantics/rdf4j/MarkLogicRepositoryConnectionTest.java

@@ -50,10 +50,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.*;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1562,6 +1559,7 @@ public void testConnectionWithMLConnectionVariablesWithoutDatabase()
         con.clear();
     }
 
+    @Deprecated
     @Test
     public void testConnectionWithMLConnectionVariablesWithDatabase()
     {