Skip to content

Commit 5eeeb36

Browse files
nebhalenebhale
committed
Fix hidden compile failures
1 parent b158614 commit 5eeeb36

File tree

4 files changed

+74
-37
lines changed

4 files changed

+74
-37
lines changed

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

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.cloudfoundry.reactor.client.v3.applications;
1818

19+
import org.cloudfoundry.client.v3.BuildpackData;
1920
import org.cloudfoundry.client.v3.Lifecycle;
2021
import org.cloudfoundry.client.v3.Link;
2122
import org.cloudfoundry.client.v3.PaginatedResponse;
@@ -121,8 +122,10 @@ protected AssignApplicationDropletResponse getResponse() {
121122
.updatedAt("2016-01-26T22:20:35Z")
122123
.lifecycle(Lifecycle.builder()
123124
.type("buildpack")
124-
.data("buildpack", "name-2420")
125-
.data("stack", "name-2421")
125+
.data(BuildpackData.builder()
126+
.buildpack("name-2420")
127+
.stack("name-2421")
128+
.build())
126129
.build())
127130
.link("self", Link.builder()
128131
.href("/v3/apps/guid-a08fd981-137f-4a8f-9c32-6be10007edde")
@@ -262,8 +265,10 @@ protected CreateApplicationResponse getResponse() {
262265
.createdAt("2016-01-26T22:20:35Z")
263266
.lifecycle(Lifecycle.builder()
264267
.type("buildpack")
265-
.data("buildpack", "name-2443")
266-
.data("stack", "default-stack-name")
268+
.data(BuildpackData.builder()
269+
.buildpack("name-2443")
270+
.stack("default-stack-name")
271+
.build())
267272
.build())
268273
.environmentVariable("open", "source")
269274
.link("self", Link.builder()
@@ -306,7 +311,10 @@ protected CreateApplicationRequest getValidRequest() throws Exception {
306311
.environmentVariable("open", "source")
307312
.lifecycle(Lifecycle.builder()
308313
.type("buildpack")
309-
.data("buildpack", "name-2443")
314+
.data(BuildpackData.builder()
315+
.buildpack("name-2443")
316+
.stack("name-2444")
317+
.build())
310318
.build())
311319
.relationships(Relationships.builder()
312320
.space(Relationship.builder()
@@ -440,8 +448,10 @@ protected GetApplicationResponse getResponse() {
440448
.createdAt("2016-01-26T22:20:35Z")
441449
.lifecycle(Lifecycle.builder()
442450
.type("buildpack")
443-
.data("buildpack", "name-2431")
444-
.data("stack", "name-2432")
451+
.data(BuildpackData.builder()
452+
.buildpack("name-2431")
453+
.stack("name-2432")
454+
.build())
445455
.build())
446456
.environmentVariable("unicorn", "horn")
447457
.link("self", Link.builder()
@@ -792,8 +802,10 @@ protected ListApplicationsResponse getResponse() {
792802
.createdAt("1970-01-01T00:00:03Z")
793803
.lifecycle(Lifecycle.builder()
794804
.type("buildpack")
795-
.data("buildpack", "name-2374")
796-
.data("stack", "name-2375")
805+
.data(BuildpackData.builder()
806+
.buildpack("name-2374")
807+
.stack("name-2375")
808+
.build())
797809
.build())
798810
.environmentVariable("magic", "beautiful")
799811
.link("self", Link.builder()
@@ -835,8 +847,10 @@ protected ListApplicationsResponse getResponse() {
835847
.createdAt("1970-01-01T00:00:02Z")
836848
.lifecycle(Lifecycle.builder()
837849
.type("buildpack")
838-
.data("buildpack", "name-2372")
839-
.data("stack", "name-2373")
850+
.data(BuildpackData.builder()
851+
.buildpack("name-2372")
852+
.stack("name-2373")
853+
.build())
840854
.build())
841855
.link("self", Link.builder()
842856
.href("/v3/apps/guid-5b9fc319-1483-40f4-b868-18240a6c6e5f")
@@ -929,8 +943,10 @@ protected ListApplicationDropletsResponse getResponse() {
929943
.error(null)
930944
.lifecycle(Lifecycle.builder()
931945
.type("buildpack")
932-
.data("buildpack", "name-2303")
933-
.data("stack", "name-2304")
946+
.data(BuildpackData.builder()
947+
.buildpack("name-2303")
948+
.stack("name-2304")
949+
.build())
934950
.build())
935951
.result("execution_metadata", null)
936952
.result("process_types", "{\"web\":\"started\"}")
@@ -961,8 +977,10 @@ protected ListApplicationDropletsResponse getResponse() {
961977
.state("STAGING")
962978
.lifecycle(Lifecycle.builder()
963979
.type("buildpack")
964-
.data("buildpack", "name-2301")
965-
.data("stack", "name-2302")
980+
.data(BuildpackData.builder()
981+
.buildpack("name-2301")
982+
.stack("name-2302")
983+
.build())
966984
.build())
967985
.environmentVariable("yuu", "huuu")
968986
.createdAt("1970-01-01T00:00:01Z")
@@ -1395,8 +1413,10 @@ protected StartApplicationResponse getResponse() {
13951413
.updatedAt("2016-01-26T22:20:35Z")
13961414
.lifecycle(Lifecycle.builder()
13971415
.type("buildpack")
1398-
.data("buildpack", "name-2438")
1399-
.data("stack", "name-2439")
1416+
.data(BuildpackData.builder()
1417+
.buildpack("name-2438")
1418+
.stack("name-2439")
1419+
.build())
14001420
.build())
14011421
.link("self", Link.builder()
14021422
.href("/v3/apps/guid-76956e3e-9905-42f9-b2c1-f9b53ef24ac0")
@@ -1482,8 +1502,10 @@ protected StopApplicationResponse getResponse() {
14821502
.updatedAt("2016-01-26T22:20:34Z")
14831503
.lifecycle(Lifecycle.builder()
14841504
.type("buildpack")
1485-
.data("buildpack", "name-2406")
1486-
.data("stack", "name-2407")
1505+
.data(BuildpackData.builder()
1506+
.buildpack("name-2406")
1507+
.stack("name-2407")
1508+
.build())
14871509
.build())
14881510
.link("self", Link.builder()
14891511
.href("/v3/apps/guid-11e8e36d-71f5-4be8-9487-c6d1a187e439")
@@ -1570,8 +1592,10 @@ protected UpdateApplicationResponse getResponse() {
15701592
.updatedAt("2016-01-26T22:20:35Z")
15711593
.lifecycle(Lifecycle.builder()
15721594
.type("buildpack")
1573-
.data("buildpack", "http://gitwheel.org/my-app")
1574-
.data("stack", "redhat")
1595+
.data(BuildpackData.builder()
1596+
.buildpack("http://gitwheel.org/my-app")
1597+
.stack("redhat")
1598+
.build())
15751599
.build())
15761600
.environmentVariable("MY_ENV_VAR", "foobar")
15771601
.environmentVariable("FOOBAR", "MY_ENV_VAR")
@@ -1617,8 +1641,10 @@ protected UpdateApplicationRequest getValidRequest() throws Exception {
16171641
.environmentVariable("FOOBAR", "MY_ENV_VAR")
16181642
.lifecycle(Lifecycle.builder()
16191643
.type("buildpack")
1620-
.data("buildpack", "http://gitwheel.org/my-app")
1621-
.data("stack", "redhat")
1644+
.data(BuildpackData.builder()
1645+
.buildpack("http://gitwheel.org/my-app")
1646+
.stack("redhat")
1647+
.build())
16221648
.build())
16231649
.build();
16241650
}

‎cloudfoundry-client-spring/src/test/java/org/cloudfoundry/reactor/client/v3/droplets/ReactorDropletsTest.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.cloudfoundry.reactor.client.v3.droplets;
1818

19+
import org.cloudfoundry.client.v3.BuildpackData;
1920
import org.cloudfoundry.client.v3.Lifecycle;
2021
import org.cloudfoundry.client.v3.Link;
2122
import org.cloudfoundry.client.v3.droplets.DeleteDropletRequest;
@@ -111,8 +112,10 @@ protected GetDropletResponse getResponse() {
111112
.error("example error")
112113
.lifecycle(Lifecycle.builder()
113114
.type("buildpack")
114-
.data("buildpack", "name-2466")
115-
.data("stack", "name-2467")
115+
.data(BuildpackData.builder()
116+
.buildpack("name-2466")
117+
.stack("name-2467")
118+
.build())
116119
.build())
117120
.result("execution_metadata", null)
118121
.result("process_types", null)
@@ -196,8 +199,10 @@ protected ListDropletsResponse getResponse() {
196199
.state("STAGED")
197200
.lifecycle(Lifecycle.builder()
198201
.type("buildpack")
199-
.data("buildpack", "name-2488")
200-
.data("stack", "name-2489")
202+
.data(BuildpackData.builder()
203+
.buildpack("name-2488")
204+
.stack("name-2489")
205+
.build())
201206
.build())
202207
.memoryLimit(123)
203208
.diskLimit(456)
@@ -232,8 +237,10 @@ protected ListDropletsResponse getResponse() {
232237
.state("STAGING")
233238
.lifecycle(Lifecycle.builder()
234239
.type("buildpack")
235-
.data("buildpack", "name-2490")
236-
.data("stack", "name-2491")
240+
.data(BuildpackData.builder()
241+
.buildpack("name-2490")
242+
.stack("name-2491")
243+
.build())
237244
.build())
238245
.environmentVariable("yuu", "huuu")
239246
.createdAt("1970-01-01T00:00:01Z")

‎cloudfoundry-client-spring/src/test/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackagesTest.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.cloudfoundry.reactor.client.v3.packages;
1818

19+
import org.cloudfoundry.client.v3.BuildpackData;
1920
import org.cloudfoundry.client.v3.Lifecycle;
2021
import org.cloudfoundry.client.v3.Link;
2122
import org.cloudfoundry.client.v3.PaginatedResponse.Pagination;
@@ -52,13 +53,11 @@
5253
import static io.netty.handler.codec.http.HttpMethod.POST;
5354
import static io.netty.handler.codec.http.HttpResponseStatus.CREATED;
5455
import static io.netty.handler.codec.http.HttpResponseStatus.OK;
55-
import static org.cloudfoundry.client.v3.packages.PackageType.DOCKER;
5656
import static org.cloudfoundry.client.v3.packages.ListPackagesResponse.Resource;
57+
import static org.cloudfoundry.client.v3.packages.PackageType.DOCKER;
5758
import static org.cloudfoundry.util.tuple.TupleUtils.consumer;
5859
import static org.junit.Assert.assertArrayEquals;
5960
import static org.junit.Assert.assertEquals;
60-
import static org.junit.Assert.assertNotNull;
61-
import static org.junit.Assert.assertTrue;
6261

6362
public final class ReactorPackagesTest {
6463

@@ -474,8 +473,10 @@ protected StagePackageResponse getResponse() {
474473
.state("PENDING")
475474
.lifecycle(Lifecycle.builder()
476475
.type("buildpack")
477-
.data("buildpack", "http://github.com/myorg/awesome-buildpack")
478-
.data("stack", "cflinuxfs2")
476+
.data(BuildpackData.builder()
477+
.buildpack("http://github.com/myorg/awesome-buildpack")
478+
.stack("cflinuxfs2")
479+
.build())
479480
.build())
480481
.memoryLimit(1_024)
481482
.diskLimit(4_096)
@@ -524,8 +525,10 @@ protected StagePackageRequest getValidRequest() {
524525
.environmentVariable("CUSTOM_ENV_VAR", "hello")
525526
.lifecycle(Lifecycle.builder()
526527
.type("buildpack")
527-
.data("buildpack", "http://github.com/myorg/awesome-buildpack")
528-
.data("stack", "cflinuxfs2")
528+
.data(BuildpackData.builder()
529+
.buildpack("http://github.com/myorg/awesome-buildpack")
530+
.stack("cflinuxfs2")
531+
.build())
529532
.build())
530533
.build();
531534
}

‎cloudfoundry-client-spring/src/test/resources/fixtures/client/v3/apps/POST_request.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"lifecycle": {
77
"type": "buildpack",
88
"data": {
9-
"buildpack": "name-2443"
9+
"buildpack": "name-2443",
10+
"stack": "name-2444"
1011
}
1112
},
1213
"relationships": {

0 commit comments

Comments
 (0)