minor refactoring to allow import to Eclipse

cloudfoundry · Sep 5, 2024 · ac0f15b · ac0f15b
1 parent 1fffc4c
commit ac0f15b
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 15 deletions.
diff --git a/...tances/ReactorServiceInstancesV3Test.java → ...tances/ReactorServiceInstancesV3Test.java b/...tances/ReactorServiceInstancesV3Test.java → ...tances/ReactorServiceInstancesV3Test.java
diff --git a/...main/java/org/cloudfoundry/client/v2/serviceinstances/_DeleteServiceInstanceResponse.java b/...main/java/org/cloudfoundry/client/v2/serviceinstances/_DeleteServiceInstanceResponse.java
@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase;
 import org.cloudfoundry.Nullable;
 import org.cloudfoundry.client.v2.Resource;
-import org.cloudfoundry.client.v2.jobs.JobEntity;
 import org.immutables.value.Value;
 
 /**
@@ -40,7 +39,7 @@ abstract class _DeleteServiceInstanceResponse extends Resource<Object> {
      */
     @JsonProperty("entity")
     @JsonTypeIdResolver(_DeleteServiceInstanceResponse.DeleteServiceInstanceResponseTypeIdResolver.class)
-    @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", defaultImpl = JobEntity.class, visible = true)
+    @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", defaultImpl = org.cloudfoundry.client.v2.jobs.JobEntity.class, visible = true)
     @Nullable
     public abstract Object getEntity();
 

diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/PaginatedRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/PaginatedRequest.java
@@ -47,7 +47,7 @@ public abstract class PaginatedRequest {
     public abstract Integer getPerPage();
 
     @Value.Check
-    void check() {
+    public void check() {
         if (getPage() != null && getPage() < 1) {
             throw new IllegalStateException("page must be greater than or equal to 1");
         }

diff --git a/...y-client/src/main/java/org/cloudfoundry/uaa/identityzones/_ListIdentityZonesResponse.java b/...y-client/src/main/java/org/cloudfoundry/uaa/identityzones/_ListIdentityZonesResponse.java
@@ -17,11 +17,14 @@
 package org.cloudfoundry.uaa.identityzones;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 import java.io.IOException;
@@ -34,6 +37,7 @@
 @Value.Immutable
 abstract class _ListIdentityZonesResponse {
 
+
     /**
      * The identity zones
      */

diff --git a/...perations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java b/...perations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java
@@ -693,18 +693,11 @@ public Mono<Void> pushManifestV3(PushManifestV3Request request) {
                                                 .flatMap(
                                                         function(
                                                                 (appId, packageId) ->
-                                                                        buildAndStage(
-                                                                                        cloudFoundryClient,
-                                                                                        manifestApp,
-                                                                                        packageId)
-                                                                                .flatMap(
-                                                                                        dropletId ->
-                                                                                                applyDropletAndWaitForRunning(
-                                                                                                        cloudFoundryClient,
-                                                                                                        manifestApp
-                                                                                                                .getName(),
-                                                                                                        appId,
-                                                                                                        dropletId))))))
+                                                                        buildAndStageAndWaitForRunning(
+                                                                                cloudFoundryClient,
+                                                                                manifestApp,
+                                                                                packageId,
+                                                                                appId)))))
                 .then();
     }
 
@@ -1157,6 +1150,21 @@ private static Mono<Void> bindServices(
                 .then();
     }
 
+    private static Mono<Void> buildAndStageAndWaitForRunning(
+            CloudFoundryClient cloudFoundryClient,
+            ManifestV3Application manifestApp,
+            String packageId,
+            String appId) {
+        return buildAndStage(cloudFoundryClient, manifestApp, packageId)
+                .flatMap(
+                        dropletId ->
+                                applyDropletAndWaitForRunning(
+                                        cloudFoundryClient,
+                                        manifestApp.getName(),
+                                        appId,
+                                        dropletId));
+    }
+
     private static Mono<String> buildAndStage(
             CloudFoundryClient cloudFoundryClient,
             ManifestV3Application manifestApp,

diff --git a/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java b/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java
@@ -24,3 +24,5 @@
     typeImmutable = "*"
 )
 package org.cloudfoundry.logcachetest;
+
+import org.immutables.value.Value;
diff --git a/...-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java b/...-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java
@@ -16,6 +16,8 @@
 
 package org.cloudfoundry.servicebroker.binding;
 
+import org.immutables.value.Value;
+
 @Value.Immutable
 abstract class _UnbindResponse {
 

diff --git a/...roker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java b/...roker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java
@@ -16,6 +16,8 @@
 
 package org.cloudfoundry.servicebroker.instance;
 
+import org.immutables.value.Value;
+
 @Value.Immutable
 abstract class _DeprovisionSyncResponse {
 

diff --git a/...ice-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java b/...ice-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java
@@ -16,6 +16,8 @@
 
 package org.cloudfoundry.servicebroker.instance;
 
+import org.immutables.value.Value;
+
 @Value.Immutable
 abstract class _UpdateSyncResponse {
 

diff --git a/.../java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java b/.../java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java
@@ -16,6 +16,8 @@
 
 package org.cloudfoundry.servicebroker.lastoperation;
 
+import org.immutables.value.Value;
+
 @Value.Immutable
 abstract class _LastOperationDeprovisionResponse {
 

diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java
@@ -28,3 +28,5 @@
     typeImmutable = "*"
 )
 package org.cloudfoundry.servicebroker;
+
+import org.immutables.value.Value;