added two new packages 'org.linkeddatafragments.fragments' and 'org.linkeddatafragments.fragments.TPF', and moved the corresponding i'faces and classes to these packages

Olaf Hartig · Olaf Hartig · commit f0449f16ca0c · 2015-12-15T14:19:58.000+01:00
diff --git a/src/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java b/src/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java
@@ -1,5 +1,11 @@
 package org.linkeddatafragments.datasource;
 
+import org.linkeddatafragments.fragments.LinkedDataFragment;
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragment;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragmentImpl;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragmentRequest;
+
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.RDFNode;
diff --git a/src/org/linkeddatafragments/datasource/HdtDataSource.java b/src/org/linkeddatafragments/datasource/HdtDataSource.java
@@ -2,6 +2,9 @@
 
 import java.io.IOException;
 
+import org.linkeddatafragments.fragments.LinkedDataFragment;
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragmentRequest;
 import org.rdfhdt.hdt.enums.TripleComponentRole;
 import org.rdfhdt.hdt.hdt.HDT;
 import org.rdfhdt.hdt.hdt.HDTManager;
diff --git a/src/org/linkeddatafragments/datasource/IDataSource.java b/src/org/linkeddatafragments/datasource/IDataSource.java
@@ -2,6 +2,8 @@
 
 import java.io.Closeable;
 
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
+
 /**
  * A data source of Linked Data Fragments.
  *
diff --git a/src/org/linkeddatafragments/datasource/IFragmentRequestProcessor.java b/src/org/linkeddatafragments/datasource/IFragmentRequestProcessor.java
@@ -2,6 +2,8 @@
 
 import java.io.Closeable;
 
+import org.linkeddatafragments.fragments.LinkedDataFragment;
+
 /**
  * Processes a single request sent to a Linked Data Fragments interface.
  *
diff --git a/src/org/linkeddatafragments/datasource/IndexDataSource.java b/src/org/linkeddatafragments/datasource/IndexDataSource.java
@@ -11,6 +11,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.linkeddatafragments.fragments.LinkedDataFragment;
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragmentRequest;
+
 /**
  * An Index data source provides an overview of all available datasets.
  *
diff --git a/src/org/linkeddatafragments/datasource/JenaTDBDataSource.java b/src/org/linkeddatafragments/datasource/JenaTDBDataSource.java
@@ -18,6 +18,10 @@
 import com.hp.hpl.jena.tdb.TDBFactory;
 import java.io.File;
 
+import org.linkeddatafragments.fragments.LinkedDataFragment;
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragmentRequest;
+
 /**
  * Experimental Jena TDB-backed data source of Basic Linked Data Fragments.
  *
diff --git a/src/org/linkeddatafragments/fragments/LinkedDataFragment.java b/src/org/linkeddatafragments/fragments/LinkedDataFragment.java
@@ -1,4 +1,4 @@
-package org.linkeddatafragments.datasource;
+package org.linkeddatafragments.fragments;
 
 import com.hp.hpl.jena.rdf.model.StmtIterator;
 
diff --git a/src/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java b/src/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java
@@ -1,4 +1,4 @@
-package org.linkeddatafragments.datasource;
+package org.linkeddatafragments.fragments;
 
 import java.net.URISyntaxException;
 
diff --git a/src/org/linkeddatafragments/fragments/LinkedDataFragmentRequest.java b/src/org/linkeddatafragments/fragments/LinkedDataFragmentRequest.java
@@ -1,4 +1,4 @@
-package org.linkeddatafragments.datasource;
+package org.linkeddatafragments.fragments;
 
 /**
  * Basis for representing a request of some type of Linked Data Fragment (LDF).
diff --git a/src/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java b/src/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java
@@ -1,4 +1,4 @@
-package org.linkeddatafragments.datasource;
+package org.linkeddatafragments.fragments;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragment.java b/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragment.java
@@ -1,4 +1,6 @@
-package org.linkeddatafragments.datasource;
+package org.linkeddatafragments.fragments.TPF;
+
+import org.linkeddatafragments.fragments.LinkedDataFragment;
 
 /**
  * A Triple Pattern Fragment.
diff --git a/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragmentImpl.java b/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragmentImpl.java
@@ -1,5 +1,6 @@
-package org.linkeddatafragments.datasource;
+package org.linkeddatafragments.fragments.TPF;
 
+import org.linkeddatafragments.fragments.LinkedDataFragmentBase;
 import org.linkeddatafragments.util.CommonResources;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
diff --git a/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragmentRequest.java b/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragmentRequest.java
@@ -1,4 +1,6 @@
-package org.linkeddatafragments.datasource;
+package org.linkeddatafragments.fragments.TPF;
+
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
 
 /**
  * Represents a request of a Triple Pattern Fragment (TPF).
diff --git a/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragmentRequestImpl.java b/src/org/linkeddatafragments/fragments/TPF/TriplePatternFragmentRequestImpl.java
@@ -1,8 +1,9 @@
-package org.linkeddatafragments.datasource;
+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
diff --git a/src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java b/src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java
@@ -25,12 +25,12 @@
 import org.linkeddatafragments.datasource.IFragmentRequestProcessor;
 import org.linkeddatafragments.datasource.IndexDataSource;
 import org.linkeddatafragments.datasource.JenaTDBDataSourceType;
-import org.linkeddatafragments.datasource.LinkedDataFragment;
-import org.linkeddatafragments.datasource.LinkedDataFragmentRequest;
-import org.linkeddatafragments.datasource.LinkedDataFragmentRequestBase;
-import org.linkeddatafragments.datasource.TriplePatternFragmentRequestImpl;
 import org.linkeddatafragments.exceptions.DataSourceException;
 import org.linkeddatafragments.exceptions.DataSourceNotFoundException;
+import org.linkeddatafragments.fragments.LinkedDataFragment;
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
+import org.linkeddatafragments.fragments.LinkedDataFragmentRequestBase;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragmentRequestImpl;
 import org.linkeddatafragments.util.MIMEParse;
 
 /**
diff --git a/src/test/java/org/linkeddatafragments/datasource/DataSourceTest.java b/src/test/java/org/linkeddatafragments/datasource/DataSourceTest.java
@@ -14,8 +14,8 @@
 
 import org.linkeddatafragments.datasource.IDataSource;
 import org.linkeddatafragments.datasource.IFragmentRequestProcessor;
-import org.linkeddatafragments.datasource.TriplePatternFragment;
-import org.linkeddatafragments.datasource.TriplePatternFragmentRequest;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragment;
+import org.linkeddatafragments.fragments.TPF.TriplePatternFragmentRequest;
 
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`import java.io.Closeable;`
`4`	`4`
	`5`	`+import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;`
	`6`	`+`
`5`	`7`	`/**`
`6`	`8`	`* A data source of Linked Data Fragments.`
`7`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.linkeddatafragments.datasource;`
	`1`	`+package org.linkeddatafragments.fragments;`
`2`	`2`
`3`	`3`	`import com.hp.hpl.jena.rdf.model.StmtIterator;`
`4`	`4`