moved code for parsing HTTP requests out of the request classes (LinkedDataFragmentRequestBase and TriplePatternFragmentRequestImpl) into the corresponding parser classes

Author: Olaf Hartig

src/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java

@@ -1,50 +1,27 @@
 package org.linkeddatafragments.fragments;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.linkeddatafragments.config.ConfigReader;
-
 /**
- * Base class for implementations of {@link LinkedDataFragmentRequest} that
- * are based on an {@link HttpServletRequest}.
+ * Base class for implementations of {@link LinkedDataFragmentRequest}.
  *
  * @author <a href="http://olafhartig.de">Olaf Hartig</a>
  */
 public abstract class LinkedDataFragmentRequestBase
     implements LinkedDataFragmentRequest
 {
-    public final HttpServletRequest request;
-    public final ConfigReader config;
-
     public final String fragmentURL;
     public final String datasetURL;
     public final boolean pageNumberWasRequested;
     public final long pageNumber;
 
-    public LinkedDataFragmentRequestBase( final HttpServletRequest request,
-                                          final ConfigReader config )
+    public LinkedDataFragmentRequestBase( final String fragmentURL,
+                                          final String datasetURL,
+                                          final boolean pageNumberWasRequested,
+                                          final long pageNumber )
     {
-        this.request = request;
-        this.config = config;
-
-        this.fragmentURL = extractFragmentURL( request, config );
-        this.datasetURL = extractDatasetURL( request, config );
-        
-        final String givenPageNumber = request.getParameter( PARAMETERNAME_PAGE );
-        if ( givenPageNumber != null ) {
-            long pageNumber;
-            try {
-                pageNumber = Long.parseLong( givenPageNumber );
-            } catch (NumberFormatException ex) {
-                pageNumber = 1L;
-            }
-            this.pageNumber = ( pageNumber > 0 ) ? pageNumber : 1L;
-            this.pageNumberWasRequested = true;
-        }
-        else {
-            this.pageNumber = 1L;
-            this.pageNumberWasRequested = false;
-        }
+        this.fragmentURL = fragmentURL;
+        this.datasetURL = datasetURL;
+        this.pageNumberWasRequested = pageNumberWasRequested;
+        this.pageNumber = pageNumber;
     }
 
     @Override
@@ -70,33 +47,4 @@ public long getPageNumber() throws UnsupportedOperationException {
             throw new UnsupportedOperationException();
     }
 
-
-    // ----- HELPERS ---------
-
-    public static String extractFragmentURL( final HttpServletRequest request,
-                                             final ConfigReader config ) {
-        final String datasetURL = extractDatasetURL( request, config );
-        final String query = request.getQueryString();
-        return query == null ? datasetURL : (datasetURL + "?" + query);
-    }
-
-    public static String extractDatasetURL( final HttpServletRequest request,
-                                            final ConfigReader config ) {
-        return extractBaseURL( request, config ) + request.getRequestURI();
-    }
-
-    public static String extractBaseURL( final HttpServletRequest request,
-                                         final ConfigReader config ) {
-        if (config.getBaseURL() != null) {
-            return config.getBaseURL();
-        } else if ((request.getServerPort() == 80)
-                || (request.getServerPort() == 443)) {
-            return request.getScheme() + "://"
-                    + request.getServerName();
-        } else {
-            return request.getScheme() + "://"
-                    + request.getServerName() + ":" + request.getServerPort();
-        }
-    }
-
 }

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

@@ -1,39 +1,48 @@
 package org.linkeddatafragments.fragments.tpf;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.linkeddatafragments.config.ConfigReader;
 import org.linkeddatafragments.fragments.LinkedDataFragmentRequestBase;
 
 /**
- * An implementation of {@link TriplePatternFragmentRequest} that is based on
- * an {@link HttpServletRequest}.
+ * An implementation of {@link TriplePatternFragmentRequest}.
  *
  * @author <a href="http://olafhartig.de">Olaf Hartig</a>
  */
 public class TriplePatternFragmentRequestImpl
     extends LinkedDataFragmentRequestBase
     implements TriplePatternFragmentRequest
-{    
-    public TriplePatternFragmentRequestImpl( final HttpServletRequest request,
-                                             final ConfigReader config )
+{
+    public final String subject;
+    public final String predicate;
+    public final String object;
+
+    public TriplePatternFragmentRequestImpl( final String fragmentURL,
+                                             final String datasetURL,
+                                             final boolean pageNumberWasRequested,
+                                             final long pageNumber,
+                                             final String subject,
+                                             final String predicate,
+                                             final String object )
     {
-        super( request, config );
+        super( fragmentURL, datasetURL, pageNumberWasRequested, pageNumber );
+
+        this.subject = subject;
+        this.predicate = predicate;
+        this.object = object;
     }
 
     @Override
     public String getSubject() {
-        return request.getParameter( PARAMETERNAME_SUBJ );
+        return subject;
     }
 
     @Override
     public String getPredicate() {
-        return request.getParameter( PARAMETERNAME_PRED );
+        return predicate;
     }
 
     @Override
     public String getObject() {
-        return request.getParameter( PARAMETERNAME_OBJ );
+        return object;
     }
 
 }