Skip to content

Commit 0d55afa

Browse files
gregturngregturn
committed
#728 - Polishing.
* Fix up issues reported by Jens. * Add extra tests showing encoding as well as decoding. * Properly handle Reactor types on WebFlux inputs. * Update CI to account for the upgrade to Spring Framework 5.2.
1 parent e887f06 commit 0d55afa

27 files changed

+1466
-920
lines changed

‎ci/pipeline-template.yml

Lines changed: 1 addition & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,8 @@ groups:
7979
- name: spring-hateoas
8080
jobs:
8181
- Test - JDK 8
82-
- Test - JDK 8 and Spring 5.0 (snapshots)
83-
- Test - JDK 8 and Spring 5.1 (snapshots)
8482
- Test - JDK 11
85-
- Test - JDK 11 and Spring 5.0 (snapshots)
86-
- Test - JDK 11 and Spring 5.1 (snapshots)
8783
- Test - JDK 13
88-
- Test - JDK 13 and Spring 5.0 (snapshots)
89-
- Test - JDK 13 and Spring 5.1 (snapshots)
9084
- Build
9185
- name: pull-requests
9286
jobs:
@@ -106,32 +100,6 @@ jobs:
106100
params: { PROFILE: "non-existent" }
107101
<<: *slack-failure
108102

109-
- name: Test - JDK 8 and Spring 5.0 (snapshots)
110-
serial: true
111-
public: true
112-
plan:
113-
- get: spring-hateoas-github
114-
trigger: true
115-
- get: openjdk:8-jdk
116-
trigger: true
117-
- task: test
118-
file: spring-hateoas-github/ci/test.yml
119-
params: { PROFILE: "spring5-next" }
120-
<<: *slack-failure
121-
122-
- name: Test - JDK 8 and Spring 5.1 (snapshots)
123-
serial: true
124-
public: true
125-
plan:
126-
- get: spring-hateoas-github
127-
trigger: true
128-
- get: openjdk:8-jdk
129-
trigger: true
130-
- task: test
131-
file: spring-hateoas-github/ci/test.yml
132-
params: { PROFILE: "spring51-next" }
133-
<<: *slack-failure
134-
135103
- name: Test - JDK 11
136104
serial: true
137105
public: true
@@ -146,34 +114,6 @@ jobs:
146114
params: { PROFILE: "non-existant" }
147115
<<: *slack-failure
148116

149-
- name: Test - JDK 11 and Spring 5.0 (snapshots)
150-
serial: true
151-
public: true
152-
plan:
153-
- get: spring-hateoas-github
154-
trigger: true
155-
- get: openjdk:11-jdk
156-
trigger: true
157-
- task: test
158-
image: openjdk:11-jdk
159-
file: spring-hateoas-github/ci/test.yml
160-
params: { PROFILE: "spring5-next" }
161-
<<: *slack-failure
162-
163-
- name: Test - JDK 11 and Spring 5.1 (snapshots)
164-
serial: true
165-
public: true
166-
plan:
167-
- get: spring-hateoas-github
168-
trigger: true
169-
- get: openjdk:11-jdk
170-
trigger: true
171-
- task: test
172-
image: openjdk:11-jdk
173-
file: spring-hateoas-github/ci/test.yml
174-
params: { PROFILE: "spring51-next" }
175-
<<: *slack-failure
176-
177117
- name: Test - JDK 13
178118
serial: true
179119
public: true
@@ -188,34 +128,6 @@ jobs:
188128
params: { PROFILE: "non-existant" }
189129
<<: *slack-failure
190130

191-
- name: Test - JDK 13 and Spring 5.0 (snapshots)
192-
serial: true
193-
public: true
194-
plan:
195-
- get: spring-hateoas-github
196-
trigger: true
197-
- get: openjdk:13-jdk
198-
trigger: true
199-
- task: test
200-
image: openjdk:13-jdk
201-
file: spring-hateoas-github/ci/test.yml
202-
params: { PROFILE: "spring5-next" }
203-
<<: *slack-failure
204-
205-
- name: Test - JDK 13 and Spring 5.1 (snapshots)
206-
serial: true
207-
public: true
208-
plan:
209-
- get: spring-hateoas-github
210-
trigger: true
211-
- get: openjdk:13-jdk
212-
trigger: true
213-
- task: test
214-
image: openjdk:13-jdk
215-
file: spring-hateoas-github/ci/test.yml
216-
params: { PROFILE: "spring51-next" }
217-
<<: *slack-failure
218-
219131
- name: Build
220132
serial: true
221133
public: true
@@ -224,14 +136,8 @@ jobs:
224136
trigger: true
225137
passed: [
226138
Test - JDK 8,
227-
Test - JDK 8 and Spring 5.0 (snapshots),
228-
Test - JDK 8 and Spring 5.1 (snapshots),
229139
Test - JDK 11,
230-
Test - JDK 11 and Spring 5.0 (snapshots),
231-
Test - JDK 11 and Spring 5.1 (snapshots),
232-
Test - JDK 13,
233-
Test - JDK 13 and Spring 5.0 (snapshots),
234-
Test - JDK 13 and Spring 5.1 (snapshots)
140+
Test - JDK 13
235141
]
236142
- put: spring-hateoas-status
237143
params:
@@ -299,36 +205,14 @@ jobs:
299205
- task: test (JDK 8)
300206
file: spring-hateoas-github/ci/test.yml
301207
params: { PROFILE: "non-existent" }
302-
- task: test (JDK 8 and Spring 5.0 snapshots)
303-
file: spring-hateoas-github/ci/test.yml
304-
params: { PROFILE: "spring5-next" }
305-
- task: test (JDK 8 and Spring 5.1 snapshots)
306-
file: spring-hateoas-github/ci/test.yml
307-
params: { PROFILE: "spring51-next" }
308208
- task: test (JDK 11)
309209
image: openjdk:11-jdk
310210
file: spring-hateoas-github/ci/test.yml
311211
params: { PROFILE: "non-existent" }
312-
- task: test (JDK 11 and Spring 5.0 snapshots)
313-
image: openjdk:11-jdk
314-
file: spring-hateoas-github/ci/test.yml
315-
params: { PROFILE: "spring5-next" }
316-
- task: test (JDK 11 and Spring 5.1 snapshots)
317-
image: openjdk:11-jdk
318-
file: spring-hateoas-github/ci/test.yml
319-
params: { PROFILE: "spring51-next" }
320212
- task: test (JDK 13)
321213
image: openjdk:13-jdk
322214
file: spring-hateoas-github/ci/test.yml
323215
params: { PROFILE: "non-existent" }
324-
- task: test (JDK 13 and Spring 5.0 snapshots)
325-
image: openjdk:13-jdk
326-
file: spring-hateoas-github/ci/test.yml
327-
params: { PROFILE: "spring5-next" }
328-
- task: test (JDK 13 and Spring 5.1 snapshots)
329-
image: openjdk:13-jdk
330-
file: spring-hateoas-github/ci/test.yml
331-
params: { PROFILE: "spring51-next" }
332216
on_failure:
333217
aggregate:
334218
- put: spring-hateoas-pull-requests

‎pom.xml

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -85,33 +85,7 @@
8585
</properties>
8686

8787
<profiles>
88-
89-
<profile>
90-
<id>spring5-next</id>
91-
<properties>
92-
</properties>
93-
<repositories>
94-
<repository>
95-
<id>spring-libs-snapshot</id>
96-
<url>http://repo.spring.io/libs-snapshot</url>
97-
</repository>
98-
</repositories>
99-
</profile>
100-
101-
<profile>
102-
<id>spring51-next</id>
103-
<properties>
104-
</properties>
105-
<dependencies>
106-
</dependencies>
107-
<repositories>
108-
<repository>
109-
<id>spring-libs-snapshot</id>
110-
<url>http://repo.spring.io/libs-snapshot</url>
111-
</repository>
112-
</repositories>
113-
</profile>
114-
88+
11589
<profile>
11690

11791
<!-- Profile to be run on the CI server, JARs JavaDocs -->
@@ -653,6 +627,12 @@
653627
<artifactId>reactor-test</artifactId>
654628
<scope>test</scope>
655629
</dependency>
630+
631+
<dependency>
632+
<groupId>io.projectreactor.addons</groupId>
633+
<artifactId>reactor-extra</artifactId>
634+
<scope>test</scope>
635+
</dependency>
656636

657637
<!-- Needs to be after Jadler to make sure it sees the Servlet 3.0 dependency pulled in for testing -->
658638

‎readme.adoc

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ Check the matrix below to see the status of supported versions:
2323
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.x/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"]
2424

2525
| Test - JDK 8 and Spring 5.0 (snapshots)
26-
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
26+
|
2727
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
2828
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
2929

3030
| Test - JDK 8 and Spring 5.1 (snapshots)
31-
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
31+
|
3232
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
3333
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.x/jobs/Test%20-%20JDK%208%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
3434

@@ -37,31 +37,11 @@ Check the matrix below to see the status of supported versions:
3737
| Not supported
3838
| Not supported
3939

40-
| Test - JDK 11 and Spring 5.0 (snapshots)
41-
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
42-
| Not supported
43-
| Not supported
44-
45-
| Test - JDK 11 and Spring 5.1 (snapshots)
46-
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2011%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
47-
| Not supported
48-
| Not supported
49-
5040
| Test - JDK 13
5141
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
5242
| Not supported
5343
| Not supported
5444

55-
| Test - JDK 13 and Spring 5.0 (snapshots)
56-
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013%20and%20Spring%205.0%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
57-
| Not supported
58-
| Not supported
59-
60-
| Test - JDK 13 and Spring 5.1 (snapshots)
61-
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Test%20-%20JDK%2013%20and%20Spring%205.1%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
62-
| Not supported
63-
| Not supported
64-
6545
| Build - Release to repo.spring.io
6646
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas/jobs/Build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas"]
6747
| image:https://ci.spring.io/api/v1/teams/spring-data/pipelines/spring-hateoas-0.25.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-data/pipelines/spring-hateoas-0.25.x"]

0 commit comments

Comments
 (0)