Skip to content

Commit f153c81

Browse files
committed
Merge branch '1081-rename-spaces' into 4.x
2 parents 1e3b4c6 + 5f29fe8 commit f153c81

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,14 @@ public void update() {
322322
.annotation("version", "1.2.4")
323323
.label("dept", "1234")
324324
.build())
325+
.name("test-space-name")
325326
.build())
326327
.as(StepVerifier::create)
327328
.expectNext(UpdateSpaceResponse.builder()
328329
.id("885735b5-aea4-4cf5-8e44-961af0e41920")
329330
.createdAt("2017-02-01T01:33:58Z")
330331
.updatedAt("2017-02-01T01:33:58Z")
331-
.name("space1")
332+
.name("test-space-name")
332333
.metadata(Metadata.builder()
333334
.annotation("version", "1.2.4")
334335
.label("dept", "1234")

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/spaces/PATCH_{id}_request.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "test-space-name",
23
"metadata": {
34
"labels": {
45
"dept": "1234"

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/spaces/PATCH_{id}_response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": "1.2.4"
1111
}
1212
},
13-
"name": "space1",
13+
"name": "test-space-name",
1414
"links": {
1515
"self": {
1616
"href": "https://api.example.org/v3/spaces/885735b5-aea4-4cf5-8e44-961af0e41920"

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/spaces/_UpdateSpaceRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ abstract class _UpdateSpaceRequest {
3737
@Nullable
3838
abstract Metadata getMetadata();
3939

40+
@JsonProperty("name")
41+
@Nullable
42+
abstract String getName();
43+
4044
/**
4145
* The space id
4246
*/

integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ public void listFilterByOrganization() {
243243
@Test
244244
public void update() {
245245
String spaceName = this.nameFactory.getSpaceName();
246+
String newSpaceName = this.nameFactory.getSpaceName();
246247

247248
this.organizationId
248249
.flatMap(organizationId -> createSpaceId(this.cloudFoundryClient, organizationId, spaceName))
@@ -251,9 +252,10 @@ public void update() {
251252
.annotation("annotationKey", "annotationValue")
252253
.label("labelKey", "labelValue")
253254
.build())
255+
.name(newSpaceName)
254256
.spaceId(spaceId)
255257
.build()))
256-
.thenMany(requestListSpaces(this.cloudFoundryClient, spaceName))
258+
.thenMany(requestListSpaces(this.cloudFoundryClient, newSpaceName))
257259
.map(SpaceResource::getMetadata)
258260
.as(StepVerifier::create)
259261
.consumeNextWith(metadata -> {

0 commit comments

Comments
 (0)