You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/02/05 22:06:39 UTC
[1/2] jena git commit: JENA-1476: Switch
javax.xml.bind.DatatypeConverter to commons-codec
Repository: jena
Updated Branches:
refs/heads/master 568b82262 -> f1ed0e2b7
JENA-1476: Switch javax.xml.bind.DatatypeConverter to commons-codec
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e032ed77
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e032ed77
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e032ed77
Branch: refs/heads/master
Commit: e032ed770419ac36de4f7703bf914ab5e7ba67fe
Parents: 568b822
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 3 15:50:25 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 3 22:00:29 2018 +0000
----------------------------------------------------------------------
jena-core/pom.xml | 5 +++++
.../java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java | 5 ++---
.../java/org/apache/jena/datatypes/xsd/XSDhexBinary.java | 8 +++++---
.../apache/jena/reasoner/rulesys/builtins/MakeSkolem.java | 5 ++---
.../java/org/apache/jena/graph/test/TestTypedLiterals.java | 5 ++---
5 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e032ed77/jena-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index b883411..3c87ab1 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -67,6 +67,11 @@
<groupId>commons-cli</groupId>
</dependency>
+ <dependency>
+ <artifactId>commons-codec</artifactId>
+ <groupId>commons-codec</groupId>
+ </dependency>
+
<dependency>
<groupId>org.xenei</groupId>
<artifactId>junit-contracts</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/e032ed77/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java
index 78a1541..5e580ff 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java
@@ -18,8 +18,7 @@
package org.apache.jena.datatypes.xsd;
-import javax.xml.bind.DatatypeConverter;
-
+import org.apache.commons.codec.binary.Base64;
import org.apache.jena.datatypes.DatatypeFormatException ;
/**
@@ -39,7 +38,7 @@ public class XSDbase64Binary extends XSDbinary {
@Override
public String unparse(Object value) {
if (value instanceof byte[]) {
- return DatatypeConverter.printBase64Binary((byte[])value);
+ return Base64.encodeBase64String((byte[])value);
} else {
throw new DatatypeFormatException("base64 asked to encode an unwrapped byte array");
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e032ed77/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDhexBinary.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDhexBinary.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDhexBinary.java
index 7ca7781..d738586 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDhexBinary.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDhexBinary.java
@@ -18,8 +18,7 @@
package org.apache.jena.datatypes.xsd;
-import javax.xml.bind.DatatypeConverter;
-
+import org.apache.commons.codec.binary.Hex;
import org.apache.jena.datatypes.DatatypeFormatException ;
/**
@@ -39,7 +38,10 @@ public class XSDhexBinary extends XSDbinary {
@Override
public String unparse(Object value) {
if (value instanceof byte[]) {
- return DatatypeConverter.printHexBinary((byte[])value);
+ // XSD canonical form uses upper case and this aligns with
+ // javax.xml.bind.DatatypeConverter.printHexBinary which
+ // Jena used until 3.7.0.
+ return Hex.encodeHexString((byte[])value, false);
} else {
throw new DatatypeFormatException("hexBinary asked to encode a non-byte arrary");
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e032ed77/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
index 01491d5..69bd08d 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
@@ -21,8 +21,7 @@ package org.apache.jena.reasoner.rulesys.builtins;
import java.security.MessageDigest ;
import java.security.NoSuchAlgorithmException ;
-import javax.xml.bind.DatatypeConverter;
-
+import org.apache.commons.codec.binary.Base64;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.reasoner.rulesys.RuleContext ;
@@ -76,7 +75,7 @@ public class MakeSkolem extends BaseBuiltin {
MessageDigest digester = MessageDigest.getInstance("MD5");
digester.reset();
byte[] digest = digester.digest(key.toString().getBytes());
- String label = DatatypeConverter.printBase64Binary(digest);
+ String label = Base64.encodeBase64String(digest);
Node skolem = NodeFactory.createBlankNode(label);
return context.getEnv().bind(args[0], skolem);
} catch (NoSuchAlgorithmException e) {
http://git-wip-us.apache.org/repos/asf/jena/blob/e032ed77/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
index 11c137c..5bfccf6 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
@@ -25,10 +25,9 @@ import java.math.BigInteger ;
import java.text.SimpleDateFormat ;
import java.util.* ;
-import javax.xml.bind.DatatypeConverter;
-
import junit.framework.TestCase ;
import junit.framework.TestSuite ;
+import org.apache.commons.codec.binary.Hex;
import org.apache.jena.JenaRuntime ;
import org.apache.jena.datatypes.BaseDatatype ;
import org.apache.jena.datatypes.DatatypeFormatException ;
@@ -961,7 +960,7 @@ public class TestTypedLiterals extends TestCase {
Literal l = m.createTypedLiteral(data, XSDDatatype.XSDhexBinary);
LiteralLabel ll = l.asNode().getLiteral();
assertEquals("binary test 1b", ll.getDatatype(), XSDDatatype.XSDhexBinary);
- assertEquals("binary test 2b", DatatypeConverter.printHexBinary(data), ll.getLexicalForm());
+ assertEquals("binary test 2b", Hex.encodeHexString(data, false), ll.getLexicalForm());
// Check round tripping from value
LiteralLabel l2 = m.createTypedLiteral(ll.getLexicalForm(), XSDDatatype.XSDhexBinary).asNode().getLiteral();
[2/2] jena git commit: JENA-1476: Merge commit 'refs/pull/351/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1476: Merge commit 'refs/pull/351/head' of github.com:apache/jena
This closes #351.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f1ed0e2b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f1ed0e2b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f1ed0e2b
Branch: refs/heads/master
Commit: f1ed0e2b7530aae74194e0cc6cb2996a10b1d00f
Parents: 568b822 e032ed7
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Feb 5 22:01:07 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Feb 5 22:01:07 2018 +0000
----------------------------------------------------------------------
jena-core/pom.xml | 5 +++++
.../java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java | 5 ++---
.../java/org/apache/jena/datatypes/xsd/XSDhexBinary.java | 8 +++++---
.../apache/jena/reasoner/rulesys/builtins/MakeSkolem.java | 5 ++---
.../java/org/apache/jena/graph/test/TestTypedLiterals.java | 5 ++---
5 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------