Merge pull request #130 from filip26/0_9

Version 1.0.0
filip26 · Dec 11, 2020 · 27e04af · 27e04af
2 parents 49baf46 + 6ca44ce
commit 27e04af
Show file tree

Hide file tree

Showing 92 changed files with 227 additions and 230 deletions.
diff --git a/README.md b/README.md
@@ -61,15 +61,15 @@ Maven
 <dependency>
     <groupId>com.apicatalog</groupId>
     <artifactId>titanium-json-ld</artifactId>
-    <version>0.8.6</version>
+    <version>1.0.0</version>
 </dependency>
 
 ```
 
 Gradle
 
 ```gradle
-compile group: 'com.apicatalog', name: 'titanium-json-ld', version: '0.8.6'
+compile group: 'com.apicatalog', name: 'titanium-json-ld', version: '1.0.0'
 ```
 
 #### JSON-P Provider
@@ -82,14 +82,14 @@ Maven
     <dependency>
         <groupId>org.glassfish</groupId>
         <artifactId>jakarta.json</artifactId>
-        <version>1.1.6</version>
+        <version>2.0.0</version>
     </dependency>
 ```
 
 Gradle
 
 ```gradle
-compile group: 'org.glassfish', name: 'jakarta.json', version: '1.1.6'
+compile group: 'org.glassfish', name: 'jakarta.json', version: '2.0.0'
 
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.apicatalog</groupId>
     <artifactId>titanium-json-ld</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>Titanium JSON-LD 1.1</name>

diff --git a/src/main/java/com/apicatalog/jsonld/JsonLd.java b/src/main/java/com/apicatalog/jsonld/JsonLd.java
@@ -17,12 +17,12 @@
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.impl.CompactionApi;
-import com.apicatalog.jsonld.api.impl.ExpansionApi;
-import com.apicatalog.jsonld.api.impl.FlatteningApi;
-import com.apicatalog.jsonld.api.impl.FramingApi;
-import com.apicatalog.jsonld.api.impl.FromRdfApi;
-import com.apicatalog.jsonld.api.impl.ToRdfApi;
+import com.apicatalog.jsonld.api.CompactionApi;
+import com.apicatalog.jsonld.api.ExpansionApi;
+import com.apicatalog.jsonld.api.FlatteningApi;
+import com.apicatalog.jsonld.api.FramingApi;
+import com.apicatalog.jsonld.api.FromRdfApi;
+import com.apicatalog.jsonld.api.ToRdfApi;
 import com.apicatalog.jsonld.document.Document;
 import com.apicatalog.jsonld.uri.UriUtils;
 import com.apicatalog.rdf.RdfDataset;

diff --git a/...om/apicatalog/jsonld/api/JsonLdEmbed.java → ...va/com/apicatalog/jsonld/JsonLdEmbed.java b/...om/apicatalog/jsonld/api/JsonLdEmbed.java → ...va/com/apicatalog/jsonld/JsonLdEmbed.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api;
+package com.apicatalog.jsonld;
 
 /**
  * 

diff --git a/...om/apicatalog/jsonld/api/JsonLdError.java → ...va/com/apicatalog/jsonld/JsonLdError.java b/...om/apicatalog/jsonld/api/JsonLdError.java → ...va/com/apicatalog/jsonld/JsonLdError.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api;
+package com.apicatalog.jsonld;
 
 /**
  * The {@link JsonLdError} type is used to report processing errors.

diff --git a/...picatalog/jsonld/api/JsonLdErrorCode.java → ...om/apicatalog/jsonld/JsonLdErrorCode.java b/...picatalog/jsonld/api/JsonLdErrorCode.java → ...om/apicatalog/jsonld/JsonLdErrorCode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api;
+package com.apicatalog.jsonld;
 
 import static java.util.Map.entry;
 

diff --git a/.../apicatalog/jsonld/api/JsonLdOptions.java → .../com/apicatalog/jsonld/JsonLdOptions.java b/.../apicatalog/jsonld/api/JsonLdOptions.java → .../com/apicatalog/jsonld/JsonLdOptions.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api;
+package com.apicatalog.jsonld;
 
 import java.net.URI;
 
@@ -22,7 +22,6 @@
 import com.apicatalog.jsonld.context.cache.LruCache;
 import com.apicatalog.jsonld.document.Document;
 import com.apicatalog.jsonld.document.JsonDocument;
-import com.apicatalog.jsonld.lang.Version;
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.jsonld.loader.SchemeRouter;
 
@@ -80,7 +79,7 @@ public enum RdfDirection {
 
     private boolean ordered;
 
-    private Version processingMode;
+    private JsonLdVersion processingMode;
 
     private boolean produceGeneralizedRdf;
 
@@ -127,7 +126,7 @@ public JsonLdOptions(DocumentLoader loader) {
         this.expandContext = null;
         this.extractAllScripts = false;
         this.ordered = false;
-        this.processingMode = Version.V1_1;
+        this.processingMode = JsonLdVersion.V1_1;
         this.produceGeneralizedRdf = true;
         this.rdfDirection = null;
         this.useNativeTypes = false;
@@ -142,8 +141,8 @@ public JsonLdOptions(DocumentLoader loader) {
 
         // custom
         this.numericId = false;
-        this.contextCache = new LruCache<>(128);
-        this.documentCache =new LruCache<>(256); 
+        this.contextCache = new LruCache<>(256);
+        this.documentCache = null; 
     }
 
     public JsonLdOptions(JsonLdOptions options) {
@@ -246,7 +245,7 @@ public boolean isOrdered() {
         return ordered;
     }
 
-    public Version getProcessingMode() {
+    public JsonLdVersion getProcessingMode() {
         return processingMode;
     }
 
@@ -294,7 +293,7 @@ public void setOrdered(boolean ordered) {
         this.ordered = ordered;
     }
 
-    public void setProcessingMode(Version processingMode) {
+    public void setProcessingMode(JsonLdVersion processingMode) {
         this.processingMode = processingMode;
     }
 

diff --git a/...a/com/apicatalog/jsonld/lang/Version.java → .../com/apicatalog/jsonld/JsonLdVersion.java b/...a/com/apicatalog/jsonld/lang/Version.java → .../com/apicatalog/jsonld/JsonLdVersion.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.lang;
+package com.apicatalog.jsonld;
 
-public enum Version {
+public enum JsonLdVersion {
 
     V1_0("json-ld-1.0"), V1_1("json-ld-1.1");
 
     private final String text;
 
-    Version(final String text) {
+    JsonLdVersion(final String text) {
         this.text = text;
     }
 
-    public static Version of(String text) {
+    public static JsonLdVersion of(String text) {
 
         if (text == null) {
             throw new IllegalArgumentException();

diff --git a/...apicatalog/jsonld/api/impl/CommonApi.java → .../com/apicatalog/jsonld/api/CommonApi.java b/...apicatalog/jsonld/api/impl/CommonApi.java → .../com/apicatalog/jsonld/api/CommonApi.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.JsonLdOptions;
-import com.apicatalog.jsonld.lang.Version;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdVersion;
 
 public interface CommonApi<R> {
 
@@ -36,7 +36,7 @@ public interface CommonApi<R> {
      * @param processingMode to set
      * @return builder instance
      */
-    R mode(Version processingMode);
+    R mode(JsonLdVersion processingMode);
 
     /**
      * Set the base <code>IRI</code>. If set, this overrides the input document's IRI.

diff --git a/...atalog/jsonld/api/impl/CompactionApi.java → .../apicatalog/jsonld/api/CompactionApi.java b/...atalog/jsonld/api/impl/CompactionApi.java → .../apicatalog/jsonld/api/CompactionApi.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.JsonLdError;
-import com.apicatalog.jsonld.api.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdVersion;
 import com.apicatalog.jsonld.document.Document;
-import com.apicatalog.jsonld.lang.Version;
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.jsonld.processor.CompactionProcessor;
 import com.apicatalog.jsonld.uri.UriUtils;
@@ -74,7 +74,7 @@ public CompactionApi options(JsonLdOptions options) {
     }
 
     @Override
-    public CompactionApi mode(Version processingMode) {
+    public CompactionApi mode(JsonLdVersion processingMode) {
         options.setProcessingMode(processingMode);
         return this;
     }

diff --git a/...picatalog/jsonld/api/impl/ContextApi.java → ...com/apicatalog/jsonld/api/ContextApi.java b/...picatalog/jsonld/api/impl/ContextApi.java → ...com/apicatalog/jsonld/api/ContextApi.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 

diff --git a/...catalog/jsonld/api/impl/ExpansionApi.java → ...m/apicatalog/jsonld/api/ExpansionApi.java b/...catalog/jsonld/api/impl/ExpansionApi.java → ...m/apicatalog/jsonld/api/ExpansionApi.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.JsonLdError;
-import com.apicatalog.jsonld.api.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdVersion;
 import com.apicatalog.jsonld.document.Document;
 import com.apicatalog.jsonld.document.JsonDocument;
-import com.apicatalog.jsonld.lang.Version;
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.jsonld.processor.ExpansionProcessor;
 import com.apicatalog.jsonld.uri.UriUtils;
@@ -94,7 +94,7 @@ public ExpansionApi context(Document context) {
     }
 
     @Override
-    public ExpansionApi mode(Version processingMode) {
+    public ExpansionApi mode(JsonLdVersion processingMode) {
         options.setProcessingMode(processingMode);
         return this;
     }

diff --git a/...atalog/jsonld/api/impl/FlatteningApi.java → .../apicatalog/jsonld/api/FlatteningApi.java b/...atalog/jsonld/api/impl/FlatteningApi.java → .../apicatalog/jsonld/api/FlatteningApi.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.JsonLdError;
-import com.apicatalog.jsonld.api.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdVersion;
 import com.apicatalog.jsonld.document.Document;
 import com.apicatalog.jsonld.document.JsonDocument;
-import com.apicatalog.jsonld.lang.Version;
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.jsonld.processor.FlatteningProcessor;
 import com.apicatalog.jsonld.uri.UriUtils;
@@ -67,7 +67,7 @@ public FlatteningApi options(JsonLdOptions options) {
     }
 
     @Override
-    public FlatteningApi mode(Version processingMode) {
+    public FlatteningApi mode(JsonLdVersion processingMode) {
         options.setProcessingMode(processingMode);
         return this;
     }

diff --git a/...picatalog/jsonld/api/impl/FramingApi.java → ...com/apicatalog/jsonld/api/FramingApi.java b/...picatalog/jsonld/api/impl/FramingApi.java → ...com/apicatalog/jsonld/api/FramingApi.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.JsonLdEmbed;
-import com.apicatalog.jsonld.api.JsonLdError;
-import com.apicatalog.jsonld.api.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdEmbed;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdVersion;
 import com.apicatalog.jsonld.document.Document;
 import com.apicatalog.jsonld.document.JsonDocument;
-import com.apicatalog.jsonld.lang.Version;
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.jsonld.processor.FramingProcessor;
 import com.apicatalog.jsonld.uri.UriUtils;
@@ -102,7 +102,7 @@ public FramingApi context(Document context) {
     }
 
     @Override
-    public FramingApi mode(Version processingMode) {
+    public FramingApi mode(JsonLdVersion processingMode) {
         options.setProcessingMode(processingMode);
         return this;
     }

diff --git a/...picatalog/jsonld/api/impl/FromRdfApi.java → ...com/apicatalog/jsonld/api/FromRdfApi.java b/...picatalog/jsonld/api/impl/FromRdfApi.java → ...com/apicatalog/jsonld/api/FromRdfApi.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.JsonLdError;
-import com.apicatalog.jsonld.api.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdVersion;
 import com.apicatalog.jsonld.document.Document;
-import com.apicatalog.jsonld.lang.Version;
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.jsonld.processor.FromRdfProcessor;
 import com.apicatalog.rdf.RdfDataset;
@@ -60,7 +60,7 @@ public FromRdfApi options(JsonLdOptions options) {
     }
 
     @Override
-    public FromRdfApi mode(Version processingMode) {
+    public FromRdfApi mode(JsonLdVersion processingMode) {
         options.setProcessingMode(processingMode);
         return this;
     }

diff --git a/...apicatalog/jsonld/api/impl/LoaderApi.java → .../com/apicatalog/jsonld/api/LoaderApi.java b/...apicatalog/jsonld/api/impl/LoaderApi.java → .../com/apicatalog/jsonld/api/LoaderApi.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import com.apicatalog.jsonld.loader.DocumentLoader;
 

diff --git a/.../apicatalog/jsonld/api/impl/ToRdfApi.java → ...a/com/apicatalog/jsonld/api/ToRdfApi.java b/.../apicatalog/jsonld/api/impl/ToRdfApi.java → ...a/com/apicatalog/jsonld/api/ToRdfApi.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apicatalog.jsonld.api.impl;
+package com.apicatalog.jsonld.api;
 
 import java.net.URI;
 
-import com.apicatalog.jsonld.api.JsonLdError;
-import com.apicatalog.jsonld.api.JsonLdOptions;
-import com.apicatalog.jsonld.api.JsonLdOptions.RdfDirection;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.JsonLdVersion;
+import com.apicatalog.jsonld.JsonLdOptions.RdfDirection;
 import com.apicatalog.jsonld.document.Document;
 import com.apicatalog.jsonld.document.JsonDocument;
-import com.apicatalog.jsonld.lang.Version;
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.jsonld.processor.ToRdfProcessor;
 import com.apicatalog.jsonld.uri.UriUtils;
@@ -126,7 +126,7 @@ public ToRdfApi rdfDirection(RdfDirection direction) {
     }
 
     @Override
-    public ToRdfApi mode(Version processingMode) {
+    public ToRdfApi mode(JsonLdVersion processingMode) {
         options.setProcessingMode(processingMode);
         return this;
     }