changed the request parser classes to use the new generic TriplePatternElement interface

Author: Olaf Hartig

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

@@ -6,14 +6,27 @@
 import org.linkeddatafragments.fragments.FragmentRequestParserBase;
 import org.linkeddatafragments.fragments.IFragmentRequestParser;
 import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
+import org.linkeddatafragments.util.TriplePatternElementParser;
 
 /**
  * An {@link IFragmentRequestParser} for {@link TriplePatternFragmentRequest}s.
  *
+ * @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 class TPFRequestParser extends FragmentRequestParserBase
+public class TPFRequestParser<TermType,VarType>
+    extends FragmentRequestParserBase
 {
+    public final TriplePatternElementParser<TermType,VarType> elmtParser;
+
+    public TPFRequestParser(
+                final TriplePatternElementParser<TermType,VarType> elmtParser )
+    {
+        this.elmtParser = elmtParser;
+    }
+
     @Override
     protected Worker getWorker( final HttpServletRequest httpRequest,
                                 final ConfigReader config )
@@ -22,19 +35,20 @@ protected Worker getWorker( final HttpServletRequest httpRequest,
         return new Worker( httpRequest, config );
     }
 
-
-    static protected class Worker extends FragmentRequestParserBase.Worker
+    protected class Worker extends FragmentRequestParserBase.Worker
     {   
         public Worker( final HttpServletRequest request,
                        final ConfigReader config )
         {
             super( request, config );
         }
 
+        @Override
         public LinkedDataFragmentRequest createFragmentRequest()
                                                throws IllegalArgumentException
         {
-            return new TriplePatternFragmentRequestImpl( getFragmentURL(),
+            return new TriplePatternFragmentRequestImpl<TermType,VarType>(
+                                                         getFragmentURL(),
                                                          getDatasetURL(),
                                                          pageNumberWasRequested,
                                                          pageNumber,
@@ -43,21 +57,28 @@ public LinkedDataFragmentRequest createFragmentRequest()
                                                          getObject() );
         }
 
-        public String getSubject() {
-            return request.getParameter(
+        public TriplePatternElement<TermType,VarType> getSubject() {
+            return getParameterAsTriplePatternElement(
                     TriplePatternFragmentRequest.PARAMETERNAME_SUBJ );
         }
 
-        public String getPredicate() {
-            return request.getParameter(
+        public TriplePatternElement<TermType,VarType> getPredicate() {
+            return getParameterAsTriplePatternElement(
                     TriplePatternFragmentRequest.PARAMETERNAME_PRED );
         }
 
-        public String getObject() {
-            return request.getParameter(
+        public TriplePatternElement<TermType,VarType> getObject() {
+            return getParameterAsTriplePatternElement(
                     TriplePatternFragmentRequest.PARAMETERNAME_OBJ );
         }
 
+        public TriplePatternElement<TermType,VarType>
+                   getParameterAsTriplePatternElement( final String paramName )
+        {
+            final String parameter = request.getParameter( paramName );
+            return elmtParser.parseIntoTriplePatternElement( parameter );
+        }
+
     } // end of class Worker
 
 }

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

@@ -0,0 +1,29 @@
+package org.linkeddatafragments.fragments.tpf;
+
+import com.hp.hpl.jena.rdf.model.RDFNode;
+
+import org.linkeddatafragments.util.TriplePatternElementParserForJena;
+
+/**
+ * An {@link TPFRequestParser} for Jena-based backends.
+ *
+ * @author <a href="http://olafhartig.de">Olaf Hartig</a>
+ */
+public class TPFRequestParserForJenaBackends
+    extends TPFRequestParser<RDFNode,String>
+{
+    private static TPFRequestParserForJenaBackends instance = null;
+
+    public static TPFRequestParserForJenaBackends getInstance()
+    {
+        if ( instance == null ) {
+            instance = new TPFRequestParserForJenaBackends();
+        }
+        return instance;
+    }
+
+    protected TPFRequestParserForJenaBackends()
+    {
+        super( TriplePatternElementParserForJena.getInstance() );
+    }
+}