changed interface TriplePatternFragmentRequest to use the new generic TriplePatternElement interface for subject, predicate, and object.

Author: Olaf Hartig

src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentRequest.java

@@ -5,32 +5,30 @@
 /**
  * Represents a request of a Triple Pattern Fragment (TPF).
  *
+ * @param <TermType> type for representing RDF terms in triple patterns 
+ * @param <VarType> type for representing specific variables in triple patterns
+ *
  * @author <a href="http://olafhartig.de">Olaf Hartig</a>
  */
-public interface TriplePatternFragmentRequest extends LinkedDataFragmentRequest
+public interface TriplePatternFragmentRequest<TermType,VarType>
+    extends LinkedDataFragmentRequest
 {
     public final static String PARAMETERNAME_SUBJ = "subject";
     public final static String PARAMETERNAME_PRED = "predicate";
     public final static String PARAMETERNAME_OBJ = "object";
 
     /**
-     * Returns the subject position of the requested triple pattern (or null,
-     * in which case the requested triple pattern has an unnamed variable as
-     * subject).
+     * Returns the subject position of the requested triple pattern.
      */
-    String getSubject();
+    TriplePatternElement<TermType,VarType> getSubject();
 
     /**
-     * Returns the predicate position of the requested triple pattern (or null,
-     * in which case the requested triple pattern has an unnamed variable as
-     * predicate).
+     * Returns the predicate position of the requested triple pattern.
      */
-    String getPredicate();
+    TriplePatternElement<TermType,VarType> getPredicate();
 
     /**
-     * Returns the object position of the requested triple pattern (or null,
-     * in which case the requested triple pattern has an unnamed variable as
-     * object).
+     * Returns the object position of the requested triple pattern.
      */
-    String getObject();
+    TriplePatternElement<TermType,VarType> getObject();
 }

src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentRequestImpl.java

@@ -7,41 +7,50 @@
  *
  * @author <a href="http://olafhartig.de">Olaf Hartig</a>
  */
-public class TriplePatternFragmentRequestImpl
+public class TriplePatternFragmentRequestImpl<TermType,VarType>
     extends LinkedDataFragmentRequestBase
-    implements TriplePatternFragmentRequest
+    implements TriplePatternFragmentRequest<TermType,VarType>
 {
-    public final String subject;
-    public final String predicate;
-    public final String object;
+    public final TriplePatternElement<TermType,VarType> subject;
+    public final TriplePatternElement<TermType,VarType> predicate;
+    public final TriplePatternElement<TermType,VarType> object;
 
     public TriplePatternFragmentRequestImpl( final String fragmentURL,
                                              final String datasetURL,
                                              final boolean pageNumberWasRequested,
                                              final long pageNumber,
-                                             final String subject,
-                                             final String predicate,
-                                             final String object )
+                                             final TriplePatternElement<TermType,VarType> subject,
+                                             final TriplePatternElement<TermType,VarType> predicate,
+                                             final TriplePatternElement<TermType,VarType> object )
     {
         super( fragmentURL, datasetURL, pageNumberWasRequested, pageNumber );
 
+        if ( subject == null )
+            throw new IllegalArgumentException();
+
+        if ( predicate == null )
+            throw new IllegalArgumentException();
+
+        if ( object == null )
+            throw new IllegalArgumentException();
+
         this.subject = subject;
         this.predicate = predicate;
         this.object = object;
     }
 
     @Override
-    public String getSubject() {
+    public TriplePatternElement<TermType,VarType> getSubject() {
         return subject;
     }
 
     @Override
-    public String getPredicate() {
+    public TriplePatternElement<TermType,VarType> getPredicate() {
         return predicate;
     }
 
     @Override
-    public String getObject() {
+    public TriplePatternElement<TermType,VarType> getObject() {
         return object;
     }
 
@@ -50,9 +59,9 @@ public String toString()
     {
         return "TriplePatternFragmentRequest(" +
                "class: " + getClass().getName() +
-               ", subject: " + subject +
-               ", predicate: " + predicate +
-               ", object: " + object +
+               ", subject: " + subject.toString() +
+               ", predicate: " + predicate.toString() +
+               ", object: " + object.toString() +
                ", fragmentURL: " + fragmentURL +
                ", isPageRequest: " + pageNumberWasRequested +
                ", pageNumber: " + pageNumber +