This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 36682f0 Context API refactoring.
36682f0 is described below
commit 36682f0a2df941e9091554721cc96b360ab9b630
Author: JamesBognar <[email protected]>
AuthorDate: Mon Sep 27 19:48:21 2021 -0400
Context API refactoring.
---
.../main/java/org/apache/juneau/jena/N3Parser.java | 2 +-
.../java/org/apache/juneau/jena/N3Serializer.java | 2 +-
.../java/org/apache/juneau/jena/NTripleParser.java | 2 +-
.../org/apache/juneau/jena/NTripleSerializer.java | 2 +-
.../java/org/apache/juneau/jena/RdfCommon.java | 836 ---------------------
.../java/org/apache/juneau/jena/RdfParser.java | 85 +--
.../org/apache/juneau/jena/RdfParserBuilder.java | 215 +++---
.../org/apache/juneau/jena/RdfParserSession.java | 6 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 245 +-----
.../apache/juneau/jena/RdfSerializerBuilder.java | 284 ++++---
.../apache/juneau/jena/RdfSerializerSession.java | 16 +-
.../apache/juneau/jena/RdfXmlAbbrevSerializer.java | 2 +-
.../java/org/apache/juneau/jena/RdfXmlParser.java | 2 +-
.../org/apache/juneau/jena/RdfXmlSerializer.java | 2 +-
.../java/org/apache/juneau/jena/TurtleParser.java | 2 +-
.../org/apache/juneau/jena/TurtleSerializer.java | 2 +-
.../apache/juneau/jena/annotation/RdfConfig.java | 8 +-
.../jena/annotation/RdfConfigAnnotation.java | 143 ++--
.../juneau/jena/RdfConfigAnnotationTest.java | 283 ++++---
.../java/org/apache/juneau/jena/RdfParserTest.java | 3 +-
.../test/java/org/apache/juneau/jena/RdfTest.java | 7 +-
21 files changed, 603 insertions(+), 1546 deletions(-)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
index 8dcdcb3..b82967a 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.jena.Constants.*;
public class N3Parser extends RdfParser {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default N3 parser, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
index c486cb1..e7f0f68 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
@@ -18,7 +18,7 @@ package org.apache.juneau.jena;
public class N3Serializer extends RdfSerializer {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default N3 serializer, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
index f0fbdf0..da92ed5 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.jena.Constants.*;
public class NTripleParser extends RdfParser {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default N-Triple parser, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
index 3b20b69..58a6820 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
@@ -18,7 +18,7 @@ package org.apache.juneau.jena;
public class NTripleSerializer extends RdfSerializer {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default N-Triple serializer, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
deleted file mode 100644
index cdebd56..0000000
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
+++ /dev/null
@@ -1,836 +0,0 @@
-//
***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
-// * with the License. You may obtain a copy of the License at
*
-// *
*
-// * http://www.apache.org/licenses/LICENSE-2.0
*
-// *
*
-// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
-// * specific language governing permissions and limitations under the
License. *
-//
***************************************************************************************************************************
-package org.apache.juneau.jena;
-
-import java.util.*;
-
-import org.apache.juneau.collections.*;
-import org.apache.juneau.xml.*;
-
-/**
- * Configurable properties common to both the {@link RdfSerializer} and {@link
RdfParser} classes.
- * {@review}
- */
-public interface RdfCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "RdfCommon";
-
- /**
- * Maps RDF writer names to property prefixes that apply to them.
- */
- static final Map<String,String> LANG_PROP_MAP =
AMap.of("RDF/XML","rdfXml.","RDF/XML-ABBREV","rdfXml.","N3","n3.","N3-PP","n3.","N3-PLAIN","n3.","N3-TRIPLES","n3.","TURTLE","n3.","N-TRIPLE","ntriple.");
-
- /**
- * Configuration property: RDF language.
- *
- * <p>
- * The RDF language to use.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_language RDF_language}
- * <li><b>Name:</b> <js>"RdfCommon.language.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b> <c>RdfCommon.language</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_LANGUAGE</c>
- * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#language()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#language(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#ntriple()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#turtle()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#xml()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#xmlabbrev()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#language(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#ntriple()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#turtle()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#xml()}
- * </ul>
- * </ul>
- */
- public static final String RDF_language = PREFIX + ".language.s";
-
- /**
- * Configuration property: XML namespace for Juneau properties.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_juneauNs RDF_juneauNs}
- * <li><b>Name:</b> <js>"RdfCommon.juneauNs.s"</js>
- * <li><b>Data type:</b> {@link org.apache.juneau.xml.Namespace}
- * <li><b>System property:</b> <c>RdfCommon.juneauNs</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JUNEAUNS</c>
- * <li><b>Default:</b>
<code>{j:<js>'http://www.apache.org/juneau/'</js>}</code>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#juneauNs()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#juneauNs(Namespace)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#juneauNs(Namespace)}
- * </ul>
- * </ul>
- */
- public static final String RDF_juneauNs = PREFIX + ".juneauNs.s";
-
- /**
- * Configuration property: Default XML namespace for bean properties.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_juneauBpNs RDF_juneauBpNs}
- * <li><b>Name:</b> <js>"RdfCommon.juneauBpNs.s"</js>
- * <li><b>Data type:</b> {@link org.apache.juneau.xml.Namespace}
- * <li><b>System property:</b> <c>RdfCommon.juneauBpNs</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JUNEAUBPNS</c>
- * <li><b>Default:</b>
<code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#juneauBpNs()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#juneauBpNs(Namespace)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#juneauBpNs(Namespace)}
- * </ul>
- * </ul>
- */
- public static final String RDF_juneauBpNs = PREFIX + ".juneauBpNs.s";
-
- /**
- * Configuration property: RDF/XML property: <c>iri_rules</c>.
- *
- * <p>
- * Set the engine for checking and resolving.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_arp_iriRules RDF_arp_iriRules}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.iri-rules.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.iri-rules</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_IRI_RULES</c>
- * <li><b>Default:</b> <js>"lax"</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#arp_iriRules()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#arp_iriRules(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#arp_iriRules(String)}
- * </ul>
- * </ul>
- */
- public static final String RDF_arp_iriRules = PREFIX +
".jena.rdfXml.iri-rules.s";
-
- /**
- * Configuration property: RDF/XML ARP property: <c>error-mode</c>.
- *
- * <p>
- * This allows a coarse-grained approach to control of error handling.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_arp_errorMode RDF_arp_errorMode}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.error-mode.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.error-mode</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_ERROR_MODE</c>
- * <li><b>Default:</b> <js>"lax"</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#arp_errorMode()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#arp_errorMode(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#arp_errorMode(String)}
- * </ul>
- * </ul>
- */
- public static final String RDF_arp_errorMode = PREFIX +
".jena.rdfXml.error-mode.s";
-
- /**
- * Configuration property: RDF/XML ARP property: <c>embedding</c>.
- *
- * <p>
- * Sets ARP to look for RDF embedded within an enclosing XML document.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_arp_embedding RDF_arp_embedding}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.embedding.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.embedding</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_EMBEDDING</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#arp_embedding()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#arp_embedding()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#arp_embedding()}
- * </ul>
- * </ul>
- *
- * <h5 class='section'>Description:</h5>
- *
- */
- public static final String RDF_arp_embedding = PREFIX +
".jena.rdfXml.embedding.b";
-
- /**
- * Configuration property: RDF/XML ARP property: <c>ERR_xxx</c>.
- *
- * <p>
- * Provides fine-grained control over detected error conditions.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_arp_err_ RDF_arp_err_}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.ERR_"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b> <c>RdfCommon.jena.rdfXml.ERR_</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_ERR_</c>
- * </ul>
- *
- * <p>
- * Possible values:
- * <ul>
- * <li><js>"EM_IGNORE"</js>
- * <li><js>"EM_WARNING"</js>
- * <li><js>"EM_ERROR"</js>
- * <li><js>"EM_FATAL"</js>
- * </ul>
- *
- * <ul class='seealso'>
- * <li>
- * {@doc ExtARP/ARPErrorNumbers.html ARPErrorNumbers}
- * <li>
- * {@doc ExtARP/ARPOptions.html#setErrorMode(int,%20int)
ARPOptions.setErrorMode(int, int)}
- * </ul>
- */
- public static final String RDF_arp_err_ = PREFIX + ".jena.rdfXml.ERR_";
-
- /**
- * Configuration property: RDF/XML ARP property: <c>WARN_xxx</c>.
- *
- * <p>
- * See {@link #RDF_arp_err_} for details.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_arp_warn_ RDF_arp_warn_}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.WARN_"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b> <c>RdfCommon.jena.rdfXml.WARN_</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_WARN_</c>
- * </ul>
- */
- public static final String RDF_arp_warn_ = PREFIX +
".jena.rdfXml.WARN_";
-
- /**
- * RDF/XML ARP property: <c>IGN_xxx</c>.
- *
- * <p>
- * See {@link #RDF_arp_err_} for details.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_arp_ign_ RDF_arp_ign_}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.IGN_"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b> <c>RdfCommon.jena.rdfXml.IGN_</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_IGN_</c>
- * </ul>
- */
- public static final String RDF_arp_ign_ = PREFIX + ".jena.rdfXml.IGN_";
-
- /**
- * Configuration property: RDF/XML property: <c>xmlbase</c>.
- *
- * <p>
- * The value to be included for an <xa>xml:base</xa> attribute on the
root element in the file.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_xmlBase RDF_rdfxml_xmlBase}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.xmlbase.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.xmlbase</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_XMLBASE</c>
- * <li><b>Default:</b> <jk>null</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_xmlBase()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_xmlBase(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_xmlBase(String)}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_xmlBase = PREFIX +
".jena.rdfXml.xmlbase.s";
-
- /**
- * Configuration property: RDF/XML property: <c>longId</c>.
- *
- * <p>
- * Whether to use long ID's for anon resources.
- * Short ID's are easier to read, but can run out of memory on very
large models.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_longId RDF_rdfxml_longId}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.longId.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.rdfXml.longId</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_LONGID</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_longId()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_longId()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_longId()}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_longId = PREFIX +
".jena.rdfXml.longId.b";
-
- /**
- * Configuration property: RDF/XML property: <c>allowBadURIs</c>.
- *
- * <p>
- * URIs in the graph are, by default, checked prior to serialization.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_allowBadUris
RDF_rdfxml_allowBadUris}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.rdfXml.allowBadURIs.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.allowBadURIs</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_ALLOWBADURIS</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_allowBadUris()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_allowBadUris()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_allowBadUris()}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_allowBadUris = PREFIX +
".jena.rdfXml.allowBadURIs.b";
-
- /**
- * Configuration property: RDF/XML property: <c>relativeURIs</c>.
- *
- * <p>
- * What sort of relative URIs should be used.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_relativeUris
RDF_rdfxml_relativeUris}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.rdfXml.relativeURIs.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.relativeURIs</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_RELATIVEURIS</c>
- * <li><b>Default:</b> <js>"same-document, absolute, relative,
parent"</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_relativeUris()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_relativeUris(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_relativeUris(String)}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_relativeUris = PREFIX +
".jena.rdfXml.relativeURIs.s";
-
- /**
- * Configuration property: RDF/XML property: <c>showXmlDeclaration</c>.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_showXmlDeclaration
RDF_rdfxml_showXmlDeclaration}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.rdfXml.showXmlDeclaration.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.showXmlDeclaration</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_SHOWXMLDECLARATION</c>
- * <li><b>Default:</b> <js>"default"</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_showXmlDeclaration()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_showXmlDeclaration(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_showXmlDeclaration(String)}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_showXmlDeclaration = PREFIX +
".jena.rdfXml.showXmlDeclaration.s";
-
- /**
- * Configuration property: RDF/XML property:
<c>disableShowDoctypeDeclaration</c>.
- *
- * <p>
- * If <jk>true</jk>, an XML doctype declaration is not included in the
output.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_disableShowDoctypeDeclaration
RDF_rdfxml_disableShowDoctypeDeclaration}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.rdfXml.disableShowDoctypeDeclaration.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.disableShowDoctypeDeclaration</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_DISABLESHOWDOCTYPEDECLARATION</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_disableShowDoctypeDeclaration()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_disableShowDoctypeDeclaration()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_disableShowDoctypeDeclaration()}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_disableShowDoctypeDeclaration =
PREFIX + ".jena.rdfXml.disableShowDoctypeDeclaration.b";
-
- /**
- * Configuration property: RDF/XML property: <c>tab</c>.
- *
- * <p>
- * The number of spaces with which to indent XML child elements.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_tab RDF_rdfxml_tab}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.tab.i"</js>
- * <li><b>Data type:</b> <jk>int</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.rdfXml.tab</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_TAB</c>
- * <li><b>Default:</b> <c>2</c>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_tab()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_tab(int)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_tab(int)}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_tab = PREFIX +
".jena.rdfXml.tab.i";
-
- /**
- * Configuration property: RDF/XML property: <c>attributeQuoteChar</c>.
- *
- * <p>
- * The XML attribute quote character.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_attributeQuoteChar
RDF_rdfxml_attributeQuoteChar}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.rdfXml.attributeQuoteChar.s"</js>
- * <li><b>Data type:</b> <c>Character</c>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.attributeQuoteChar</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_ATTRIBUTEQUOTECHAR</c>
- * <li><b>Default:</b> <js>'"'</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_attributeQuoteChar()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_attributeQuoteChar(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_attributeQuoteChar(String)}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_attributeQuoteChar = PREFIX +
".jena.rdfXml.attributeQuoteChar.s";
-
- /**
- * Configuration property: RDF/XML property: <c>blockRules</c>.
- *
- * <p>
- * A list of <c>Resource</c> or a <c>String</c> being a comma separated
list of fragment IDs from
- * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar}
indicating grammar
- * rules that will not be used.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_rdfxml_blockRules RDF_rdfxml_blockRules}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.blockRules.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b>
<c>RdfCommon.jena.rdfXml.blockRules</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_RDFXML_BLOCKRULES</c>
- * <li><b>Default:</b> <js>""</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#rdfxml_blockRules()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_blockRules(String)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#rdfxml_blockRules(String)}
- * </ul>
- * </ul>
- */
- public static final String RDF_rdfxml_blockRules = PREFIX +
".jena.rdfXml.blockRules.s";
-
- /**
- * Configuration property: N3/Turtle property: <c>minGap</c>.
- *
- * <p>
- * Minimum gap between items on a line.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_minGap RDF_n3_minGap}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.minGap.i"</js>
- * <li><b>Data type:</b> <jk>int</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.n3.minGap</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_MINGAP</c>
- * <li><b>Default:</b> <c>1</c>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_minGap()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_minGap(int)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_minGap(int)}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_minGap = PREFIX + ".jena.n3.minGap.i";
-
- /**
- * Configuration property: N3/Turtle property:
<c>disableObjectLists</c>.
- *
- * <p>
- * Don't print object lists as comma separated lists.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_disableObjectLists
RDF_n3_disableObjectLists}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.n3.disableObjectLists.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.disableObjectLists</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_DISABLEOBJECTLISTS</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_disableObjectLists()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_disableObjectLists()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_disableObjectLists()}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_disableObjectLists = PREFIX +
".jena.n3.disableObjectLists.b";
-
- /**
- * Configuration property: N3/Turtle property: <c>subjectColumn</c>.
- *
- * <p>
- * If the subject is shorter than this value, the first property may go
on the same line.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_subjectColumn RDF_n3_subjectColumn}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.subjectColumn.i"</js>
- * <li><b>Data type:</b> <jk>int</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.subjectColumn</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_SUBJECTCOLUMN</c>
- * <li><b>Default:</b> indentProperty
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_subjectColumn()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_subjectColumn(int)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_subjectColumn(int)}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_subjectColumn = PREFIX +
".jena.n3.subjectColumn.i";
-
- /**
- * Configuration property: N3/Turtle property: <c>propertyColumn</c>.
- *
- * <p>
- * Width of the property column.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_propertyColumn RDF_n3_propertyColumn}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.propertyColumn.i"</js>
- * <li><b>Data type:</b> <jk>int</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.propertyColumn</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_PROPERTYCOLUMN</c>
- * <li><b>Default:</b> <c>8</c>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_propertyColumn()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_propertyColumn(int)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_propertyColumn(int)}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_propertyColumn = PREFIX +
".jena.n3.propertyColumn.i";
-
- /**
- * Configuration property: N3/Turtle property: <c>indentProperty</c>.
- *
- * <p>
- * Width to indent properties.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_indentProperty RDF_n3_indentProperty}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.indentProperty.i"</js>
- * <li><b>Data type:</b> <jk>int</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.indentProperty</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_INDENTPROPERTY</c>
- * <li><b>Default:</b> <c>6</c>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_indentProperty()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_indentProperty(int)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_indentProperty(int)}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_indentProperty = PREFIX +
".jena.n3.indentProperty.i";
-
- /**
- * Configuration property: N3/Turtle property: <c>widePropertyLen</c>.
- *
- * <p>
- * Width of the property column.
- * Must be longer than <c>propertyColumn</c>.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_widePropertyLen RDF_n3_widePropertyLen}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.widePropertyLen.i"</js>
- * <li><b>Data type:</b> <jk>int</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.widePropertyLen</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_WIDEPROPERTYLEN</c>
- * <li><b>Default:</b> <c>20</c>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_widePropertyLen()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_widePropertyLen(int)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_widePropertyLen(int)}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_widePropertyLen = PREFIX +
".jena.n3.widePropertyLen.i";
-
- /**
- * Configuration property: N3/Turtle property:
<c>disableAbbrevBaseUri</c>.
- *
- * <p>
- * Control whether to use abbreviations <c><></c> or
<c><#></c>.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_disableAbbrevBaseUri
RDF_n3_disableAbbrevBaseUri}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.n3.disableAbbrevBaseUri.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.disableAbbrevBaseUri</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_DISABLEABBREVBASEURI</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_disableAbbrevBaseUri()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_disableAbbrevBaseUri()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_disableAbbrevBaseUri()}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_disableAbbrevBaseUri = PREFIX +
".jena.n3.disableAbbrevBaseUuri.b";
-
- /**
- * Configuration property: N3/Turtle property:
<c>disableUsePropertySymbols</c>.
- *
- * <p>
- * Control whether to use <c>a</c>, <c>=</c> and <c>=></c> in output.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_disableUsePropertySymbols
RDF_n3_disableUsePropertySymbols}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.n3.disableUsePropertySymbols.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.disableUsePropertySymbols</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_DISABLEUSEPROPERTYSYMBOLS</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_disableUsePropertySymbols()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_disableUsePropertySymbols()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_disableUsePropertySymbols()}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_disableUsePropertySymbols = PREFIX +
".jena.n3.disableUsePropertySymbols.b";
-
- /**
- * Configuration property: N3/Turtle property:
<c>disableUseTripleQuotedStrings</c>.
- *
- * <p>
- * Disallow the use of <c>"""</c> to delimit long strings.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_disableUseTripleQuotedStrings
RDF_n3_disableUseTripleQuotedStrings}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.n3.disableUseTripleQuotedStrings.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.disableUseTripleQuotedStrings</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_DISABLEUSETRIPLEQUOTEDSTRINGS</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_disableUseTripleQuotedStrings()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_disableUseTripleQuotedStrings()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_disableUseTripleQuotedStrings()}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_disableUseTripleQuotedStrings =
PREFIX + ".jena.n3.disableUseTripleQuotedStrings.b";
-
- /**
- * Configuration property: N3/Turtle property:
<c>disableUseDoubles</c>.
- *
- * <p>
- * Disallow the use doubles as <c>123.456</c>.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_n3_disableUseDoubles
RDF_n3_disableUseDoubles}
- * <li><b>Name:</b>
<js>"RdfCommon.jena.n3.disableUseDoubles.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfCommon.jena.n3.disableUseDoubles</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_JENA_N3_DISABLEUSEDOUBLES</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#n3_disableUseDoubles()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#n3_disableUseDoubles()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#n3_disableUseDoubles()}
- * </ul>
- * </ul>
- */
- public static final String RDF_n3_disableUseDoubles = PREFIX +
".jena.n3.disableUseDoubles.b";
-
- /**
- * Configuration property: RDF format for representing collections and
arrays.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_collectionFormat RDF_collectionFormat}
- * <li><b>Name:</b> <js>"RdfCommon.collectionFormat.s"</js>
- * <li><b>Data type:</b> <c>String</c>
- * <li><b>System property:</b> <c>RdfCommon.collectionFormat</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_COLLECTIONFORMAT</c>
- * <li><b>Default:</b> <js>"DEFAULT"</js>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#collectionFormat()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#collectionFormat(RdfCollectionFormat)}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#collectionFormat(RdfCollectionFormat)}
- * </ul>
- * </ul>
- */
- public static final String RDF_collectionFormat = PREFIX +
".collectionFormat.s";
-
- /**
- * Configuration property: Collections should be serialized and parsed
as loose collections.
- *
- * <p>
- * When specified, collections of resources are handled as loose
collections of resources in RDF instead of
- * resources that are children of an RDF collection (e.g. Sequence,
Bag).
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfCommon#RDF_looseCollections RDF_looseCollections}
- * <li><b>Name:</b> <js>"RdfCommon.looseCollections.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.looseCollections</c>
- * <li><b>Environment variable:</b>
<c>RDFCOMMON_LOOSECOLLECTIONS</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#looseCollections()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#looseCollections()}
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#looseCollections()}
- * </ul>
- * </ul>
- */
- public static final String RDF_looseCollections = PREFIX +
".looseCollections.b";
-}
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 39ad615..4bc47ae 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -43,56 +43,18 @@ import org.apache.juneau.xml.*;
* <li class='link'>{@doc juneau-marshall-rdf}
* </ul>
*/
-@ConfigurableContext(prefixes={RdfCommon.PREFIX,RdfParser.PREFIX})
-public class RdfParser extends ReaderParser implements RdfCommon,
RdfMetaProvider {
-
- private static final Namespace
- DEFAULT_JUNEAU_NS = Namespace.of("j",
"http://www.apache.org/juneau/";),
- DEFAULT_JUNEAUBP_NS = Namespace.of("jp",
"http://www.apache.org/juneaubp/";);
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "RdfParser";
-
- /**
- * Configuration property: Trim whitespace from text elements.
- *
- * <p>
- * If <jk>true</jk>, whitespace in text elements will be automatically
trimmed.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfParser#RDF_trimWhitespace RDF_trimWhitespace}
- * <li><b>Name:</b> <js>"RdfParser.trimWhitespace.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfParser.trimWhitespace</c>
- * <li><b>Environment variable:</b>
<c>RDFPARSER_TRIMWHITESPACE</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#trimWhitespace()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfParserBuilder#trimWhitespace()}
- * </ul>
- * </ul>
- */
- public static final String RDF_trimWhitespace = PREFIX +
".trimWhitespace.b";
+@ConfigurableContext
+public class RdfParser extends ReaderParser implements RdfMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
- private final boolean trimWhitespace, looseCollections;
- private final String rdfLanguage;
- private final Namespace juneauNs, juneauBpNs;
- private final RdfCollectionFormat collectionFormat;
-
- final Map<String,Object> jenaProperties;
+ final boolean trimWhitespace, looseCollections;
+ final String language;
+ final Namespace juneauNs, juneauBpNs;
+ final RdfCollectionFormat collectionFormat;
+ final Map<String,Object> jenaSettings;
private final Map<ClassMeta<?>,RdfClassMeta> rdfClassMetas = new
ConcurrentHashMap<>();
private final Map<BeanMeta<?>,RdfBeanMeta> rdfBeanMetas = new
ConcurrentHashMap<>();
@@ -110,27 +72,20 @@ public class RdfParser extends ReaderParser implements
RdfCommon, RdfMetaProvide
*/
protected RdfParser(RdfParserBuilder builder) {
super((RdfParserBuilder)
builder.consumes(getConsumes(builder)));
- ContextProperties cp = getContextProperties();
- trimWhitespace =
cp.getBoolean(RDF_trimWhitespace).orElse(false);
- looseCollections =
cp.getBoolean(RDF_looseCollections).orElse(false);
- rdfLanguage =
cp.getString(RDF_language).orElse("RDF/XML-ABBREV");
- juneauNs = cp.getInstance(RDF_juneauNs,
String.class).map(Namespace::of).orElse(DEFAULT_JUNEAU_NS);
- juneauBpNs = cp.getInstance(RDF_juneauBpNs,
String.class).map(Namespace::of).orElse(DEFAULT_JUNEAUBP_NS);
- collectionFormat = cp.get(RDF_collectionFormat,
RdfCollectionFormat.class).orElse(RdfCollectionFormat.DEFAULT);
-
- ASortedMap<String,Object> m = ASortedMap.create();
- for (String k : getPropertyKeys("RdfCommon"))
- if (k.startsWith("jena."))
- m.put(k.substring(5), cp.get("RdfCommon." +
k).orElse(null));
- jenaProperties = m.unmodifiable();
+
+ trimWhitespace = builder.trimWhitespace;
+ looseCollections = builder.looseCollections;
+ language = builder.language;
+ juneauNs = builder.juneauNs;
+ juneauBpNs = builder.juneauBpNs;
+ collectionFormat = builder.collectionFormat;
+ jenaSettings = new TreeMap<>(builder.jenaSettings);
}
private static String getConsumes(RdfParserBuilder builder) {
if (builder.getConsumes() != null)
return builder.getConsumes();
- ContextProperties cp = builder.getContextProperties();
- String rdfLanguage = cp.get(RDF_language,
String.class).orElse("RDF/XML-ABBREV");
- switch(rdfLanguage) {
+ switch(builder.language) {
case "RDF/XML":
case "RDF/XML-ABBREV": return "text/xml+rdf";
case "N-TRIPLE": return "text/n-triple";
@@ -283,7 +238,7 @@ public class RdfParser extends ReaderParser implements
RdfCommon, RdfMetaProvide
* The RDF language to use.
*/
protected final String getLanguage() {
- return rdfLanguage;
+ return language;
}
/**
@@ -308,8 +263,8 @@ public class RdfParser extends ReaderParser implements
RdfCommon, RdfMetaProvide
* @return
* A map of all Jena-related configuration properties.
*/
- protected final Map<String,Object> getJenaProperties() {
- return jenaProperties;
+ protected final Map<String,Object> getJenaSettings() {
+ return jenaSettings;
}
//-----------------------------------------------------------------------------------------------------------------
@@ -341,7 +296,7 @@ public class RdfParser extends ReaderParser implements
RdfCommon, RdfMetaProvide
.filtered()
.a("trimWhitespace", trimWhitespace)
.a("looseCollections", looseCollections)
- .a("rdfLanguage", rdfLanguage)
+ .a("language", language)
.a("juneauNs", juneauNs)
.a("juneauBpNs", juneauBpNs)
.a("collectionFormat", collectionFormat)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index 6963555..0efa59a 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -12,9 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.jena;
-import static org.apache.juneau.jena.RdfCommon.*;
-import static org.apache.juneau.jena.RdfParser.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
import java.nio.charset.*;
@@ -34,12 +31,29 @@ import org.apache.juneau.xml.*;
@FluentSetters
public class RdfParserBuilder extends ReaderParserBuilder {
+ private static final Namespace
+ DEFAULT_JUNEAU_NS = Namespace.of("j",
"http://www.apache.org/juneau/";),
+ DEFAULT_JUNEAUBP_NS = Namespace.of("jp",
"http://www.apache.org/juneaubp/";);
+
+ boolean trimWhitespace, looseCollections;
+ String language;
+ Namespace juneauNs, juneauBpNs;
+ RdfCollectionFormat collectionFormat;
+ Map<String,Object> jenaSettings = new TreeMap<String,Object>();
+
/**
* Constructor, default settings.
*/
protected RdfParserBuilder() {
super();
type(RdfParser.class);
+ trimWhitespace = env("Rdf.trimWhitespace", false);
+ looseCollections = env("Rdf.looseCollections", false);
+ language = env("Rdf.language", "RDF/XML-ABBREV");
+ collectionFormat = env("Rdf.collectionFormat",
RdfCollectionFormat.DEFAULT);
+ juneauNs = DEFAULT_JUNEAU_NS;
+ juneauBpNs = DEFAULT_JUNEAUBP_NS;
+ jenaSettings = new TreeMap<>();
}
/**
@@ -49,6 +63,13 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
protected RdfParserBuilder(RdfParser copyFrom) {
super(copyFrom);
+ trimWhitespace = copyFrom.trimWhitespace;
+ looseCollections = copyFrom.looseCollections;
+ language = copyFrom.language;
+ collectionFormat = copyFrom.collectionFormat;
+ juneauNs = copyFrom.juneauNs;
+ juneauBpNs = copyFrom.juneauBpNs;
+ jenaSettings = new TreeMap<>(copyFrom.jenaSettings);
}
/**
@@ -58,6 +79,13 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
protected RdfParserBuilder(RdfParserBuilder copyFrom) {
super(copyFrom);
+ trimWhitespace = copyFrom.trimWhitespace;
+ looseCollections = copyFrom.looseCollections;
+ language = copyFrom.language;
+ collectionFormat = copyFrom.collectionFormat;
+ juneauNs = copyFrom.juneauNs;
+ juneauBpNs = copyFrom.juneauBpNs;
+ jenaSettings = new TreeMap<>(copyFrom.jenaSettings);
}
@Override /* ContextBuilder */
@@ -80,28 +108,9 @@ public class RdfParserBuilder extends ReaderParserBuilder {
return this;
}
- /**
- * XML namespace for Juneau properties.
- *
- * @param value
- * The new value for this property.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public RdfParserBuilder juneauNs(String value) {
- return set(RDF_juneauNs, value);
- }
-
- /**
- * Default XML namespace for bean properties.
- *
- * @param value
- * The new value for this property.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public RdfParserBuilder juneauBpNs(String value) {
- return set(RDF_juneauBpNs, value);
+ RdfParserBuilder jena(String key, Object value) {
+ jenaSettings.put(key, value);
+ return this;
}
/**
@@ -131,8 +140,8 @@ public class RdfParserBuilder extends ReaderParserBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder arp_iriRules(String value) {
- return set(RDF_arp_iriRules, value);
+ public RdfParserBuilder rdfxml_iriRules(String value) {
+ return jena("rdfXml.iri-rules", value);
}
/**
@@ -169,12 +178,12 @@ public class RdfParserBuilder extends ReaderParserBuilder
{
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder arp_errorMode(String value) {
- return set(RDF_arp_errorMode, value);
+ public RdfParserBuilder rdfxml_errorMode(String value) {
+ return jena("rdfXml.error-mode", value);
}
/**
- * RDF/XML ARP property: <c>error-mode</c>.
+ * RDF/XML ARP property: <c>embedding</c>.
*
* <p>
* Sets ARP to look for RDF embedded within an enclosing XML document.
@@ -189,8 +198,13 @@ public class RdfParserBuilder extends ReaderParserBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder arp_embedding(boolean value) {
- return set(RDF_arp_embedding, value);
+ public RdfParserBuilder rdfxml_embedding() {
+ return rdfxml_embedding(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder rdfxml_embedding(boolean value) {
+ return jena("rdfXml.embedding", value);
}
/**
@@ -204,8 +218,8 @@ public class RdfParserBuilder extends ReaderParserBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder rdfxml_xmlBase(String value) {
- return set(RDF_rdfxml_xmlBase, value);
+ public RdfParserBuilder rdfxml_xmlbase(String value) {
+ return jena("rdfXml.xmlbase", value);
}
/**
@@ -219,7 +233,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder rdfxml_longId() {
- return set(RDF_rdfxml_longId);
+ return rdfxml_longId(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder rdfxml_longId(boolean value) {
+ return jena("rdfXml.longId", value);
}
/**
@@ -233,8 +252,13 @@ public class RdfParserBuilder extends ReaderParserBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
+ public RdfParserBuilder rdfxml_allowBadUris() {
+ return rdfxml_allowBadUris(true);
+ }
+
+ @FluentSetter
public RdfParserBuilder rdfxml_allowBadUris(boolean value) {
- return set(RDF_rdfxml_allowBadUris, value);
+ return jena("rdfXml.allowBadURIs", value);
}
/**
@@ -271,7 +295,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder rdfxml_relativeUris(String value) {
- return set(RDF_rdfxml_relativeUris, value);
+ return jena("rdfXml.relativeURIs", value);
}
/**
@@ -296,7 +320,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder rdfxml_showXmlDeclaration(String value) {
- return set(RDF_rdfxml_showXmlDeclaration, value);
+ return jena("rdfXml.showXmlDeclaration", value);
}
/**
@@ -312,7 +336,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder rdfxml_disableShowDoctypeDeclaration() {
- return set(RDF_rdfxml_disableShowDoctypeDeclaration);
+ return rdfxml_disableShowDoctypeDeclaration(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder rdfxml_disableShowDoctypeDeclaration(boolean
value) {
+ return jena("rdfXml.disableShowDoctypeDeclaration", value);
}
/**
@@ -327,7 +356,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder rdfxml_tab(int value) {
- return set(RDF_rdfxml_tab, value);
+ return jena("rdfXml.tab", value);
}
/**
@@ -341,8 +370,8 @@ public class RdfParserBuilder extends ReaderParserBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder rdfxml_attributeQuoteChar(String value) {
- return set(RDF_rdfxml_attributeQuoteChar, value);
+ public RdfParserBuilder rdfxml_attributeQuoteChar(char value) {
+ return jena("rdfXml.attributeQuoteChar", value);
}
/**
@@ -359,7 +388,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder rdfxml_blockRules(String value) {
- return set(RDF_rdfxml_blockRules, value);
+ return jena("rdfXml.blockRules", value);
}
/**
@@ -374,7 +403,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_minGap(int value) {
- return set(RDF_n3_minGap, value);
+ return jena("n3.minGap", value);
}
/**
@@ -387,7 +416,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_disableObjectLists() {
- return set(RDF_n3_disableObjectLists);
+ return n3_disableObjectLists(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder n3_disableObjectLists(boolean value) {
+ return jena("n3.disableObjectLists", value);
}
/**
@@ -402,7 +436,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_subjectColumn(int value) {
- return set(RDF_n3_subjectColumn, value);
+ return jena("n3.subjectColumn", value);
}
/**
@@ -417,7 +451,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_propertyColumn(int value) {
- return set(RDF_n3_propertyColumn, value);
+ return jena("n3.propertyColumn", value);
}
/**
@@ -432,7 +466,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_indentProperty(int value) {
- return set(RDF_n3_indentProperty, value);
+ return jena("n3.indentProperty", value);
}
/**
@@ -448,7 +482,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_widePropertyLen(int value) {
- return set(RDF_n3_widePropertyLen, value);
+ return jena("n3.widePropertyLen", value);
}
/**
@@ -461,7 +495,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_disableAbbrevBaseUri() {
- return set(RDF_n3_disableAbbrevBaseUri);
+ return n3_disableAbbrevBaseUri(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder n3_disableAbbrevBaseUri(boolean value) {
+ return jena("n3.disableAbbrevBaseUri", value);
}
/**
@@ -474,7 +513,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_disableUsePropertySymbols() {
- return set(RDF_n3_disableUsePropertySymbols);
+ return n3_disableUsePropertySymbols(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder n3_disableUsePropertySymbols(boolean value) {
+ return jena("n3.disableUsePropertySymbols", value);
}
/**
@@ -487,7 +531,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder n3_disableUseTripleQuotedStrings() {
- return set(RDF_n3_disableUseTripleQuotedStrings);
+ return n3_disableUseTripleQuotedStrings(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder n3_disableUseTripleQuotedStrings(boolean value)
{
+ return jena("n3.disableUseTripleQuotedStrings", value);
}
/**
@@ -500,40 +549,12 @@ public class RdfParserBuilder extends ReaderParserBuilder
{
*/
@FluentSetter
public RdfParserBuilder n3_disableUseDoubles() {
- return set(RDF_n3_disableUseDoubles);
+ return n3_disableUseDoubles(true);
}
- /**
- * RDF format for representing collections and arrays.
- *
- * <p>
- * Possible values:
- * <ul class='spaced-list'>
- * <li>
- * <js>"DEFAULT"</js> - Default format. The default is an
RDF Sequence container.
- * <li>
- * <js>"SEQ"</js> - RDF Sequence container.
- * <li>
- * <js>"BAG"</js> - RDF Bag container.
- * <li>
- * <js>"LIST"</js> - RDF List container.
- * <li>
- * <js>"MULTI_VALUED"</js> - Multi-valued properties.
- * </ul>
- *
- * <ul class='notes'>
- * <li>
- * If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>,
the order of the elements in the collection will get
- * lost.
- * </ul>
- *
- * @param value
- * The new value for this property.
- * @return This object (for method chaining).
- */
@FluentSetter
- public RdfParserBuilder collectionFormat(String value) {
- return set(RDF_collectionFormat, value);
+ public RdfParserBuilder n3_disableUseDoubles(boolean value) {
+ return jena("n3.disableUseDoubles", value);
}
/**
@@ -563,7 +584,8 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder collectionFormat(RdfCollectionFormat value) {
- return set(RDF_collectionFormat, value);
+ collectionFormat = value;
+ return this;
}
/**
@@ -580,7 +602,8 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder juneauBpNs(Namespace value) {
- return set(RDF_juneauBpNs, value);
+ juneauBpNs = value;
+ return this;
}
/**
@@ -597,7 +620,8 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder juneauNs(Namespace value) {
- return set(RDF_juneauNs, value);
+ juneauNs = value;
+ return this;
}
/**
@@ -646,7 +670,8 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder language(String value) {
- return set(RDF_language, value);
+ language = value;
+ return this;
}
/**
@@ -704,7 +729,13 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder looseCollections() {
- return set(RDF_looseCollections);
+ return looseCollections(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder looseCollections(boolean value) {
+ looseCollections = value;
+ return this;
}
/**
@@ -765,7 +796,13 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder trimWhitespace() {
- return set(RDF_trimWhitespace);
+ return trimWhitespace(true);
+ }
+
+ @FluentSetter
+ public RdfParserBuilder trimWhitespace(boolean value) {
+ trimWhitespace = value;
+ return this;
}
/**
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 811d81e..130dea0 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -65,7 +65,7 @@ public class RdfParserSession extends ReaderParserSession {
// Note: NTripleReader throws an exception if you try to set
any properties on it.
if (! ctx.getLanguage().equals(LANG_NTRIPLE)) {
- for (Map.Entry<String,Object> e :
ctx.jenaProperties.entrySet())
+ for (Map.Entry<String,Object> e :
ctx.getJenaSettings().entrySet())
rdfReader.setProperty(e.getKey(), e.getValue());
}
}
@@ -511,8 +511,8 @@ public class RdfParserSession extends ReaderParserSession {
* @return
* A map of all Jena-related configuration properties.
*/
- protected final Map<String,Object> getJenaProperties() {
- return ctx.getJenaProperties();
+ protected final Map<String,Object> getJenaSettings() {
+ return ctx.getJenaSettings();
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index ba062c7..98251aa 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.jena;
+import static java.util.Optional.*;
+
import java.util.*;
import java.util.concurrent.*;
@@ -42,203 +44,28 @@ import org.apache.juneau.xml.annotation.*;
* <li class='link'>{@doc juneau-marshall-rdf}
* </ul>
*/
-@ConfigurableContext(prefixes={RdfCommon.PREFIX,RdfSerializer.PREFIX})
-public class RdfSerializer extends WriterSerializer implements RdfCommon,
RdfMetaProvider {
-
- private static final Namespace
- DEFAULT_JUNEAU_NS = Namespace.of("j",
"http://www.apache.org/juneau/";),
- DEFAULT_JUNEAUBP_NS = Namespace.of("jp",
"http://www.apache.org/juneaubp/";);
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "RdfSerializer";
-
- /**
- * Configuration property: Add <js>"_type"</js> properties when needed.
- *
- * <p>
- * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
- * through reflection.
- *
- * <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
- * provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfSerializer#RDF_addBeanTypes RDF_addBeanTypes}
- * <li><b>Name:</b> <js>"RdfSerializer.addBeanTypes.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfSerializer.addBeanTypes</c>
- * <li><b>Environment variable:</b>
<c>RDFSERIALIZER_ADDBEANTYPES</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#addBeanTypes()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#addBeanTypes()}
- * </ul>
- * </ul>
- */
- public static final String RDF_addBeanTypes = PREFIX +
".addBeanTypes.b";
-
- /**
- * Configuration property: Add XSI data types to non-<c>String</c>
literals.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfSerializer#RDF_addLiteralTypes RDF_addLiteralTypes}
- * <li><b>Name:</b> <js>"RdfSerializer.addLiteralTypes.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfSerializer.addLiteralTypes</c>
- * <li><b>Environment variable:</b>
<c>RDFSERIALIZER_ADDLITERALTYPES</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#addLiteralTypes()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#addLiteralTypes()}
- * </ul>
- * </ul>
- */
- public static final String RDF_addLiteralTypes = PREFIX +
".addLiteralTypes.b";
-
- /**
- * Configuration property: Add RDF root identifier property to root
node.
- *
- * When enabled an RDF property
<c>http://www.apache.org/juneau/root</c> is added with a value of
<js>"true"</js>
- * to identify the root node in the graph.
- * <br>This helps locate the root node during parsing.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfSerializer#RDF_addRootProperty RDF_addRootProperty}
- * <li><b>Name:</b> <js>"RdfSerializer.addRootProperty.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfSerializer.addRootProperty</c>
- * <li><b>Environment variable:</b>
<c>RDFSERIALIZER_ADDROOTPROPERTY</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#addRootProperty()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#addRootProperty()}
- * </ul>
- * </ul>
- */
- public static final String RDF_addRootProperty = PREFIX +
".addRootProperty.b";
-
- /**
- * Configuration property: Auto-detect namespace usage.
- *
- * <p>
- * Don't detect namespace usage before serialization.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfSerializer#RDF_disableAutoDetectNamespaces
RDF_disableAutoDetectNamespaces}
- * <li><b>Name:</b>
<js>"RdfSerializer.disableAutoDetectNamespaces.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b>
<c>RdfSerializer.disableAutoDetectNamespaces</c>
- * <li><b>Environment variable:</b>
<c>RDFSERIALIZER_DISABLEAUTODETECTNAMESPACES</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#disableAutoDetectNamespaces()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#disableAutoDetectNamespaces()}
- * </ul>
- * </ul>
- */
- public static final String RDF_disableAutoDetectNamespaces = PREFIX +
".disableAutoDetectNamespaces.b";
-
- /**
- * Configuration property: Default namespaces.
- *
- * <p>
- * The default list of namespaces associated with this serializer.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfSerializer#RDF_namespaces RDF_namespaces}
- * <li><b>Name:</b> <js>"RdfSerializer.namespaces.ls"</js>
- * <li><b>Data type:</b> <c>List<{@link
org.apache.juneau.xml.Namespace}></c>
- * <li><b>System property:</b> <c>RdfSerializer.namespaces</c>
- * <li><b>Environment variable:</b>
<c>RDFSERIALIZER_NAMESPACES</c>
- * <li><b>Default:</b> empty list
- * <li><b>Session property:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.Rdf#namespace()}
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#namespaces()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#namespaces(Namespace...)}
- * </ul>
- * </ul>
- */
- public static final String RDF_namespaces = PREFIX + ".namespaces.ls";
-
- /**
- * Configuration property: Reuse XML namespaces when RDF namespaces
not specified.
- *
- * <p>
- * When enabled, namespaces defined using {@link XmlNs @XmlNs} and
{@link Xml @Xml} will be inherited by the RDF serializers.
- * <br>Otherwise, namespaces will be defined using {@link RdfNs @RdfNs}
and {@link Rdf @Rdf}.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.jena.RdfSerializer#RDF_disableUseXmlNamespaces
RDF_disableUseXmlNamespaces}
- * <li><b>Name:</b> <js>"Rdf.disableUseXmlNamespaces.b"</js>
- * <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>Rdf.disableUseXmlNamespaces</c>
- * <li><b>Environment variable:</b>
<c>RDFSERIALIZER_USEXMLNAMESPACES</c>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Annotations:</b>
- * <ul>
- * <li class='ja'>{@link
org.apache.juneau.jena.annotation.RdfConfig#disableUseXmlNamespaces()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.jena.RdfSerializerBuilder#disableUseXmlNamespaces()}
- * </ul>
- * </ul>
- */
- public static final String RDF_disableUseXmlNamespaces = PREFIX +
".disableUseXmlNamespaces.b";
+@ConfigurableContext
+public class RdfSerializer extends WriterSerializer implements RdfMetaProvider
{
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
- private final boolean
+ final boolean
addLiteralTypes,
addRootProperty,
useXmlNamespaces,
looseCollections,
autoDetectNamespaces,
- addBeanTypes;
- private final String rdfLanguage;
- private final Namespace juneauNs;
- private final Namespace juneauBpNs;
- private final RdfCollectionFormat collectionFormat;
- final Map<String,Object> jenaProperties;
+ addBeanTypesRdf;
+
+ final String language;
+ final Namespace juneauNs, juneauBpNs;
+ final RdfCollectionFormat collectionFormat;
+ final Map<String,Object> jenaSettings;
final Namespace[] namespaces;
+ private final boolean addBeanTypes;
private final Map<ClassMeta<?>,RdfClassMeta> rdfClassMetas = new
ConcurrentHashMap<>();
private final Map<BeanMeta<?>,RdfBeanMeta> rdfBeanMetas = new
ConcurrentHashMap<>();
private final Map<BeanPropertyMeta,RdfBeanPropertyMeta>
rdfBeanPropertyMetas = new ConcurrentHashMap<>();
@@ -255,32 +82,26 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon, RdfMet
*/
protected RdfSerializer(RdfSerializerBuilder builder) {
super(builder.produces(getProduces(builder)).accept(getAccept(builder)));
- ContextProperties cp = getContextProperties();
- addLiteralTypes =
cp.getBoolean(RDF_addLiteralTypes).orElse(false);
- addRootProperty =
cp.getBoolean(RDF_addRootProperty).orElse(false);
- useXmlNamespaces = !
cp.getBoolean(RDF_disableUseXmlNamespaces).orElse(false);
- looseCollections =
cp.getBoolean(RDF_looseCollections).orElse(false);
- autoDetectNamespaces = !
cp.getBoolean(RDF_disableAutoDetectNamespaces).orElse(false);
- rdfLanguage =
cp.getString(RDF_language).orElse("RDF/XML-ABBREV");
- juneauNs = cp.get(RDF_juneauNs,
String.class).map(Namespace::of).orElse(DEFAULT_JUNEAU_NS);
- juneauBpNs = cp.get(RDF_juneauBpNs,
String.class).map(Namespace::of).orElse(DEFAULT_JUNEAUBP_NS);
- collectionFormat = cp.get(RDF_collectionFormat,
RdfCollectionFormat.class).orElse(RdfCollectionFormat.DEFAULT);
- namespaces = cp.get(RDF_namespaces,
String[].class).map(Namespace::createArray).orElse(new Namespace[0]);
- addBeanTypes = cp.getFirstBoolean(RDF_addBeanTypes,
SERIALIZER_addBeanTypes).orElse(false);
-
- ASortedMap<String,Object> m = ASortedMap.create();
- for (String k : getPropertyKeys("RdfCommon"))
- if (k.startsWith("jena."))
- m.put(k.substring(5), cp.get("RdfCommon." +
k).orElse(null));
- jenaProperties = m.unmodifiable();
+ addLiteralTypes = builder.addLiteralTypes;
+ addRootProperty = builder.addRootProperty;
+ useXmlNamespaces = ! builder.disableUseXmlNamespaces;
+ looseCollections = builder.looseCollections;
+ autoDetectNamespaces = ! builder.disableAutoDetectNamespaces;
+ language = builder.language;
+ juneauNs = builder.juneauNs;
+ juneauBpNs = builder.juneauBpNs;
+ collectionFormat = builder.collectionFormat;
+ namespaces = ofNullable(builder.namespaces).map(x ->
x.toArray(new Namespace[0])).orElse(new Namespace[0]);
+ addBeanTypesRdf = builder.addBeanTypesRdf;
+ jenaSettings = new TreeMap<>(builder.jenaSettings);
+
+ addBeanTypes = addBeanTypesRdf || super.isAddBeanTypes();
}
private static String getProduces(RdfSerializerBuilder builder) {
if (builder.getProduces() != null)
return builder.getProduces();
- ContextProperties cp = builder.getContextProperties();
- String rdfLanguage = cp.get(RDF_language,
String.class).orElse("RDF/XML-ABBREV");
- switch(rdfLanguage) {
+ switch(builder.language) {
case "RDF/XML": return "text/xml+rdf+abbrev";
case "RDF/XML-ABBREV": return "text/xml+rdf";
case "N-TRIPLE": return "text/n-triple";
@@ -296,9 +117,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon, RdfMet
private static String getAccept(RdfSerializerBuilder builder) {
if (builder.getAccept() != null)
return builder.getAccept();
- ContextProperties cp = builder.getContextProperties();
- String rdfLanguage = cp.get(RDF_language,
String.class).orElse("RDF/XML-ABBREV");
- switch(rdfLanguage) {
+ switch(builder.language) {
case "RDF/XML": return "text/xml+rdf+abbrev";
case "RDF/XML-ABBREV": return
"text/xml+rdf+abbrev,text/xml+rdf;q=0.9";
case "N-TRIPLE": return "text/n-triple";
@@ -451,7 +270,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon, RdfMet
* The RDF language to use.
*/
protected final String getLanguage() {
- return rdfLanguage;
+ return language;
}
/**
@@ -476,8 +295,8 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon, RdfMet
* @return
* A map of all Jena-related configuration properties.
*/
- protected final Map<String,Object> getJenaProperties() {
- return jenaProperties;
+ protected final Map<String,Object> getJenaSettings() {
+ return jenaSettings;
}
//-----------------------------------------------------------------------------------------------------------------
@@ -571,7 +390,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon, RdfMet
.a("useXmlNamespaces", useXmlNamespaces)
.a("looseCollections", looseCollections)
.a("autoDetectNamespaces",
autoDetectNamespaces)
- .a("rdfLanguage", rdfLanguage)
+ .a("language", language)
.a("juneauNs", juneauNs)
.a("juneauBpNs", juneauBpNs)
.a("collectionFormat", collectionFormat)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 9bc48f7..5cb1dc9 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -12,15 +12,13 @@
//
***************************************************************************************************************************
package org.apache.juneau.jena;
-import static org.apache.juneau.jena.RdfCommon.*;
-import static org.apache.juneau.jena.RdfSerializer.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
import java.nio.charset.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.collections.AList;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.jena.annotation.*;
@@ -35,12 +33,35 @@ import org.apache.juneau.xml.annotation.*;
@FluentSetters
public class RdfSerializerBuilder extends WriterSerializerBuilder {
+ private static final Namespace
+ DEFAULT_JUNEAU_NS = Namespace.of("j",
"http://www.apache.org/juneau/";),
+ DEFAULT_JUNEAUBP_NS = Namespace.of("jp",
"http://www.apache.org/juneaubp/";);
+
+ boolean addBeanTypesRdf, addLiteralTypes, addRootProperty,
disableAutoDetectNamespaces, disableUseXmlNamespaces, looseCollections;
+ String language;
+ Namespace juneauNs, juneauBpNs;
+ RdfCollectionFormat collectionFormat;
+ List<Namespace> namespaces;
+ Map<String,Object> jenaSettings;
+
/**
* Constructor, default settings.
*/
protected RdfSerializerBuilder() {
super();
type(RdfSerializer.class);
+ addBeanTypesRdf = env("Rdf.addBeanTypesRdf", false);
+ addLiteralTypes = env("Rdf.addLiteralTypes", false);
+ addRootProperty = env("Rdf.addRootProperty", false);
+ disableAutoDetectNamespaces =
env("Rdf.disableAutoDetectNamespaces", false);
+ disableUseXmlNamespaces = env("Rdf.disableUseXmlNamespaces",
false);
+ looseCollections = env("Rdf.looseCollections", false);
+ language = env("Rdf.language", "RDF/XML-ABBREV");
+ collectionFormat = env("Rdf.collectionFormat",
RdfCollectionFormat.DEFAULT);
+ juneauNs = DEFAULT_JUNEAU_NS;
+ juneauBpNs = DEFAULT_JUNEAUBP_NS;
+ namespaces = null;
+ jenaSettings = new TreeMap<>();
}
/**
@@ -50,6 +71,18 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
protected RdfSerializerBuilder(RdfSerializer copyFrom) {
super(copyFrom);
+ addBeanTypesRdf = copyFrom.addBeanTypesRdf;
+ addLiteralTypes = copyFrom.addLiteralTypes;
+ addRootProperty = copyFrom.addRootProperty;
+ disableAutoDetectNamespaces = ! copyFrom.autoDetectNamespaces;
+ disableUseXmlNamespaces = ! copyFrom.useXmlNamespaces;
+ looseCollections = copyFrom.looseCollections;
+ language = copyFrom.language;
+ collectionFormat = copyFrom.collectionFormat;
+ juneauNs = copyFrom.juneauNs;
+ juneauBpNs = copyFrom.juneauBpNs;
+ namespaces = copyFrom.namespaces.length == 0 ? null :
AList.of(copyFrom.namespaces);
+ jenaSettings = new TreeMap<>(copyFrom.jenaSettings);
}
/**
@@ -59,6 +92,18 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
protected RdfSerializerBuilder(RdfSerializerBuilder copyFrom) {
super(copyFrom);
+ addBeanTypesRdf = copyFrom.addBeanTypesRdf;
+ addLiteralTypes = copyFrom.addLiteralTypes;
+ addRootProperty = copyFrom.addRootProperty;
+ disableAutoDetectNamespaces =
copyFrom.disableAutoDetectNamespaces;
+ disableUseXmlNamespaces = copyFrom.disableUseXmlNamespaces;
+ looseCollections = copyFrom.looseCollections;
+ language = copyFrom.language;
+ collectionFormat = copyFrom.collectionFormat;
+ juneauNs = copyFrom.juneauNs;
+ juneauBpNs = copyFrom.juneauBpNs;
+ namespaces = copyFrom.namespaces;
+ jenaSettings = new TreeMap<>(copyFrom.jenaSettings);
}
@Override /* ContextBuilder */
@@ -75,28 +120,39 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
// Properties
//-----------------------------------------------------------------------------------------------------------------
+ RdfSerializerBuilder jena(String key, Object value) {
+ jenaSettings.put(key, value);
+ return this;
+ }
+
/**
- * XML namespace for Juneau properties.
+ * Add <js>"_type"</js> properties when needed.
*
- * @param value
- * The new value for this setting.
- * @return This object (for method chaining).
+ * <p>
+ * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
+ * through reflection.
+ *
+ * <p>
+ * When present, this value overrides the {@link
SerializerBuilder#addBeanTypes()} setting and is
+ * provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
+ *
+ * @return This object.
*/
@FluentSetter
- public RdfSerializerBuilder juneauNs(String value) {
- return set(RDF_juneauNs, value);
+ public RdfSerializerBuilder addBeanTypesRdf() {
+ return addBeanTypesRdf(true);
}
/**
- * Default XML namespace for bean properties.
+ * Same as {@link #addBeanTypesRdf()} but allows you to explicitly
specify the value.
*
- * @param value
- * The new value for this setting.
- * @return This object (for method chaining).
+ * @param value The value for this setting.
+ * @return This object.
*/
@FluentSetter
- public RdfSerializerBuilder juneauBpNs(String value) {
- return set(RDF_juneauBpNs, value);
+ public RdfSerializerBuilder addBeanTypesRdf(boolean value) {
+ addBeanTypesRdf = value;
+ return this;
}
/**
@@ -125,8 +181,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder arp_iriRules(String value) {
- return set(RDF_arp_iriRules, value);
+ public RdfSerializerBuilder rdfxml_iriRules(String value) {
+ return jena("rdfXml.iri-rules", value);
}
/**
@@ -163,8 +219,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder arp_errorMode(String value) {
- return set(RDF_arp_errorMode, value);
+ public RdfSerializerBuilder rdfxml_errorMode(String value) {
+ return jena("rdfXml.error-mode", value);
}
/**
@@ -183,8 +239,13 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder arp_embedding() {
- return set(RDF_arp_embedding);
+ public RdfSerializerBuilder rdfxml_embedding() {
+ return rdfxml_embedding(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder rdfxml_embedding(boolean value) {
+ return jena("rdfXml.embedding", value);
}
/**
@@ -198,8 +259,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder rdfxml_xmlBase(String value) {
- return set(RDF_rdfxml_xmlBase, value);
+ public RdfSerializerBuilder rdfxml_xmlbase(String value) {
+ return jena("rdfXml.xmlbase", value);
}
/**
@@ -213,7 +274,12 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder rdfxml_longId() {
- return set(RDF_rdfxml_longId);
+ return rdfxml_longId(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder rdfxml_longId(boolean value) {
+ return jena("rdfXml.longId", value);
}
/**
@@ -226,7 +292,12 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder rdfxml_allowBadUris() {
- return set(RDF_rdfxml_allowBadUris);
+ return rdfxml_allowBadUris(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder rdfxml_allowBadUris(boolean value) {
+ return jena("rdfXml.allowBadURIs", value);
}
/**
@@ -263,7 +334,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder rdfxml_relativeUris(String value) {
- return set(RDF_rdfxml_relativeUris, value);
+ return jena("rdfXml.relativeURIs", value);
}
/**
@@ -288,7 +359,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder rdfxml_showXmlDeclaration(String value) {
- return set(RDF_rdfxml_showXmlDeclaration, value);
+ return jena("rdfXml.showXmlDeclaration", value);
}
/**
@@ -304,7 +375,12 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder rdfxml_disableShowDoctypeDeclaration() {
- return set(RDF_rdfxml_disableShowDoctypeDeclaration);
+ return rdfxml_disableShowDoctypeDeclaration(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder
rdfxml_disableShowDoctypeDeclaration(boolean value) {
+ return jena("rdfXml.disableShowDoctypeDeclaration", value);
}
/**
@@ -319,7 +395,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder rdfxml_tab(int value) {
- return set(RDF_rdfxml_tab, value);
+ return jena("rdfXml.tab", value);
}
/**
@@ -333,8 +409,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder rdfxml_attributeQuoteChar(String value) {
- return set(RDF_rdfxml_attributeQuoteChar, value);
+ public RdfSerializerBuilder rdfxml_attributeQuoteChar(char value) {
+ return jena("rdfXml.attributeQuoteChar", value);
}
/**
@@ -351,7 +427,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder rdfxml_blockRules(String value) {
- return set(RDF_rdfxml_blockRules, value);
+ return jena("rdfXml.blockRules", value);
}
/**
@@ -366,7 +442,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_minGap(int value) {
- return set(RDF_n3_minGap, value);
+ return jena("n3.minGap", value);
}
/**
@@ -379,7 +455,12 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_disableObjectLists() {
- return set(RDF_n3_disableObjectLists);
+ return n3_disableObjectLists(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder n3_disableObjectLists(boolean value) {
+ return jena("n3.disableObjectLists", value);
}
/**
@@ -394,7 +475,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_subjectColumn(int value) {
- return set(RDF_n3_subjectColumn, value);
+ return jena("n3.subjectColumn", value);
}
/**
@@ -409,7 +490,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_propertyColumn(int value) {
- return set(RDF_n3_propertyColumn, value);
+ return jena("n3.propertyColumn", value);
}
/**
@@ -424,7 +505,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_indentProperty(int value) {
- return set(RDF_n3_indentProperty, value);
+ return jena("n3.indentProperty", value);
}
/**
@@ -440,7 +521,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_widePropertyLen(int value) {
- return set(RDF_n3_widePropertyLen, value);
+ return jena("n3.widePropertyLen", value);
}
/**
@@ -453,7 +534,12 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_disableAbbrevBaseUri() {
- return set(RDF_n3_disableAbbrevBaseUri);
+ return n3_disableAbbrevBaseUri(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder n3_disableAbbrevBaseUri(boolean value) {
+ return jena("n3.disableAbbrevBaseUri", value);
}
/**
@@ -466,7 +552,12 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_disableUsePropertySymbols() {
- return set(RDF_n3_disableUsePropertySymbols);
+ return n3_disableUsePropertySymbols(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder n3_disableUsePropertySymbols(boolean value)
{
+ return jena("n3.disableUsePropertySymbols", value);
}
/**
@@ -479,68 +570,30 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder n3_disableUseTripleQuotedStrings() {
- return set(RDF_n3_disableUseTripleQuotedStrings);
+ return n3_disableUseTripleQuotedStrings(true);
}
- /**
- * N3/Turtle property: <c>disableUseDoubles</c>.
- *
- * <p>
- * Disallow the use of doubles as <c>123.456</c>.
- *
- * @return This object (for method chaining).
- */
@FluentSetter
- public RdfSerializerBuilder n3_disableUseDoubles() {
- return set(RDF_n3_disableUseDoubles);
+ public RdfSerializerBuilder n3_disableUseTripleQuotedStrings(boolean
value) {
+ return jena("n3.disableUseTripleQuotedStrings", value);
}
/**
- * RDF format for representing collections and arrays.
+ * N3/Turtle property: <c>disableUseDoubles</c>.
*
* <p>
- * Possible values:
- * <ul class='spaced-list'>
- * <li>
- * <js>"DEFAULT"</js> - Default format. The default is an
RDF Sequence container.
- * <li>
- * <js>"SEQ"</js> - RDF Sequence container.
- * <li>
- * <js>"BAG"</js> - RDF Bag container.
- * <li>
- * <js>"LIST"</js> - RDF List container.
- * <li>
- * <js>"MULTI_VALUED"</js> - Multi-valued properties.
- * </ul>
- *
- * <ul class='notes'>
- * <li>
- * If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>,
the order of the elements in the collection will get
- * lost.
- * </ul>
+ * Disallow the use of doubles as <c>123.456</c>.
*
- * @param value
- * The new value for this setting.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder collectionFormat(String value) {
- return set(RDF_collectionFormat, value);
+ public RdfSerializerBuilder n3_disableUseDoubles() {
+ return n3_disableUseDoubles(true);
}
- /**
- * Default namespaces.
- *
- * <p>
- * The default list of namespaces associated with this serializer.
- *
- * @param value
- * The new value for this setting.
- * @return This object (for method chaining).
- */
@FluentSetter
- public RdfSerializerBuilder namespaces(String[] value) {
- return set(RDF_namespaces, value);
+ public RdfSerializerBuilder n3_disableUseDoubles(boolean value) {
+ return jena("n3.disableUseDoubles", value);
}
/**
@@ -553,7 +606,13 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder addLiteralTypes() {
- return set(RDF_addLiteralTypes);
+ return addLiteralTypes(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder addLiteralTypes(boolean value) {
+ addLiteralTypes = value;
+ return this;
}
/**
@@ -576,7 +635,13 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder addRootProperty() {
- return set(RDF_addRootProperty);
+ return addRootProperty(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder addRootProperty(boolean value) {
+ addRootProperty = value;
+ return this;
}
/**
@@ -597,7 +662,13 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder disableAutoDetectNamespaces() {
- return set(RDF_disableAutoDetectNamespaces);
+ return disableAutoDetectNamespaces(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder disableAutoDetectNamespaces(boolean value) {
+ disableAutoDetectNamespaces = value;
+ return this;
}
/**
@@ -629,7 +700,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder collectionFormat(RdfCollectionFormat value)
{
- return set(RDF_collectionFormat, value);
+ collectionFormat = value;
+ return this;
}
/**
@@ -646,7 +718,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder juneauBpNs(Namespace value) {
- return set(RDF_juneauBpNs, value);
+ juneauBpNs = value;
+ return this;
}
/**
@@ -663,7 +736,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder juneauNs(Namespace value) {
- return set(RDF_juneauNs, value);
+ juneauNs = value;
+ return this;
}
/**
@@ -714,7 +788,8 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder language(String value) {
- return set(RDF_language, value);
+ language = value;
+ return this;
}
/**
@@ -772,7 +847,13 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder looseCollections() {
- return set(RDF_looseCollections);
+ return looseCollections(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder looseCollections(boolean value) {
+ looseCollections = value;
+ return this;
}
/**
@@ -807,7 +888,10 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder namespaces(Namespace...values) {
- return set(RDF_namespaces, values);
+ if (namespaces == null)
+ namespaces = new ArrayList<>();
+ Collections.addAll(namespaces, values);
+ return this;
}
/**
@@ -860,7 +944,13 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder disableUseXmlNamespaces() {
- return set(RDF_disableUseXmlNamespaces);
+ return disableUseXmlNamespaces(true);
+ }
+
+ @FluentSetter
+ public RdfSerializerBuilder disableUseXmlNamespaces(boolean value) {
+ disableUseXmlNamespaces = value;
+ return this;
}
/**
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 08d3614..2dffac2 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -13,7 +13,6 @@
package org.apache.juneau.jena;
import static org.apache.juneau.jena.Constants.*;
-import static org.apache.juneau.jena.RdfSerializer.*;
import static org.apache.juneau.internal.ExceptionUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
@@ -40,6 +39,11 @@ import org.apache.juneau.xml.annotation.*;
@SuppressWarnings({ "rawtypes", "unchecked" })
public final class RdfSerializerSession extends WriterSerializerSession {
+ /**
+ * Maps RDF writer names to property prefixes that apply to them.
+ */
+ static final Map<String,String> LANG_PROP_MAP =
AMap.of("RDF/XML","rdfXml.","RDF/XML-ABBREV","rdfXml.","N3","n3.","N3-PP","n3.","N3-PLAIN","n3.","N3-TRIPLES","n3.","TURTLE","n3.","N-TRIPLE","ntriple.");
+
private final RdfSerializer ctx;
private final Property pRoot, pValue;
private final Model model;
@@ -63,7 +67,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
this.ctx = ctx;
SessionProperties sp = getSessionProperties();
- namespaces = sp.getInstanceArray(RDF_namespaces,
Namespace.class).orElse(ctx.namespaces);
+ namespaces = ctx.namespaces;
model = ModelFactory.createDefaultModel();
addModelPrefix(ctx.getJuneauNs());
addModelPrefix(ctx.getJuneauBpNs());
@@ -74,7 +78,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
writer = model.getWriter(ctx.getLanguage());
// Only apply properties with this prefix!
- String propPrefix =
RdfCommon.LANG_PROP_MAP.get(ctx.getLanguage());
+ String propPrefix = LANG_PROP_MAP.get(ctx.getLanguage());
if (propPrefix == null)
throw runtimeException("Unknown RDF language
encountered: ''{0}''", ctx.getLanguage());
@@ -84,7 +88,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
writer.setProperty("attributeQuoteChar",
Character.toString(getQuoteChar()));
}
- for (Map.Entry<String,Object> e : ctx.jenaProperties.entrySet())
+ for (Map.Entry<String,Object> e :
ctx.getJenaSettings().entrySet())
if (e.getKey().startsWith(propPrefix, 5))
writer.setProperty(e.getKey().substring(5 +
propPrefix.length()), e.getValue());
@@ -463,8 +467,8 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
* @return
* A map of all Jena-related configuration properties.
*/
- protected final Map<String,Object> getJenaProperties() {
- return ctx.getJenaProperties();
+ protected final Map<String,Object> getJenaSettings() {
+ return ctx.getJenaSettings();
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
index 5658912..d8e3620 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
@@ -18,7 +18,7 @@ package org.apache.juneau.jena;
public class RdfXmlAbbrevSerializer extends RdfSerializer {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default RDF/XML serializer, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
index 84f1063..225eace 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.jena.Constants.*;
public class RdfXmlParser extends RdfParser {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default XML parser, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
index 41e700f..b24f57a 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
@@ -18,7 +18,7 @@ package org.apache.juneau.jena;
public class RdfXmlSerializer extends RdfSerializer {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default RDF/XML serializer, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
index f7ef896..e0474ae 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.jena.Constants.*;
public class TurtleParser extends RdfParser {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default Turtle parser, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
index 52a719b..ff5e3f5 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
@@ -18,7 +18,7 @@ package org.apache.juneau.jena;
public class TurtleSerializer extends RdfSerializer {
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default Turtle serializer, all default settings.*/
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
index 5d4b2f5..9d91e0b 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
@@ -33,7 +33,7 @@ import org.apache.juneau.xml.annotation.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextApply({RdfConfigAnnotation.SerializerApplier.class,RdfConfigAnnotation.ParserApplier.class})
+@ContextApply({RdfConfigAnnotation.SerializerApply.class,RdfConfigAnnotation.ParserApply.class})
public @interface RdfConfig {
/**
@@ -151,7 +151,7 @@ public @interface RdfConfig {
* <li class='jf'>{@link RdfCommon#RDF_arp_iriRules}
* </ul>
*/
- String arp_iriRules() default "";
+ String rdfxml_iriRules() default "";
/**
* Configuration property: RDF/XML ARP property: <c>error-mode</c>.
@@ -187,7 +187,7 @@ public @interface RdfConfig {
* {@doc ExtARP/ARPOptions.html#setStrictErrorMode(int)
ARPOptions.setStrictErrorMode(int)}
* </ul>
*/
- String arp_errorMode() default "";
+ String rdfxml_errorMode() default "";
/**
* Configuration property: RDF/XML ARP property: <c>embedding</c>.
@@ -206,7 +206,7 @@ public @interface RdfConfig {
* {@doc ExtARP/ARPOptions.html#setEmbedding(boolean)
ARPOptions.setEmbedding(boolean)}
* </ul>
*/
- String arp_embedding() default "";
+ String rdfxml_embedding() default "";
/**
* Configuration property: RDF/XML property: <c>xmlbase</c>.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
index 3b73265..2cc8206 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
@@ -12,15 +12,13 @@
//
***************************************************************************************************************************
package org.apache.juneau.jena.annotation;
-import static org.apache.juneau.jena.RdfCommon.*;
-import static org.apache.juneau.jena.RdfParser.*;
-import static org.apache.juneau.jena.RdfSerializer.*;
-
import org.apache.juneau.*;
+import org.apache.juneau.jena.RdfCollectionFormat;
import org.apache.juneau.jena.RdfParserBuilder;
import org.apache.juneau.jena.RdfSerializerBuilder;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
+import org.apache.juneau.xml.Namespace;
/**
* Utility classes and methods for the {@link RdfConfig @RdfConfig} annotation.
@@ -30,7 +28,7 @@ public class RdfConfigAnnotation {
/**
* Applies {@link RdfConfig} annotations to a {@link
RdfSerializerBuilder}.
*/
- public static class SerializerApplier extends
AnnotationApplier<RdfConfig,RdfSerializerBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<RdfConfig,RdfSerializerBuilder> {
/**
* Constructor.
@@ -38,7 +36,7 @@ public class RdfConfigAnnotation {
* @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public SerializerApplier(VarResolverSession vr) {
+ public SerializerApply(VarResolverSession vr) {
super(RdfConfig.class, RdfSerializerBuilder.class, vr);
}
@@ -46,47 +44,46 @@ public class RdfConfigAnnotation {
public void apply(AnnotationInfo<RdfConfig> ai,
RdfSerializerBuilder b) {
RdfConfig a = ai.getAnnotation();
- string(a.language()).ifPresent(x -> b.set(RDF_language,
x));
- string(a.juneauNs()).ifPresent(x -> b.set(RDF_juneauNs,
x));
- string(a.juneauBpNs()).ifPresent(x ->
b.set(RDF_juneauBpNs, x));
- bool(a.disableUseXmlNamespaces()).ifPresent(x ->
b.set(RDF_disableUseXmlNamespaces, x));
- string(a.arp_iriRules()).ifPresent(x ->
b.set(RDF_arp_iriRules, x));
- string(a.arp_errorMode()).ifPresent(x ->
b.set(RDF_arp_errorMode, x));
- bool(a.arp_embedding()).ifPresent(x ->
b.set(RDF_arp_embedding, x));
- string(a.rdfxml_xmlBase()).ifPresent(x ->
b.set(RDF_rdfxml_xmlBase, x));
- bool(a.rdfxml_longId()).ifPresent(x ->
b.set(RDF_rdfxml_longId, x));
- bool(a.rdfxml_allowBadUris()).ifPresent(x ->
b.set(RDF_rdfxml_allowBadUris, x));
- string(a.rdfxml_relativeUris()).ifPresent(x ->
b.set(RDF_rdfxml_relativeUris, x));
- string(a.rdfxml_showXmlDeclaration()).ifPresent(x ->
b.set(RDF_rdfxml_showXmlDeclaration, x));
-
bool(a.rdfxml_disableShowDoctypeDeclaration()).ifPresent(x ->
b.set(RDF_rdfxml_disableShowDoctypeDeclaration, x));
- integer(a.rdfxml_tab(), "rdfxml_tab").ifPresent(x ->
b.set(RDF_rdfxml_tab, x));
- string(a.rdfxml_attributeQuoteChar()).ifPresent(x ->
b.set(RDF_rdfxml_attributeQuoteChar, x));
- string(a.rdfxml_blockRules()).ifPresent(x ->
b.set(RDF_rdfxml_blockRules, x));
- integer(a.n3_minGap(), "n3_minGap").ifPresent(x ->
b.set(RDF_n3_minGap, x));
- bool(a.n3_disableObjectLists()).ifPresent(x ->
b.set(RDF_n3_disableObjectLists, x));
- integer(a.n3_subjectColumn(),
"n3_subjectColumn").ifPresent(x -> b.set(RDF_n3_subjectColumn, x));
- integer(a.n3_propertyColumn(),
"n3_propertyColumn").ifPresent(x -> b.set(RDF_n3_propertyColumn, x));
- integer(a.n3_indentProperty(),
"n3_indentProperty").ifPresent(x -> b.set(RDF_n3_indentProperty, x));
- integer(a.n3_widePropertyLen(),
"n3_widePropertyLen").ifPresent(x -> b.set(RDF_n3_widePropertyLen, x));
- bool(a.n3_disableAbbrevBaseUri()).ifPresent(x ->
b.set(RDF_n3_disableAbbrevBaseUri, x));
- bool(a.n3_disableUsePropertySymbols()).ifPresent(x ->
b.set(RDF_n3_disableUsePropertySymbols, x));
- bool(a.n3_disableUseTripleQuotedStrings()).ifPresent(x
-> b.set(RDF_n3_disableUseTripleQuotedStrings, x));
- bool(a.n3_disableUseDoubles()).ifPresent(x ->
b.set(RDF_n3_disableUseDoubles, x));
- string(a.collectionFormat()).ifPresent(x ->
b.set(RDF_collectionFormat, x));
- bool(a.looseCollections()).ifPresent(x ->
b.set(RDF_looseCollections, x));
- bool(a.addBeanTypes()).ifPresent(x ->
b.set(RDF_addBeanTypes, x));
- bool(a.addLiteralTypes()).ifPresent(x ->
b.set(RDF_addLiteralTypes, x));
- bool(a.addRootProperty()).ifPresent(x ->
b.set(RDF_addRootProperty, x));
- bool(a.disableAutoDetectNamespaces()).ifPresent(x ->
b.set(RDF_disableAutoDetectNamespaces, x));
- b.setIfNotEmpty(RDF_namespaces,
stringList(a.namespaces()));
- bool(a.trimWhitespace()).ifPresent(x ->
b.set(RDF_trimWhitespace, x));
+ string(a.language()).ifPresent(x -> b.language(x));
+ string(a.juneauNs()).map(Namespace::of).ifPresent(x ->
b.juneauNs(x));
+ string(a.juneauBpNs()).map(Namespace::of).ifPresent(x
-> b.juneauBpNs(x));
+ bool(a.disableUseXmlNamespaces()).ifPresent(x ->
b.disableUseXmlNamespaces(x));
+
string(a.collectionFormat()).map(RdfCollectionFormat::valueOf).ifPresent(x ->
b.collectionFormat(x));
+ bool(a.looseCollections()).ifPresent(x ->
b.looseCollections(x));
+ bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypesRdf(x));
+ bool(a.addLiteralTypes()).ifPresent(x ->
b.addLiteralTypes(x));
+ bool(a.addRootProperty()).ifPresent(x ->
b.addRootProperty(x));
+ bool(a.disableAutoDetectNamespaces()).ifPresent(x ->
b.disableAutoDetectNamespaces(x));
+
strings(a.namespaces()).map(Namespace::createArray).ifPresent(x ->
b.namespaces(x));
+ string(a.rdfxml_iriRules()).ifPresent(x ->
b.rdfxml_iriRules(x));
+ string(a.rdfxml_errorMode()).ifPresent(x ->
b.rdfxml_errorMode(x));
+ bool(a.rdfxml_embedding()).ifPresent(x ->
b.rdfxml_embedding(x));
+ string(a.rdfxml_xmlBase()).ifPresent(x ->
b.rdfxml_xmlbase(x));
+ bool(a.rdfxml_longId()).ifPresent(x ->
b.rdfxml_longId(x));
+ bool(a.rdfxml_allowBadUris()).ifPresent(x ->
b.rdfxml_allowBadUris(x));
+ string(a.rdfxml_relativeUris()).ifPresent(x ->
b.rdfxml_relativeUris(x));
+ string(a.rdfxml_showXmlDeclaration()).ifPresent(x ->
b.rdfxml_showXmlDeclaration(x));
+
bool(a.rdfxml_disableShowDoctypeDeclaration()).ifPresent(x ->
b.rdfxml_disableShowDoctypeDeclaration(x));
+ integer(a.rdfxml_tab(), "rdfxml_tab").ifPresent(x ->
b.rdfxml_tab(x));
+ string(a.rdfxml_attributeQuoteChar()).map(x ->
x.charAt(0)).ifPresent(x -> b.rdfxml_attributeQuoteChar(x));
+ string(a.rdfxml_blockRules()).ifPresent(x ->
b.rdfxml_blockRules(x));
+ integer(a.n3_minGap(), "n3_minGap").ifPresent(x ->
b.n3_minGap(x));
+ bool(a.n3_disableObjectLists()).ifPresent(x ->
b.n3_disableObjectLists(x));
+ integer(a.n3_subjectColumn(),
"n3_subjectColumn").ifPresent(x -> b.n3_subjectColumn(x));
+ integer(a.n3_propertyColumn(),
"n3_propertyColumn").ifPresent(x -> b.n3_propertyColumn(x));
+ integer(a.n3_indentProperty(),
"n3_indentProperty").ifPresent(x -> b.n3_indentProperty(x));
+ integer(a.n3_widePropertyLen(),
"n3_widePropertyLen").ifPresent(x -> b.n3_widePropertyLen(x));
+ bool(a.n3_disableAbbrevBaseUri()).ifPresent(x ->
b.n3_disableAbbrevBaseUri(x));
+ bool(a.n3_disableUsePropertySymbols()).ifPresent(x ->
b.n3_disableUsePropertySymbols(x));
+ bool(a.n3_disableUseTripleQuotedStrings()).ifPresent(x
-> b.n3_disableUseTripleQuotedStrings(x));
+ bool(a.n3_disableUseDoubles()).ifPresent(x ->
b.n3_disableUseDoubles(x));
}
}
/**
* Applies {@link RdfConfig} annotations to a {@link RdfParserBuilder}.
*/
- public static class ParserApplier extends
AnnotationApplier<RdfConfig,RdfParserBuilder> {
+ public static class ParserApply extends
AnnotationApplier<RdfConfig,RdfParserBuilder> {
/**
* Constructor.
@@ -94,7 +91,7 @@ public class RdfConfigAnnotation {
* @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public ParserApplier(VarResolverSession vr) {
+ public ParserApply(VarResolverSession vr) {
super(RdfConfig.class, RdfParserBuilder.class, vr);
}
@@ -102,40 +99,34 @@ public class RdfConfigAnnotation {
public void apply(AnnotationInfo<RdfConfig> ai,
RdfParserBuilder b) {
RdfConfig a = ai.getAnnotation();
- string(a.language()).ifPresent(x -> b.set(RDF_language,
x));
- string(a.juneauNs()).ifPresent(x -> b.set(RDF_juneauNs,
x));
- string(a.juneauBpNs()).ifPresent(x ->
b.set(RDF_juneauBpNs, x));
- bool(a.disableUseXmlNamespaces()).ifPresent(x ->
b.set(RDF_disableUseXmlNamespaces, x));
- string(a.arp_iriRules()).ifPresent(x ->
b.set(RDF_arp_iriRules, x));
- string(a.arp_errorMode()).ifPresent(x ->
b.set(RDF_arp_errorMode, x));
- bool(a.arp_embedding()).ifPresent(x ->
b.set(RDF_arp_embedding, x));
- string(a.rdfxml_xmlBase()).ifPresent(x ->
b.set(RDF_rdfxml_xmlBase, x));
- bool(a.rdfxml_longId()).ifPresent(x ->
b.set(RDF_rdfxml_longId, x));
- bool(a.rdfxml_allowBadUris()).ifPresent(x ->
b.set(RDF_rdfxml_allowBadUris, x));
- string(a.rdfxml_relativeUris()).ifPresent(x ->
b.set(RDF_rdfxml_relativeUris, x));
- string(a.rdfxml_showXmlDeclaration()).ifPresent(x ->
b.set(RDF_rdfxml_showXmlDeclaration, x));
-
bool(a.rdfxml_disableShowDoctypeDeclaration()).ifPresent(x ->
b.set(RDF_rdfxml_disableShowDoctypeDeclaration, x));
- integer(a.rdfxml_tab(), "rdfxml_tab").ifPresent(x ->
b.set(RDF_rdfxml_tab, x));
- string(a.rdfxml_attributeQuoteChar()).ifPresent(x ->
b.set(RDF_rdfxml_attributeQuoteChar, x));
- string(a.rdfxml_blockRules()).ifPresent(x ->
b.set(RDF_rdfxml_blockRules, x));
- integer(a.n3_minGap(), "n3_minGap").ifPresent(x ->
b.set(RDF_n3_minGap, x));
- bool(a.n3_disableObjectLists()).ifPresent(x ->
b.set(RDF_n3_disableObjectLists, x));
- integer(a.n3_subjectColumn(),
"n3_subjectColumn").ifPresent(x -> b.set(RDF_n3_subjectColumn, x));
- integer(a.n3_propertyColumn(),
"n3_propertyColumn").ifPresent(x -> b.set(RDF_n3_propertyColumn, x));
- integer(a.n3_indentProperty(),
"n3_indentProperty").ifPresent(x -> b.set(RDF_n3_indentProperty, x));
- integer(a.n3_widePropertyLen(),
"n3_widePropertyLen").ifPresent(x -> b.set(RDF_n3_widePropertyLen, x));
- bool(a.n3_disableAbbrevBaseUri()).ifPresent(x ->
b.set(RDF_n3_disableAbbrevBaseUri, x));
- bool(a.n3_disableUsePropertySymbols()).ifPresent(x ->
b.set(RDF_n3_disableUsePropertySymbols, x));
- bool(a.n3_disableUseTripleQuotedStrings()).ifPresent(x
-> b.set(RDF_n3_disableUseTripleQuotedStrings, x));
- bool(a.n3_disableUseDoubles()).ifPresent(x ->
b.set(RDF_n3_disableUseDoubles, x));
- string(a.collectionFormat()).ifPresent(x ->
b.set(RDF_collectionFormat, x));
- bool(a.looseCollections()).ifPresent(x ->
b.set(RDF_looseCollections, x));
- bool(a.addBeanTypes()).ifPresent(x ->
b.set(RDF_addBeanTypes, x));
- bool(a.addLiteralTypes()).ifPresent(x ->
b.set(RDF_addLiteralTypes, x));
- bool(a.addRootProperty()).ifPresent(x ->
b.set(RDF_addRootProperty, x));
- bool(a.disableAutoDetectNamespaces()).ifPresent(x ->
b.set(RDF_disableAutoDetectNamespaces, x));
- b.setIfNotEmpty(RDF_namespaces,
stringList(a.namespaces()));
- bool(a.trimWhitespace()).ifPresent(x ->
b.set(RDF_trimWhitespace, x));
+ string(a.language()).ifPresent(x -> b.language(x));
+ string(a.juneauNs()).map(Namespace::of).ifPresent(x ->
b.juneauNs(x));
+ string(a.juneauBpNs()).map(Namespace::of).ifPresent(x
-> b.juneauBpNs(x));
+
string(a.collectionFormat()).map(RdfCollectionFormat::valueOf).ifPresent(x ->
b.collectionFormat(x));
+ bool(a.looseCollections()).ifPresent(x ->
b.looseCollections(x));
+ bool(a.trimWhitespace()).ifPresent(x ->
b.trimWhitespace(x));
+ string(a.rdfxml_iriRules()).ifPresent(x ->
b.rdfxml_iriRules(x));
+ string(a.rdfxml_errorMode()).ifPresent(x ->
b.rdfxml_errorMode(x));
+ bool(a.rdfxml_embedding()).ifPresent(x ->
b.rdfxml_embedding(x));
+ string(a.rdfxml_xmlBase()).ifPresent(x ->
b.rdfxml_xmlbase(x));
+ bool(a.rdfxml_longId()).ifPresent(x ->
b.rdfxml_longId(x));
+ bool(a.rdfxml_allowBadUris()).ifPresent(x ->
b.rdfxml_allowBadUris(x));
+ string(a.rdfxml_relativeUris()).ifPresent(x ->
b.rdfxml_relativeUris(x));
+ string(a.rdfxml_showXmlDeclaration()).ifPresent(x ->
b.rdfxml_showXmlDeclaration(x));
+
bool(a.rdfxml_disableShowDoctypeDeclaration()).ifPresent(x ->
b.rdfxml_disableShowDoctypeDeclaration(x));
+ integer(a.rdfxml_tab(), "rdfxml_tab").ifPresent(x ->
b.rdfxml_tab(x));
+ string(a.rdfxml_attributeQuoteChar()).map(x ->
x.charAt(0)).ifPresent(x -> b.rdfxml_attributeQuoteChar(x));
+ string(a.rdfxml_blockRules()).ifPresent(x ->
b.rdfxml_blockRules(x));
+ integer(a.n3_minGap(), "n3_minGap").ifPresent(x ->
b.n3_minGap(x));
+ bool(a.n3_disableObjectLists()).ifPresent(x ->
b.n3_disableObjectLists(x));
+ integer(a.n3_subjectColumn(),
"n3_subjectColumn").ifPresent(x -> b.n3_subjectColumn(x));
+ integer(a.n3_propertyColumn(),
"n3_propertyColumn").ifPresent(x -> b.n3_propertyColumn(x));
+ integer(a.n3_indentProperty(),
"n3_indentProperty").ifPresent(x -> b.n3_indentProperty(x));
+ integer(a.n3_widePropertyLen(),
"n3_widePropertyLen").ifPresent(x -> b.n3_widePropertyLen(x));
+ bool(a.n3_disableAbbrevBaseUri()).ifPresent(x ->
b.n3_disableAbbrevBaseUri(x));
+ bool(a.n3_disableUsePropertySymbols()).ifPresent(x ->
b.n3_disableUsePropertySymbols(x));
+ bool(a.n3_disableUseTripleQuotedStrings()).ifPresent(x
-> b.n3_disableUseTripleQuotedStrings(x));
+ bool(a.n3_disableUseDoubles()).ifPresent(x ->
b.n3_disableUseDoubles(x));
}
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
index 7a1b69f..acd2d97 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
@@ -14,7 +14,6 @@ package org.apache.juneau.jena;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.jena.RdfSerializer.*;
import java.util.*;
import java.util.function.*;
@@ -63,9 +62,9 @@ public class RdfConfigAnnotationTest {
addBeanTypes="$X{true}",
addLiteralTypes="$X{true}",
addRootProperty="$X{true}",
- arp_embedding="$X{true}",
- arp_errorMode="$X{strict}",
- arp_iriRules="$X{strict}",
+ rdfxml_embedding="$X{true}",
+ rdfxml_errorMode="$X{strict}",
+ rdfxml_iriRules="$X{strict}",
disableAutoDetectNamespaces="$X{true}",
collectionFormat="$X{SEQ}",
juneauBpNs="$X{foo:http://foo}";,
@@ -114,29 +113,29 @@ public class RdfConfigAnnotationTest {
check("foo:http://foo";, x.getNamespaces());
check("false", x.isUseXmlNamespaces());
- Map<String,Object> jp = x.getJenaProperties();
- check("true", jp.get(RDF_arp_embedding.substring(15)));
- check("strict", jp.get(RDF_arp_errorMode.substring(15)));
- check("strict", jp.get(RDF_arp_iriRules.substring(15)));
- check("true",
jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
- check("1", jp.get(RDF_n3_indentProperty.substring(15)));
- check("1", jp.get(RDF_n3_minGap.substring(15)));
- check("true", jp.get(RDF_n3_disableObjectLists.substring(15)));
- check("1", jp.get(RDF_n3_propertyColumn.substring(15)));
- check("1", jp.get(RDF_n3_subjectColumn.substring(15)));
- check("true", jp.get(RDF_n3_disableUseDoubles.substring(15)));
- check("true",
jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
- check("true",
jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
- check("1", jp.get(RDF_n3_widePropertyLen.substring(15)));
- check("true", jp.get(RDF_rdfxml_allowBadUris.substring(15)));
- check("'", jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
- check("foo", jp.get(RDF_rdfxml_blockRules.substring(15)));
- check("true", jp.get(RDF_rdfxml_longId.substring(15)));
- check("absolute",
jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check("true",
jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
- check("true",
jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
- check("1", jp.get(RDF_rdfxml_tab.substring(15)));
- check("foo", jp.get(RDF_rdfxml_xmlBase.substring(15)));
+ Map<String,Object> jp = x.getJenaSettings();
+ check("true", jp.get("rdfXml.embedding"));
+ check("strict", jp.get("rdfXml.error-mode"));
+ check("strict", jp.get("rdfXml.iri-rules"));
+ check("true", jp.get("n3.disableAbbrevBaseUri"));
+ check("1", jp.get("n3.indentProperty"));
+ check("1", jp.get("n3.minGap"));
+ check("true", jp.get("n3.disableObjectLists"));
+ check("1", jp.get("n3.propertyColumn"));
+ check("1", jp.get("n3.subjectColumn"));
+ check("true", jp.get("n3.disableUseDoubles"));
+ check("true", jp.get("n3.disableUsePropertySymbols"));
+ check("true", jp.get("n3.disableUseTripleQuotedStrings"));
+ check("1", jp.get("n3.widePropertyLen"));
+ check("true", jp.get("rdfXml.allowBadURIs"));
+ check("'", jp.get("rdfXml.attributeQuoteChar"));
+ check("foo", jp.get("rdfXml.blockRules"));
+ check("true", jp.get("rdfXml.longId"));
+ check("absolute", jp.get("rdfXml.relativeURIs"));
+ check("true", jp.get("rdfXml.disableShowDoctypeDeclaration"));
+ check("true", jp.get("rdfXml.showXmlDeclaration"));
+ check("1", jp.get("rdfXml.tab"));
+ check("foo", jp.get("rdfXml.xmlbase"));
}
@Test
@@ -150,29 +149,29 @@ public class RdfConfigAnnotationTest {
check("true", x.isLooseCollections());
check("true", x.isTrimWhitespace());
- Map<String,Object> jp = x.getJenaProperties();
- check("true", jp.get(RDF_arp_embedding.substring(15)));
- check("strict", jp.get(RDF_arp_errorMode.substring(15)));
- check("strict", jp.get(RDF_arp_iriRules.substring(15)));
- check("true",
jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
- check("1", jp.get(RDF_n3_indentProperty.substring(15)));
- check("1", jp.get(RDF_n3_minGap.substring(15)));
- check("true", jp.get(RDF_n3_disableObjectLists.substring(15)));
- check("1", jp.get(RDF_n3_propertyColumn.substring(15)));
- check("1", jp.get(RDF_n3_subjectColumn.substring(15)));
- check("true", jp.get(RDF_n3_disableUseDoubles.substring(15)));
- check("true",
jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
- check("true",
jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
- check("1", jp.get(RDF_n3_widePropertyLen.substring(15)));
- check("true", jp.get(RDF_rdfxml_allowBadUris.substring(15)));
- check("'", jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
- check("foo", jp.get(RDF_rdfxml_blockRules.substring(15)));
- check("true", jp.get(RDF_rdfxml_longId.substring(15)));
- check("absolute",
jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check("true",
jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
- check("true",
jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
- check("1", jp.get(RDF_rdfxml_tab.substring(15)));
- check("foo", jp.get(RDF_rdfxml_xmlBase.substring(15)));
+ Map<String,Object> jp = x.getJenaSettings();
+ check("true", jp.get("rdfXml.embedding"));
+ check("strict", jp.get("rdfXml.error-mode"));
+ check("strict", jp.get("rdfXml.iri-rules"));
+ check("true", jp.get("n3.disableAbbrevBaseUri"));
+ check("1", jp.get("n3.indentProperty"));
+ check("1", jp.get("n3.minGap"));
+ check("true", jp.get("n3.disableObjectLists"));
+ check("1", jp.get("n3.propertyColumn"));
+ check("1", jp.get("n3.subjectColumn"));
+ check("true", jp.get("n3.disableUseDoubles"));
+ check("true", jp.get("n3.disableUsePropertySymbols"));
+ check("true", jp.get("n3.disableUseTripleQuotedStrings"));
+ check("1", jp.get("n3.widePropertyLen"));
+ check("true", jp.get("rdfXml.allowBadURIs"));
+ check("'", jp.get("rdfXml.attributeQuoteChar"));
+ check("foo", jp.get("rdfXml.blockRules"));
+ check("true", jp.get("rdfXml.longId"));
+ check("absolute", jp.get("rdfXml.relativeURIs"));
+ check("true", jp.get("rdfXml.disableShowDoctypeDeclaration"));
+ check("true", jp.get("rdfXml.showXmlDeclaration"));
+ check("1", jp.get("rdfXml.tab"));
+ check("foo", jp.get("rdfXml.xmlbase"));
}
//-----------------------------------------------------------------------------------------------------------------
@@ -199,29 +198,29 @@ public class RdfConfigAnnotationTest {
check("", x.getNamespaces());
check("true", x.isUseXmlNamespaces());
- Map<String,Object> jp = x.getJenaProperties();
- check(null, jp.get(RDF_arp_embedding.substring(15)));
- check(null, jp.get(RDF_arp_errorMode.substring(15)));
- check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
- check(null, jp.get(RDF_n3_indentProperty.substring(15)));
- check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
- check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
- check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
- check(null,
jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
- check(null,
jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
- check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
- check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
- check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
- check(null, jp.get(RDF_rdfxml_longId.substring(15)));
- check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
- check(null,
jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
- check(null, jp.get(RDF_rdfxml_tab.substring(15)));
- check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
+ Map<String,Object> jp = x.getJenaSettings();
+ check(null, jp.get("rdfXml.embedding"));
+ check(null, jp.get("rdfXml.error-mode"));
+ check(null, jp.get("rdfXml.iri-rules"));
+ check(null, jp.get("n3.disableAbbrevBaseUri"));
+ check(null, jp.get("n3.indentProperty"));
+ check(null, jp.get("n3.minGap"));
+ check(null, jp.get("n3.disableObjectLists"));
+ check(null, jp.get("n3.propertyColumn"));
+ check(null, jp.get("n3.subjectColumn"));
+ check(null, jp.get("n3.disableUseDoubles"));
+ check(null, jp.get("n3.disableUsePropertySymbols"));
+ check(null, jp.get("n3.disableUseTripleQuotedStrings"));
+ check(null, jp.get("n3.widePropertyLen"));
+ check(null, jp.get("rdfXml.allowBadURIs"));
+ check(null, jp.get("rdfXml.attributeQuoteChar"));
+ check(null, jp.get("rdfXml.blockRules"));
+ check(null, jp.get("rdfXml.longId"));
+ check(null, jp.get("rdfXml.relativeURIs"));
+ check(null, jp.get("rdfXml.disableShowDoctypeDeclaration"));
+ check(null, jp.get("rdfXml.showXmlDeclaration"));
+ check(null, jp.get("rdfXml.tab"));
+ check(null, jp.get("rdfXml.xmlbase"));
}
@Test
@@ -235,29 +234,29 @@ public class RdfConfigAnnotationTest {
check("false", x.isLooseCollections());
check("false", x.isTrimWhitespace());
- Map<String,Object> jp = x.getJenaProperties();
- check(null, jp.get(RDF_arp_embedding.substring(15)));
- check(null, jp.get(RDF_arp_errorMode.substring(15)));
- check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
- check(null, jp.get(RDF_n3_indentProperty.substring(15)));
- check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
- check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
- check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
- check(null,
jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
- check(null,
jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
- check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
- check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
- check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
- check(null, jp.get(RDF_rdfxml_longId.substring(15)));
- check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
- check(null,
jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
- check(null, jp.get(RDF_rdfxml_tab.substring(15)));
- check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
+ Map<String,Object> jp = x.getJenaSettings();
+ check(null, jp.get("rdfXml.embedding"));
+ check(null, jp.get("rdfXml.error-mode"));
+ check(null, jp.get("rdfXml.iri-rules"));
+ check(null, jp.get("n3.disableAbbrevBaseUri"));
+ check(null, jp.get("n3.indentProperty"));
+ check(null, jp.get("n3.minGap"));
+ check(null, jp.get("n3.disableObjectLists"));
+ check(null, jp.get("n3.propertyColumn"));
+ check(null, jp.get("n3.subjectColumn"));
+ check(null, jp.get("n3.disableUseDoubles"));
+ check(null, jp.get("n3.disableUsePropertySymbols"));
+ check(null, jp.get("n3.disableUseTripleQuotedStrings"));
+ check(null, jp.get("n3.widePropertyLen"));
+ check(null, jp.get("rdfXml.allowBadURIs"));
+ check(null, jp.get("rdfXml.attributeQuoteChar"));
+ check(null, jp.get("rdfXml.blockRules"));
+ check(null, jp.get("rdfXml.longId"));
+ check(null, jp.get("rdfXml.relativeURIs"));
+ check(null, jp.get("rdfXml.disableShowDoctypeDeclaration"));
+ check(null, jp.get("rdfXml.showXmlDeclaration"));
+ check(null, jp.get("rdfXml.tab"));
+ check(null, jp.get("rdfXml.xmlbase"));
}
//-----------------------------------------------------------------------------------------------------------------
@@ -283,29 +282,29 @@ public class RdfConfigAnnotationTest {
check("", x.getNamespaces());
check("true", x.isUseXmlNamespaces());
- Map<String,Object> jp = x.getJenaProperties();
- check(null, jp.get(RDF_arp_embedding.substring(15)));
- check(null, jp.get(RDF_arp_errorMode.substring(15)));
- check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
- check(null, jp.get(RDF_n3_indentProperty.substring(15)));
- check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
- check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
- check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
- check(null,
jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
- check(null,
jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
- check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
- check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
- check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
- check(null, jp.get(RDF_rdfxml_longId.substring(15)));
- check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
- check(null,
jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
- check(null, jp.get(RDF_rdfxml_tab.substring(15)));
- check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
+ Map<String,Object> jp = x.getJenaSettings();
+ check(null, jp.get("rdfXml.embedding"));
+ check(null, jp.get("rdfXml.error-mode"));
+ check(null, jp.get("rdfXml.iri-rules"));
+ check(null, jp.get("n3.disableAbbrevBaseUri"));
+ check(null, jp.get("n3.indentProperty"));
+ check(null, jp.get("n3.minGap"));
+ check(null, jp.get("n3.disableObjectLists"));
+ check(null, jp.get("n3.propertyColumn"));
+ check(null, jp.get("n3.subjectColumn"));
+ check(null, jp.get("n3.disableUseDoubles"));
+ check(null, jp.get("n3.disableUsePropertySymbols"));
+ check(null, jp.get("n3.disableUseTripleQuotedStrings"));
+ check(null, jp.get("n3.widePropertyLen"));
+ check(null, jp.get("rdfXml.allowBadURIs"));
+ check(null, jp.get("rdfXml.attributeQuoteChar"));
+ check(null, jp.get("rdfXml.blockRules"));
+ check(null, jp.get("rdfXml.longId"));
+ check(null, jp.get("rdfXml.relativeURIs"));
+ check(null, jp.get("rdfXml.disableShowDoctypeDeclaration"));
+ check(null, jp.get("rdfXml.showXmlDeclaration"));
+ check(null, jp.get("rdfXml.tab"));
+ check(null, jp.get("rdfXml.xmlbase"));
}
@Test
@@ -319,28 +318,28 @@ public class RdfConfigAnnotationTest {
check("false", x.isLooseCollections());
check("false", x.isTrimWhitespace());
- Map<String,Object> jp = x.getJenaProperties();
- check(null, jp.get(RDF_arp_embedding.substring(15)));
- check(null, jp.get(RDF_arp_errorMode.substring(15)));
- check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
- check(null, jp.get(RDF_n3_indentProperty.substring(15)));
- check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
- check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
- check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
- check(null,
jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
- check(null,
jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
- check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
- check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
- check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
- check(null, jp.get(RDF_rdfxml_longId.substring(15)));
- check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null,
jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
- check(null,
jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
- check(null, jp.get(RDF_rdfxml_tab.substring(15)));
- check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
+ Map<String,Object> jp = x.getJenaSettings();
+ check(null, jp.get("rdfXml.embedding"));
+ check(null, jp.get("rdfXml.error-mode"));
+ check(null, jp.get("rdfXml.iri-rules"));
+ check(null, jp.get("n3.disableAbbrevBaseUri"));
+ check(null, jp.get("n3.indentProperty"));
+ check(null, jp.get("n3.minGap"));
+ check(null, jp.get("n3.disableObjectLists"));
+ check(null, jp.get("n3.propertyColumn"));
+ check(null, jp.get("n3.subjectColumn"));
+ check(null, jp.get("n3.disableUseDoubles"));
+ check(null, jp.get("n3.disableUsePropertySymbols"));
+ check(null, jp.get("n3.disableUseTripleQuotedStrings"));
+ check(null, jp.get("n3.widePropertyLen"));
+ check(null, jp.get("rdfXml.allowBadURIs"));
+ check(null, jp.get("rdfXml.attributeQuoteChar"));
+ check(null, jp.get("rdfXml.blockRules"));
+ check(null, jp.get("rdfXml.longId"));
+ check(null, jp.get("rdfXml.relativeURIs"));
+ check(null, jp.get("rdfXml.disableShowDoctypeDeclaration"));
+ check(null, jp.get("rdfXml.showXmlDeclaration"));
+ check(null, jp.get("rdfXml.tab"));
+ check(null, jp.get("rdfXml.xmlbase"));
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
index 504b4c2..618707b 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.jena;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.jena.RdfCommon.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -47,7 +46,7 @@ public class RdfParserTest {
// Create a new serializer with readable output.
RdfSerializer s = RdfSerializer.create().xmlabbrev()
- .set(RDF_rdfxml_tab, 3)
+ .rdfxml_tab(3)
.sq()
.addRootProperty()
.build();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
index 97744b7..17370a6 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.jena;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.jena.RdfCommon.*;
import static org.junit.runners.MethodSorters.*;
import java.net.*;
@@ -36,7 +35,7 @@ public class RdfTest {
String expected;
RdfSerializerBuilder s = RdfSerializer.create().xmlabbrev()
- .set(RDF_rdfxml_tab, 3)
+ .rdfxml_tab(3)
.sq()
.addRootProperty();
RdfParser p = RdfParser.create().xml().build();
@@ -196,7 +195,7 @@ public class RdfTest {
B b = new B().init(), b2;
String rdfXml, expected;
RdfSerializerBuilder s = RdfSerializer.create().xmlabbrev()
- .set(RDF_rdfxml_tab, 3)
+ .rdfxml_tab(3)
.sq()
.addRootProperty();
RdfParser p = RdfXmlParser.DEFAULT;
@@ -429,7 +428,7 @@ public class RdfTest {
C c = new C().init(), c2;
String rdfXml, expected;
RdfSerializerBuilder s = RdfSerializer.create().xmlabbrev()
- .set(RDF_rdfxml_tab, 3)
+ .rdfxml_tab(3)
.sq()
.addRootProperty();
RdfParser p = RdfXmlParser.DEFAULT;
