inds) {
log.debug("Number of individuals returned from request: " + inds.size());
- JSONArray jInds = new JSONArray();
+ ArrayNode jInds = JsonNodeFactory.instance.arrayNode();
for (Individual ind : inds) {
- jInds.put(IndividualJsonWrapper.packageIndividualAsJson(vreq, ind));
+ jInds.add(IndividualJsonWrapper.packageIndividualAsJson(vreq, ind));
}
return jInds;
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
index 6a97e736a..59e31ed1c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
@@ -13,6 +13,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -51,6 +52,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule;
+@WebServlet(name = "JenaAdminServlet", urlPatterns = {"/jenaAdmin"} )
public class JenaAdminActions extends BaseEditController {
private static final Log log = LogFactory.getLog(JenaAdminActions.class.getName());
@@ -131,9 +133,7 @@ public class JenaAdminActions extends BaseEditController {
typeSet.add((Resource) stmt.getObject());
}
}
- for (Resource classRes : ontModel.listClasses().toList()) {
- typeSet.add(classRes);
- }
+ typeSet.addAll(ontModel.listClasses().toList());
for (Resource ontClass : typeSet) {
if (!ontClass.isAnon()) { // Only query for named classes
System.out.println("Describing "+ontClass.getURI());
@@ -161,7 +161,7 @@ public class JenaAdminActions extends BaseEditController {
}
private String testWriteXML() {
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
output.append("Test Write XML\n");
OntModel model = ModelAccess.on(getServletContext()).getOntModel();
Model tmp = ModelFactory.createDefaultModel();
@@ -175,10 +175,10 @@ public class JenaAdminActions extends BaseEditController {
valid = false;
output.append("-----\n");
output.append("Unable to write statement as RDF/XML:\n");
- output.append("Subject : \n"+stmt.getSubject().getURI());
- output.append("Subject : \n"+stmt.getPredicate().getURI());
+ output.append("Subject : \n").append(stmt.getSubject().getURI());
+ output.append("Subject : \n").append(stmt.getPredicate().getURI());
String objectStr = (stmt.getObject().isLiteral()) ? ((Literal)stmt.getObject()).getLexicalForm() : ((Resource)stmt.getObject()).getURI();
- output.append("Subject : \n"+objectStr);
+ output.append("Subject : \n").append(objectStr);
output.append("Exception: \n");
e.printStackTrace();
}
@@ -230,10 +230,9 @@ public class JenaAdminActions extends BaseEditController {
}
}
}
- for (Iterator removeIt = statementsToRemove.iterator(); removeIt.hasNext(); ) {
- Statement stmt = removeIt.next();
- memoryModel.remove(stmt);
- }
+ for (Statement stmt : statementsToRemove) {
+ memoryModel.remove(stmt);
+ }
} finally {
memoryModel.leaveCriticalSection();
}
@@ -248,16 +247,20 @@ public class JenaAdminActions extends BaseEditController {
VitroRequest request = new VitroRequest(req);
String actionStr = request.getParameter("action");
- if (actionStr.equals("printRestrictions")) {
- printRestrictions();
- } else if (actionStr.equals("outputTbox")) {
- outputTbox(response);
- } else if (actionStr.equals("testWriteXML")) {
- try {
- response.getWriter().write(testWriteXML());
- } catch ( IOException ioe ) {
- throw new RuntimeException( ioe );
- }
+ switch (actionStr) {
+ case "printRestrictions":
+ printRestrictions();
+ break;
+ case "outputTbox":
+ outputTbox(response);
+ break;
+ case "testWriteXML":
+ try {
+ response.getWriter().write(testWriteXML());
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+ break;
}
if (actionStr.equals("checkURIs")) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
index 1824c2a7e..2b7a8b6d3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -28,6 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.Csv2Rdf;
import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils;
+@WebServlet(name = "JenaCsv2RdfController", urlPatterns = {"/csv2rdf"} )
public class JenaCsv2RdfController extends JenaIngestController {
Log log = LogFactory.getLog( JenaCsv2RdfController.class );
@@ -137,7 +139,6 @@ public class JenaCsv2RdfController extends JenaIngestController {
log.error(e1);
throw new ServletException(e1);
}
- return;
}
public Model doExecuteCsv2Rdf(VitroRequest vreq, FileItem fileStream, String filePath) throws Exception {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
index 4d7db548f..d132585fe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
@@ -14,6 +14,7 @@ import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -41,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaOutputUtils;
+@WebServlet(name = "JenaExportController", urlPatterns = {"/export/*"} )
public class JenaExportController extends BaseEditController {
private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION
.or(SimplePermission.EDIT_ONTOLOGY.ACTION);
@@ -104,7 +106,7 @@ public class JenaExportController extends BaseEditController {
String formatParam = vreq.getParameter("format");
String subgraphParam = vreq.getParameter("subgraph");
String assertedOrInferredParam = vreq.getParameter("assertedOrInferred");
- String ontologyURI = vreq.getParameter("ontologyURI");
+ StringBuilder ontologyURI = new StringBuilder(vreq.getParameter("ontologyURI"));
Model model = null;
OntModel ontModel = ModelFactory.createOntologyModel();
@@ -112,12 +114,13 @@ public class JenaExportController extends BaseEditController {
if(!subgraphParam.equalsIgnoreCase("tbox")
&& !subgraphParam.equalsIgnoreCase("abox")
&& !subgraphParam.equalsIgnoreCase("full")){
- ontologyURI = subgraphParam;
+ ontologyURI = new StringBuilder(subgraphParam);
subgraphParam = "tbox";
- char[] uri = ontologyURI.toCharArray();
- ontologyURI="";
- for(int i =0; i < uri.length-1;i++)
- ontologyURI = ontologyURI + uri[i];
+ char[] uri = ontologyURI.toString().toCharArray();
+ ontologyURI = new StringBuilder();
+ for(int i =0; i < uri.length-1;i++) {
+ ontologyURI.append(uri[i]);
+ }
}
if( "abox".equals(subgraphParam)){
@@ -139,7 +142,7 @@ public class JenaExportController extends BaseEditController {
// only those statements that are in the inferred graph
Model tempModel = xutil.extractTBox(
ModelAccess.on(getServletContext()).getOntModel(TBOX_UNION),
- ontologyURI);
+ ontologyURI.toString());
Model inferenceModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_INFERENCES);
inferenceModel.enterCriticalSection(Lock.READ);
try {
@@ -150,17 +153,17 @@ public class JenaExportController extends BaseEditController {
} else if ("full".equals(assertedOrInferredParam)) {
model = xutil.extractTBox(
ModelAccess.on(getServletContext()).getOntModel(TBOX_UNION),
- ontologyURI);
+ ontologyURI.toString());
} else {
model = xutil.extractTBox(
- ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS), ontologyURI);
+ ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS), ontologyURI.toString());
}
}
else if("full".equals(subgraphParam)){
if("inferred".equals(assertedOrInferredParam)){
ontModel = xutil.extractTBox(
- dataset, ontologyURI, ABOX_INFERENCES);
+ dataset, ontologyURI.toString(), ABOX_INFERENCES);
ontModel.addSubModel(ModelAccess.on(getServletContext()).getOntModel(ABOX_INFERENCES));
ontModel.addSubModel(ModelAccess.on(getServletContext()).getOntModel(TBOX_INFERENCES));
}
@@ -212,23 +215,31 @@ public class JenaExportController extends BaseEditController {
}
private void setHeaders(HttpServletResponse response, String formatParam) {
- if ( formatParam == null ) {
- formatParam = "RDF/XML-ABBREV"; // default
- }
- String mime = formatToMimetype.get( formatParam );
- if ( mime == null ) {
- throw new RuntimeException( "Unsupported RDF format " + formatParam);
- }
-
- response.setContentType( mime );
- if(mime.equals("application/rdf+xml"))
- response.setHeader("content-disposition", "attachment; filename=" + "export.rdf");
- else if(mime.equals("text/n3"))
- response.setHeader("content-disposition", "attachment; filename=" + "export.n3");
- else if(mime.equals("text/plain"))
- response.setHeader("content-disposition", "attachment; filename=" + "export.txt");
- else if(mime.equals("application/x-turtle"))
- response.setHeader("content-disposition", "attachment; filename=" + "export.ttl");
+ if ( formatParam == null ) {
+ formatParam = "RDF/XML-ABBREV"; // default
+ }
+
+ String mime = formatToMimetype.get( formatParam );
+ if ( mime == null ) {
+ throw new RuntimeException( "Unsupported RDF format " + formatParam);
+ }
+
+ response.setContentType( mime );
+
+ switch (mime) {
+ case "application/rdf+xml":
+ response.setHeader("content-disposition", "attachment; filename=" + "export.rdf");
+ break;
+ case "text/n3":
+ response.setHeader("content-disposition", "attachment; filename=" + "export.n3");
+ break;
+ case "text/plain":
+ response.setHeader("content-disposition", "attachment; filename=" + "export.txt");
+ break;
+ case "application/x-turtle":
+ response.setHeader("content-disposition", "attachment; filename=" + "export.ttl");
+ break;
+ }
}
private void outputSparqlConstruct(String queryStr, String formatParam,
@@ -246,10 +257,8 @@ public class JenaExportController extends BaseEditController {
IOUtils.copy(in, out);
out.flush();
out.close();
- } catch (RDFServiceException e) {
+ } catch (RDFServiceException | IOException e) {
throw new RuntimeException(e);
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
} finally {
rdfService.close();
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index 50014cf4e..21e1d4820 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -80,6 +81,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaOutputUtils;
import edu.cornell.mannlib.vitro.webapp.utils.jena.WorkflowOntology;
import edu.cornell.mannlib.vitro.webapp.utils.sparql.SparqlQueryUtils;
+@WebServlet(name = "JenaIngestController", urlPatterns = {"/ingest"} )
public class JenaIngestController extends BaseEditController {
private static final Log log = LogFactory.getLog(JenaIngestController.class);
@@ -301,11 +303,11 @@ public class JenaIngestController extends BaseEditController {
} catch (org.apache.jena.shared.CannotEncodeCharacterException cece) {
// there's got to be a better way to do this
byte[] badCharBytes = String.valueOf(cece.getBadChar()).getBytes();
- String errorMsg = "Cannot encode character with byte values: (decimal) ";
- for (int i=0; i sourceModelList = new ArrayList();
- for (int i = 0; i < sourceModel.length ; i++) {
- Model m = maker.getModel(sourceModel[i]);
+ for (String aSourceModel : sourceModel) {
+ Model m = maker.getModel(aSourceModel);
if (m != null) {
sourceModelList.add(m);
}
@@ -498,9 +500,7 @@ public class JenaIngestController extends BaseEditController {
List ontologiesObj = daoObj.getAllOntologies();
List prefixList = new ArrayList<>();
if(ontologiesObj !=null && ontologiesObj.size()>0){
- Iterator ontItr = ontologiesObj.iterator();
- while(ontItr.hasNext()){
- Ontology ont = ontItr.next();
+ for (Ontology ont : ontologiesObj) {
prefixList.add(ont.getPrefix() == null ? "(not yet specified)" : ont.getPrefix());
prefixList.add(ont.getURI() == null ? "" : ont.getURI());
}
@@ -738,9 +738,8 @@ public class JenaIngestController extends BaseEditController {
files = new File[1];
files[0] = file;
}
- for (int i=0; i31 && java.lang.Character.isDefined(chars[i])) {
- cleanChars[cleanPos] = chars[i];
+ for (char aChar : chars) {
+ if (Character.getNumericValue(aChar) > 31 && Character.isDefined(aChar)) {
+ cleanChars[cleanPos] = aChar;
cleanPos++;
} else {
log.error("Bad char in " + lex);
- log.error("Numeric value " + java.lang.Character.getNumericValue(chars[i]));
+ log.error("Numeric value " + Character.getNumericValue(aChar));
badChar = true;
}
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java
index 97729606d..3c5ef21dd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java
@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.transform.stream.StreamSource;
@@ -36,7 +37,8 @@ import org.apache.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-public class JenaXMLFileUpload extends JenaIngestController {
+@WebServlet(name = "JenaXMLFileUpload", urlPatterns = {"/jenaXmlFileUpload/*"} )
+public class JenaXMLFileUpload extends JenaIngestController {
Log log = LogFactory.getLog(JenaXMLFileUpload.class);
private String baseDirectoryForFiles;
private int maxFileSize = 1024 * 1024 * 500;
@@ -151,7 +153,7 @@ public class JenaXMLFileUpload extends JenaIngestController {
} catch (Exception e) {
System.out.println(this.getClass().getName()+" could not forward to view.");
System.out.println(e.getMessage());
- System.out.println(e.getStackTrace());
+ e.printStackTrace(System.out);
}
}
@@ -178,7 +180,7 @@ public class JenaXMLFileUpload extends JenaIngestController {
} catch (Exception e) {
System.out.println(this.getClass().getName()+" could not forward to view.");
System.out.println(e.getMessage());
- System.out.println(e.getStackTrace());
+ e.printStackTrace(System.out);
}
}
@@ -205,7 +207,7 @@ public class JenaXMLFileUpload extends JenaIngestController {
XsltTransformer t = xsltExec.load();
//this is how to set parameters:
//t.setParameter(new QName("someparametername"), new XdmAtomicValue(10));
- Serializer out = new Serializer();
+ Serializer out = new Processor(false).newSerializer();
out.setOutputProperty(Serializer.Property.METHOD, "xml");
out.setOutputProperty(Serializer.Property.INDENT, "yes");
File outFile = new File(file.getAbsolutePath() + ".rdfxml");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
index ec0fc9884..8a507cb79 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
@@ -16,6 +16,7 @@ import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -50,6 +51,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel;
+@WebServlet(name = "RDFUploadController", urlPatterns = {"/uploadRDF"} )
public class RDFUploadController extends JenaIngestController {
private static int maxFileSizeInBytes = 1024 * 1024 * 2000; //2000mb
@@ -391,15 +393,14 @@ public class RDFUploadController extends JenaIngestController {
files = new File[1];
files[0] = file;
}
- for (int i=0; i vclasses = new ArrayList();
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
List groups = vcgc.getGroups();
for(VClassGroup vcg: groups) {
- for( VClass vc : vcg){
- vclasses.add(vc);
- }
+ vclasses.addAll(vcg);
}
//Sort vclass by name
Collections.sort(vclasses);
- ArrayList classes = new ArrayList(vclasses.size());
+ ArrayNode classes = JsonNodeFactory.instance.arrayNode();
for(VClass vc: vclasses) {
- JSONObject vcObj = new JSONObject();
+ ObjectNode vcObj = JsonNodeFactory.instance.objectNode();
vcObj.put("name", vc.getName());
vcObj.put("URI", vc.getURI());
classes.add(vcObj);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java
index ae1d18e8f..b64e87b94 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java
@@ -11,11 +11,11 @@ import java.util.ListIterator;
import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
@@ -50,7 +50,7 @@ public class GetEntitiesByVClass extends JsonArrayProducer {
}
@Override
- protected JSONArray process() throws ServletException {
+ protected ArrayNode process() throws ServletException {
log.debug("in getEntitiesByVClass()");
String vclassURI = vreq.getParameter("vclassURI");
WebappDaoFactory daos = vreq.getUnfilteredWebappDaoFactory();
@@ -96,26 +96,22 @@ public class GetEntitiesByVClass extends JsonArrayProducer {
//put all the entities on the JSON array
- JSONArray ja = individualsToJson( entsToReturn );
+ ArrayNode ja = individualsToJson( entsToReturn );
//put the responseGroup number on the end of the JSON array
if( more ){
- try{
- JSONObject obj = new JSONObject();
- obj.put("resultGroup", "true");
- obj.put("size", count);
- obj.put("total", numberOfEntsInVClass);
+ ObjectNode obj = JsonNodeFactory.instance.objectNode();
+ obj.put("resultGroup", "true");
+ obj.put("size", count);
+ obj.put("total", numberOfEntsInVClass);
- StringBuffer nextUrlStr = vreq.getRequestURL();
- nextUrlStr.append("?")
- .append("getEntitiesByVClass").append( "=1&" )
- .append("resultKey=").append( requestHash );
- obj.put("nextUrl", nextUrlStr.toString());
+ StringBuffer nextUrlStr = vreq.getRequestURL();
+ nextUrlStr.append("?")
+ .append("getEntitiesByVClass").append( "=1&" )
+ .append("resultKey=").append( requestHash );
+ obj.put("nextUrl", nextUrlStr.toString());
- ja.put(obj);
- }catch(JSONException je ){
- throw new ServletException("unable to create continuation as JSON: " + je.getMessage());
- }
+ ja.add(obj);
}
log.debug("done with getEntitiesByVClass()");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java
index e3cce23f7..3fa8470bb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java
@@ -11,11 +11,11 @@ import java.util.ListIterator;
import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -32,7 +32,7 @@ public class GetEntitiesByVClassContinuation extends JsonArrayProducer {
}
@Override
- protected JSONArray process() throws ServletException {
+ protected ArrayNode process() throws ServletException {
log.debug("in getEntitiesByVClassContinuation()");
String resKey = vreq.getParameter("resultKey");
if( resKey == null )
@@ -68,26 +68,22 @@ public class GetEntitiesByVClassContinuation extends JsonArrayProducer {
}
//put all the entities on the JSON array
- JSONArray ja = individualsToJson( entsToReturn );
+ ArrayNode ja = individualsToJson( entsToReturn );
//put the responseGroup number on the end of the JSON array
if( more ){
- try{
- JSONObject obj = new JSONObject();
- obj.put("resultGroup", "true");
- obj.put("size", count);
+ ObjectNode obj = JsonNodeFactory.instance.objectNode();
+ obj.put("resultGroup", "true");
+ obj.put("size", count);
- StringBuffer nextUrlStr = vreq.getRequestURL();
- nextUrlStr.append("?")
- .append("getEntitiesByVClass").append( "=1&" )
- .append("resultKey=").append( resKey );
- obj.put("nextUrl", nextUrlStr.toString());
+ StringBuffer nextUrlStr = vreq.getRequestURL();
+ nextUrlStr.append("?")
+ .append("getEntitiesByVClass").append( "=1&" )
+ .append("resultKey=").append( resKey );
+ obj.put("nextUrl", nextUrlStr.toString());
- ja.put(obj);
- }catch(JSONException je ){
- throw new ServletException(je.getMessage());
- }
- }
+ ja.add(obj);
+ }
log.debug("done with getEntitiesByVClassContinuation()");
return ja;
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
index 98e6c9d53..80c98910f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
@@ -6,12 +6,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -19,7 +18,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService;
import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService.ShortViewContext;
import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
/**
* Does a Solr search for individuals, and uses the short view to render each of
@@ -37,8 +35,8 @@ public class GetRandomSearchIndividualsByVClass extends GetSearchIndividualsByVC
* Search for individuals by VClass.
*/
@Override
- protected JSONObject process() throws Exception {
- JSONObject rObj = null;
+ protected ObjectNode process() throws Exception {
+ ObjectNode rObj = null;
//This gets the first vclass value and sets that as display type.
List vclassIds = super.getVclassIds(vreq);
@@ -57,13 +55,13 @@ public class GetRandomSearchIndividualsByVClass extends GetSearchIndividualsByVC
* Look through the return object. For each individual, render the short
* view and insert the resulting HTML into the object.
*/
- private void addShortViewRenderings(JSONObject rObj) throws JSONException {
- JSONArray individuals = rObj.getJSONArray("individuals");
- String vclassName = rObj.getJSONObject("vclass").getString("name");
- for (int i = 0; i < individuals.length(); i++) {
- JSONObject individual = individuals.getJSONObject(i);
+ private void addShortViewRenderings(ObjectNode rObj) {
+ ArrayNode individuals = (ArrayNode) rObj.get("individuals");
+ String vclassName = rObj.get("vclass").get("name").asText();
+ for (int i = 0; i < individuals.size(); i++) {
+ ObjectNode individual = (ObjectNode) individuals.get(i);
individual.put("shortViewHtml",
- renderShortView(individual.getString("URI"), vclassName));
+ renderShortView(individual.get("URI").asText(), vclassName));
}
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
index 7c606c1ed..60ac4b7b7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
@@ -6,12 +6,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -19,7 +18,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService;
import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService.ShortViewContext;
import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
/**
* Does a search for individuals, and uses the short view to render each of
@@ -38,8 +36,8 @@ public class GetRenderedSearchIndividualsByVClass extends GetSearchIndividualsBy
* information are in the request parameters.
*/
@Override
- protected JSONObject process() throws Exception {
- JSONObject rObj = null;
+ protected ObjectNode process() throws Exception {
+ ObjectNode rObj = null;
//This gets the first vclass value and sets that as display type
List vclassIds = super.getVclassIds(vreq);
@@ -65,13 +63,13 @@ public class GetRenderedSearchIndividualsByVClass extends GetSearchIndividualsBy
* Look through the return object. For each individual, render the short
* view and insert the resulting HTML into the object.
*/
- private void addShortViewRenderings(JSONObject rObj) throws JSONException {
- JSONArray individuals = rObj.getJSONArray("individuals");
- String vclassName = rObj.getJSONObject("vclass").getString("name");
- for (int i = 0; i < individuals.length(); i++) {
- JSONObject individual = individuals.getJSONObject(i);
+ private void addShortViewRenderings(ObjectNode rObj) {
+ ArrayNode individuals = (ArrayNode) rObj.get("individuals");
+ String vclassName = rObj.get("vclass").get("name").asText();
+ for (int i = 0; i < individuals.size(); i++) {
+ ObjectNode individual = (ObjectNode) individuals.get(i);
individual.put("shortViewHtml",
- renderShortView(individual.getString("URI"), vclassName));
+ renderShortView(individual.get("URI").asText(), vclassName));
}
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
index a861d0106..ec37344c6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
@@ -2,9 +2,9 @@
package edu.cornell.mannlib.vitro.webapp.controller.json;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -21,8 +21,8 @@ public class GetSearchIndividualsByVClass extends JsonObjectProducer {
}
@Override
- protected JSONObject process() throws Exception {
- VClass vclass=null;
+ protected ObjectNode process() throws Exception {
+ VClass vclass = null;
String queryType = (String) vreq.getAttribute("queryType");
String vitroClassIdStr = vreq.getParameter("vclassId");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java
index 77da4a50a..f973d12f0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java
@@ -5,9 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.controller.json;
import java.util.Arrays;
import java.util.List;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -25,7 +25,7 @@ public class GetSearchIndividualsByVClasses extends JsonObjectProducer {
}
@Override
- protected JSONObject process() throws Exception {
+ protected ObjectNode process() throws Exception {
log.debug("Executing retrieval of individuals by vclasses");
VClass vclass=null;
log.debug("Retrieving search individuals by vclasses");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
index 4f1dbdfdf..ef9e58760 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
@@ -2,11 +2,11 @@
package edu.cornell.mannlib.vitro.webapp.controller.json;
-import java.util.ArrayList;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
@@ -26,8 +26,8 @@ public class GetVClassesForVClassGroup extends JsonObjectProducer {
}
@Override
- protected JSONObject process() throws Exception {
- JSONObject map = new JSONObject();
+ protected ObjectNode process() throws Exception {
+ ObjectNode map = JsonNodeFactory.instance.objectNode();
String vcgUri = vreq.getParameter("classgroupUri");
if( vcgUri == null ){
throw new Exception("no URI passed for classgroupUri");
@@ -38,10 +38,10 @@ public class GetVClassesForVClassGroup extends JsonObjectProducer {
if( vcg == null ){
throw new Exception("Could not find vclassgroup: " + vcgUri);
}
-
- ArrayList classes = new ArrayList(vcg.size());
+
+ ArrayNode classes = JsonNodeFactory.instance.arrayNode();
for( VClass vc : vcg){
- JSONObject vcObj = new JSONObject();
+ ObjectNode vcObj = JsonNodeFactory.instance.objectNode();
vcObj.put("name", vc.getName());
vcObj.put("URI", vc.getURI());
vcObj.put("entityCount", vc.getEntityCount());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java
index 3355a3282..f16961e7b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java
@@ -8,9 +8,10 @@ import java.io.Writer;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -35,10 +36,10 @@ public abstract class JsonArrayProducer extends JsonProducer {
* Sub-classes implement this method. Given the request, produce a JSON
* object as the result.
*/
- protected abstract JSONArray process() throws Exception;
+ protected abstract ArrayNode process() throws Exception;
public final void process(HttpServletResponse resp) throws IOException {
- JSONArray jsonArray = null;
+ ArrayNode jsonArray = null;
try {
jsonArray = process();
} catch (Exception e) {
@@ -47,7 +48,7 @@ public abstract class JsonArrayProducer extends JsonProducer {
}
if (jsonArray == null) {
- jsonArray = new JSONArray();
+ jsonArray = JsonNodeFactory.instance.arrayNode();
}
log.debug("Response to JSON request: " + jsonArray.toString());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
index 43a5dba94..efe3b4dac 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
@@ -8,10 +8,10 @@ import java.io.Writer;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -42,10 +42,10 @@ public abstract class JsonObjectProducer extends JsonProducer {
* Sub-classes implement this method. Given the request, produce a JSON
* object as the result.
*/
- protected abstract JSONObject process() throws Exception;
+ protected abstract ObjectNode process() throws Exception;
public final void process(HttpServletResponse resp) throws IOException {
- JSONObject jsonObject = null;
+ ObjectNode jsonObject = null;
String errorMessage = "";
try {
@@ -57,20 +57,16 @@ public abstract class JsonObjectProducer extends JsonProducer {
}
if (jsonObject == null) {
- jsonObject = new JSONObject();
+ jsonObject = JsonNodeFactory.instance.objectNode();
}
log.debug("Response to JSON request: " + jsonObject.toString());
- try {
- resp.setCharacterEncoding("UTF-8");
- resp.setContentType("application/json;charset=UTF-8");
- Writer writer = resp.getWriter();
+ resp.setCharacterEncoding("UTF-8");
+ resp.setContentType("application/json;charset=UTF-8");
+ Writer writer = resp.getWriter();
- jsonObject.put("errorMessage", errorMessage);
- writer.write(jsonObject.toString());
- } catch (JSONException e) {
- log.error(e, e);
- }
+ jsonObject.put("errorMessage", errorMessage);
+ writer.write(jsonObject.toString());
}
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java
index c0c32d0d1..3db4d85d5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java
@@ -7,12 +7,12 @@ import java.util.List;
import javax.servlet.ServletException;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
@@ -27,19 +27,15 @@ public abstract class JsonProducer {
/**
* Process a list of Individuals into a JSON array that holds the Names and URIs.
*/
- protected JSONArray individualsToJson(List individuals) throws ServletException {
- try{
- JSONArray ja = new JSONArray();
- for (Individual ent: individuals) {
- JSONObject entJ = new JSONObject();
- entJ.put("name", ent.getName());
- entJ.put("URI", ent.getURI());
- ja.put( entJ );
- }
- return ja;
- }catch(JSONException ex){
- throw new ServletException("could not convert list of Individuals into JSON: " + ex);
- }
+ protected ArrayNode individualsToJson(List individuals) throws ServletException {
+ ArrayNode ja = JsonNodeFactory.instance.arrayNode();
+ for (Individual ent: individuals) {
+ ObjectNode entJ = JsonNodeFactory.instance.objectNode();
+ entJ.put("name", ent.getName());
+ entJ.put("URI", ent.getURI());
+ ja.add( entJ );
+ }
+ return ja;
}
/**
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java
index 6b7a32543..9f7c46afd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java
@@ -7,12 +7,13 @@ import java.util.Collections;
import java.util.List;
import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
@@ -31,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.log.LogUtils;
*
* Moved most of the logic into a group of JsonProducer classes. jeb228
*/
+@WebServlet(name = "JSONService", urlPatterns = {"/dataservice"} )
public class JsonServlet extends VitroHttpServlet {
private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(JsonServlet.class);
@@ -80,7 +82,7 @@ public class JsonServlet extends VitroHttpServlet {
}
- public static JSONObject getSearchIndividualsByVClass(String vclassURI, HttpServletRequest req) throws Exception {
+ public static ObjectNode getSearchIndividualsByVClass(String vclassURI, HttpServletRequest req) throws Exception {
List vclassURIs = Collections.singletonList(vclassURI);
VitroRequest vreq = new VitroRequest(req);
@@ -89,7 +91,7 @@ public class JsonServlet extends VitroHttpServlet {
return IndividualListResultsUtils.wrapIndividualListResultsInJson(vcResults, vreq, false);
}
- public static JSONObject getSearchIndividualsByVClasses(List vclassURIs, HttpServletRequest req) throws Exception {
+ public static ObjectNode getSearchIndividualsByVClasses(List vclassURIs, HttpServletRequest req) throws Exception {
VitroRequest vreq = new VitroRequest(req);
log.debug("Retrieve search results for vclasses" + vclassURIs.toString());
IndividualListResults vcResults = getSearchVClassIntersectionResults(vclassURIs, vreq);
@@ -124,7 +126,7 @@ public class JsonServlet extends VitroHttpServlet {
return value;
}
- public static JSONObject getRandomSearchIndividualsByVClass(String vclassURI, HttpServletRequest req) throws Exception {
+ public static ObjectNode getRandomSearchIndividualsByVClass(String vclassURI, HttpServletRequest req) throws Exception {
VitroRequest vreq = new VitroRequest(req);
IndividualListResults vcResults = getRandomSearchVClassResults(vclassURI, vreq);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
index 0d6190a9d..977f83bab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
@@ -10,7 +10,6 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.IndividualDaoJena;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.NewURIMaker;
public class NewURIMakerVitro implements NewURIMaker {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
index 8748744c5..0939225eb 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
@@ -6,6 +6,7 @@ import java.util.List;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
public interface ObjectPropertyDao extends PropertyDao {
@@ -27,7 +28,7 @@ public interface ObjectPropertyDao extends PropertyDao {
*/
public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI, String domainURI, String rangeURI, ObjectProperty base);
- public List getObjectPropertiesForObjectPropertyStatements(List /*of ObjectPropertyStatement */ objectPropertyStatements);
+ public List getObjectPropertiesForObjectPropertyStatements(List objectPropertyStatements);
public List getSuperPropertyURIs(String objectPropertyURI, boolean direct);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
index 6485b9d30..da03eeadb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.dao;
import java.util.List;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
public interface PropertyGroupDao {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
index 5bd9fec9c..0a3aff295 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
@@ -3,9 +3,7 @@
package edu.cornell.mannlib.vitro.webapp.dao;
import java.util.Collection;
-import java.util.Iterator;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstanceIface;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java
index 3ab9e4b1d..e751d0fbb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java
@@ -58,7 +58,7 @@ public class WebappDaoFactoryConfig {
}
public Map getCustomListViewConfigFileMap() {
- return this.getCustomListViewConfigFileMap();
+ return customListViewConfigFileMap;
}
public void setCustomListViewConfigFileMap(
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
index eff599a09..27500d74c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
@@ -1,12 +1,9 @@
/* $This file is distributed under the terms of the license in LICENSE$ */
package edu.cornell.mannlib.vitro.webapp.dao.filtering;
-import java.util.Date;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
public class DataPropertyStatementFiltering implements DataPropertyStatement {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
index 3f75b1d8c..7a7b5b2ce 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
@@ -3,7 +3,6 @@
package edu.cornell.mannlib.vitro.webapp.dao.filtering;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import net.sf.jga.algorithms.Filter;
@@ -67,16 +66,13 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
//Filter based on subject, property and object. This could be changed
//to filter on the subject's and object's class.
Individual sub = individualDao.getIndividualByURI(inst.getSubjectEntURI());
- if( filters.getIndividualFilter().fn(sub) == false )
+ if(!filters.getIndividualFilter().fn(sub))
return false;
Individual obj = individualDao.getIndividualByURI(inst.getObjectEntURI());
- if( filters.getIndividualFilter().fn(obj) == false)
+ if(!filters.getIndividualFilter().fn(obj))
return false;
ObjectProperty prop = objectPropDao.getObjectPropertyByURI(inst.getPropertyURI());
- if( filters.getObjectPropertyFilter().fn(prop) == false)
- return false;
- else
- return true;
+ return filters.getObjectPropertyFilter().fn(prop);
}
};
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
index ec6a79f49..09d2398d9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
@@ -13,12 +13,11 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import com.fasterxml.jackson.databind.JsonNode;
import net.sf.jga.algorithms.Filter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.json.JSONObject;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
@@ -156,8 +155,10 @@ public class IndividualFiltering implements Individual {
// predicate + range class combination is allowed even if the predicate is
// hidden on its own.
+ return _innerIndividual.getPopulatedObjectPropertyList();
+
// Will revisit filtering at this level if it turns out to be truly necessary.
-
+/*
List outOProps = new ArrayList();
List oProps = _innerIndividual.getPopulatedObjectPropertyList();
for (ObjectProperty op: oProps) {
@@ -167,6 +168,7 @@ public class IndividualFiltering implements Individual {
}
}
return outOProps;
+*/
}
/* ********************* methods that need delegated filtering *************** */
@@ -421,7 +423,7 @@ public class IndividualFiltering implements Individual {
}
@Override
- public JSONObject toJSON() throws JSONException {
+ public JsonNode toJSON() {
return _innerIndividual.toJSON();
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
index ac206ea8c..23723883a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
@@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.filtering;
import java.util.LinkedList;
import java.util.List;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
import net.sf.jga.algorithms.Filter;
import net.sf.jga.fn.UnaryFunctor;
import net.sf.jga.fn.adaptor.AndUnary;
@@ -32,7 +33,7 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
return filterAndWrap(innerObjectPropertyDao.getAllObjectProperties(), filters);
}
- public List getObjectPropertiesForObjectPropertyStatements(List objectPropertyStatements) {
+ public List getObjectPropertiesForObjectPropertyStatements(List objectPropertyStatements) {
//assume that the objPropStmts are already filtered
List list =
innerObjectPropertyDao
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
index 57e1bc717..c1ddeb680 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
@@ -1,7 +1,6 @@
/* $This file is distributed under the terms of the license in LICENSE$ */
package edu.cornell.mannlib.vitro.webapp.dao.filtering;
-import java.util.Date;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
index 1cc60a71f..c01b1847a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
@@ -2,17 +2,13 @@
package edu.cornell.mannlib.vitro.webapp.dao.filtering;
-import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import net.sf.jga.algorithms.Filter;
-
import org.apache.jena.ontology.DatatypeProperty;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.Property;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
@@ -70,8 +66,7 @@ public class PropertyGroupDaoFiltering implements PropertyGroupDao {
}
grp.setPropertyList(filteredProps); //side effect
- return ;
- }
+ }
public List getPublicGroups(boolean withProperties) {
List groups = innerDao.getPublicGroups(withProperties);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
index 3a1adeb9d..ca84be242 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
@@ -190,11 +190,9 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
}
}
- public void addVClassesToGroups(List groups) {
+ public void addVClassesToGroups(List groups) {
if ((groups != null) && (groups.size()>0)) {
- Iterator groupIt = groups.iterator();
- while (groupIt.hasNext()) {
- VClassGroup g = (VClassGroup) groupIt.next();
+ for (VClassGroup g : groups) {
this.addVClassesToGroup(g);
}
} else {
@@ -204,9 +202,9 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
vcg.setLocalName("0");
vcg.setPublicName("Browse Categories");
vcg.addAll( this.getAllVclasses() );
- java.util.Collections.sort(vcg.getVitroClassList(),new Comparator(){
- public int compare(Object o1, Object o2){
- return ((VClass)o1).getName().compareTo(((VClass)o2).getName());
+ vcg.getVitroClassList().sort(new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return ((VClass) o1).getName().compareTo(((VClass) o2).getName());
}
});
groups.add(vcg);
@@ -223,7 +221,6 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
if( out != null )
vclass.setEntityCount(out.size());
System.out.println(vclass.getURI() + " count: " + vclass.getEntityCount());
- return;
}
private List correctVClassCounts(List vclasses){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
index 195ea5dc5..b263e8930 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
@@ -37,7 +37,7 @@ public class VClassGroupDaoFiltering extends BaseFiltering implements VClassGrou
public LinkedHashMap getClassGroupMap() {
LinkedHashMap lhm = innerDao.getClassGroupMap();
Set keys = lhm.keySet();
- for( Object key : keys){
+ for( String key : keys){
VClassGroup vcg = (VClassGroup)lhm.get(key);
if( vcg == null || !filters.getVClassGroupFilter().fn(vcg) ){
lhm.remove(key);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
index 08d4e9fef..5c2193cc4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
@@ -4,12 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.dao.filtering.filters;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import net.sf.jga.fn.UnaryFunctor;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java
index b1a4d30e0..af7a5590f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java
@@ -63,7 +63,7 @@ public class VitroFilterUtils {
@Override
public List fn(List individuals) {
- Collections.sort(individuals,comparator);
+ individuals.sort(comparator);
return individuals;
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java
index 4658086e6..376707416 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java
@@ -12,7 +12,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.User;
/**
* A object to hold all the filters commonly used by the vitro webapp.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
index ea7a242ab..7592dd7ff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
@@ -164,7 +164,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
}
List dataprops = new ArrayList(hash.values());
- Collections.sort(dataprops, new DataPropertyRanker());
+ dataprops.sort(new DataPropertyRanker());
return dataprops;
}
@@ -633,13 +633,11 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
isRoot = true;
} else {
isRoot = true;
- Iterator pit = parentList.iterator();
- while (pit.hasNext()) {
- Property pt = pit.next();
- if ( (!pt.equals(op)) && (!(ontModel.contains(op,OWL.equivalentProperty,pt)) || (ontModel.contains(pt,OWL.equivalentProperty,op))) ) {
- isRoot = false;
- }
- }
+ for (Property pt : parentList) {
+ if ((!pt.equals(op)) && (!(ontModel.contains(op, OWL.equivalentProperty, pt)) || (ontModel.contains(pt, OWL.equivalentProperty, op)))) {
+ isRoot = false;
+ }
+ }
}
} else {
isRoot = true;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
index e056d4468..cabaef2cf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
@@ -470,7 +470,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
String propertyUri,
Set constructQueries) {
- if (constructQueries == null) {
+ if (constructQueries == null || constructQueries.isEmpty() ) {
return null;
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
index f01e640cf..62d3ff74a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
@@ -66,11 +66,9 @@ public class DependentResourceDeleteJena {
ListIterator removed = removedStmts.listIterator();
while( removed.hasNext()){
Statement removedStmt = removed.next();
- ListIterator changed = changedStmts.listIterator();
- while( changed.hasNext()){
- Statement changedStmt = changed.next();
- if( removedStmt.equals(changedStmt) ){
- removed.remove();
+ for (Statement changedStmt : changedStmts) {
+ if (removedStmt.equals(changedStmt)) {
+ removed.remove();
}
}
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
index 7df2c09df..d9ecce8a1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
@@ -104,7 +104,7 @@ public class DisplayModelDaoJena implements DisplayModelDao {
if( text == null ){
//text of file is not yet in model
File oldMenuFile = new File(context.getRealPath(MENU_N3_FILE));
- StringBuffer str = new StringBuffer(2000);
+ StringBuilder str = new StringBuilder(2000);
BufferedReader reader = new BufferedReader(new FileReader(oldMenuFile));
char[] buf = new char[1024];
int numRead=0;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
index 1c50aa665..c8ca354bd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
@@ -69,17 +69,15 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
HashSet nonExternalIdPropURISet = new HashSet();
if (ind != null) {
Collection dpsColl = getWebappDaoFactory().getDataPropertyStatementDao().getDataPropertyStatementsForIndividualByDataPropertyURI(ind, dataPropertyURI);
- Iterator dpsIt = dpsColl.iterator();
- while (dpsIt.hasNext()) {
- DataPropertyStatement dps = dpsIt.next();
+ for (DataPropertyStatement dps : dpsColl) {
if (externalIdPropURISet.contains(dps.getDatapropURI())) {
externalIdStatements.add(dps);
} else if (!nonExternalIdPropURISet.contains(dps.getDatapropURI())) {
- OntModel tboxOntModel = getOntModelSelector().getTBoxModel();
+ OntModel tboxOntModel = getOntModelSelector().getTBoxModel();
tboxOntModel.enterCriticalSection(Lock.READ);
try {
Resource dataprop = tboxOntModel.getResource(dps.getDatapropURI());
- if (dataprop != null && (tboxOntModel.contains(dataprop, DATAPROPERTY_ISEXTERNALID, ResourceFactory.createTypedLiteral(true)) || tboxOntModel.contains(dataprop, DATAPROPERTY_ISEXTERNALID, "TRUE") )) {
+ if (dataprop != null && (tboxOntModel.contains(dataprop, DATAPROPERTY_ISEXTERNALID, ResourceFactory.createTypedLiteral(true)) || tboxOntModel.contains(dataprop, DATAPROPERTY_ISEXTERNALID, "TRUE"))) {
externalIdPropURISet.add(dps.getDatapropURI());
externalIdStatements.add(dps);
} else {
@@ -219,12 +217,12 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
ontModel.enterCriticalSection(Lock.WRITE);
try {
- entURI = new String(preferredURI);
+ entURI = preferredURI;
org.apache.jena.ontology.Individual test = ontModel.getIndividual(entURI);
int count = 0;
while (test != null) {
++count;
- entURI = new String(preferredURI) + count;
+ entURI = preferredURI + count;
test = ontModel.getIndividual(entURI);
}
@@ -236,8 +234,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
}
List vclasses = ent.getVClasses(false);
if (vclasses != null) {
- for (Iterator typeIt = vclasses.iterator(); typeIt.hasNext(); ) {
- VClass vc = typeIt.next();
+ for (VClass vc : vclasses) {
ind.addRDFType(ResourceFactory.createResource(vc.getURI()));
}
}
@@ -316,24 +313,21 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
if (vcl == null) {
conservativeTypeDeletion = true; // if the bean has null here instead of an empty list, we don't want to trust it and just start deleting any existing types. So we'll just update the Vitro flag-related types and leave the rest alone.
} else {
- for (Iterator typeIt = vcl.iterator(); typeIt.hasNext(); ) {
- VClass vc = typeIt.next();
+ for (VClass vc : vcl) {
newTypeURIsSet.add(vc.getURI());
}
}
} catch (Exception e) {
log.error(e, e);
}
- for (Iterator oldIt = oldTypeURIsSet.iterator(); oldIt.hasNext();) {
- String uri = oldIt.next();
+ for (String uri : oldTypeURIsSet) {
if (!newTypeURIsSet.contains(uri)) {
- if ( (!conservativeTypeDeletion) || (uri.indexOf(VitroVocabulary.vitroURI) == 0) ) {
+ if ((!conservativeTypeDeletion) || (uri.indexOf(VitroVocabulary.vitroURI) == 0)) {
ind.removeRDFType(ResourceFactory.createResource(uri));
}
}
}
- for (Iterator newIt = newTypeURIsSet.iterator(); newIt.hasNext();) {
- String uri = newIt.next();
+ for (String uri : newTypeURIsSet) {
if (!oldTypeURIsSet.contains(uri)) {
ind.addRDFType(ResourceFactory.createResource(uri));
}
@@ -677,7 +671,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
int attempts = 0;
- while( uriIsGood == false && attempts < 30 ){
+ while(!uriIsGood && attempts < 30 ){
log.debug("While loop: Uri is good false, attempt=" + attempts);
String localName = "n" + random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );
uri = namespace + localName;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
index 35c01ef77..e26661533 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
@@ -2,7 +2,6 @@
package edu.cornell.mannlib.vitro.webapp.dao.jena;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -28,7 +27,6 @@ import org.apache.jena.query.QueryExecutionFactory;
import org.apache.jena.query.QueryFactory;
import org.apache.jena.query.QuerySolution;
import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.ResultSetFactory;
import org.apache.jena.rdf.model.AnonId;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.Property;
@@ -313,12 +311,9 @@ public class IndividualDaoSDB extends IndividualDaoJena {
private void fillIndividualsForObjectPropertyStatements(Individual entity){
getOntModel().enterCriticalSection(Lock.READ);
try {
- Iterator e2eIt = entity.getObjectPropertyStatements().iterator();
- while (e2eIt.hasNext()) {
- ObjectPropertyStatement e2e =
- (ObjectPropertyStatement) e2eIt.next();
+ for (ObjectPropertyStatement e2e : entity.getObjectPropertyStatements()) {
e2e.setSubject(makeIndividual(e2e.getSubjectURI()));
- e2e.setObject(makeIndividual(e2e.getObjectURI()));
+ e2e.setObject(makeIndividual(e2e.getObjectURI()));
}
} finally {
getOntModel().leaveCriticalSection();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
index 82a348046..1273bbe94 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
@@ -348,12 +348,11 @@ public class IndividualJena extends IndividualImpl implements Individual {
if (this.propertyList == null) {
getObjectPropertyList();
}
- for (Iterator i = this.propertyList.iterator(); i.hasNext();) {
- ObjectProperty op = (ObjectProperty) i.next();
- if (op.getURI() != null) {
- map.put(op.getURI(), op);
- }
- }
+ for (ObjectProperty op : this.propertyList) {
+ if (op.getURI() != null) {
+ map.put(op.getURI(), op);
+ }
+ }
this.objectPropertyMap = map;
return map;
}
@@ -402,12 +401,11 @@ public class IndividualJena extends IndividualImpl implements Individual {
if (this.datatypePropertyList == null) {
getDataPropertyList();
}
- for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) {
- DataProperty dp = (DataProperty) i.next();
- if (dp.getURI() != null) {
- map.put(dp.getURI(), dp);
- }
- }
+ for (DataProperty dp : this.datatypePropertyList) {
+ if (dp.getURI() != null) {
+ map.put(dp.getURI(), dp);
+ }
+ }
this.dataPropertyMap = map;
return map;
}
@@ -519,15 +517,13 @@ public class IndividualJena extends IndividualImpl implements Individual {
protected void sortEnts2EntsForDisplay(){
if( getObjectPropertyList() == null ) return;
- Iterator it = getObjectPropertyList().iterator();
- while(it.hasNext()){
- ObjectProperty prop = (ObjectProperty)it.next();
- /* if (prop.getObjectIndividualSortPropertyURI()==null) {
+ for (ObjectProperty prop : getObjectPropertyList()) {
+ /* if (prop.getObjectIndividualSortPropertyURI()==null) {
prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
} else {*/
- prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
+ prop.sortObjectPropertyStatementsForDisplay(prop, prop.getObjectPropertyStatements());
/* }*/
- }
+ }
}
private Collator collator = Collator.getInstance();
@@ -606,7 +602,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
}
};
try {
- Collections.sort(getObjectPropertyStatements(), comp);
+ getObjectPropertyStatements().sort(comp);
} catch (Exception e) {
log.error("Exception sorting object property statements for object property "+this.getURI());
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
index 18918ebd0..18fc66d96 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
import static edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB.SDBDatasetMode.ASSERTIONS_ONLY;
-import java.io.InputStream;
import java.sql.Timestamp;
import java.text.Collator;
import java.util.ArrayList;
@@ -17,7 +16,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.jena.graph.NodeFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -27,14 +25,11 @@ import org.apache.jena.ontology.OntModel;
import org.apache.jena.ontology.OntModelSpec;
import org.apache.jena.ontology.OntResource;
import org.apache.jena.query.Dataset;
-import org.apache.jena.query.Query;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
import org.apache.jena.query.QueryFactory;
import org.apache.jena.query.QuerySolution;
import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.ResultSetFactory;
-import org.apache.jena.query.Syntax;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
@@ -62,9 +57,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB.SDBDatasetM
import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
-
-import javax.xml.soap.Node;
public class IndividualSDB extends IndividualImpl implements Individual {
@@ -610,12 +602,11 @@ public class IndividualSDB extends IndividualImpl implements Individual {
if (this.propertyList == null) {
getObjectPropertyList();
}
- for (Iterator i = this.propertyList.iterator(); i.hasNext();) {
- ObjectProperty op = (ObjectProperty) i.next();
- if (op.getURI() != null) {
- map.put(op.getURI(), op);
- }
- }
+ for (ObjectProperty op : this.propertyList) {
+ if (op.getURI() != null) {
+ map.put(op.getURI(), op);
+ }
+ }
this.objectPropertyMap = map;
return map;
}
@@ -668,12 +659,11 @@ public class IndividualSDB extends IndividualImpl implements Individual {
if (this.datatypePropertyList == null) {
getDataPropertyList();
}
- for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) {
- DataProperty dp = (DataProperty) i.next();
- if (dp.getURI() != null) {
- map.put(dp.getURI(), dp);
- }
- }
+ for (DataProperty dp : this.datatypePropertyList) {
+ if (dp.getURI() != null) {
+ map.put(dp.getURI(), dp);
+ }
+ }
this.dataPropertyMap = map;
return map;
}
@@ -963,15 +953,13 @@ public class IndividualSDB extends IndividualImpl implements Individual {
protected void sortEnts2EntsForDisplay(){
if( getObjectPropertyList() == null ) return;
- Iterator it = getObjectPropertyList().iterator();
- while(it.hasNext()){
- ObjectProperty prop = (ObjectProperty)it.next();
- /* if (prop.getObjectIndividualSortPropertyURI()==null) {
+ for (ObjectProperty prop : getObjectPropertyList()) {
+ /* if (prop.getObjectIndividualSortPropertyURI()==null) {
prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
} else {*/
- prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
+ prop.sortObjectPropertyStatementsForDisplay(prop, prop.getObjectPropertyStatements());
/* }*/
- }
+ }
}
private Collator collator = Collator.getInstance();
@@ -1050,7 +1038,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
}
};
try {
- Collections.sort(getObjectPropertyStatements(), comp);
+ getObjectPropertyStatements().sort(comp);
} catch (Exception e) {
log.error("Exception sorting object property statements for object property "+this.getURI());
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
index 1e914b258..a94846ec9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
@@ -32,7 +32,6 @@ import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
import org.apache.jena.query.QueryFactory;
import org.apache.jena.query.Syntax;
-import org.apache.jena.rdf.model.AnonId;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
@@ -217,12 +216,12 @@ public class JenaBaseDao extends JenaBaseDaoCon {
}
}
if ( (existingValue!=null && value == null) || (existingValue!=null && value != null && !(existingValue.equals(value)))
- || (existingValue!=null && existingValue == false && keepOnlyIfTrue)) {
+ || (existingValue!=null && !existingValue && keepOnlyIfTrue)) {
model.removeAll(res, dataprop, null);
}
if ( (existingValue==null && value != null) || (existingValue!=null && value != null && !(existingValue.equals(value)) ) ) {
if (keepOnlyIfTrue) {
- if (value==true) {
+ if (value) {
model.add(res, dataprop, model.createTypedLiteral(value));
}
} else {
@@ -772,20 +771,18 @@ public class JenaBaseDao extends JenaBaseDaoCon {
}
private Literal getLabel(String lang, ListlabelList) {
- Iterator labelIt = labelList.iterator();
- while (labelIt.hasNext()) {
- RDFNode label = labelIt.next();
- if (label.isLiteral()) {
- Literal labelLit = ((Literal)label);
- String labelLanguage = labelLit.getLanguage();
- if ( (labelLanguage == null) && (lang == null || lang.isEmpty()) ) {
- return labelLit;
- }
- if ( (lang != null) && (lang.equals(labelLanguage)) ) {
- return labelLit;
- }
- }
- }
+ for (RDFNode label : labelList) {
+ if (label.isLiteral()) {
+ Literal labelLit = ((Literal) label);
+ String labelLanguage = labelLit.getLanguage();
+ if ((labelLanguage == null) && (lang == null || lang.isEmpty())) {
+ return labelLit;
+ }
+ if ((lang != null) && (lang.equals(labelLanguage))) {
+ return labelLit;
+ }
+ }
+ }
return null;
}
@@ -899,18 +896,18 @@ public class JenaBaseDao extends JenaBaseDaoCon {
}
// Sort by lexical value to guarantee consistent results
- Collections.sort(labels, new Comparator() {
- public int compare(RDFNode left, RDFNode right) {
- if (left == null) {
- return (right == null) ? 0 : -1;
- }
- if ( left.isLiteral() && right.isLiteral()) {
- return ((Literal) left).getLexicalForm().compareTo(((Literal) right).getLexicalForm());
- }
- // Can't sort meaningfully if both are not literals
- return 0;
- }
- });
+ labels.sort(new Comparator() {
+ public int compare(RDFNode left, RDFNode right) {
+ if (left == null) {
+ return (right == null) ? 0 : -1;
+ }
+ if (left.isLiteral() && right.isLiteral()) {
+ return ((Literal) left).getLexicalForm().compareTo(((Literal) right).getLexicalForm());
+ }
+ // Can't sort meaningfully if both are not literals
+ return 0;
+ }
+ });
for (String lang : PREFERRED_LANGUAGES) {
label = getLabel(lang,labels);
@@ -970,7 +967,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
if (vitroURIStr.indexOf(PSEUDO_BNODE_NS)==0) {
String idStr = vitroURIStr.split("#")[1];
log.debug("Trying to get bnode " + idStr);
- RDFNode rdfNode = ontModel.getRDFNode(NodeFactory.createAnon(idStr));
+ RDFNode rdfNode = ontModel.getRDFNode(NodeFactory.createBlankNode(idStr));
if ( (rdfNode != null) && (rdfNode.canAs(OntClass.class)) ) {
log.debug("found it");
cls = rdfNode.as(OntClass.class);
@@ -998,7 +995,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
protected Node makeNodeForURI(String vitroURIStr) {
if (vitroURIStr.indexOf(PSEUDO_BNODE_NS)==0) {
- return NodeFactory.createAnon(vitroURIStr.split("#")[1]);
+ return NodeFactory.createBlankNode(vitroURIStr.split("#")[1]);
} else {
return NodeFactory.createURI(vitroURIStr);
}
@@ -1020,22 +1017,20 @@ public class JenaBaseDao extends JenaBaseDaoCon {
}
// Now for each value, work backwards and see if it has an alternate path to the original resource.
// If not, add it to the list of direct values.
- Iterator possibleValueIt = possibleValueSet.iterator();
- while (possibleValueIt.hasNext()) {
- Resource possibleRes = possibleValueIt.next();
- StmtIterator pStmtIt = getOntModel().listStatements((Resource)null, prop, possibleRes);
- boolean hasAlternatePath = false;
- while (stmtIt.hasNext()) {
- Statement stmt = stmtIt.nextStatement();
- if (possibleValueSet.contains(stmt.getSubject())) {
- hasAlternatePath = true;
- break;
- }
- }
- if (!hasAlternatePath) {
- directValueList.add(possibleRes);
- }
- }
+ for (Resource possibleRes : possibleValueSet) {
+ StmtIterator pStmtIt = getOntModel().listStatements((Resource) null, prop, possibleRes);
+ boolean hasAlternatePath = false;
+ while (stmtIt.hasNext()) {
+ Statement stmt = stmtIt.nextStatement();
+ if (possibleValueSet.contains(stmt.getSubject())) {
+ hasAlternatePath = true;
+ break;
+ }
+ }
+ if (!hasAlternatePath) {
+ directValueList.add(possibleRes);
+ }
+ }
return directValueList;
}
@@ -1049,22 +1044,20 @@ public class JenaBaseDao extends JenaBaseDaoCon {
possibleSubjectSet.add(stmt.getSubject());
}
- Iterator possibleSubjectIt = possibleSubjectSet.iterator();
- while (possibleSubjectIt.hasNext()) {
- Resource possibleRes = possibleSubjectIt.next();
- StmtIterator pStmtIt = getOntModel().listStatements(possibleRes, prop, (RDFNode)null);
- boolean hasAlternatePath = false;
- while (stmtIt.hasNext()) {
- Statement stmt = stmtIt.nextStatement();
- if (stmt.getObject().isResource() && possibleSubjectSet.contains(stmt.getObject())) {
- hasAlternatePath = true;
- break;
- }
- }
- if (!hasAlternatePath) {
- directSubjectList.add(possibleRes);
- }
- }
+ for (Resource possibleRes : possibleSubjectSet) {
+ StmtIterator pStmtIt = getOntModel().listStatements(possibleRes, prop, (RDFNode) null);
+ boolean hasAlternatePath = false;
+ while (stmtIt.hasNext()) {
+ Statement stmt = stmtIt.nextStatement();
+ if (stmt.getObject().isResource() && possibleSubjectSet.contains(stmt.getObject())) {
+ hasAlternatePath = true;
+ break;
+ }
+ }
+ if (!hasAlternatePath) {
+ directSubjectList.add(possibleRes);
+ }
+ }
return directSubjectList;
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
index 93df98244..97d3ad69a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
@@ -93,11 +93,9 @@ public class JenaModelUtils {
try {
List rootClasses = myWebappDaoFactory.getVClassDao()
.getRootClasses();
- for (Iterator rootClassIt = rootClasses.iterator();
- rootClassIt.hasNext(); ) {
- VClass rootClass = rootClassIt.next();
+ for (VClass rootClass : rootClasses) {
Individual classGroup = modelForClassgroups.createIndividual(
- wadf.getDefaultNamespace() + "vitroClassGroup" +
+ wadf.getDefaultNamespace() + "vitroClassGroup" +
rootClass.getLocalName(), classGroupClass);
classGroup.setLabel(rootClass.getName(), null);
@@ -105,16 +103,14 @@ public class JenaModelUtils {
rootClass.getURI());
modelForClassgroupAnnotations.add(
rootClassRes, inClassGroupProperty, classGroup);
- for (Iterator childIt = myWebappDaoFactory.getVClassDao()
- .getAllSubClassURIs(rootClass.getURI()).iterator();
- childIt.hasNext(); ) {
- String childURI = childIt.next();
+ for (String childURI : myWebappDaoFactory.getVClassDao()
+ .getAllSubClassURIs(rootClass.getURI())) {
Resource childClass = modelForClassgroupAnnotations
.getResource(childURI);
if (!modelForClassgroupAnnotations.contains(
childClass, inClassGroupProperty, (RDFNode) null)) {
- childClass.addProperty(inClassGroupProperty, classGroup);
- }
+ childClass.addProperty(inClassGroupProperty, classGroup);
+ }
}
}
} catch (Exception e) {
@@ -261,14 +257,13 @@ public class JenaModelUtils {
Resource property) {
dataset.getLock().enterCriticalSection(Lock.READ);
try {
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
buff.append("PREFIX afn: \n")
- .append("CONSTRUCT { \n")
- .append(" ?res <" + property.getURI() + "> ?o } WHERE { \n");
+ .append("CONSTRUCT { \n").append(" ?res <").append(property.getURI()).append("> ?o } WHERE { \n");
if (graphURI != null) {
- buff.append(" GRAPH " + graphURI + " { \n");
+ buff.append(" GRAPH ").append(graphURI).append(" { \n");
}
- buff.append(" ?res <" + property.getURI() + "> ?o \n");
+ buff.append(" ?res <").append(property.getURI()).append("> ?o \n");
buff.append(getNamespaceFilter(namespace));
if (graphURI != null) {
buff.append(" } \n");
@@ -292,13 +287,12 @@ public class JenaModelUtils {
private String makeDescribeQueryStr( String typeURI, String namespace, String graphURI ) {
- StringBuffer describeQueryStrBuff = new StringBuffer()
+ StringBuilder describeQueryStrBuff = new StringBuilder()
.append("PREFIX rdf: \n")
.append("PREFIX afn: \n")
.append("DESCRIBE ?res WHERE { \n");
if (graphURI != null) {
- describeQueryStrBuff
- .append("GRAPH " + graphURI + "{ \n");
+ describeQueryStrBuff.append("GRAPH ").append(graphURI).append("{ \n");
}
describeQueryStrBuff
.append(" ?res rdf:type <").append(typeURI).append("> . \n");
@@ -320,7 +314,7 @@ public class JenaModelUtils {
}
private String getNamespaceFilter(String namespace) {
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
if (namespace == null) {
// exclude resources in the Vitro internal namespace or in the
// OWL namespace, but allow all others
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index 4f806003e..91c81f5cb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -474,15 +474,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
}
- public List getObjectPropertiesForObjectPropertyStatements(List objPropertyStmts) {
+ public List getObjectPropertiesForObjectPropertyStatements(List objPropertyStmts) {
if( objPropertyStmts == null || objPropertyStmts.size() < 1) return new ArrayList();
HashMap hash = new HashMap();
String uris ="";
getOntModel().enterCriticalSection(Lock.READ);
try {
- Iterator it = objPropertyStmts.iterator();
- while(it.hasNext()){
- ObjectPropertyStatement objPropertyStmt = (ObjectPropertyStatement)it.next();
+ for (ObjectPropertyStatement objPropertyStmt : objPropertyStmts) {
if (hash.containsKey(objPropertyStmt.getPropertyURI())) {
ObjectProperty p = hash.get(objPropertyStmt.getPropertyURI());
p.addObjectPropertyStatement(objPropertyStmt);
@@ -490,16 +488,14 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
OntProperty op = getOntModel().getOntProperty(objPropertyStmt.getPropertyURI());
if (op != null) {
ObjectProperty p = propertyFromOntProperty(op);
- hash.put(p.getURI(),p);
+ hash.put(p.getURI(), p);
p.addObjectPropertyStatement(objPropertyStmt);
}
}
}
List props = new ArrayList();
- Iterator keyIt = hash.keySet().iterator();
- while (keyIt.hasNext()) {
- Object key = keyIt.next();
+ for (String key : hash.keySet()) {
props.add(hash.get(key));
}
return props;
@@ -875,13 +871,11 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
isRoot = true;
} else {
isRoot = true;
- Iterator pit = parentList.iterator();
- while (pit.hasNext()) {
- Property pt = pit.next();
- if ( (!pt.equals(op)) && (!(getOntModel().contains(op,OWL.equivalentProperty,pt)) || (getOntModel().contains(pt,OWL.equivalentProperty,op))) ) {
- isRoot = false;
- }
- }
+ for (Property pt : parentList) {
+ if ((!pt.equals(op)) && (!(getOntModel().contains(op, OWL.equivalentProperty, pt)) || (getOntModel().contains(pt, OWL.equivalentProperty, op)))) {
+ isRoot = false;
+ }
+ }
}
} else {
isRoot = true;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
index 48a96ada0..b9d06d028 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
@@ -7,7 +7,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
@@ -19,7 +18,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jena.ontology.OntModel;
-import org.apache.jena.ontology.OntResource;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.Query;
import org.apache.jena.query.QueryExecution;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
index d965b5cf1..78dce1a42 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
@@ -3,8 +3,6 @@
package edu.cornell.mannlib.vitro.webapp.dao.jena;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -28,7 +26,6 @@ import org.apache.jena.query.QueryExecutionFactory;
import org.apache.jena.query.QueryFactory;
import org.apache.jena.query.QuerySolution;
import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.ResultSetFactory;
import org.apache.jena.query.Syntax;
import org.apache.jena.rdf.model.RDFNode;
import org.apache.jena.rdf.model.Resource;
@@ -68,11 +65,11 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
protected static final String PREFIXES;
static {
- String prefixes = "";
+ StringBuilder prefixes = new StringBuilder();
for (String key : NAMESPACES.keySet()) {
- prefixes += "PREFIX " + key + ": <" + NAMESPACES.get(key) + ">\n";
+ prefixes.append("PREFIX ").append(key).append(": <").append(NAMESPACES.get(key)).append(">\n");
}
- PREFIXES = prefixes;
+ PREFIXES = prefixes.toString();
log.debug("Query prefixes: " + PREFIXES);
}
@@ -165,15 +162,13 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
}
private void getAllSubPropertyURIs(String propertyURI, HashSet subtree){
- List directSubproperties = getSubPropertyURIs(propertyURI);
- Iterator it=directSubproperties.iterator();
- while(it.hasNext()){
- String uri = it.next();
- if (!subtree.contains(uri)) {
- subtree.add(uri);
- getAllSubPropertyURIs(uri,subtree);
- }
- }
+ List directSubproperties = getSubPropertyURIs(propertyURI);
+ for (String uri : directSubproperties) {
+ if (!subtree.contains(uri)) {
+ subtree.add(uri);
+ getAllSubPropertyURIs(uri, subtree);
+ }
+ }
}
@Override
@@ -208,15 +203,13 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
}
private void getAllSuperPropertyURIs(String propertyURI, HashSet subtree){
- List directSuperproperties = getSuperPropertyURIs(propertyURI,true);
- Iterator it=directSuperproperties.iterator();
- while(it.hasNext()){
- String uri = it.next();
- if (!subtree.contains(uri)) {
- subtree.add(uri);
- getAllSuperPropertyURIs(uri,subtree);
- }
- }
+ List directSuperproperties = getSuperPropertyURIs(propertyURI,true);
+ for (String uri : directSuperproperties) {
+ if (!subtree.contains(uri)) {
+ subtree.add(uri);
+ getAllSuperPropertyURIs(uri, subtree);
+ }
+ }
}
@Override
@@ -313,17 +306,15 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
}
@Override
- public void removeEquivalentProperty(Property property,
- Property equivalentProperty) {
- removeEquivalentProperty(property, equivalentProperty);
+ public void removeEquivalentProperty(Property property, Property equivalentProperty) {
+ removeEquivalentProperty(property.getURI(), equivalentProperty.getURI());
}
protected void removeABoxStatementsWithPredicate(Property predicate) {
// DO NOT issue a removeAll() with a null (wildcard) in predicate position!
if (predicate == null) {
log.debug("Cannot remove ABox statements with a null predicate.");
- return;
- } else {
+ } else {
removeABoxStatementsWithPredicate(predicate.getURI());
}
}
@@ -425,18 +416,14 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
List classList = ontClass.listEquivalentClasses().toList();
classList.addAll(ontClass.listSubClasses().toList());
-
- Iterator it = classList.iterator();
-
- while (it.hasNext()) {
- OntClass oc = it.next();
-
- if (!oc.isAnon()) {
- classSet.add(oc.getURI());
- } else {
- classSet.addAll(getRestrictedClasses(oc));
- }
- }
+
+ for (OntClass oc : classList) {
+ if (!oc.isAnon()) {
+ classSet.add(oc.getURI());
+ } else {
+ classSet.addAll(getRestrictedClasses(oc));
+ }
+ }
return classSet;
}
@@ -902,32 +889,32 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
return opList;
}
ObjectPropertyDao opDao = getWebappDaoFactory().getObjectPropertyDao();
- String propQuery = "PREFIX rdfs: \n" +
- "PREFIX config: \n" +
- "PREFIX vitro: \n" +
- "SELECT ?property ?domain ?range WHERE { \n" +
- " ?context config:configContextFor ?property . \n" +
- " ?context config:qualifiedByDomain ?domain . \n" +
- " ?context config:qualifiedBy ?range . \n";
+ StringBuilder propQuery = new StringBuilder("PREFIX rdfs: \n" +
+ "PREFIX config: