Skip to content

Commit 6972f7b

Browse files
nebhalenebhale
committed
Merge branch '3.x'
Signed-off-by: Ben Hale <[email protected]>
2 parents e36330d + 37e3648 commit 6972f7b

17 files changed

+169
-4
lines changed

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
import org.cloudfoundry.client.v3.processes.HealthCheck;
8787
import org.cloudfoundry.client.v3.processes.HealthCheckType;
8888
import org.cloudfoundry.client.v3.processes.PortMapping;
89+
import org.cloudfoundry.client.v3.processes.ProcessRelationships;
8990
import org.cloudfoundry.client.v3.processes.ProcessResource;
9091
import org.cloudfoundry.client.v3.processes.ProcessState;
9192
import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
@@ -521,6 +522,12 @@ public void getProcess() {
521522
.endpoint(null)
522523
.build())
523524
.build())
525+
.metadata(Metadata.builder()
526+
.annotations(Collections.emptyMap())
527+
.labels(Collections.emptyMap())
528+
.build())
529+
.relationships(ProcessRelationships.builder()
530+
.build())
524531
.createdAt("2016-03-23T18:48:22Z")
525532
.updatedAt("2016-03-23T18:48:42Z")
526533
.link("self", Link.builder()
@@ -576,7 +583,9 @@ public void getProcessStatistics() {
576583
.host("10.244.16.10")
577584
.instancePort(PortMapping.builder()
578585
.external(64546)
586+
.externalTlsProxyPort(1234)
579587
.internal(8080)
588+
.internalTlsProxyPort(5678)
580589
.build())
581590
.uptime(9042)
582591
.memoryQuota(268435456)
@@ -1006,6 +1015,12 @@ public void listProcesses() {
10061015
.endpoint(null)
10071016
.build())
10081017
.build())
1018+
.metadata(Metadata.builder()
1019+
.annotations(Collections.emptyMap())
1020+
.labels(Collections.emptyMap())
1021+
.build())
1022+
.relationships(ProcessRelationships.builder()
1023+
.build())
10091024
.createdAt("2016-03-23T18:48:22Z")
10101025
.updatedAt("2016-03-23T18:48:42Z")
10111026
.link("self", Link.builder()
@@ -1039,6 +1054,12 @@ public void listProcesses() {
10391054
.endpoint(null)
10401055
.build())
10411056
.build())
1057+
.metadata(Metadata.builder()
1058+
.annotations(Collections.emptyMap())
1059+
.labels(Collections.emptyMap())
1060+
.build())
1061+
.relationships(ProcessRelationships.builder()
1062+
.build())
10421063
.createdAt("2016-03-23T18:48:22Z")
10431064
.updatedAt("2016-03-23T18:48:42Z")
10441065
.link("self", Link.builder()
@@ -1188,6 +1209,12 @@ public void scale() {
11881209
.endpoint(null)
11891210
.build())
11901211
.build())
1212+
.metadata(Metadata.builder()
1213+
.annotations(Collections.emptyMap())
1214+
.labels(Collections.emptyMap())
1215+
.build())
1216+
.relationships(ProcessRelationships.builder()
1217+
.build())
11911218
.createdAt("2016-03-23T18:48:22Z")
11921219
.updatedAt("2016-03-23T18:48:42Z")
11931220
.link("self", Link.builder()

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/isolationsegments/ReactorIsolationSegmentsTest.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.cloudfoundry.reactor.client.v3.isolationsegments;
1818

1919
import org.cloudfoundry.client.v3.Link;
20+
import org.cloudfoundry.client.v3.Metadata;
2021
import org.cloudfoundry.client.v3.Pagination;
2122
import org.cloudfoundry.client.v3.Relationship;
2223
import org.cloudfoundry.client.v3.isolationsegments.AddIsolationSegmentOrganizationEntitlementRequest;
@@ -47,6 +48,7 @@
4748
import reactor.test.StepVerifier;
4849

4950
import java.time.Duration;
51+
import java.util.Collections;
5052

5153
import static io.netty.handler.codec.http.HttpMethod.DELETE;
5254
import static io.netty.handler.codec.http.HttpMethod.GET;
@@ -314,12 +316,20 @@ public void listEntitledOrganizations() {
314316
.build())
315317
.resource(OrganizationResource.builder()
316318
.id("885735b5-aea4-4cf5-8e44-961af0e41920")
319+
.metadata(Metadata.builder()
320+
.annotations(Collections.emptyMap())
321+
.labels(Collections.emptyMap())
322+
.build())
317323
.createdAt("2017-02-01T01:33:58Z")
318324
.updatedAt("2017-02-01T01:33:58Z")
319325
.name("org1")
320326
.build())
321327
.resource(OrganizationResource.builder()
322328
.id("d4c91047-7b29-4fda-b7f9-04033e5c9c9f")
329+
.metadata(Metadata.builder()
330+
.annotations(Collections.emptyMap())
331+
.labels(Collections.emptyMap())
332+
.build())
323333
.createdAt("2017-02-02T00:14:30Z")
324334
.updatedAt("2017-02-02T00:14:30Z")
325335
.name("org2")

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/organizations/ReactorOrganizationsV3Test.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.cloudfoundry.reactor.client.v3.organizations;
1818

1919
import org.cloudfoundry.client.v3.Link;
20+
import org.cloudfoundry.client.v3.Metadata;
2021
import org.cloudfoundry.client.v3.Pagination;
2122
import org.cloudfoundry.client.v3.Relationship;
2223
import org.cloudfoundry.client.v3.organizations.AssignOrganizationDefaultIsolationSegmentRequest;
@@ -38,6 +39,7 @@
3839
import reactor.test.StepVerifier;
3940

4041
import java.time.Duration;
42+
import java.util.Collections;
4143

4244
import static io.netty.handler.codec.http.HttpMethod.GET;
4345
import static io.netty.handler.codec.http.HttpMethod.PATCH;
@@ -108,6 +110,10 @@ public void create() {
108110
.link("self", Link.builder()
109111
.href("https://api.example.org/v3/organizations/24637893-3b77-489d-bb79-8466f0d88b52")
110112
.build())
113+
.metadata(Metadata.builder()
114+
.annotations(Collections.emptyMap())
115+
.labels(Collections.emptyMap())
116+
.build())
111117
.name("my-organization")
112118
.updatedAt("2017-02-01T01:33:58Z")
113119
.build())
@@ -138,6 +144,10 @@ public void get() {
138144
.link("self", Link.builder()
139145
.href("https://api.example.org/v3/organizations/24637893-3b77-489d-bb79-8466f0d88b52")
140146
.build())
147+
.metadata(Metadata.builder()
148+
.annotations(Collections.emptyMap())
149+
.labels(Collections.emptyMap())
150+
.build())
141151
.name("my-organization")
142152
.updatedAt("2017-02-01T01:33:58Z")
143153
.build())
@@ -206,12 +216,20 @@ public void list() {
206216
.build())
207217
.resource(OrganizationResource.builder()
208218
.id("885735b5-aea4-4cf5-8e44-961af0e41920")
219+
.metadata(Metadata.builder()
220+
.annotations(Collections.emptyMap())
221+
.labels(Collections.emptyMap())
222+
.build())
209223
.createdAt("2017-02-01T01:33:58Z")
210224
.updatedAt("2017-02-01T01:33:58Z")
211225
.name("org1")
212226
.build())
213227
.resource(OrganizationResource.builder()
214228
.id("d4c91047-7b29-4fda-b7f9-04033e5c9c9f")
229+
.metadata(Metadata.builder()
230+
.annotations(Collections.emptyMap())
231+
.labels(Collections.emptyMap())
232+
.build())
215233
.createdAt("2017-02-02T00:14:30Z")
216234
.updatedAt("2017-02-02T00:14:30Z")
217235
.name("org2")

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/processes/ReactorProcessesTest.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.cloudfoundry.reactor.client.v3.processes;
1818

1919
import org.cloudfoundry.client.v3.Link;
20+
import org.cloudfoundry.client.v3.Metadata;
2021
import org.cloudfoundry.client.v3.Pagination;
2122
import org.cloudfoundry.client.v3.processes.Data;
2223
import org.cloudfoundry.client.v3.processes.GetProcessRequest;
@@ -28,6 +29,7 @@
2829
import org.cloudfoundry.client.v3.processes.ListProcessesRequest;
2930
import org.cloudfoundry.client.v3.processes.ListProcessesResponse;
3031
import org.cloudfoundry.client.v3.processes.PortMapping;
32+
import org.cloudfoundry.client.v3.processes.ProcessRelationships;
3133
import org.cloudfoundry.client.v3.processes.ProcessResource;
3234
import org.cloudfoundry.client.v3.processes.ProcessState;
3335
import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
@@ -45,6 +47,7 @@
4547
import reactor.test.StepVerifier;
4648

4749
import java.time.Duration;
50+
import java.util.Collections;
4851

4952
import static io.netty.handler.codec.http.HttpMethod.DELETE;
5053
import static io.netty.handler.codec.http.HttpMethod.GET;
@@ -109,6 +112,12 @@ public void get() {
109112
.endpoint(null)
110113
.build())
111114
.build())
115+
.metadata(Metadata.builder()
116+
.annotations(Collections.emptyMap())
117+
.labels(Collections.emptyMap())
118+
.build())
119+
.relationships(ProcessRelationships.builder()
120+
.build())
112121
.createdAt("2016-03-23T18:48:22Z")
113122
.updatedAt("2016-03-23T18:48:42Z")
114123
.link("self", Link.builder()
@@ -163,7 +172,9 @@ public void getProcessStatistics() {
163172
.host("10.244.16.10")
164173
.instancePort(PortMapping.builder()
165174
.external(64546)
175+
.externalTlsProxyPort(1234)
166176
.internal(8080)
177+
.internalTlsProxyPort(5678)
167178
.build())
168179
.uptime(9042)
169180
.memoryQuota(268435456)
@@ -219,6 +230,12 @@ public void list() {
219230
.endpoint(null)
220231
.build())
221232
.build())
233+
.metadata(Metadata.builder()
234+
.annotations(Collections.emptyMap())
235+
.labels(Collections.emptyMap())
236+
.build())
237+
.relationships(ProcessRelationships.builder()
238+
.build())
222239
.createdAt("2016-03-23T18:48:22Z")
223240
.updatedAt("2016-03-23T18:48:42Z")
224241
.link("self", Link.builder()
@@ -252,6 +269,12 @@ public void list() {
252269
.endpoint(null)
253270
.build())
254271
.build())
272+
.metadata(Metadata.builder()
273+
.annotations(Collections.emptyMap())
274+
.labels(Collections.emptyMap())
275+
.build())
276+
.relationships(ProcessRelationships.builder()
277+
.build())
255278
.createdAt("2016-03-23T18:48:22Z")
256279
.updatedAt("2016-03-23T18:48:42Z")
257280
.link("self", Link.builder()
@@ -311,6 +334,12 @@ public void scale() {
311334
.endpoint(null)
312335
.build())
313336
.build())
337+
.metadata(Metadata.builder()
338+
.annotations(Collections.emptyMap())
339+
.labels(Collections.emptyMap())
340+
.build())
341+
.relationships(ProcessRelationships.builder()
342+
.build())
314343
.createdAt("2016-03-23T18:48:22Z")
315344
.updatedAt("2016-03-23T18:48:42Z")
316345
.link("self", Link.builder()
@@ -367,6 +396,12 @@ public void update() {
367396
.endpoint(null)
368397
.build())
369398
.build())
399+
.metadata(Metadata.builder()
400+
.annotations(Collections.emptyMap())
401+
.labels(Collections.emptyMap())
402+
.build())
403+
.relationships(ProcessRelationships.builder()
404+
.build())
370405
.createdAt("2016-03-23T18:48:22Z")
371406
.updatedAt("2016-03-23T18:48:42Z")
372407
.link("self", Link.builder()

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/GET_{id}_processes_response.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
"endpoint": null
2929
}
3030
},
31+
"metadata": {
32+
"annotations": {},
33+
"labels": {}
34+
},
35+
"relationships": {},
3136
"created_at": "2016-03-23T18:48:22Z",
3237
"updated_at": "2016-03-23T18:48:42Z",
3338
"links": {
@@ -63,6 +68,11 @@
6368
"endpoint": null
6469
}
6570
},
71+
"metadata": {
72+
"annotations": {},
73+
"labels": {}
74+
},
75+
"relationships": {},
6676
"created_at": "2016-03-23T18:48:22Z",
6777
"updated_at": "2016-03-23T18:48:42Z",
6878
"links": {

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/GET_{id}_processes_{type}_response.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"endpoint": null
1313
}
1414
},
15+
"metadata": {
16+
"annotations": {},
17+
"labels": {}
18+
},
19+
"relationships": {},
1520
"created_at": "2016-03-23T18:48:22Z",
1621
"updated_at": "2016-03-23T18:48:42Z",
1722
"links": {

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/GET_{id}_processes_{type}_stats_response.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
"instance_ports": [
1515
{
1616
"external": 64546,
17-
"internal": 8080
17+
"external_tls_proxy_port": 1234,
18+
"internal": 8080,
19+
"internal_tls_proxy_port": 5678
1820
}
1921
],
2022
"uptime": 9042,

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/PUT_{id}_processes_{type}_actions_scale_response.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"endpoint": null
1313
}
1414
},
15+
"metadata": {
16+
"annotations": {},
17+
"labels": {}
18+
},
19+
"relationships": {},
1520
"created_at": "2016-03-23T18:48:22Z",
1621
"updated_at": "2016-03-23T18:48:42Z",
1722
"links": {

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/isolation_segments/GET_{id}_organizations_response.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@
1414
"resources": [
1515
{
1616
"guid": "885735b5-aea4-4cf5-8e44-961af0e41920",
17+
"metadata": {
18+
"annotations": {},
19+
"labels": {}
20+
},
1721
"created_at": "2017-02-01T01:33:58Z",
1822
"updated_at": "2017-02-01T01:33:58Z",
1923
"name": "org1",
2024
"links": {}
2125
},
2226
{
2327
"guid": "d4c91047-7b29-4fda-b7f9-04033e5c9c9f",
28+
"metadata": {
29+
"annotations": {},
30+
"labels": {}
31+
},
2432
"created_at": "2017-02-02T00:14:30Z",
2533
"updated_at": "2017-02-02T00:14:30Z",
2634
"name": "org2",

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/organizations/GET_response.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@
1414
"resources": [
1515
{
1616
"guid": "885735b5-aea4-4cf5-8e44-961af0e41920",
17+
"metadata": {
18+
"annotations": {},
19+
"labels": {}
20+
},
1721
"created_at": "2017-02-01T01:33:58Z",
1822
"updated_at": "2017-02-01T01:33:58Z",
1923
"name": "org1",
2024
"links": {}
2125
},
2226
{
2327
"guid": "d4c91047-7b29-4fda-b7f9-04033e5c9c9f",
28+
"metadata": {
29+
"annotations": {},
30+
"labels": {}
31+
},
2432
"created_at": "2017-02-02T00:14:30Z",
2533
"updated_at": "2017-02-02T00:14:30Z",
2634
"name": "org2",

0 commit comments

Comments
 (0)