From 9f9c6d610b034ec0ef4d80dab497ad8d33875376 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Mon, 18 Sep 2017 00:21:18 +0100 Subject: [PATCH] Various code improvements from IntelliJ inspections --- .../service/impl/AgrovocService.java | 32 ++------- .../service/impl/GemetService.java | 69 +++++++++++-------- .../semservices/service/impl/LCSHService.java | 13 ++-- .../semservices/service/impl/UMLSService.java | 8 +-- .../controller/ExportQrCodeController.java | 1 - .../controller/ajax/GeoFocusMapLocations.java | 16 ++--- .../ajax/GeoFocusResearcherCount.java | 16 ++--- .../harvester/CsvFileHarvestJob.java | 14 ++-- .../harvester/FileHarvestController.java | 13 ++-- .../controller/harvester/Harvester.java | 5 +- .../DataVisualizationController.java | 6 +- .../ShortURLVisualizationController.java | 5 +- .../n3editing/N3TransitionToV2Mapping.java | 2 - .../PersonHasPublicationValidator.java | 1 - .../PublicationHasAuthorValidator.java | 2 - ...AuthorsToInformationResourceGenerator.java | 6 -- .../AddClinicalRoleToPersonGenerator.java | 2 - .../AddEditWebpageFormGenerator.java | 7 -- .../AddEditorRoleToPersonGenerator.java | 1 - ...EditorsToInformationResourceGenerator.java | 6 -- .../AddFullNameToPersonGenerator.java | 7 -- .../AddHeadOfRoleToPersonGenerator.java | 1 - .../AddOrcidIdToPersonGenerator.java | 11 --- .../AddPresenterRoleToPersonGenerator.java | 2 - .../AddReviewerRoleToPersonGenerator.java | 1 - .../AddRoleToPersonTwoStageGenerator.java | 1 - .../GrantAdministeredByGenerator.java | 9 --- .../GrantHasContributorGenerator.java | 4 -- ...OrganizationAdministersGrantGenerator.java | 9 --- .../OrganizationForTrainingGenerator.java | 1 - ...ganizationHasPositionHistoryGenerator.java | 1 - .../PersonHasAwardOrHonorGenerator.java | 1 - .../generators/PersonHasEmailGenerator.java | 7 -- .../PersonHasIssuedCredentialGenerator.java | 3 - .../PersonHasPositionHistoryGenerator.java | 2 - .../PersonHasPreferredTitleGenerator.java | 7 -- .../ProjectHasParticipantGenerator.java | 6 -- .../SubjectHasMailingAddressGenerator.java | 7 -- .../SubjectHasPhoneFaxNumberGenerator.java | 8 --- ...aultAddMissingIndividualFormGenerator.java | 1 - .../VIVONewIndividualFormGenerator.java | 1 - .../AddAssociatedConceptsPreprocessor.java | 12 ++-- .../ManageLabelsForPersonPreprocessor.java | 11 --- .../RoleToActivityPredicatePreprocessor.java | 30 -------- .../RoleToPredicatePreprocessor.java | 21 ------ .../documentBuilding/CalculateParameters.java | 2 +- .../extensions/LabelsAcrossContextNodes.java | 8 +-- .../ConceptSearchServiceUtils.java | 12 ++-- .../CoAuthorshipGraphMLWriter.java | 10 +-- .../CoAuthorshipRequestHandler.java | 3 +- .../CoAuthorshipVisCodeGenerator.java | 9 +-- .../constants/QueryConstants.java | 3 +- .../CoPIGrantCountConstructQueryRunner.java | 5 -- .../CoPIGrantCountRequestHandler.java | 2 +- .../CoPIGraphMLWriter.java | 9 +-- .../CoPIVisCodeGenerator.java | 7 +- .../ModelConstructorRequestHandler.java | 7 +- .../PersonGrantCountRequestHandler.java | 2 +- .../PersonGrantCountVisCodeGenerator.java | 7 +- .../PersonLevelRequestHandler.java | 1 - .../PersonPublicationCountQueryRunner.java | 5 -- .../PersonPublicationCountRequestHandler.java | 1 - ...ersonPublicationCountVisCodeGenerator.java | 9 +-- .../setup/VisualizationSetup.java | 1 - .../utilities/UtilitiesRequestHandler.java | 2 - .../utilities/VisualizationCaches.java | 1 - .../visutils/AllPropertiesQueryRunner.java | 8 +-- .../visutils/GenericQueryRunner.java | 5 +- .../visutils/GenericQueryRunnerOnModel.java | 5 +- .../visualization/visutils/PDFDocument.java | 3 - .../VIVOIndividualTemplateModel.java | 7 +- .../controller/OrcidAddExternalIdHandler.java | 1 - .../controller/OrcidConfirmationState.java | 3 - .../controller/OrcidReadProfileHandler.java | 1 - .../reasoner/plugin/DCTitleForDocuments.java | 12 ---- .../webapp/sitemap/SiteMapServlet.java | 1 - .../webapp/startup/DataGetterN3Setup.java | 1 - .../webapp/startup/GeneratorSetup.java | 2 - .../webapp/startup/JSONWrapperSetup.java | 5 -- .../webapp/startup/SiteAdminSetup.java | 3 - .../webapp/startup/TemplateModelSetup.java | 5 -- 81 files changed, 124 insertions(+), 433 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java index 0639b9c4..4d78f904 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java @@ -190,7 +190,7 @@ public class AgrovocService implements ExternalConceptService { } protected String getAgrovocTermCode(String rdf) throws Exception { - String termcode = new String(); + String termcode = ""; try { Document doc = XMLUtils.parse(rdf); NodeList nodes = doc.getElementsByTagName("hasCodeAgrovoc"); @@ -199,13 +199,7 @@ public class AgrovocService implements ExternalConceptService { termcode = node.getTextContent(); } - } catch (SAXException e) { - // e.printStackTrace(); - throw e; - } catch (ParserConfigurationException e) { - // e.printStackTrace(); - throw e; - } catch (IOException e) { + } catch (SAXException | IOException | ParserConfigurationException e) { // e.printStackTrace(); throw e; } @@ -213,7 +207,7 @@ public class AgrovocService implements ExternalConceptService { } protected String getConceptURIFromRDF(String rdf) { - String conceptUri = new String(); + String conceptUri = ""; try { Document doc = XMLUtils.parse(rdf); NodeList nodes = doc.getElementsByTagName("skos:Concept"); @@ -222,13 +216,7 @@ public class AgrovocService implements ExternalConceptService { NamedNodeMap attrs = node.getAttributes(); Attr idAttr = (Attr) attrs.getNamedItem("rdf:about"); conceptUri = idAttr.getTextContent(); - } catch (IOException e) { - e.printStackTrace(); - System.err.println("rdf: " + rdf); - } catch (SAXException e) { - e.printStackTrace(); - System.err.println("rdf: " + rdf); - } catch (ParserConfigurationException e) { + } catch (IOException | ParserConfigurationException | SAXException e) { e.printStackTrace(); System.err.println("rdf: " + rdf); } @@ -254,13 +242,7 @@ public class AgrovocService implements ExternalConceptService { } - } catch (IOException e) { - e.printStackTrace(); - System.err.println("rdf: " + rdf); - } catch (SAXException e) { - e.printStackTrace(); - System.err.println("rdf: " + rdf); - } catch (ParserConfigurationException e) { + } catch (IOException | ParserConfigurationException | SAXException e) { e.printStackTrace(); System.err.println("rdf: " + rdf); } @@ -270,7 +252,7 @@ public class AgrovocService implements ExternalConceptService { protected String getDbpediaDescription(String uri) throws Exception { String descriptionSource = " (Source: DBpedia)"; - String description = new String(); + String description = ""; String qs = "" + "PREFIX rdfs: \n" + "PREFIX rdf: \n" @@ -329,7 +311,7 @@ public class AgrovocService implements ExternalConceptService { * @param uri The URI */ protected String stripConceptId(String uri) { - String conceptId = new String(); + String conceptId = ""; int lastslash = uri.lastIndexOf('/'); conceptId = uri.substring(lastslash + 1, uri.length()); return conceptId; diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java index 4f5fbb54..5c6999b0 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java @@ -150,7 +150,7 @@ public class GemetService implements ExternalConceptService { if (obj.has(key)) { return obj.get(key).asText(); } else { - return new String(""); + return ""; } } @@ -160,7 +160,7 @@ public class GemetService implements ExternalConceptService { * @throws Exception */ protected String getAvailableLangs(String concept_uri) throws Exception { - String result = new String(); + String result = ""; String serviceUrl = GemetWS_address + "getAvailableLanguages" + "?concept_uri=" + concept_uri; try { @@ -177,7 +177,7 @@ public class GemetService implements ExternalConceptService { * @throws Exception */ protected String getConcept(String concept_uri) throws Exception { - String result = new String(); + String result = ""; String serviceUrl = GemetWS_address + "getConcept" + "?concept_uri=" + concept_uri + "&language=en"; @@ -196,20 +196,27 @@ public class GemetService implements ExternalConceptService { * @throws Exception */ protected String getAllTranslationsForConcept(String concept_uri, String property) throws Exception { - String result = new String(); - String property_uri = new String(); - if (property.equals("definition")) { - property_uri = definitionUri; - } else if (property.equals("preferredLabel")) { - property_uri = prefLabelUri; - } else if (property.equals("scopeNote")) { - property_uri = scopeNoteUri; - } else if (property.equals("nonPreferredLabels")) { - property_uri = altLabelUri; - } else if (property.equals("example")) { - property_uri = exampleUri; - } else if (property.equals("acronymLabel")) { - property_uri = acronymLabelUri; + String result = ""; + String property_uri = ""; + switch (property) { + case "definition": + property_uri = definitionUri; + break; + case "preferredLabel": + property_uri = prefLabelUri; + break; + case "scopeNote": + property_uri = scopeNoteUri; + break; + case "nonPreferredLabels": + property_uri = altLabelUri; + break; + case "example": + property_uri = exampleUri; + break; + case "acronymLabel": + property_uri = acronymLabelUri; + break; } String serviceUrl = GemetWS_address + "getAllTranslationsForConcept" + @@ -234,14 +241,18 @@ public class GemetService implements ExternalConceptService { * @throws Exception */ protected String getRelatedConcepts(String concept_uri, String relation) throws Exception { - String result = new String(); - String relation_uri = new String(); - if (relation.equals("broader")) { - relation_uri = broaderUri; - } else if (relation.equals("narrower")) { - relation_uri = narrowerUri; - } else if (relation.equals("related")) { - relation_uri = relatedUri; + String result = ""; + String relation_uri = ""; + switch (relation) { + case "broader": + relation_uri = broaderUri; + break; + case "narrower": + relation_uri = narrowerUri; + break; + case "related": + relation_uri = relatedUri; + break; } String serviceUrl = GemetWS_address + "getRelatedConcepts" + "?concept_uri=" + concept_uri + @@ -263,7 +274,7 @@ public class GemetService implements ExternalConceptService { * @throws Exception */ protected String getConceptsMatchingKeyword(String keyword) throws Exception { - String result = new String(); + String result = ""; String encodedKeyword = URLEncoder.encode(keyword, "UTF-8"); String serviceUrl = GemetWS_address + "getConceptsMatchingKeyword" + "?keyword=" + encodedKeyword + @@ -283,7 +294,7 @@ public class GemetService implements ExternalConceptService { * @param url URI */ protected String getGemetResults(String url) throws Exception { - String results = new String(); + String results = ""; //System.out.println("url: "+url); try { @@ -310,7 +321,7 @@ public class GemetService implements ExternalConceptService { protected List getRelatedUris(String json) { List uriList = new ArrayList(); - String uri = new String(); + String uri = ""; ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(json); if (jsonArray.size() == 0) { return new ArrayList(); @@ -338,7 +349,7 @@ public class GemetService implements ExternalConceptService { } protected String stripConceptId(String uri) { - String conceptId = new String(); + String conceptId = ""; int lastslash = uri.lastIndexOf('/'); conceptId = uri.substring(lastslash + 1, uri.length()); return conceptId; diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java index 39b882b6..a2347927 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java @@ -176,7 +176,7 @@ public class LCSHService implements ExternalConceptService { protected List getConceptURIFromXML(String rdf) { List uris = new ArrayList(); - String conceptUri = new String(); + String conceptUri = ""; try { Document doc = XMLUtils.parse(rdf); NodeList nodes = doc.getElementsByTagName("entry"); @@ -202,15 +202,10 @@ public class LCSHService implements ExternalConceptService { uris.add(conceptUri); } - } catch (IOException e) { + } catch (IOException | ParserConfigurationException | SAXException e) { log.error("error occurred in parsing " +rdf, e); - } catch (SAXException e) { - log.error("error occurred in parsing " +rdf, e); - } catch (ParserConfigurationException e) { - log.error("error occurred in parsing " +rdf, e); - } - return uris; + return uris; } @@ -222,7 +217,7 @@ public class LCSHService implements ExternalConceptService { * @param uri URI */ protected String stripConceptId(String uri) { - String conceptId = new String(); + String conceptId = ""; int lastslash = uri.lastIndexOf('/'); conceptId = uri.substring(lastslash + 1, uri.length()); return conceptId; diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java index 6d94a1fd..9232592d 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java @@ -132,7 +132,7 @@ public class UMLSService implements ExternalConceptService { private List processOutput(String results) throws Exception { List conceptList = new ArrayList(); List bestMatchIdList = new ArrayList(); - String bestMatchId = new String(); + String bestMatchId = ""; try { ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results); @@ -179,13 +179,13 @@ public class UMLSService implements ExternalConceptService { if (obj.has(key)) { return obj.get(key).asText(); } else { - return new String(""); + return ""; } } protected String stripConceptId(String uri) { - String conceptId = new String(); + String conceptId = ""; int lastslash = uri.lastIndexOf('/'); conceptId = uri.substring(lastslash + 1, uri.length()); return conceptId; @@ -196,7 +196,7 @@ public class UMLSService implements ExternalConceptService { throw new IllegalStateException("Unable to read umls.properties"); } - if (ticketGrantingTicketURL == null || lastUpdate + 28700000l < System.currentTimeMillis()) { + if (ticketGrantingTicketURL == null || lastUpdate + 28700000L < System.currentTimeMillis()) { try { if (!StringUtils.isEmpty(apikey)) { ticketGrantingTicketURL = Request.Post(UMLS_AUTH_KEY_URL).useExpectContinue().version(HttpVersion.HTTP_1_1) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java index e748994a..d036ff1d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java @@ -24,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestA import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestAnalyzer; import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestInfo; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModel; import freemarker.ext.beans.BeansWrapper; import freemarker.template.DefaultObjectWrapper; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java index 766cc8bf..7b9f6c36 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java @@ -7,20 +7,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; -import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; @@ -68,7 +64,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder { try { geoLocations = getGeoLocations(vreq); - String response = "["; + StringBuilder response = new StringBuilder("["); String geometry = "{\"geometry\": {\"type\": \"Point\",\"coordinates\": \"\"},"; String typeProps = "\"type\": \"Feature\",\"properties\": {\"mapType\": \"\","; String previousLabel = ""; @@ -111,18 +107,18 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder { + "\",\"local\": \"" + local + "\"}},"; - response += tempStr; + response.append(tempStr); previousLabel = label; } } if ( response.lastIndexOf(",") > 0 ) { - response = response.substring(0, response.lastIndexOf(",")); + response = new StringBuilder(response.substring(0, response.lastIndexOf(","))); } - response += " ]"; + response.append(" ]"); if ( log.isDebugEnabled() ) { - log.debug(response); + log.debug(response.toString()); } - return response; + return response.toString(); } catch (Exception e) { log.error("Failed geographic focus locations", e); return EMPTY_RESPONSE; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java index 8347a88b..c03e4643 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusResearcherCount.java @@ -2,26 +2,20 @@ package edu.cornell.mannlib.vitro.webapp.controller.ajax; import java.io.IOException; -import java.lang.Integer; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; -import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; public class GeoFocusResearcherCount extends AbstractAjaxResponder { @@ -47,15 +41,15 @@ public class GeoFocusResearcherCount extends AbstractAjaxResponder { try { geoFocusCount = getGeoFocusCount(vreq); - String response = "{ "; + StringBuilder response = new StringBuilder("{ "); for (Map map: geoFocusCount) { String theCount = map.get("count"); - response += "\"count\": \"" + theCount + "\""; + response.append("\"count\": \"").append(theCount).append("\""); } - response += " }"; - log.debug(response); - return response; + response.append(" }"); + log.debug(response.toString()); + return response.toString(); } catch (Exception e) { log.error("Failed geographic focus count", e); return EMPTY_RESPONSE; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java index cb0aad1d..6844dadb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java @@ -6,10 +6,8 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; @@ -221,24 +219,24 @@ class CsvFileHarvestJob implements FileHarvestJob { try { int rowNum = 0; int numberFields = 0; - String errorMsg = "File header does not match template"; + StringBuilder errorMsg = new StringBuilder("File header does not match template"); for (CSVRecord cRecord : cReader) { rowNum++; if (false) { numberFields = cRecord.size(); - errorMsg += "file header items: "; + errorMsg.append("file header items: "); for(int i = 0; i < cRecord.size(); i++) { - errorMsg += cRecord.get(i) + ", "; + errorMsg.append(cRecord.get(i)).append(", "); } } else { if (cRecord.size() > 0) { if(cRecord.size() != numberFields) { if (errorMsg != null) { - errorMsg += "template items: "; + errorMsg.append("template items: "); for(int i = 0; i < cRecord.size(); i++) { - errorMsg += cRecord.get(i) + ", "; + errorMsg.append(cRecord.get(i)).append(", "); } - return errorMsg; + return errorMsg.toString(); } return "Mismatch in number of entries in row " + rowNum + ": expected " + numberFields + ", found " + cRecord.size(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java index 663b8c31..3530adfc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java @@ -455,9 +455,9 @@ public class FileHarvestController extends FreemarkerHttpServlet { unsentLogLinesList.clear(); } - String progressSinceLastCheck = ""; + StringBuilder progressSinceLastCheck = new StringBuilder(); for(int i = 0; i < unsentLogLines.length; i++) { - progressSinceLastCheck += unsentLogLines[i] + newline; + progressSinceLastCheck.append(unsentLogLines[i]).append(newline); } boolean finished = sessionInfo.isFinished(); @@ -484,7 +484,7 @@ public class FileHarvestController extends FreemarkerHttpServlet { if(!abnormalTermination) { json = generateJson(false); - json.put("progressSinceLastCheck", progressSinceLastCheck); + json.put("progressSinceLastCheck", progressSinceLastCheck.toString()); json.put("finished", finished); json.put("newlyAddedUris", newlyAddedUris); json.put("newlyAddedUrls", newlyAddedUrls); @@ -635,9 +635,10 @@ public class FileHarvestController extends FreemarkerHttpServlet { boolean match = false; String[] validRdfTypesForJob = job.getRdfTypesForLinks(); for(String rdfType : validRdfTypesForJob) { - if(types.contains(rdfType)) - match = true; - break; + if(types.contains(rdfType)) { + match = true; + break; + } } if(match) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java index 9a6518a7..7f099a76 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/Harvester.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.harvester; import java.util.ArrayList; +import java.util.Collections; /* //PLEASE SEE JAVADOC COMMENT FOR CLASS BELOW import org.vivoweb.harvester.diff.Diff; @@ -175,9 +176,7 @@ class Harvester { for(int i = 0; i < args.length; i++) { if(args[i] instanceof String[]) { String[] array = (String[])(args[i]); - for(int j = 0; j < array.length; j++) { - allData.add(array[j]); - } + Collections.addAll(allData, array); } else { allData.add(args[i].toString()); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java index b65435ec..864da198 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java @@ -92,10 +92,8 @@ public class DataVisualizationController extends VitroHttpServlet { response, log); } - - return; - - } else { + + } else { UtilityFunctions.handleMalformedParameters( "Inappropriate query parameters were submitted.", diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java index 8085f5cc..32ff3f9e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -249,9 +250,7 @@ public class ShortURLVisualizationController extends FreemarkerHttpServlet { if (urlParams.length > 1 && urlParams[0].equalsIgnoreCase("vis")) { - for (int ii=1; ii < urlParams.length; ii++) { - matchedGroups.add(urlParams[ii]); - } + matchedGroups.addAll(Arrays.asList(urlParams).subList(1, urlParams.length)); } return matchedGroups; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java index 28fd5225..b4e45f26 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java @@ -1,8 +1,6 @@ /* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping; - import java.util.HashMap; import java.util.Map; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java index 020ca807..76cc439c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java index 910b0c1f..3780076c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java @@ -8,8 +8,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; - import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java index 6037e9e2..52ca4d18 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,17 +22,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; import org.apache.jena.rdf.model.RDFNode; -import org.apache.jena.rdf.model.Literal; import org.apache.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.XSD; -import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator; -import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.PublicationHasAuthorValidator; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java index 4a726b19..3d086a64 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java @@ -2,8 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.HashMap; - import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java index 130c1518..9fd9cc60 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java @@ -1,10 +1,6 @@ /* $This file is distributed under the terms of the license in LICENSE$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; @@ -12,9 +8,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; -import org.apache.jena.rdf.model.Literal; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFNode; import org.apache.jena.vocabulary.XSD; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java index bb30661b..4563bfdb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; /** * Generates the edit configuration for adding a Role to a Person. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java index 20a916bd..56835612 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,17 +22,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; import org.apache.jena.rdf.model.RDFNode; -import org.apache.jena.rdf.model.Literal; import org.apache.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.XSD; -import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator; -import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java index af914e7f..87007f90 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddFullNameToPersonGenerator.java @@ -2,12 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpSession; @@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class AddFullNameToPersonGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java index 6ebe6df5..30dd8d6e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java index da849473..debd3ca8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java @@ -2,27 +2,16 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.jena.vocabulary.XSD; - import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class AddOrcidIdToPersonGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java index 53f315a3..e35af3c6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java @@ -14,10 +14,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInput import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java index 03140703..e1c68edb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java index a8e5d91a..e78c66e8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java index 87c211e5..f83bd860 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantAdministeredByGenerator.java @@ -3,24 +3,15 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import javax.servlet.http.HttpSession; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInputValidator; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class GrantAdministeredByGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java index 89db1e5c..e1ac2f79 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/GrantHasContributorGenerator.java @@ -13,13 +13,9 @@ import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java index bfad4874..57fdfc1c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationAdministersGrantGenerator.java @@ -3,24 +3,15 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import javax.servlet.http.HttpSession; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInputValidator; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class OrganizationAdministersGrantGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java index 4038a3aa..8b30e432 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java @@ -16,7 +16,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java index 58447c1d..c048996e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java @@ -17,7 +17,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisio import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator implements EditConfigurationGenerator { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java index 75dc75f1..4a79ae92 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java @@ -15,7 +15,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalVali import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java index 32cdd692..a5fe5052 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEmailGenerator.java @@ -2,12 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpSession; @@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class PersonHasEmailGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java index 8e6428e6..8c400a7c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasIssuedCredentialGenerator.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators import java.util.Arrays; import java.util.HashMap; -import java.util.Map; import javax.servlet.http.HttpSession; @@ -16,11 +15,9 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInput import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class PersonHasIssuedCredentialGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java index f23852ce..b7c1ffda 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java @@ -17,10 +17,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInput import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java index 056dbf38..ccc71551 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPreferredTitleGenerator.java @@ -2,12 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpSession; @@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class PersonHasPreferredTitleGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java index 6e1b3fc8..c0f7e785 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ProjectHasParticipantGenerator.java @@ -11,15 +11,9 @@ import javax.servlet.http.HttpSession; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java index 0ac42176..93d33a31 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasMailingAddressGenerator.java @@ -2,12 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpSession; @@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class SubjectHasMailingAddressGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java index d07fdb76..a0953454 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/SubjectHasPhoneFaxNumberGenerator.java @@ -2,18 +2,14 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.lang3.StringUtils; import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model; @@ -22,12 +18,8 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; public class SubjectHasPhoneFaxNumberGenerator extends VivoBaseGenerator implements diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java index 89a82f0e..711d877c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java @@ -7,7 +7,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java index 204c2b6b..3a4f9372 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java @@ -20,7 +20,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.FoafNameToRdfsLabelPreprocessor; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; /** diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java index b5348ab0..8fec071a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java @@ -746,7 +746,7 @@ public class AddAssociatedConceptsPreprocessor extends //This will either generate or retrieve URIs for the concept semantic type labels if they exist //We will then update the submission to include this private String getConceptSemanticTypeURIValues() { - String pseudoInputString = ""; + StringBuilder pseudoInputString = new StringBuilder(); if(conceptSemanticTypeLabelValues != null && !conceptSemanticTypeLabelValues.isEmpty()) { String[] conceptSemanticTypeLabels = convertDelimitedStringToArray(conceptSemanticTypeLabelValues); //keep track of what label values already exist and to which label variables they map @@ -761,7 +761,7 @@ public class AddAssociatedConceptsPreprocessor extends if(uri != "") { String[] urisToAdd = new String[1]; urisToAdd[0] = uri; - pseudoInputString = uri; + pseudoInputString = new StringBuilder(uri); log.debug("uris to add" + uri); submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd); } @@ -809,21 +809,21 @@ public class AddAssociatedConceptsPreprocessor extends } } if(i != 0) { - pseudoInputString += ","; + pseudoInputString.append(","); } - pseudoInputString += uri; + pseudoInputString.append(uri); } //Add this string to the uris for the form String[] urisToAdd = new String[1]; - urisToAdd[0] = pseudoInputString; + urisToAdd[0] = pseudoInputString.toString(); log.debug("uris to add" + pseudoInputString); submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd); } } - return pseudoInputString; + return pseudoInputString.toString(); } private String getURIForSemanticTypeLabel(String label) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java index 3735d131..b9321cac 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java @@ -3,27 +3,16 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -import org.apache.jena.ontology.OntModel; import org.apache.jena.rdf.model.Literal; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.Property; -import org.apache.jena.rdf.model.ResIterator; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; /* * This preprocessor is used to set the language attribute on the label based on the user selection * on the manage labels page when adding a new label. */ -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java index 003f13d4..db5e7f7f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java @@ -4,40 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocess import java.util.Map; import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -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.rdf.model.Literal; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.rdf.model.ResourceFactory; -import org.apache.jena.vocabulary.XSD; -import org.apache.jena.rdf.model.Property; -import org.apache.jena.shared.Lock; - -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; - -import org.vivoweb.webapp.util.ModelUtils; public class RoleToActivityPredicatePreprocessor extends RoleToPredicatePreprocessor { public RoleToActivityPredicatePreprocessor(EditConfigurationVTwo editConfig, WebappDaoFactory wadf) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java index 833929f0..d7ded275 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java @@ -5,37 +5,16 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocess import java.util.Map; import java.util.List; import java.util.ArrayList; -import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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.rdf.model.Literal; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.rdf.model.ResourceFactory; -import org.apache.jena.vocabulary.XSD; -import org.apache.jena.rdf.model.Property; -import org.apache.jena.shared.Lock; - import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import org.vivoweb.webapp.util.ModelUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java index 9ad4d70b..dd1768b5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java @@ -213,7 +213,7 @@ public class CalculateParameters implements DocumentModifier, ContextModelsUser queryList = null; Iterator itr = adjacentNodes.iterator(); while(itr.hasNext()){ - adjacentNodesConcat.append(itr.next() + " "); + adjacentNodesConcat.append(itr.next()).append(" "); } info[0] = adjacentNodesConcat.toString(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java index bb25b936..23633602 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java @@ -353,13 +353,9 @@ public class LabelsAcrossContextNodes implements IndexingUriFinder, String subjectUri = stmt.getSubject().getURI(); String predicateUri = stmt.getPredicate().getURI(); - if (incomingPropertyUri.equals(predicateUri) + return incomingPropertyUri.equals(predicateUri) && (contextNodeClasses.isEmpty() || isAnyMatch( - contextNodeClasses, getTypes(subjectUri)))) { - return true; - } else { - return false; - } + contextNodeClasses, getTypes(subjectUri))); } private boolean isAnyMatch(Set set1, Set set2) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java index 17c263f0..23feb3f1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java @@ -72,15 +72,11 @@ public class ConceptSearchServiceUtils { Class classDefinition = Class.forName(searchServiceClassName); object = classDefinition.newInstance(); conceptServiceClass = (ExternalConceptService) object; - } catch (InstantiationException e) { + } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) { System.out.println(e); - } catch (IllegalAccessException e) { - System.out.println(e); - } catch (ClassNotFoundException e) { - System.out.println(e); - } - - if(conceptServiceClass == null){ + } + + if(conceptServiceClass == null){ log.error("could not find Concept Search Class for " + searchServiceName); return null; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java index 46d8dfdd..ede6d78c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java @@ -2,7 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; -import java.io.OutputStreamWriter; import java.io.StringWriter; import java.util.ArrayList; import java.util.Collections; @@ -26,7 +25,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; @@ -81,15 +79,11 @@ public class CoAuthorshipGraphMLWriter { transformer.transform(source, result); graphMLContent.append(writer.toString()); - } catch (TransformerConfigurationException e) { - throw new IllegalStateException("XML error generating GraphML", e); - } catch (TransformerException e) { - throw new IllegalStateException("XML error generating GraphML", e); - } catch (ParserConfigurationException e) { + } catch (ParserConfigurationException | TransformerException e) { throw new IllegalStateException("XML error generating GraphML", e); } - return graphMLContent; + return graphMLContent; } public StringBuilder getCoAuthorshipGraphMLContent() { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java index 1c9e4ae1..0acfcfc1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java @@ -22,7 +22,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFr import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; @@ -168,7 +167,7 @@ public class CoAuthorshipRequestHandler implements VisualizationRequestHandler { String coAuthorSeparator = "; "; for (Collaborator currCoAuthor : coAuthors) { - coAuthorsMerged.append(currCoAuthor.getCollaboratorName() + coAuthorSeparator); + coAuthorsMerged.append(currCoAuthor.getCollaboratorName()).append(coAuthorSeparator); } return StringUtils.removeEnd(coAuthorsMerged.toString(), coAuthorSeparator); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java index c63e2d1e..bcbfdf1f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -101,14 +101,11 @@ public class CoAuthorshipVisCodeGenerator { if (yearToUniqueCoauthors.size() > 0) { try { minPublishedYear = Integer.parseInt(Collections.min(publishedYears)); - } catch (NoSuchElementException e1) { + } catch (NoSuchElementException | NumberFormatException e1) { log.debug("vis: " + e1.getMessage() + " error occurred for " + yearToUniqueCoauthors.toString()); - } catch (NumberFormatException e2) { - log.debug("vis: " + e2.getMessage() + " error occurred for " - + yearToUniqueCoauthors.toString()); } - } + } int minPubYearConsidered = 0; @@ -254,4 +251,4 @@ public class CoAuthorshipVisCodeGenerator { public SparklineData getValueObjectContainer() { return this.sparklineParameterVO; } -} +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java index 3b59376e..b6103813 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java @@ -52,8 +52,7 @@ public class QueryConstants { StringBuilder prefixSection = new StringBuilder(); for (Map.Entry prefixEntry : PREFIX_TO_NAMESPACE.entrySet()) { - prefixSection.append("PREFIX " + prefixEntry.getKey() - + ": <" + prefixEntry.getValue() + ">\n"); + prefixSection.append("PREFIX ").append(prefixEntry.getKey()).append(": <").append(prefixEntry.getValue()).append(">\n"); } return prefixSection.toString(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java index 0aacadd4..3a78ef5b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java @@ -15,11 +15,6 @@ import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.Violation; -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.Syntax; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index ea0a6321..8686787d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -164,7 +164,7 @@ public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler String coPISeparator = ";"; for (Collaborator currentCoPI : coInvestigators) { - coPIsMerged.append(currentCoPI.getCollaboratorName() + coPISeparator); + coPIsMerged.append(currentCoPI.getCollaboratorName()).append(coPISeparator); } return StringUtils.removeEnd(coPIsMerged.toString(), coPISeparator); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java index b5765e71..4f467ccf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java @@ -25,7 +25,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; @@ -83,15 +82,11 @@ public class CoPIGraphMLWriter { transformer.transform(source, result); graphMLContent.append(writer.toString()); - } catch (TransformerConfigurationException e) { - throw new IllegalStateException("XML error generating GraphML", e); - } catch (TransformerException e) { - throw new IllegalStateException("XML error generating GraphML", e); - } catch (ParserConfigurationException e) { + } catch (ParserConfigurationException | TransformerException e) { throw new IllegalStateException("XML error generating GraphML", e); } - return graphMLContent; + return graphMLContent; } public StringBuilder getCoPIGraphMLContent(){ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java index 9f37bf2c..71b2ae38 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java @@ -111,14 +111,11 @@ public class CoPIVisCodeGenerator { try { minGrantYear = Integer.parseInt(Collections .min(investigatedYears)); - } catch (NoSuchElementException e1) { + } catch (NoSuchElementException | NumberFormatException e1) { log.debug("vis: " + e1.getMessage() + " error occurred for " + yearToUniqueCoPIs.toString()); - } catch (NumberFormatException e2) { - log.debug("vis: " + e2.getMessage() + " error occurred for " - + yearToUniqueCoPIs.toString()); } - } + } int minGrantYearConsidered = 0; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java index e5bfeadb..2337e0d5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java @@ -103,13 +103,10 @@ public class ModelConstructorRequestHandler implements parseModelIdentifier.getType(), vitroRequest.getRDFService()); refreshedModels.add(parseModelIdentifier); - } catch (IllegalConstructedModelIdentifierException e) { - e.printStackTrace(); - } catch (MalformedQueryParametersException e) { - // TODO Auto-generated catch block + } catch (IllegalConstructedModelIdentifierException | MalformedQueryParametersException e) { e.printStackTrace(); } - } + } Map fileData = new HashMap(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java index bdd111ba..d2eda2e0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java @@ -112,7 +112,7 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl UtilityFunctions.getYearToActivityCount(authorGrants); - boolean shouldVIVOrenderVis = yearToGrantCount.size() > 0 ? true : false; + boolean shouldVIVOrenderVis = (yearToGrantCount.size() > 0); /* * Computations required to generate HTML for the sparkline & related context. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java index ea13fbd5..95f16033 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java @@ -102,14 +102,11 @@ public class PersonGrantCountVisCodeGenerator { try { minGrantYear = Integer.parseInt(Collections .min(grantYears)); - } catch (NoSuchElementException e1) { + } catch (NoSuchElementException | NumberFormatException e1) { log.debug("vis: " + e1.getMessage() + " error occurred for " + yearToGrantCount.toString()); - } catch (NumberFormatException e2) { - log.debug("vis: " + e2.getMessage() + " error occurred for " - + yearToGrantCount.toString()); } - } + } int minGrantYearConsidered = 0; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index 85aad034..c59d355b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.visualization.personlevel; import java.util.HashMap; import java.util.Map; -import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java index 67651f19..e0409cd2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java @@ -7,7 +7,6 @@ import java.util.Set; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.Resource; import org.apache.jena.rdf.model.ResourceFactory; import org.apache.jena.rdf.model.Statement; import org.apache.jena.vocabulary.RDFS; @@ -20,21 +19,17 @@ import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.Violation; -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.Syntax; import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java index 8ff07624..c2cd583e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java @@ -21,7 +21,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizati import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java index 182472ef..435ae0ae 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -103,14 +103,11 @@ public class PersonPublicationCountVisCodeGenerator { if (yearToPublicationCount.size() > 0) { try { minPublishedYear = Integer.parseInt(Collections.min(publishedYears)); - } catch (NoSuchElementException e1) { + } catch (NoSuchElementException | NumberFormatException e1) { log.debug("vis: " + e1.getMessage() + " error occurred for " + yearToPublicationCount.toString()); - } catch (NumberFormatException e2) { - log.debug("vis: " + e2.getMessage() + " error occurred for " - + yearToPublicationCount.toString()); } - } + } int minPubYearConsidered = 0; @@ -233,4 +230,4 @@ public class PersonPublicationCountVisCodeGenerator { public SparklineData getValueObjectContainer() { return this.sparklineParameterVO; } -} +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java index 7b68f7fd..add94838 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java @@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.visualization.setup; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.visualization.utilities.CachingRDFServiceExecutor; -import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java index aec2d898..63a15a55 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java @@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.visualization.utilities; import java.util.HashMap; import java.util.Map; -import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -34,7 +33,6 @@ import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryP import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.AllPropertiesQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.GenericQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java index f9624b8a..6206e126 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java @@ -8,7 +8,6 @@ import org.apache.jena.query.QuerySolution; import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java index 9a0e9afe..e0b5edfe 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java @@ -12,13 +12,7 @@ import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; import org.apache.jena.iri.Violation; -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.Syntax; import org.apache.jena.rdf.model.RDFNode; @@ -78,7 +72,7 @@ public class AllPropertiesQueryRunner implements QueryRunner { + filterClause + "}"; - log.debug("sparqlQuery = " + sparqlQuery.toString()); + log.debug("sparqlQuery = " + sparqlQuery); return sparqlQuery; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java index d73f0cd6..276823a4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java @@ -76,12 +76,11 @@ public class GenericQueryRunner implements QueryRunner { for (Map.Entry currentfieldLabelToOutputFieldLabel : this.fieldLabelToOutputFieldLabel.entrySet()) { - sparqlQuery.append("\t(str(?" + currentfieldLabelToOutputFieldLabel.getKey() + ") as ?" - + currentfieldLabelToOutputFieldLabel.getValue() + ")\n"); + sparqlQuery.append("\t(str(?").append(currentfieldLabelToOutputFieldLabel.getKey()).append(") as ?").append(currentfieldLabelToOutputFieldLabel.getValue()).append(")\n"); } - sparqlQuery.append("\n" + this.aggregationRules + "\n"); + sparqlQuery.append("\n").append(this.aggregationRules).append("\n"); sparqlQuery.append("WHERE {\n"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java index 04c9e72b..c2ed662d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java @@ -73,12 +73,11 @@ public class GenericQueryRunnerOnModel implements QueryRunner { for (Map.Entry currentfieldLabelToOutputFieldLabel : this.fieldLabelToOutputFieldLabel.entrySet()) { - sparqlQuery.append("\t(str(?" + currentfieldLabelToOutputFieldLabel.getKey() + ") as ?" - + currentfieldLabelToOutputFieldLabel.getValue() + ")\n"); + sparqlQuery.append("\t(str(?").append(currentfieldLabelToOutputFieldLabel.getKey()).append(") as ?").append(currentfieldLabelToOutputFieldLabel.getValue()).append(")\n"); } - sparqlQuery.append("\n" + this.aggregationRules + "\n"); + sparqlQuery.append("\n").append(this.aggregationRules).append("\n"); sparqlQuery.append("WHERE {\n"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java index b87679cc..58ed6958 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java @@ -96,9 +96,6 @@ public class PDFDocument { createImage(document, pdfWriter, featureHeaderStyle); - } catch (DocumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java index 2b911240..baa08be6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java @@ -52,12 +52,7 @@ public class VIVOIndividualTemplateModel extends IndividualTemplateModel { /* Template methods (for efficiency, not pre-computed) */ public boolean conceptSubclass() { - if ( isVClass(AWARD_CLASS) || isVClass(DEGREE_CLASS) ||isVClass(CONTACT_CLASS) || isVClass(CREDENTIAL_CLASS) || isVClass(DTP_CLASS) ) { - return true; - } - else { - return false; - } + return isVClass(AWARD_CLASS) || isVClass(DEGREE_CLASS) || isVClass(CONTACT_CLASS) || isVClass(CREDENTIAL_CLASS) || isVClass(DTP_CLASS); } public boolean person() { diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java index d278cba3..d6c605b4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java @@ -13,7 +13,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.orcidclient.OrcidClientException; -import edu.cornell.mannlib.orcidclient.actions.AddExternalIdAction; import edu.cornell.mannlib.orcidclient.auth.AuthorizationStatus; import edu.cornell.mannlib.orcidclient.beans.ExternalId; import edu.cornell.mannlib.vitro.webapp.beans.Individual; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java index 72510c97..b834d6c2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java @@ -17,14 +17,11 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import javax.xml.bind.JAXBElement; -import javax.xml.namespace.QName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.orcidclient.model.ExternalIdentifier; -import edu.cornell.mannlib.orcidclient.model.ExternalIdentifiers; import edu.cornell.mannlib.orcidclient.model.OrcidBio; import edu.cornell.mannlib.orcidclient.model.OrcidId; import edu.cornell.mannlib.orcidclient.model.OrcidProfile; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java index c2800094..83525fc4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java @@ -13,7 +13,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.orcidclient.OrcidClientException; -import edu.cornell.mannlib.orcidclient.actions.ReadPublicBioAction; import edu.cornell.mannlib.orcidclient.auth.AuthorizationStatus; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; diff --git a/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java b/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java index bb3fea16..f2036c58 100644 --- a/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java +++ b/api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java @@ -2,18 +2,6 @@ package org.vivoweb.reasoner.plugin; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.apache.jena.ontology.OntModel; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.Property; -import org.apache.jena.rdf.model.RDFNode; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.rdf.model.ResourceFactory; -import org.apache.jena.rdf.model.Statement; -import org.apache.jena.rdf.model.StmtIterator; -import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin; diff --git a/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java b/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java index b7337bd1..51fadef5 100644 --- a/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java +++ b/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java @@ -20,7 +20,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; @WebServlet(name = "SiteMapServlet", urlPatterns = {"/robots.txt","/sitemap.xml"}) public class SiteMapServlet extends VitroHttpServlet { diff --git a/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java b/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java index 0b324ba5..cee386bb 100644 --- a/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java +++ b/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java @@ -1,6 +1,5 @@ package org.vivoweb.webapp.startup; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Map; import javax.servlet.ServletContextEvent; diff --git a/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java index e728562e..3b8a8f50 100644 --- a/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java +++ b/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java @@ -1,8 +1,6 @@ package org.vivoweb.webapp.startup; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java index b675340d..bb5caef7 100644 --- a/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java +++ b/api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java @@ -7,10 +7,7 @@ import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.individuallist.IndividualJsonWrapper; -import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -18,8 +15,6 @@ import org.apache.commons.logging.LogFactory; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import java.util.Collection; -import java.util.Map; public class JSONWrapperSetup implements ServletContextListener { private static final Log log = LogFactory.getLog(JSONWrapperSetup.class); diff --git a/api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java index 2553a8da..449d32ea 100644 --- a/api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java +++ b/api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java @@ -2,9 +2,6 @@ package org.vivoweb.webapp.startup; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.InstitutionalInternalClassController; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.SiteAdminController; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.MenuManagementDataUtils; -import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.VIVOMenuManagementDataUtils; import edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler; import javax.servlet.ServletContextEvent; diff --git a/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java index f1e2dd44..49ec0ea5 100644 --- a/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java +++ b/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java @@ -1,13 +1,8 @@ package org.vivoweb.webapp.startup; -import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModelBuilder; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.VIVOListedIndividual; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.VIVOListedIndividualBuilder; import javax.servlet.ServletContextEvent;