Skip to content

Commit 173a169

Browse files
radoslav-tomovradoslav-tomov
authored
fixing test issues
1 parent a786735 commit 173a169

File tree

16 files changed

+152
-111
lines changed

16 files changed

+152
-111
lines changed

‎cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/securitygroups/ReactorSecurityGroupsV3.java‎

Lines changed: 65 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -41,73 +41,79 @@
4141
*/
4242
public final class ReactorSecurityGroupsV3 extends AbstractClientV3Operations implements SecurityGroupsV3 {
4343

44-
/**
45-
* Creates an instance
46-
*
47-
* @param connectionContext the {@link ConnectionContext} to use when
48-
* communicating with the server
49-
* @param root the root URI of the server. Typically something like
50-
* {@code https://api.run.pivotal.io}.
51-
* @param tokenProvider the {@link TokenProvider} to use when communicating
52-
* with the server
53-
* @param requestTags map with custom http headers which will be added to
54-
* web request
55-
*/
56-
public ReactorSecurityGroupsV3(ConnectionContext connectionContext, Mono<String> root, TokenProvider tokenProvider,
57-
Map<String, String> requestTags) {
58-
super(connectionContext, root, tokenProvider, requestTags);
59-
}
44+
/**
45+
* Creates an instance
46+
*
47+
* @param connectionContext the {@link ConnectionContext} to use when
48+
* communicating with the server
49+
* @param root the root URI of the server. Typically something like
50+
* {@code https://api.run.pivotal.io}.
51+
* @param tokenProvider the {@link TokenProvider} to use when communicating
52+
* with the server
53+
* @param requestTags map with custom http headers which will be added to
54+
* web request
55+
*/
56+
public ReactorSecurityGroupsV3(ConnectionContext connectionContext, Mono<String> root,
57+
TokenProvider tokenProvider,
58+
Map<String, String> requestTags) {
59+
super(connectionContext, root, tokenProvider, requestTags);
60+
}
6061

61-
@Override
62-
public Mono<CreateSecurityGroupResponse> create(CreateSecurityGroupRequest request) {
63-
return post(request, CreateSecurityGroupResponse.class, builder -> builder.pathSegment("security_groups"))
64-
.checkpoint();
62+
@Override
63+
public Mono<CreateSecurityGroupResponse> create(CreateSecurityGroupRequest request) {
64+
return post(request, CreateSecurityGroupResponse.class,
65+
builder -> builder.pathSegment("security_groups"))
66+
.checkpoint();
6567

66-
}
68+
}
6769

68-
@Override
69-
public Mono<GetSecurityGroupResponse> get(GetSecurityGroupRequest request) {
70-
return get(request, GetSecurityGroupResponse.class,
71-
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
72-
.checkpoint();
70+
@Override
71+
public Mono<GetSecurityGroupResponse> get(GetSecurityGroupRequest request) {
72+
return get(request, GetSecurityGroupResponse.class,
73+
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
74+
.checkpoint();
7375

74-
}
76+
}
7577

76-
@Override
77-
public Mono<ListSecurityGroupsResponse> list(ListSecurityGroupsRequest request) {
78-
return get(request, ListSecurityGroupsResponse.class,
79-
builder -> builder.pathSegment("security_groups"))
80-
.checkpoint();
81-
}
78+
@Override
79+
public Mono<ListSecurityGroupsResponse> list(ListSecurityGroupsRequest request) {
80+
return get(request, ListSecurityGroupsResponse.class,
81+
builder -> builder.pathSegment("security_groups"))
82+
.checkpoint();
83+
}
8284

83-
@Override
84-
public Mono<UpdateSecurityGroupResponse> update(UpdateSecurityGroupRequest request) {
85-
return patch(request, UpdateSecurityGroupResponse.class,
86-
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
87-
.checkpoint();
88-
}
85+
@Override
86+
public Mono<UpdateSecurityGroupResponse> update(UpdateSecurityGroupRequest request) {
87+
return patch(request, UpdateSecurityGroupResponse.class,
88+
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
89+
.checkpoint();
90+
}
8991

90-
@Override
91-
public Mono<String> delete(DeleteSecurityGroupRequest request) {
92-
return delete(request, String.class,
93-
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
94-
.checkpoint();
92+
@Override
93+
public Mono<String> delete(DeleteSecurityGroupRequest request) {
94+
return delete(request,
95+
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
96+
.checkpoint();
9597

96-
}
98+
}
9799

98-
@Override
99-
public Mono<BindRunningSecurityGroupResponse> bindRunningSecurityGroup(BindRunningSecurityGroupRequest request) {
100-
return post(request, BindRunningSecurityGroupResponse.class,
101-
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(), "relationships",
102-
"running_spaces"))
103-
.checkpoint();
104-
}
100+
@Override
101+
public Mono<BindRunningSecurityGroupResponse> bindRunningSecurityGroup(
102+
BindRunningSecurityGroupRequest request) {
103+
return post(request, BindRunningSecurityGroupResponse.class,
104+
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(),
105+
"relationships",
106+
"running_spaces"))
107+
.checkpoint();
108+
}
105109

106-
@Override
107-
public Mono<BindStagingSecurityGroupResponse> bindStagingSecurityGroup(BindStagingSecurityGroupRequest request) {
108-
return post(request, BindStagingSecurityGroupResponse.class,
109-
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(), "relationships",
110-
"staging_spaces"))
111-
.checkpoint();
112-
}
110+
@Override
111+
public Mono<BindStagingSecurityGroupResponse> bindStagingSecurityGroup(
112+
BindStagingSecurityGroupRequest request) {
113+
return post(request, BindStagingSecurityGroupResponse.class,
114+
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(),
115+
"relationships",
116+
"staging_spaces"))
117+
.checkpoint();
118+
}
113119
}

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/securitygroups/ReactorSecurityGroupsV3Test.java‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,13 @@ public void list() {
262262
.id("a89a788e-671f-4549-814d-e34c1b2f533a")
263263
.createdAt("2020-02-20T17:42:08Z")
264264
.updatedAt("2020-02-20T17:42:08Z")
265-
.relationships(Relationships.builder().build())
265+
.relationships(Relationships.builder()
266+
.stagingSpaces(ToManyRelationship
267+
.builder().build())
268+
.runningSpaces(ToManyRelationship
269+
.builder().build())
270+
271+
.build())
266272
.globallyEnabled(GloballyEnabled
267273
.builder()
268274
.staging(true)
@@ -286,7 +292,8 @@ public void list() {
286292
public void update() {
287293
mockRequest(InteractionContext.builder()
288294
.request(TestRequest.builder()
289-
.method(PATCH).path("/security_groups")
295+
.method(PATCH)
296+
.path("/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a")
290297
.payload("fixtures/client/v3/security_groups/PATCH_{id}_request.json")
291298
.build())
292299
.response(TestResponse.builder()
@@ -368,7 +375,7 @@ public void delete() {
368375
.response(TestResponse.builder()
369376
.status(ACCEPTED)
370377
.header("Location",
371-
"https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a")
378+
"https://api.example.org/v3/jobs/b85a788e-671f-4549-814d-e34cdb2f539a")
372379
.build())
373380
.build());
374381

@@ -397,21 +404,15 @@ public void bindStagingSecurityGroup() {
397404
.build());
398405
this.securityGroups.bindStagingSecurityGroup(BindStagingSecurityGroupRequest.builder()
399406
.securityGroupId("b85a788e-671f-4549-814d-e34cdb2f539a")
400-
.boundSpaces(ToManyRelationship.builder()
401-
.data(Relationship.builder().id("space-guid1").build())
402-
.data(Relationship.builder().id("space-guid2").build())
403-
.build())
407+
.boundSpaces(Relationship.builder().id("space-guid1").build())
408+
.boundSpaces(Relationship.builder().id("space-guid2").build())
409+
404410
.build())
405411
.as(StepVerifier::create)
406412
.expectNext(BindStagingSecurityGroupResponse.builder()
407-
.boundSpaces(ToManyRelationship.builder()
408-
.data(Relationship.builder().id("space-guid1").build())
409-
.data(Relationship.builder().id("space-guid2").build())
410-
.data(Relationship.builder().id("previous-space-guid")
411-
.build())
412-
.build()
413-
414-
)
413+
.boundSpaces(Relationship.builder().id("space-guid1").build())
414+
.boundSpaces(Relationship.builder().id("space-guid2").build())
415+
.boundSpaces(Relationship.builder().id("previous-space-guid").build())
415416
.link("self", Link.builder()
416417
.href("https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a/relationships/staging_spaces")
417418
.build())
@@ -435,21 +436,14 @@ public void bindRunningSecurityGroup() {
435436
.build());
436437
this.securityGroups.bindRunningSecurityGroup(BindRunningSecurityGroupRequest.builder()
437438
.securityGroupId("b85a788e-671f-4549-814d-e34cdb2f539a")
438-
.boundSpaces(ToManyRelationship.builder()
439-
.data(Relationship.builder().id("space-guid1").build())
440-
.data(Relationship.builder().id("space-guid2").build())
441-
.build())
439+
.boundSpaces(Relationship.builder().id("space-guid1").build())
440+
.boundSpaces(Relationship.builder().id("space-guid2").build())
442441
.build())
443442
.as(StepVerifier::create)
444443
.expectNext(BindRunningSecurityGroupResponse.builder()
445-
.boundSpaces(ToManyRelationship.builder()
446-
.data(Relationship.builder().id("space-guid1").build())
447-
.data(Relationship.builder().id("space-guid2").build())
448-
.data(Relationship.builder().id("previous-space-guid")
449-
.build())
450-
.build()
451-
452-
)
444+
.boundSpaces(Relationship.builder().id("space-guid1").build())
445+
.boundSpaces(Relationship.builder().id("space-guid2").build())
446+
.boundSpaces(Relationship.builder().id("previous-space-guid").build())
453447
.link("self", Link.builder()
454448
.href("https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a/relationships/running_spaces")
455449
.build())

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/security_groups/bind_running/POST_request.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"data": [
3+
{
4+
"guid": "space-guid1"
5+
},
6+
{
7+
"guid": "space-guid2"
8+
}
9+
]
10+
}

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/security_groups/bind_running/POST_response.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"data": [
3+
{
4+
"guid": "space-guid1"
5+
},
6+
{
7+
"guid": "space-guid2"
8+
},
9+
{
10+
"guid": "previous-space-guid"
11+
}
12+
],
13+
"links": {
14+
"self": {
15+
"href": "https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a/relationships/running_spaces"
16+
}
17+
}
18+
}

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/AbstractBindSecurityGroupRequest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package org.cloudfoundry.client.v3.securitygroups;
1818

19+
import java.util.List;
20+
21+
import org.cloudfoundry.client.v3.Relationship;
1922
import org.cloudfoundry.client.v3.ToManyRelationship;
2023

2124
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -36,5 +39,5 @@ public abstract class AbstractBindSecurityGroupRequest {
3639
* applications during runtime
3740
*/
3841
@JsonProperty("data")
39-
abstract ToManyRelationship getBoundSpaces();
42+
abstract List<Relationship> getBoundSpaces();
4043
}

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/AbstractBindSecurityGroupResponse.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616

1717
package org.cloudfoundry.client.v3.securitygroups;
1818

19+
import java.util.List;
1920
import java.util.Map;
2021

2122
import org.cloudfoundry.AllowNulls;
2223
import org.cloudfoundry.Nullable;
2324
import org.cloudfoundry.client.v3.Link;
25+
import org.cloudfoundry.client.v3.Relationship;
2426
import org.cloudfoundry.client.v3.ToManyRelationship;
2527

2628
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -34,7 +36,7 @@ public abstract class AbstractBindSecurityGroupResponse {
3436
* applications during runtime
3537
*/
3638
@JsonProperty("data")
37-
abstract ToManyRelationship getBoundSpaces();
39+
abstract List<Relationship> getBoundSpaces();
3840

3941
/**
4042
* The links

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/SecurityGroupsV3.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public interface SecurityGroupsV3 {
6262

6363
/**
6464
* Makes the <a href=
65-
* "https://v3-apidocs.cloudfoundry.org/version/3.140.0/index.html#update-a-security-group">Delete
65+
* "https://v3-apidocs.cloudfoundry.org/version/3.140.0/index.html#delete-a-security-group">Delete
6666
* Security Groups</a> request
6767
*
6868
* @param request the Delete Security Group request

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/_BindRunningSecurityGroupRequest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
import org.immutables.value.Value;
2020

21+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
22+
23+
@JsonSerialize
2124
@Value.Immutable
2225
abstract class _BindRunningSecurityGroupRequest extends AbstractBindSecurityGroupRequest {
2326

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/_BindRunningSecurityGroupResponse.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
import org.immutables.value.Value;
2020

21+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
22+
23+
@JsonDeserialize
2124
@Value.Immutable
2225
public abstract class _BindRunningSecurityGroupResponse extends AbstractBindSecurityGroupResponse {
2326

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/_BindStagingSecurityGroupRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
package org.cloudfoundry.client.v3.securitygroups;
1818

1919
import org.immutables.value.Value;
20+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
2021

22+
@JsonSerialize
2123
@Value.Immutable
2224
abstract class _BindStagingSecurityGroupRequest extends AbstractBindSecurityGroupRequest {
2325

0 commit comments

Comments
 (0)