Merge pull request #208 from awoods/sprint-i18n-main

Sprint i18n main
vivo-project · Feb 3, 2021 · 2621bc4 · 2621bc4
2 parents 1c2d5be + 0653b36
commit 2621bc4
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 24 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
@@ -232,16 +232,6 @@ public static String sparqlNode(Node node, String varName) {
             literalBuff.append("\"");
             pyString(literalBuff, node.getLiteralLexicalForm());
             literalBuff.append("\"");
-            /*
-             * UQAM-Bug-Correction
-             * reversing the condition tests.
-             * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data
-             */
-//          if (node.getLiteralDatatypeURI() != null) {
-//          literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
-//      } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
-//          literalBuff.append("@").append(node.getLiteralLanguage());
-//      }
             if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
                 literalBuff.append("@").append(node.getLiteralLanguage());
             } else if (node.getLiteralDatatypeURI() != null) {

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java
@@ -132,6 +132,11 @@ public boolean isResource() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean isStmtResource() {
+        throw new UnsupportedOperationException();
+    }
+
     public Literal inModel(Model model) {
         throw new UnsupportedOperationException();
     }

diff --git a/...ain/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java b/...ain/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java
@@ -325,6 +325,11 @@ public PrefixMapping lock() {
 		return inner.lock();
 	}
 
+	@Override
+	public boolean hasNoMappings() {
+		return inner.hasNoMappings();
+	}
+
 	@Override
 	public boolean samePrefixMappingAs(PrefixMapping other) {
 		return inner.samePrefixMappingAs(other);
@@ -684,6 +689,11 @@ public Resource createResource(String uri) {
 		return inner.createResource(uri);
 	}
 
+	@Override
+	public Resource createResource(Statement statement) {
+		return inner.createResource(statement);
+	}
+
 	@Override
 	public Property createProperty(String nameSpace, String localName) {
 		return inner.createProperty(nameSpace, localName);

diff --git a/.../java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java b/.../java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java
@@ -364,6 +364,11 @@ public PrefixMapping lock() {
 		return inner.lock();
 	}
 
+	@Override
+	public boolean hasNoMappings() {
+		return inner.hasNoMappings();
+	}
+
 	@Override
 	public boolean samePrefixMappingAs(PrefixMapping other) {
 		return inner.samePrefixMappingAs(other);
@@ -729,6 +734,11 @@ public Resource createResource(String uri) {
 		return inner.createResource(uri);
 	}
 
+	@Override
+	public Resource createResource(Statement statement) {
+		return inner.createResource(statement);
+	}
+
 	@Override
 	public Property createProperty(String nameSpace, String localName) {
 		return inner.createProperty(nameSpace, localName);

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
@@ -255,16 +255,6 @@ protected static String sparqlNode(Node node, String varName) {
             literalBuff.append("\"");
             pyString(literalBuff, node.getLiteralLexicalForm());
             literalBuff.append("\"");
-            /*
-             * UQAM-Bug-Correction
-             * reversing the condition tests.
-             * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data
-             */
-//          if (node.getLiteralDatatypeURI() != null) {
-//          literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
-//      } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
-//          literalBuff.append("@").append(node.getLiteralLanguage());
-//      }
             if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
                 literalBuff.append("@").append(node.getLiteralLanguage());
             } else if (node.getLiteralDatatypeURI() != null) {

diff --git a/api/src/test/java/stubs/org/apache/jena/rdf/model/LiteralStub.java b/api/src/test/java/stubs/org/apache/jena/rdf/model/LiteralStub.java
@@ -44,6 +44,11 @@ public boolean isResource() {
 		return false;
 	}
 
+	@Override
+	public boolean isStmtResource() {
+		return false;
+	}
+
 	@Override
 	public boolean isURIResource() {
 		return false;

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -176,7 +176,7 @@
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-arq</artifactId>
-            <version>3.11.0</version>
+            <version>3.16.0</version>
             <exclusions>
                 <!-- Exclude OSGi bundles from jsonld-java -->
                 <exclusion>
@@ -192,23 +192,33 @@
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-core</artifactId>
-            <version>3.11.0</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-sdb</artifactId>
-            <version>3.11.0</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-tdb</artifactId>
-            <version>3.11.0</version>
+            <version>3.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
             <version>7.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.26</version>
+        </dependency>
         <dependency>
             <groupId>org.directwebremoting</groupId>
             <artifactId>dwr</artifactId>