Simplify vocabulary package implementations

trellis-ldp · Jan 4, 2018 · 93d983a · 93d983a
1 parent ca5aaf6
commit 93d983a
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 36 deletions.
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/ACL.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/ACL.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class ACL extends BaseVocabulary {
+public final class ACL {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/ns/auth/acl#";
@@ -50,6 +52,6 @@ public final class ACL extends BaseVocabulary {
     public static final IRI owner = createIRI(URI + "owner");
 
     private ACL() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/AS.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/AS.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class AS extends BaseVocabulary {
+public final class AS {
 
     /* Namespace */
     public static final String URI = "https://www.w3.org/ns/activitystreams#";
@@ -169,6 +171,6 @@ public final class AS extends BaseVocabulary {
     public static final IRI source = createIRI(URI + "source");
 
     private AS() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/DC.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/DC.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class DC extends BaseVocabulary {
+public final class DC {
 
     /* Namespace */
     public static final String URI = "http://purl.org/dc/terms/";
@@ -109,7 +111,7 @@ public final class DC extends BaseVocabulary {
     public static final IRI valid = createIRI(URI + "valid");
 
     private DC() {
-        super();
+        // prevent instantiation
     }
 }
 
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/FOAF.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/FOAF.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class FOAF extends BaseVocabulary {
+public final class FOAF {
 
     /* Namespace */
     public static final String URI = "http://xmlns.com/foaf/0.1/";
@@ -48,6 +50,6 @@ public final class FOAF extends BaseVocabulary {
     public static final IRI weblog = createIRI(URI + "weblog");
 
     private FOAF() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/JSONLD.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/JSONLD.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class JSONLD extends BaseVocabulary {
+public final class JSONLD {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/ns/json-ld#";
@@ -38,6 +40,6 @@ public final class JSONLD extends BaseVocabulary {
     public static final IRI flattened = createIRI(URI + "flattened");
 
     private JSONLD() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/LDP.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/LDP.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class LDP extends BaseVocabulary {
+public final class LDP {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/ns/ldp#";
@@ -68,6 +70,6 @@ public final class LDP extends BaseVocabulary {
     public static final IRI MemberSubject = createIRI(URI + "MemberSubject");
 
     private LDP() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Memento.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Memento.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class Memento extends BaseVocabulary {
+public final class Memento {
 
     /* Namespace */
     public static final String URI = "http://mementoweb.org/ns#";
@@ -41,6 +43,6 @@ public final class Memento extends BaseVocabulary {
     public static final IRI original = createIRI(URI + "original");
 
     private Memento() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/OA.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/OA.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class OA extends BaseVocabulary {
+public final class OA {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/ns/oa#";
@@ -103,6 +105,6 @@ public final class OA extends BaseVocabulary {
     public static final IRI PreferContainedIRIs = createIRI(URI + "PreferContainedIRIs");
 
     private OA() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/PROV.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/PROV.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class PROV extends BaseVocabulary {
+public final class PROV {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/ns/prov#";
@@ -119,6 +121,6 @@ public final class PROV extends BaseVocabulary {
     public static final IRI wasInfluencedBy = createIRI(URI + "wasInfluencedBy");
 
     private PROV() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/RDF.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/RDF.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -23,7 +25,7 @@
  *
  * @author acoburn
  */
-public final class RDF extends BaseVocabulary {
+public final class RDF {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
@@ -54,6 +56,6 @@ public final class RDF extends BaseVocabulary {
     public static final IRI rest = createIRI(URI + "rest");
 
     private RDF() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/RDFS.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/RDFS.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -23,7 +25,7 @@
  *
  * @author acoburn
  */
-public final class RDFS extends BaseVocabulary {
+public final class RDFS {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/2000/01/rdf-schema#";
@@ -48,6 +50,6 @@ public final class RDFS extends BaseVocabulary {
     public static final IRI member = createIRI(URI + "member");
 
     private RDFS() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/SKOS.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/SKOS.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class SKOS extends BaseVocabulary {
+public final class SKOS {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/2004/02/skos/core#";
@@ -64,6 +66,6 @@ public final class SKOS extends BaseVocabulary {
     public static final IRI closeMatch = createIRI(URI + "closeMatch");
 
     private SKOS() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Time.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Time.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class Time extends BaseVocabulary {
+public final class Time {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/2006/time#";
@@ -129,6 +131,6 @@ public final class Time extends BaseVocabulary {
     public static final IRI Wednesday = createIRI(URI + "Wednesday");
 
     private Time() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Trellis.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Trellis.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class Trellis extends BaseVocabulary {
+public final class Trellis {
 
     /* Namespace */
     public static final String URI = "http://www.trellisldp.org/ns/trellis#";
@@ -48,6 +50,6 @@ public final class Trellis extends BaseVocabulary {
     public static final IRI PreferUserManaged = createIRI(URI + "PreferUserManaged");
 
     private Trellis() {
-        super();
+        // prevent instantiation
     }
 }
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/VCARD.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/VCARD.java
@@ -13,6 +13,8 @@
  */
 package org.trellisldp.vocabulary;
 
+import static org.trellisldp.vocabulary.VocabUtils.createIRI;
+
 import org.apache.commons.rdf.api.IRI;
 
 /**
@@ -22,7 +24,7 @@
  *
  * @author acoburn
  */
-public final class VCARD extends BaseVocabulary {
+public final class VCARD {
 
     /* Namespace */
     public static final String URI = "http://www.w3.org/2006/vcard/ns#";
@@ -145,6 +147,6 @@ public final class VCARD extends BaseVocabulary {
     public static final IRI value = createIRI(URI + "value");
 
     private VCARD() {
-        super();
+        // prevent instantiation
     }
 }