Skip to content

Commit 34647af

Browse files
author
Greg Meyer
authored
Merge pull request #7 from DirectProjectJavaRI/develop
Releasing 8.0.0
2 parents a7d70c5 + 9d52c47 commit 34647af

File tree

80 files changed

+540
-2096
lines changed

Some content is hidden

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

80 files changed

+540
-2096
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@
2323
hs_err_pid*
2424
/.project
2525
/.classpath
26+
/embedded-db/
27+
/target/

‎pom.xml‎

Lines changed: 67 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.nhind</groupId>
55
<artifactId>config-store</artifactId>
6-
<version>7.0</version>
6+
<version>8.0.0</version>
77
<packaging>jar</packaging>
88
<name>NHIN Direct Java RI - Configuration Persistence Layer</name>
99
<description>NHIN Direct Security And Trust Agent</description>
@@ -13,13 +13,14 @@
1313
<connection>scm:git:https://github.com/DirectProjectJavaRI/config-store.git</connection>
1414
</scm>
1515
<prerequisites>
16-
<maven>3.0.0</maven>
16+
<maven>3.5.0</maven>
1717
</prerequisites>
18-
<parent>
18+
<parent>
1919
<groupId>org.springframework.boot</groupId>
2020
<artifactId>spring-boot-dependencies</artifactId>
21-
<version>2.2.4.RELEASE</version>
22-
</parent>
21+
<version>2.5.2</version>
22+
<relativePath />
23+
</parent>
2324
<developers>
2425
<developer>
2526
<name>Pat Pyette</name>
@@ -48,28 +49,23 @@
4849
<url>http://nhindirect.org/BSDLicense</url>
4950
</license>
5051
</licenses>
51-
<repositories>
52-
<repository>
53-
<id>spring-milestones</id>
54-
<name>Spring Milestones</name>
55-
<url>https://repo.spring.io/milestone</url>
56-
</repository>
57-
</repositories>
52+
<properties>
53+
<dnsjava.version>3.3.1</dnsjava.version>
54+
<dsn.version>1.6.7</dsn.version>
55+
<commons-io.version>2.8.0</commons-io.version>
56+
<commons-collections4.version>4.4</commons-collections4.version>
57+
<bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
58+
<joda-time.version>2.10.9</joda-time.version>
59+
</properties>
5860
<dependencies>
5961
<dependency>
6062
<groupId>org.springframework.boot</groupId>
6163
<artifactId>spring-boot-starter</artifactId>
62-
</dependency>
64+
</dependency>
6365
<dependency>
64-
<groupId>org.flywaydb</groupId>
65-
<artifactId>flyway-core</artifactId>
66-
<version>6.1.4</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.data</groupId>
70-
<artifactId>spring-data-r2dbc</artifactId>
71-
<version>1.0.0.RELEASE</version>
72-
</dependency>
66+
<groupId>org.springframework.boot</groupId>
67+
<artifactId>spring-boot-starter-data-r2dbc</artifactId>
68+
</dependency>
7369
<dependency>
7470
<groupId>io.projectreactor</groupId>
7571
<artifactId>reactor-test</artifactId>
@@ -78,47 +74,47 @@
7874
<dependency>
7975
<groupId>org.nhind</groupId>
8076
<artifactId>direct-policy</artifactId>
81-
<version>7.0</version>
77+
<version>8.0.0</version>
8278
</dependency>
8379
<dependency>
8480
<groupId>org.nhind</groupId>
8581
<artifactId>config-model</artifactId>
86-
<version>7.0</version>
82+
<version>8.0.0</version>
8783
</dependency>
8884
<dependency>
8985
<groupId>org.nhind</groupId>
9086
<artifactId>direct-common</artifactId>
91-
<version>7.0</version>
87+
<version>8.0.0</version>
9288
</dependency>
9389
<dependency>
9490
<groupId>commons-io</groupId>
9591
<artifactId>commons-io</artifactId>
96-
<version>2.6</version>
97-
</dependency>
92+
<version>${commons-io.version}</version>
93+
</dependency>
9894
<dependency>
9995
<groupId>org.apache.commons</groupId>
10096
<artifactId>commons-collections4</artifactId>
101-
<version>4.4</version>
102-
</dependency>
97+
<version>${commons-collections4.version}</version>
98+
</dependency>
10399
<dependency>
104100
<groupId>org.bouncycastle</groupId>
105101
<artifactId>bcprov-jdk15on</artifactId>
106-
<version>1.64</version>
107-
</dependency>
102+
<version>${bcprov-jdk15on.version}</version>
103+
</dependency>
108104
<dependency>
109105
<groupId>dnsjava</groupId>
110106
<artifactId>dnsjava</artifactId>
111-
<version>2.0.8</version>
112-
</dependency>
107+
<version>${dnsjava.version}</version>
108+
</dependency>
113109
<dependency>
114110
<groupId>joda-time</groupId>
115-
<artifactId>joda-time</artifactId>
116-
</dependency>
117-
<dependency>
118-
<groupId>org.mockito</groupId>
119-
<artifactId>mockito-core</artifactId>
120-
<scope>test</scope>
121-
</dependency>
111+
<artifactId>joda-time</artifactId>
112+
<version>${joda-time.version}</version>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.projectlombok</groupId>
116+
<artifactId>lombok</artifactId>
117+
</dependency>
122118
<dependency>
123119
<groupId>org.springframework</groupId>
124120
<artifactId>spring-test</artifactId>
@@ -128,47 +124,36 @@
128124
<groupId>org.springframework.boot</groupId>
129125
<artifactId>spring-boot-starter-test</artifactId>
130126
<scope>test</scope>
131-
</dependency>
132-
<dependency>
133-
<groupId>junit</groupId>
134-
<artifactId>junit</artifactId>
135-
<type>jar</type>
136-
<scope>test</scope>
137-
</dependency>
127+
</dependency>
138128
<dependency>
139129
<groupId>com.h2database</groupId>
140130
<artifactId>h2</artifactId>
141131
<scope>test</scope>
142132
</dependency>
143-
<dependency>
144-
<groupId>org.springframework.boot.experimental</groupId>
145-
<artifactId>spring-boot-starter-r2dbc-h2</artifactId>
146-
<version>0.1.0.M1</version>
147-
<scope>test</scope>
148-
</dependency>
149133
<dependency>
150134
<groupId>io.r2dbc</groupId>
151135
<artifactId>r2dbc-h2</artifactId>
152-
<version>0.8.1.RELEASE</version>
153136
<scope>test</scope>
154-
</dependency>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.hsqldb</groupId>
140+
<artifactId>hsqldb</artifactId>
141+
<scope>test</scope>
142+
</dependency>
155143
</dependencies>
156144
<build>
157145
<extensions>
158146
<extension>
159147
<groupId>org.apache.maven.wagon</groupId>
160148
<artifactId>wagon-webdav-jackrabbit</artifactId>
161-
<version>3.1.0</version>
162149
</extension>
163150
<extension>
164151
<groupId>org.apache.maven.wagon</groupId>
165152
<artifactId>wagon-ssh-external</artifactId>
166-
<version>3.1.0</version>
167153
</extension>
168154
<extension>
169155
<groupId>org.apache.maven.wagon</groupId>
170156
<artifactId>wagon-ssh</artifactId>
171-
<version>3.1.0</version>
172157
</extension>
173158
</extensions>
174159
<resources>
@@ -208,6 +193,7 @@
208193
<plugin>
209194
<groupId>org.apache.maven.plugins</groupId>
210195
<artifactId>maven-jxr-plugin</artifactId>
196+
<version>3.1.1</version>
211197
</plugin>
212198
<plugin>
213199
<groupId>org.apache.maven.plugins</groupId>
@@ -229,35 +215,27 @@
229215
<target>1.8</target>
230216
</configuration>
231217
</plugin>
232-
<plugin>
233-
<groupId>org.apache.maven.plugins</groupId>
234-
<artifactId>maven-jar-plugin</artifactId>
235-
<configuration>
236-
<archive>
237-
<index>true</index>
238-
<!--
239-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
240-
-->
241-
</archive>
242-
</configuration>
243-
</plugin>
244-
<plugin>
245-
<groupId>org.apache.maven.plugins</groupId>
246-
<artifactId>maven-jar-plugin</artifactId>
247-
<executions>
248-
<execution>
249-
<goals>
250-
<goal>test-jar</goal>
251-
</goals>
252-
</execution>
253-
</executions>
254-
</plugin>
218+
<plugin>
219+
<groupId>org.apache.maven.plugins</groupId>
220+
<artifactId>maven-jar-plugin</artifactId>
221+
<configuration>
222+
<archive>
223+
<index>true</index>
224+
</archive>
225+
</configuration>
226+
<executions>
227+
<execution>
228+
<goals>
229+
<goal>test-jar</goal>
230+
</goals>
231+
</execution>
232+
</executions>
233+
</plugin>
255234
<plugin>
256235
<groupId>org.apache.maven.plugins</groupId>
257236
<artifactId>maven-javadoc-plugin</artifactId>
258-
<version>3.0.1</version>
259237
<configuration>
260-
<additionalparam>-Xdoclint:none</additionalparam>
238+
<additionalJOption>-Xdoclint:none</additionalJOption>
261239
<failOnError>false</failOnError>
262240
<charset>UTF-8</charset>
263241
<docencoding>UTF-8</docencoding>
@@ -275,7 +253,8 @@
275253
</goals>
276254
</execution>
277255
</executions>
278-
</plugin>
256+
</plugin>
257+
<!-- for releases only
279258
<plugin>
280259
<groupId>org.apache.maven.plugins</groupId>
281260
<artifactId>maven-gpg-plugin</artifactId>
@@ -288,22 +267,22 @@
288267
</goals>
289268
</execution>
290269
</executions>
270+
<version>3.0.1</version>
291271
</plugin>
272+
-->
292273
</plugins>
293274
</build>
294275
<reporting>
295276
<plugins>
296277
<plugin>
297278
<groupId>org.apache.maven.plugins</groupId>
298279
<artifactId>maven-project-info-reports-plugin</artifactId>
299-
<version>2.9</version>
300280
</plugin>
301281
<plugin>
302282
<groupId>org.apache.maven.plugins</groupId>
303283
<artifactId>maven-javadoc-plugin</artifactId>
304-
<version>3.0.1</version>
305284
<configuration>
306-
<additionalparam>-Xdoclint:none</additionalparam>
285+
<additionalJOption>-Xdoclint:none</additionalJOption>
307286
<failOnError>false</failOnError>
308287
<charset>UTF-8</charset>
309288
<docencoding>UTF-8</docencoding>
@@ -326,11 +305,11 @@
326305
<plugin>
327306
<groupId>org.apache.maven.plugins</groupId>
328307
<artifactId>maven-jxr-plugin</artifactId>
308+
<version>3.1.1</version>
329309
</plugin>
330310
<plugin>
331311
<groupId>org.codehaus.mojo</groupId>
332312
<artifactId>findbugs-maven-plugin</artifactId>
333-
<version>2.3.2</version>
334313
<configuration>
335314
<effort>Max</effort>
336315
</configuration>

‎src/main/java/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/main/java/META-INF/persistence.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/java/org/nhindirect/config/repository/AddressRepository.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,22 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
2525

2626
import org.nhindirect.config.store.Address;
2727
import org.nhindirect.config.store.EntityStatus;
28-
import org.springframework.data.r2dbc.repository.Query;
2928
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
3029

3130
import reactor.core.publisher.Flux;
3231
import reactor.core.publisher.Mono;
3332

3433
public interface AddressRepository extends ReactiveCrudRepository<Address, Long>
3534
{
36-
@Query("select * from address a where upper(a.emailAddress) = upper(:emailAddress)")
3735
public Mono<Address> findByEmailAddressIgnoreCase(String emailAddress);
3836

39-
@Query("select * from address a where upper(a.endpoint) = upper(:endpoint)")
4037
public Flux<Address> findByEndpointIgnoreCase(String endpoint);
4138

42-
@Query("select * from address a where upper(a.emailAddress) in (:emailAddresses) and a.status = :status")
4339
public Flux<Address> findByEmailAddressInIgnoreCaseAndStatus(List<String> emailAddresses, EntityStatus status);
4440

45-
@Query("select * from address a where a.domainId = :domainId")
4641
public Flux<Address> findByDomainId(Long domainId);
4742

48-
@Query("delete from address where domainId = :domainId")
4943
public Mono<Void> deleteByDomainId(Long domainId);
5044

51-
@Query("delete from address where upper(emailAddress) = upper(:emailAddress)")
5245
public Mono<Void> deleteByEmailAddressIgnoreCase(String emailAddress);
5346
}

‎src/main/java/org/nhindirect/config/repository/AnchorRepository.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
2424
import java.util.List;
2525

2626
import org.nhindirect.config.store.Anchor;
27-
import org.springframework.data.r2dbc.repository.Query;
2827
import org.springframework.data.repository.query.Param;
2928
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
3029
import org.springframework.transaction.annotation.Transactional;
@@ -34,20 +33,14 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
3433

3534
public interface AnchorRepository extends ReactiveCrudRepository<Anchor, Long>
3635
{
37-
@Transactional
38-
@Query("select * from anchor a where upper(a.owner) = upper(:owner)")
3936
public Flux<Anchor> findByOwnerIgnoreCase(String owner);
4037

41-
@Transactional
42-
@Query("select * from anchor a where upper(a.owner) in upper(:owners)")
4338
public Flux<Anchor> findByOwnerInIgnoreCase(@Param("owners") List<String> owners);
4439

4540
@Transactional
46-
@Query("delete from anchor where upper(owner) = upper(:owner)")
4741
public Mono<Void> deleteByOwnerIgnoreCase(String owner);
4842

4943
@Transactional
50-
@Query("delete from anchor where id in (:ids)")
5144
public Mono<Void> deleteByIdIn(List<Long> ids);
5245

5346
}

0 commit comments

Comments
 (0)