You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/02/19 15:36:20 UTC
[2/2] incubator-juneau git commit: Bug fixes.
Bug fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6a8351f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6a8351f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6a8351f5
Branch: refs/heads/master
Commit: 6a8351f50fa38b0ed31f79eed6078a1b712f39ef
Parents: e6c54d4
Author: JamesBognar <ja...@apache.org>
Authored: Sun Feb 19 10:36:16 2017 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Sun Feb 19 10:36:16 2017 -0500
----------------------------------------------------------------------
.../org/apache/juneau/jena/RdfParserSession.java | 2 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 15 ++++-----------
2 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6a8351f5/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 13ca513..87550b3 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -88,7 +88,7 @@ public class RdfParserSession extends ParserSession {
addModelPrefix(juneauBpNs);
this.pRoot = model.createProperty(juneauNs.getUri(), RDF_juneauNs_ROOT);
this.pValue = model.createProperty(juneauNs.getUri(), RDF_juneauNs_VALUE);
- this.pType = model.createProperty(juneauNs.getUri(), RDF_juneauNs_TYPE);
+ this.pType = model.createProperty(juneauBpNs.getUri(), RDF_juneauNs_TYPE);
this.pRdfType = model.createProperty("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
rdfReader = model.getReader(rdfLanguage);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6a8351f5/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index 4746592..211a9b2 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -249,22 +249,15 @@ public class RdfSerializer extends WriterSerializer {
if (bpm != null && bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)
f = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat();
switch (f) {
- case BAG: n = serializeToContainer(session, c, sType, m.createBag()); break;
- case LIST: n = serializeToList(session, c, sType); break;
- case MULTI_VALUED: serializeToMultiProperties(session, c, sType, bpm, attrName, parentResource); break;
- default: n = serializeToContainer(session, c, sType, m.createSeq());
+ case BAG: n = serializeToContainer(session, c, eType, m.createBag()); break;
+ case LIST: n = serializeToList(session, c, eType); break;
+ case MULTI_VALUED: serializeToMultiProperties(session, c, eType, bpm, attrName, parentResource); break;
+ default: n = serializeToContainer(session, c, eType, m.createSeq());
}
} else {
n = m.createLiteral(session.encodeTextInvalidChars(session.toString(o)));
}
- if (session.isAddBeanTypeProperties() && n != null && n.isResource()) {
- if (o != null && aType.getDictionaryName() != null)
- n.asResource().addProperty(session.getTypeProperty(), aType.getDictionaryName());
- else if (o == null && eType.getDictionaryName() != null)
- n.asResource().addProperty(session.getTypeProperty(), eType.getDictionaryName());
- }
-
session.pop();
return n;