Skip to content
This repository was archived by the owner on May 24, 2022. It is now read-only.

Commit 05b8942

Browse files
knutwalkerknutwalker
committed
Merge pull request #5 from zazi/master
upgrade to java 8
2 parents 3ac1dda + 8c3f55d commit 05b8942

3 files changed

Lines changed: 211 additions & 5 deletions

File tree

‎pom.xml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
<properties>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
<java.source.version>1.7</java.source.version>
33-
<java.target.version>1.7</java.target.version>
32+
<java.source.version>1.8</java.source.version>
33+
<java.target.version>1.8</java.target.version>
3434
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
3535
<maven-assembly-plugin.version>2.5.3</maven-assembly-plugin.version>
3636
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
@@ -40,19 +40,38 @@
4040
<maven-release-plugin.version>2.5.1</maven-release-plugin.version>
4141
<maven-version-plugin.version>2.1</maven-version-plugin.version>
4242
<maven-source-plugin.version>2.4</maven-source-plugin.version>
43+
<version.maven.plugin.license>2.7</version.maven.plugin.license>
44+
<version.maven.plugin.jar>2.6</version.maven.plugin.jar>
45+
<version.maven.plugin.deploy>2.8.2</version.maven.plugin.deploy>
46+
<version.maven.plugin.site>3.4</version.maven.plugin.site>
4347
<!-- note this might deliver conflicts -->
4448
<jackson.version>2.5.2</jackson.version>
4549
<junit.version>4.12</junit.version>
4650
<google.guava.version>18.0</google.guava.version>
47-
<rxjava.version>1.0.9</rxjava.version>
51+
<rxjava.version>1.0.11</rxjava.version>
4852
</properties>
4953

5054
<prerequisites>
51-
<maven>2.2.1</maven>
55+
<maven>3.0.4</maven>
5256
</prerequisites>
5357

5458
<build>
5559
<plugins>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-jar-plugin</artifactId>
63+
<version>${version.maven.plugin.jar}</version>
64+
</plugin>
65+
<plugin>
66+
<groupId>org.apache.maven.plugins</groupId>
67+
<artifactId>maven-deploy-plugin</artifactId>
68+
<version>${version.maven.plugin.deploy}</version>
69+
</plugin>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-site-plugin</artifactId>
73+
<version>${version.maven.plugin.site}</version>
74+
</plugin>
5675
<plugin>
5776
<groupId>org.apache.maven.plugins</groupId>
5877
<artifactId>maven-compiler-plugin</artifactId>
@@ -107,7 +126,7 @@
107126
<plugin>
108127
<groupId>com.mycila</groupId>
109128
<artifactId>license-maven-plugin</artifactId>
110-
<version>2.6</version>
129+
<version>${version.maven.plugin.license}</version>
111130
<configuration>
112131
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
113132
<properties>

‎src/test/java/org/dswarm/graph/json/stream/test/ModelBuilderTest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,17 @@ public void testBuild6() throws Exception {
9696
testBuildInternal("test-mabxml2.gson");
9797
}
9898

99+
/**
100+
* multiple CSV records to check order
101+
*
102+
* @throws Exception
103+
*/
104+
@Test
105+
public void testBuild7() throws Exception {
106+
107+
testBuildInternal("test-csv.gson");
108+
}
109+
99110
private void testBuildInternal(final String testModelFile) throws Exception {
100111

101112
final String inputJSONString = TestUtil.getResourceAsString(testModelFile);

‎src/test/resources/test-csv.gson‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
[
2+
{
3+
"http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0": [
4+
{
5+
"s": {
6+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
7+
},
8+
"p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
9+
"o": {
10+
"uri": "http://data.slub-dresden.de/resources/2/schema#RecordType"
11+
}
12+
},
13+
{
14+
"s": {
15+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
16+
},
17+
"p": "http://data.slub-dresden.de/resources/2/schema#id",
18+
"o": {
19+
"v": "6543"
20+
}
21+
},
22+
{
23+
"s": {
24+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
25+
},
26+
"p": "http://data.slub-dresden.de/resources/2/schema#name",
27+
"o": {
28+
"v": "quietsch"
29+
}
30+
},
31+
{
32+
"s": {
33+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
34+
},
35+
"p": "http://data.slub-dresden.de/resources/2/schema#description",
36+
"o": {
37+
"v": "quietsch quietsch"
38+
}
39+
},
40+
{
41+
"s": {
42+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
43+
},
44+
"p": "http://data.slub-dresden.de/resources/2/schema#isbn",
45+
"o": {
46+
"v": "23400999234"
47+
}
48+
},
49+
{
50+
"s": {
51+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/72eb6682-4662-407b-b278-846595e56eb0"
52+
},
53+
"p": "http://data.slub-dresden.de/resources/2/schema#year",
54+
"o": {
55+
"v": "1956"
56+
}
57+
}
58+
]
59+
},
60+
{
61+
"http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff": [
62+
{
63+
"s": {
64+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
65+
},
66+
"p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
67+
"o": {
68+
"uri": "http://data.slub-dresden.de/resources/2/schema#RecordType"
69+
}
70+
},
71+
{
72+
"s": {
73+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
74+
},
75+
"p": "http://data.slub-dresden.de/resources/2/schema#id",
76+
"o": {
77+
"v": "5432"
78+
}
79+
},
80+
{
81+
"s": {
82+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
83+
},
84+
"p": "http://data.slub-dresden.de/resources/2/schema#name",
85+
"o": {
86+
"v": "quäk"
87+
}
88+
},
89+
{
90+
"s": {
91+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
92+
},
93+
"p": "http://data.slub-dresden.de/resources/2/schema#description",
94+
"o": {
95+
"v": "quäk quäk"
96+
}
97+
},
98+
{
99+
"s": {
100+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
101+
},
102+
"p": "http://data.slub-dresden.de/resources/2/schema#isbn",
103+
"o": {
104+
"v": "45645688800"
105+
}
106+
},
107+
{
108+
"s": {
109+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/0c3a770b-8200-48e0-8dad-9404fe6ee4ff"
110+
},
111+
"p": "http://data.slub-dresden.de/resources/2/schema#year",
112+
"o": {
113+
"v": "1913"
114+
}
115+
}
116+
]
117+
},
118+
{
119+
"http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba": [
120+
{
121+
"s": {
122+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
123+
},
124+
"p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
125+
"o": {
126+
"uri": "http://data.slub-dresden.de/resources/2/schema#RecordType"
127+
}
128+
},
129+
{
130+
"s": {
131+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
132+
},
133+
"p": "http://data.slub-dresden.de/resources/2/schema#id",
134+
"o": {
135+
"v": "7654"
136+
}
137+
},
138+
{
139+
"s": {
140+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
141+
},
142+
"p": "http://data.slub-dresden.de/resources/2/schema#name",
143+
"o": {
144+
"v": "plök"
145+
}
146+
},
147+
{
148+
"s": {
149+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
150+
},
151+
"p": "http://data.slub-dresden.de/resources/2/schema#description",
152+
"o": {
153+
"v": "plök plök"
154+
}
155+
},
156+
{
157+
"s": {
158+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
159+
},
160+
"p": "http://data.slub-dresden.de/resources/2/schema#isbn",
161+
"o": {
162+
"v": "23000543645"
163+
}
164+
},
165+
{
166+
"s": {
167+
"uri": "http://data.slub-dresden.de/datamodels/DataModel-c2ef3667-bb72-4c2a-972f-13d8c46a995f/records/950f49f1-7934-49db-a60a-1df10f5088ba"
168+
},
169+
"p": "http://data.slub-dresden.de/resources/2/schema#year",
170+
"o": {
171+
"v": "2013"
172+
}
173+
}
174+
]
175+
}
176+
]

0 commit comments

Comments
 (0)