Merge pull request #5 from zazi/master

upgrade to java 8
dswarm · Jun 4, 2015 · 05b8942 · 05b8942
2 parents 3ac1dda + 8c3f55d
commit 05b8942
Show file tree

Hide file tree

Showing 3 changed files with 211 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,8 +29,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.source.version>1.7</java.source.version>
-		<java.target.version>1.7</java.target.version>
+		<java.source.version>1.8</java.source.version>
+		<java.target.version>1.8</java.target.version>
 		<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
 		<maven-assembly-plugin.version>2.5.3</maven-assembly-plugin.version>
 		<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
@@ -40,19 +40,38 @@
 		<maven-release-plugin.version>2.5.1</maven-release-plugin.version>
 		<maven-version-plugin.version>2.1</maven-version-plugin.version>
 		<maven-source-plugin.version>2.4</maven-source-plugin.version>
+		<version.maven.plugin.license>2.7</version.maven.plugin.license>
+		<version.maven.plugin.jar>2.6</version.maven.plugin.jar>
+		<version.maven.plugin.deploy>2.8.2</version.maven.plugin.deploy>
+		<version.maven.plugin.site>3.4</version.maven.plugin.site>
 		<!-- note this might deliver conflicts -->
 		<jackson.version>2.5.2</jackson.version>
 		<junit.version>4.12</junit.version>
 		<google.guava.version>18.0</google.guava.version>
-		<rxjava.version>1.0.9</rxjava.version>
+		<rxjava.version>1.0.11</rxjava.version>
 	</properties>
 
 	<prerequisites>
-		<maven>2.2.1</maven>
+		<maven>3.0.4</maven>
 	</prerequisites>
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>${version.maven.plugin.jar}</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>${version.maven.plugin.deploy}</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>${version.maven.plugin.site}</version>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -107,7 +126,7 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>2.6</version>
+				<version>${version.maven.plugin.license}</version>
 				<configuration>
 					<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
 					<properties>

diff --git a/src/test/java/org/dswarm/graph/json/stream/test/ModelBuilderTest.java b/src/test/java/org/dswarm/graph/json/stream/test/ModelBuilderTest.java
@@ -96,6 +96,17 @@ public void testBuild6() throws Exception {
 		testBuildInternal("test-mabxml2.gson");
 	}
 
+	/**
+	 * multiple CSV records to check order
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void testBuild7() throws Exception {
+
+		testBuildInternal("test-csv.gson");
+	}
+
 	private void testBuildInternal(final String testModelFile) throws Exception {
 
 		final String inputJSONString = TestUtil.getResourceAsString(testModelFile);

diff --git a/src/test/resources/test-csv.gson b/src/test/resources/test-csv.gson
@@ -0,0 +1,176 @@
+[
+  {
+    "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0": [
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
+        },
+        "p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
+        "o": {
+          "uri": "http://data.slub-dresden.de/resources/2/schema#RecordType"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#id",
+        "o": {
+          "v": "6543"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#name",
+        "o": {
+          "v": "quietsch"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#description",
+        "o": {
+          "v": "quietsch quietsch"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#isbn",
+        "o": {
+          "v": "23400999234"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#year",
+        "o": {
+          "v": "1956"
+        }
+      }
+    ]
+  },
+  {
+    "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff": [
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
+        },
+        "p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
+        "o": {
+          "uri": "http://data.slub-dresden.de/resources/2/schema#RecordType"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#id",
+        "o": {
+          "v": "5432"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#name",
+        "o": {
+          "v": "quäk"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#description",
+        "o": {
+          "v": "quäk quäk"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#isbn",
+        "o": {
+          "v": "45645688800"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#year",
+        "o": {
+          "v": "1913"
+        }
+      }
+    ]
+  },
+  {
+    "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba": [
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
+        },
+        "p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
+        "o": {
+          "uri": "http://data.slub-dresden.de/resources/2/schema#RecordType"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#id",
+        "o": {
+          "v": "7654"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#name",
+        "o": {
+          "v": "plök"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#description",
+        "o": {
+          "v": "plök plök"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#isbn",
+        "o": {
+          "v": "23000543645"
+        }
+      },
+      {
+        "s": {
+          "uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
+        },
+        "p": "http://data.slub-dresden.de/resources/2/schema#year",
+        "o": {
+          "v": "2013"
+        }
+      }
+    ]
+  }
+]