Skip to content

Commit 84f5be7

Browse files
birgerhaarbrandtbirgerhaarbrandt
committed
Merge branch 'release/v0.3.0'
2 parents de2d817 + 0cf5ef9 commit 84f5be7

File tree

173 files changed

+10005
-1065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+10005
-1065
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ dependency-reduced-pom.xml
2222
buildNumber.properties
2323
.mvn/timing.properties
2424

25+
#Eclipse
26+
.classpath
27+
.project
28+
.settings/
29+
2530
# ---> JetBrains
2631
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
2732
*.iml

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,18 @@ Generic openEHR Client and Objekt-mapper:
77
* RestClient for openEHR Rest-API
88
* AQL-Query generator (TODO)
99

10+
## Release Notes (v0.3.0)
11+
-RestClient for DIRECTORY endpoint
12+
-Improved clean-up of empty elements
13+
-Improved generation of EVENT classes
14+
-Automated generation of PARTICIPATION classes
15+
-Added support for PARTY_PROXY
16+
-Moved to EHRbase 11
1017

1118
## Installation
1219

1320
### Prerequisite
14-
You need to have EHRbase jars for v0.8.0 in your maven repo
21+
You need to have EHRbase jars for v0.11.0 in your maven repo (clone EHRbase and build with 'mvn clean install')
1522
### Build
1623
```bash
1724
mvn clean install
@@ -37,6 +44,7 @@ see FlattenerTest and UnflattenerTest
3744
- ehr : see DefaultRestEhrEndpointIT
3845
- composition: see DefaultRestCompositionEndpointIT
3946
- template : see DefaultRestTemplateEndpointIT
47+
- directory : see DefaultRestDirectoryEndpointIT
4048
## Contributing
4149
Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
4250

‎pom.xml‎

Lines changed: 85 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,60 @@
2323

2424
<groupId>org.ehrbase</groupId>
2525
<artifactId>client-library</artifactId>
26-
<version>0.2.0</version>
26+
<version>0.3.0</version>
2727

2828
<properties>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3030
<skipIntegrationTests>true</skipIntegrationTests>
31-
<ehrbaseVersion>0.9.0-SNAPSHOT</ehrbaseVersion>
31+
<ehrbaseVersion>0.11.0</ehrbaseVersion>
32+
<maven.compiler.release>11</maven.compiler.release>
33+
<maven.compiler.source>11</maven.compiler.source>
34+
<maven.compiler.target>11</maven.compiler.target>
3235
</properties>
3336

3437
<build>
3538
<plugins>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-enforcer-plugin</artifactId>
42+
<version>1.4.1</version>
43+
<configuration>
44+
<rules>
45+
<bannedDependencies>
46+
<searchTransitive>true</searchTransitive>
47+
<excludes>
48+
<exclude>ch.qos.logback:logback-classic</exclude>
49+
<exclude>org.springframework</exclude>
50+
<exclude>org.slf4j</exclude>
51+
<exclude>io.springfox</exclude>
52+
<exclude>io.swagger</exclude>
53+
</excludes>
54+
<includes>
55+
<include>org.slf4j:slf4j-api</include>
56+
<include>org.slf4j:slf4j-simple:*:jar:test</include>
57+
</includes>
58+
</bannedDependencies>
59+
<requireMavenVersion>
60+
<version>3.0</version>
61+
</requireMavenVersion>
62+
</rules>
63+
<fail>true</fail>
64+
</configuration>
65+
<executions>
66+
<execution>
67+
<id>enforce-banned-dependencies</id>
68+
<goals>
69+
<goal>enforce</goal>
70+
</goals>
71+
</execution>
72+
</executions>
73+
</plugin>
3674
<plugin>
3775
<groupId>org.apache.maven.plugins</groupId>
3876
<artifactId>maven-compiler-plugin</artifactId>
3977
<version>3.8.1</version>
4078
<configuration>
41-
<source>1.8</source>
42-
<target>1.8</target>
79+
<release>11</release>
4380
</configuration>
4481
</plugin>
4582
<plugin>
@@ -109,16 +146,20 @@
109146
</build>
110147

111148
<dependencies>
149+
<dependency>
150+
<groupId>org.reflections</groupId>
151+
<artifactId>reflections</artifactId>
152+
<version>0.9.12</version>
153+
</dependency>
154+
<dependency>
155+
<groupId>javax.cache</groupId>
156+
<artifactId>cache-api</artifactId>
157+
<version>1.1.1</version>
158+
</dependency>
112159
<dependency>
113160
<groupId>org.ehrbase.openehr</groupId>
114161
<artifactId>opt-1.4</artifactId>
115162
<version>${ehrbaseVersion}</version>
116-
<exclusions>
117-
<exclusion>
118-
<groupId>ch.qos.logback</groupId>
119-
<artifactId>logback-classic</artifactId>
120-
</exclusion>
121-
</exclusions>
122163
</dependency>
123164
<dependency>
124165
<groupId>commons-cli</groupId>
@@ -130,21 +171,44 @@
130171
<artifactId>serialisation</artifactId>
131172
<version>${ehrbaseVersion}</version>
132173
</dependency>
174+
<dependency>
175+
<groupId>org.ehrbase.openehr</groupId>
176+
<artifactId>terminology</artifactId>
177+
<version>${ehrbaseVersion}</version>
178+
</dependency>
133179
<dependency>
134180
<groupId>org.ehrbase.openehr</groupId>
135181
<artifactId>api</artifactId>
136182
<version>${ehrbaseVersion}</version>
137183
<exclusions>
138184
<exclusion>
139-
<groupId>ch.qos.logback</groupId>
140-
<artifactId>logback-classic</artifactId>
185+
<groupId>org.springframework.boot</groupId>
186+
<artifactId>*</artifactId>
187+
</exclusion>
188+
<exclusion>
189+
<groupId>io.swagger</groupId>
190+
<artifactId>*</artifactId>
141191
</exclusion>
142192
</exclusions>
143193
</dependency>
144194
<dependency>
145195
<groupId>org.ehrbase.openehr</groupId>
146196
<artifactId>rest-openehr</artifactId>
147197
<version>${ehrbaseVersion}</version>
198+
<exclusions>
199+
<exclusion>
200+
<groupId>org.springframework.boot</groupId>
201+
<artifactId>*</artifactId>
202+
</exclusion>
203+
<exclusion>
204+
<groupId>io.springfox</groupId>
205+
<artifactId>*</artifactId>
206+
</exclusion>
207+
<exclusion>
208+
<groupId>io.swagger</groupId>
209+
<artifactId>*</artifactId>
210+
</exclusion>
211+
</exclusions>
148212
</dependency>
149213
<dependency>
150214
<groupId>org.apache.httpcomponents</groupId>
@@ -156,11 +220,7 @@
156220
<artifactId>javapoet</artifactId>
157221
<version>1.11.1</version>
158222
</dependency>
159-
<dependency>
160-
<groupId>org.reflections</groupId>
161-
<artifactId>reflections</artifactId>
162-
<version>0.9.11</version>
163-
</dependency>
223+
164224
<dependency>
165225
<groupId>org.slf4j</groupId>
166226
<artifactId>slf4j-api</artifactId>
@@ -170,6 +230,7 @@
170230
<groupId>org.slf4j</groupId>
171231
<artifactId>slf4j-simple</artifactId>
172232
<version>1.7.27</version>
233+
<scope>test</scope>
173234
</dependency>
174235

175236
<dependency>
@@ -190,5 +251,12 @@
190251
<version>${ehrbaseVersion}</version>
191252
<scope>test</scope>
192253
</dependency>
254+
<dependency>
255+
<groupId>org.ehcache</groupId>
256+
<artifactId>ehcache</artifactId>
257+
<version>3.8.1</version>
258+
<scope>test</scope>
259+
</dependency>
260+
193261
</dependencies>
194262
</project>

‎src/main/java/org/ehrbase/client/annotations/Archetype.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717

1818
package org.ehrbase.client.annotations;
1919

20+
import java.lang.annotation.ElementType;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
23+
import java.lang.annotation.Target;
2224

2325
@Retention(RetentionPolicy.RUNTIME)
26+
@Target(value = {ElementType.TYPE})
2427
public @interface Archetype {
2528
public static final String VALUE = "value";
2629
String value();

‎src/main/java/org/ehrbase/client/annotations/Choice.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.ehrbase.client.annotations;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
@Retention(RetentionPolicy.RUNTIME)
9+
@Target(value = {ElementType.FIELD})
10+
public @interface Choice {
11+
}

‎src/main/java/org/ehrbase/client/annotations/Entity.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright (c) 2019 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School
3+
* This file is part of Project EHRbase
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.ehrbase.client.annotations;
18+
19+
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Retention;
21+
import java.lang.annotation.RetentionPolicy;
22+
import java.lang.annotation.Target;
23+
24+
@Retention(RetentionPolicy.RUNTIME)
25+
@Target(value = {ElementType.TYPE})
26+
public @interface Entity {
27+
}

‎src/main/java/org/ehrbase/client/annotations/Id.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright (c) 2019 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School
3+
* This file is part of Project EHRbase
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.ehrbase.client.annotations;
19+
20+
import java.lang.annotation.ElementType;
21+
import java.lang.annotation.Retention;
22+
import java.lang.annotation.RetentionPolicy;
23+
import java.lang.annotation.Target;
24+
25+
@Retention(RetentionPolicy.RUNTIME)
26+
@Target(value = {ElementType.FIELD})
27+
public @interface Id {
28+
}

‎src/main/java/org/ehrbase/client/annotations/OptionFor.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.ehrbase.client.annotations;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
@Retention(RetentionPolicy.RUNTIME)
9+
@Target(value = {ElementType.TYPE})
10+
public @interface OptionFor {
11+
public static final String VALUE = "value";
12+
13+
String value();
14+
}

‎src/main/java/org/ehrbase/client/annotations/Path.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717

1818
package org.ehrbase.client.annotations;
1919

20+
import java.lang.annotation.ElementType;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
23+
import java.lang.annotation.Target;
2224

2325
@Retention(RetentionPolicy.RUNTIME)
26+
@Target(value = {ElementType.FIELD})
2427
public @interface Path {
2528
public static final String VALUE = "value";
2629
String value();

‎src/main/java/org/ehrbase/client/annotations/Template.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717

1818
package org.ehrbase.client.annotations;
1919

20+
import java.lang.annotation.ElementType;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
23+
import java.lang.annotation.Target;
2224

2325
@Retention(RetentionPolicy.RUNTIME)
26+
@Target(value = {ElementType.TYPE})
2427
public @interface Template {
2528
public static final String VALUE = "value";
2629
public String value();

0 commit comments

Comments
 (0)