Merge branch '3.x'

cloudfoundry · Jun 16, 2020 · 138c3d9 · 138c3d9
2 parents 2dd0120 + e6afdfb
commit 138c3d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 43 deletions.
diff --git a/...rc/test/java/org/cloudfoundry/reactor/client/v3/auditevents/ReactorAuditEventsV3Test.java b/...rc/test/java/org/cloudfoundry/reactor/client/v3/auditevents/ReactorAuditEventsV3Test.java
@@ -18,8 +18,8 @@
 
 import org.cloudfoundry.client.v3.Link;
 import org.cloudfoundry.client.v3.Pagination;
+import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.auditevents.AuditEventActor;
-import org.cloudfoundry.client.v3.auditevents.AuditEventRelationship;
 import org.cloudfoundry.client.v3.auditevents.AuditEventResource;
 import org.cloudfoundry.client.v3.auditevents.AuditEventTarget;
 import org.cloudfoundry.client.v3.auditevents.GetAuditEventRequest;
@@ -76,10 +76,10 @@ public void get() {
                     .type("app")
                     .build())
                 .data((Collections.singletonMap("request", null)))
-                .spaceRelationship(AuditEventRelationship.builder()
+                .spaceRelationship(Relationship.builder()
                     .id("cb97dd25-d4f7-4185-9e6f-ad6e585c207c")
                     .build())
-                .organizationRelationship(AuditEventRelationship.builder()
+                .organizationRelationship(Relationship.builder()
                     .id("d9be96f5-ea8f-4549-923f-bec882e32e3c")
                     .build())
                 .link("self", Link.builder()
@@ -133,10 +133,10 @@ public void list() {
                         .type("app")
                         .build())
                     .data(Collections.singletonMap("request", Collections.singletonMap("recursive", true)))
-                    .spaceRelationship(AuditEventRelationship.builder()
+                    .spaceRelationship(Relationship.builder()
                         .id("cb97dd25-d4f7-4185-9e6f-ad6e585c207c")
                         .build())
-                    .organizationRelationship(AuditEventRelationship.builder()
+                    .organizationRelationship(Relationship.builder()
                         .id("d9be96f5-ea8f-4549-923f-bec882e32e3c")
                         .build())
                     .link("self", Link.builder()

diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/auditevents/AuditEvent.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/auditevents/AuditEvent.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.Nullable;
+import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.Resource;
 
 import java.util.Map;
@@ -55,14 +56,14 @@ public abstract class AuditEvent extends Resource {
      */
     @JsonProperty("organization")
     @Nullable
-    public abstract AuditEventRelationship getOrganizationRelationship();
+    public abstract Relationship getOrganizationRelationship();
 
     /**
      * The space where the event occurred.
      */
     @JsonProperty("space")
     @Nullable
-    public abstract AuditEventRelationship getSpaceRelationship();
+    public abstract Relationship getSpaceRelationship();
 
     /**
      * The event type

diff --git a/...-client/src/main/java/org/cloudfoundry/client/v3/auditevents/_AuditEventRelationship.java b/...-client/src/main/java/org/cloudfoundry/client/v3/auditevents/_AuditEventRelationship.java