Skip to content

Commit

Permalink
fixing test issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@radoslav-tomov
radoslav-tomov committed Jul 10, 2023
1 parent a786735 commit 173a169
Show file tree
Hide file tree
Showing 16 changed files with 152 additions and 111 deletions.
124 changes: 65 additions & 59 deletions .../main/java/org/cloudfoundry/reactor/client/v3/securitygroups/ReactorSecurityGroupsV3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,73 +41,79 @@
*/
public final class ReactorSecurityGroupsV3 extends AbstractClientV3Operations implements SecurityGroupsV3 {

/**
* Creates an instance
*
* @param connectionContext the {@link ConnectionContext} to use when
* communicating with the server
* @param root the root URI of the server. Typically something like
* {@code https://api.run.pivotal.io}.
* @param tokenProvider the {@link TokenProvider} to use when communicating
* with the server
* @param requestTags map with custom http headers which will be added to
* web request
*/
public ReactorSecurityGroupsV3(ConnectionContext connectionContext, Mono<String> root, TokenProvider tokenProvider,
Map<String, String> requestTags) {
super(connectionContext, root, tokenProvider, requestTags);
}
/**
* Creates an instance
*
* @param connectionContext the {@link ConnectionContext} to use when
* communicating with the server
* @param root the root URI of the server. Typically something like
* {@code https://api.run.pivotal.io}.
* @param tokenProvider the {@link TokenProvider} to use when communicating
* with the server
* @param requestTags map with custom http headers which will be added to
* web request
*/
public ReactorSecurityGroupsV3(ConnectionContext connectionContext, Mono<String> root,
TokenProvider tokenProvider,
Map<String, String> requestTags) {
super(connectionContext, root, tokenProvider, requestTags);
}

@Override
public Mono<CreateSecurityGroupResponse> create(CreateSecurityGroupRequest request) {
return post(request, CreateSecurityGroupResponse.class, builder -> builder.pathSegment("security_groups"))
.checkpoint();
@Override
public Mono<CreateSecurityGroupResponse> create(CreateSecurityGroupRequest request) {
return post(request, CreateSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups"))
.checkpoint();

}
}

@Override
public Mono<GetSecurityGroupResponse> get(GetSecurityGroupRequest request) {
return get(request, GetSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
.checkpoint();
@Override
public Mono<GetSecurityGroupResponse> get(GetSecurityGroupRequest request) {
return get(request, GetSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
.checkpoint();

}
}

@Override
public Mono<ListSecurityGroupsResponse> list(ListSecurityGroupsRequest request) {
return get(request, ListSecurityGroupsResponse.class,
builder -> builder.pathSegment("security_groups"))
.checkpoint();
}
@Override
public Mono<ListSecurityGroupsResponse> list(ListSecurityGroupsRequest request) {
return get(request, ListSecurityGroupsResponse.class,
builder -> builder.pathSegment("security_groups"))
.checkpoint();
}

@Override
public Mono<UpdateSecurityGroupResponse> update(UpdateSecurityGroupRequest request) {
return patch(request, UpdateSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
.checkpoint();
}
@Override
public Mono<UpdateSecurityGroupResponse> update(UpdateSecurityGroupRequest request) {
return patch(request, UpdateSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
.checkpoint();
}

@Override
public Mono<String> delete(DeleteSecurityGroupRequest request) {
return delete(request, String.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
.checkpoint();
@Override
public Mono<String> delete(DeleteSecurityGroupRequest request) {
return delete(request,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId()))
.checkpoint();

}
}

@Override
public Mono<BindRunningSecurityGroupResponse> bindRunningSecurityGroup(BindRunningSecurityGroupRequest request) {
return post(request, BindRunningSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(), "relationships",
"running_spaces"))
.checkpoint();
}
@Override
public Mono<BindRunningSecurityGroupResponse> bindRunningSecurityGroup(
BindRunningSecurityGroupRequest request) {
return post(request, BindRunningSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(),
"relationships",
"running_spaces"))
.checkpoint();
}

@Override
public Mono<BindStagingSecurityGroupResponse> bindStagingSecurityGroup(BindStagingSecurityGroupRequest request) {
return post(request, BindStagingSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(), "relationships",
"staging_spaces"))
.checkpoint();
}
@Override
public Mono<BindStagingSecurityGroupResponse> bindStagingSecurityGroup(
BindStagingSecurityGroupRequest request) {
return post(request, BindStagingSecurityGroupResponse.class,
builder -> builder.pathSegment("security_groups", request.getSecurityGroupId(),
"relationships",
"staging_spaces"))
.checkpoint();
}
}
48 changes: 21 additions & 27 deletions ...t/java/org/cloudfoundry/reactor/client/v3/securitygroups/ReactorSecurityGroupsV3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,13 @@ public void list() {
.id("a89a788e-671f-4549-814d-e34c1b2f533a")
.createdAt("2020-02-20T17:42:08Z")
.updatedAt("2020-02-20T17:42:08Z")
.relationships(Relationships.builder().build())
.relationships(Relationships.builder()
.stagingSpaces(ToManyRelationship
.builder().build())
.runningSpaces(ToManyRelationship
.builder().build())

.build())
.globallyEnabled(GloballyEnabled
.builder()
.staging(true)
Expand All @@ -286,7 +292,8 @@ public void list() {
public void update() {
mockRequest(InteractionContext.builder()
.request(TestRequest.builder()
.method(PATCH).path("/security_groups")
.method(PATCH)
.path("/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a")
.payload("fixtures/client/v3/security_groups/PATCH_{id}_request.json")
.build())
.response(TestResponse.builder()
Expand Down Expand Up @@ -368,7 +375,7 @@ public void delete() {
.response(TestResponse.builder()
.status(ACCEPTED)
.header("Location",
"https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a")
"https://api.example.org/v3/jobs/b85a788e-671f-4549-814d-e34cdb2f539a")
.build())
.build());

Expand Down Expand Up @@ -397,21 +404,15 @@ public void bindStagingSecurityGroup() {
.build());
this.securityGroups.bindStagingSecurityGroup(BindStagingSecurityGroupRequest.builder()
.securityGroupId("b85a788e-671f-4549-814d-e34cdb2f539a")
.boundSpaces(ToManyRelationship.builder()
.data(Relationship.builder().id("space-guid1").build())
.data(Relationship.builder().id("space-guid2").build())
.build())
.boundSpaces(Relationship.builder().id("space-guid1").build())
.boundSpaces(Relationship.builder().id("space-guid2").build())

.build())
.as(StepVerifier::create)
.expectNext(BindStagingSecurityGroupResponse.builder()
.boundSpaces(ToManyRelationship.builder()
.data(Relationship.builder().id("space-guid1").build())
.data(Relationship.builder().id("space-guid2").build())
.data(Relationship.builder().id("previous-space-guid")
.build())
.build()

)
.boundSpaces(Relationship.builder().id("space-guid1").build())
.boundSpaces(Relationship.builder().id("space-guid2").build())
.boundSpaces(Relationship.builder().id("previous-space-guid").build())
.link("self", Link.builder()
.href("https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a/relationships/staging_spaces")
.build())
Expand All @@ -435,21 +436,14 @@ public void bindRunningSecurityGroup() {
.build());
this.securityGroups.bindRunningSecurityGroup(BindRunningSecurityGroupRequest.builder()
.securityGroupId("b85a788e-671f-4549-814d-e34cdb2f539a")
.boundSpaces(ToManyRelationship.builder()
.data(Relationship.builder().id("space-guid1").build())
.data(Relationship.builder().id("space-guid2").build())
.build())
.boundSpaces(Relationship.builder().id("space-guid1").build())
.boundSpaces(Relationship.builder().id("space-guid2").build())
.build())
.as(StepVerifier::create)
.expectNext(BindRunningSecurityGroupResponse.builder()
.boundSpaces(ToManyRelationship.builder()
.data(Relationship.builder().id("space-guid1").build())
.data(Relationship.builder().id("space-guid2").build())
.data(Relationship.builder().id("previous-space-guid")
.build())
.build()

)
.boundSpaces(Relationship.builder().id("space-guid1").build())
.boundSpaces(Relationship.builder().id("space-guid2").build())
.boundSpaces(Relationship.builder().id("previous-space-guid").build())
.link("self", Link.builder()
.href("https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a/relationships/running_spaces")
.build())
Expand Down
10 changes: 10 additions & 0 deletions ...ctor/src/test/resources/fixtures/client/v3/security_groups/bind_running/POST_request.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"data": [
{
"guid": "space-guid1"
},
{
"guid": "space-guid2"
}
]
}
18 changes: 18 additions & 0 deletions ...tor/src/test/resources/fixtures/client/v3/security_groups/bind_running/POST_response.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"data": [
{
"guid": "space-guid1"
},
{
"guid": "space-guid2"
},
{
"guid": "previous-space-guid"
}
],
"links": {
"self": {
"href": "https://api.example.org/v3/security_groups/b85a788e-671f-4549-814d-e34cdb2f539a/relationships/running_spaces"
}
}
}
5 changes: 4 additions & 1 deletion ...main/java/org/cloudfoundry/client/v3/securitygroups/AbstractBindSecurityGroupRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package org.cloudfoundry.client.v3.securitygroups;

import java.util.List;

import org.cloudfoundry.client.v3.Relationship;
import org.cloudfoundry.client.v3.ToManyRelationship;

import com.fasterxml.jackson.annotation.JsonIgnore;
Expand All @@ -36,5 +39,5 @@ public abstract class AbstractBindSecurityGroupRequest {
* applications during runtime
*/
@JsonProperty("data")
abstract ToManyRelationship getBoundSpaces();
abstract List<Relationship> getBoundSpaces();
}
4 changes: 3 additions & 1 deletion ...ain/java/org/cloudfoundry/client/v3/securitygroups/AbstractBindSecurityGroupResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@

package org.cloudfoundry.client.v3.securitygroups;

import java.util.List;
import java.util.Map;

import org.cloudfoundry.AllowNulls;
import org.cloudfoundry.Nullable;
import org.cloudfoundry.client.v3.Link;
import org.cloudfoundry.client.v3.Relationship;
import org.cloudfoundry.client.v3.ToManyRelationship;

import com.fasterxml.jackson.annotation.JsonProperty;
Expand All @@ -34,7 +36,7 @@ public abstract class AbstractBindSecurityGroupResponse {
* applications during runtime
*/
@JsonProperty("data")
abstract ToManyRelationship getBoundSpaces();
abstract List<Relationship> getBoundSpaces();

/**
* The links
Expand Down
2 changes: 1 addition & 1 deletion ...ndry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/SecurityGroupsV3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public interface SecurityGroupsV3 {

/**
* Makes the <a href=
* "https://v3-apidocs.cloudfoundry.org/version/3.140.0/index.html#update-a-security-group">Delete
* "https://v3-apidocs.cloudfoundry.org/version/3.140.0/index.html#delete-a-security-group">Delete
* Security Groups</a> request
*
* @param request the Delete Security Group request
Expand Down
3 changes: 3 additions & 0 deletions ...main/java/org/cloudfoundry/client/v3/securitygroups/_BindRunningSecurityGroupRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@

import org.immutables.value.Value;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;

@JsonSerialize
@Value.Immutable
abstract class _BindRunningSecurityGroupRequest extends AbstractBindSecurityGroupRequest {

Expand Down
3 changes: 3 additions & 0 deletions ...ain/java/org/cloudfoundry/client/v3/securitygroups/_BindRunningSecurityGroupResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@

import org.immutables.value.Value;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

@JsonDeserialize
@Value.Immutable
public abstract class _BindRunningSecurityGroupResponse extends AbstractBindSecurityGroupResponse {

Expand Down
2 changes: 2 additions & 0 deletions ...main/java/org/cloudfoundry/client/v3/securitygroups/_BindStagingSecurityGroupRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package org.cloudfoundry.client.v3.securitygroups;

import org.immutables.value.Value;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

@JsonSerialize
@Value.Immutable
abstract class _BindStagingSecurityGroupRequest extends AbstractBindSecurityGroupRequest {

Expand Down
2 changes: 2 additions & 0 deletions ...ain/java/org/cloudfoundry/client/v3/securitygroups/_BindStagingSecurityGroupResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package org.cloudfoundry.client.v3.securitygroups;

import org.immutables.value.Value;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

@JsonDeserialize
@Value.Immutable
public abstract class _BindStagingSecurityGroupResponse extends AbstractBindSecurityGroupResponse {

Expand Down
1 change: 0 additions & 1 deletion .../src/main/java/org/cloudfoundry/client/v3/securitygroups/_DeleteSecurityGroupRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
/**
* The request payload for the Delete Security Group operation
*/
@JsonSerialize
@Value.Immutable
abstract class _DeleteSecurityGroupRequest {

Expand Down
2 changes: 2 additions & 0 deletions ...t/src/main/java/org/cloudfoundry/client/v3/securitygroups/_ListSecurityGroupsRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ abstract class _ListSecurityGroupsRequest extends PaginatedRequest {
* the security group running_space_guids filter
*/
@FilterParameter("running_space_guids")
@Nullable
abstract List<String> getRunningSpaceIds();

/**
* the security group staging_space_guids filter
*/
@FilterParameter("staging_space_guids")
@Nullable
abstract List<String> getStagingSpaceIds();
}
2 changes: 1 addition & 1 deletion .../src/main/java/org/cloudfoundry/client/v3/securitygroups/_ListSecurityGroupsResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
*/
@JsonDeserialize
@Value.Immutable
abstract class _ListSecurityGroupsResponse extends PaginatedResponse<SecurityGroup> {
abstract class _ListSecurityGroupsResponse extends PaginatedResponse<SecurityGroupResource> {

}
6 changes: 2 additions & 4 deletions ...t/java/org/cloudfoundry/client/v3/securitygroups/BindRunningSecurityGroupRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ public void noSecurityGroupId() {
public void valid() {
BindRunningSecurityGroupRequest.builder()
.securityGroupId("b85a788e-671f-4549-814d-e34cdb2f539a")
.boundSpaces(ToManyRelationship.builder()
.data(Relationship.builder()
.id("space-guid-1")
.build())
.boundSpaces(Relationship.builder()
.id("space-guid-1")
.build())
.build();
}
Expand Down
Loading

0 comments on commit 173a169

Please sign in to comment.