merging changes from main and resolving all conflicts

SaifuddinMerchant · SaifuddinMerchant · commit d9e98fb44301 · 2025-10-23T10:10:52.000-07:00
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/organizationquotadefinitions/OrganizationQuotaDefinitionsV3.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/organizationquotadefinitions/OrganizationQuotaDefinitionsV3.java
@@ -24,7 +24,7 @@
 public interface OrganizationQuotaDefinitionsV3 {
 
     /**
-     * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#create-organization-quota-definition">Create Organization Quota Definition</a>
+     * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#create-an-organization-quota">Create Organization Quota Definition</a>
      * request
      *
      * @param request the Create Organization Quota Definition request
@@ -34,7 +34,7 @@ Mono<CreateOrganizationQuotaDefinitionResponse> create(
             CreateOrganizationQuotaDefinitionRequest request);
 
     /**
-     * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#get-organization-quota-definition">Get Organization Quota Definition</a>
+     * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#get-an-organization-quota">Get Organization Quota Definition</a>
      * request
      *
      * @param request the Get Organization Quota Definition request
@@ -52,7 +52,7 @@ Mono<CreateOrganizationQuotaDefinitionResponse> create(
     Mono<ListOrganizationQuotaDefinitionsResponse> list(
             ListOrganizationQuotaDefinitionsRequest request);
 
-    /** Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#update-organization-quota-definition">Update Organization Quota Definition</a>
+    /** Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#update-an-organization-quota">Update Organization Quota Definition</a>
      * request
      *
      * @param request the Update Organization Quota Definition request
@@ -62,7 +62,7 @@ Mono<UpdateOrganizationQuotaDefinitionResponse> update(
             UpdateOrganizationQuotaDefinitionRequest request);
 
     /**
-     * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#delete-organization-quota-definition">Delete Organization Quota Definition</a>
+     * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.200.0/index.html#delete-an-organization-quota">Delete Organization Quota Definition</a>
      * request
      *
      * @param request the Delete Organization Quota Definition request
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/organizationquotadefinitions/_UpdateOrganizationQuotaDefinitionRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/organizationquotadefinitions/_UpdateOrganizationQuotaDefinitionRequest.java
@@ -62,4 +62,11 @@ abstract class _UpdateOrganizationQuotaDefinitionRequest {
     @JsonProperty("routes")
     @Nullable
     abstract Routes getRoutes();
+
+    /**
+     * Quotas that affect domains
+     */
+    @JsonProperty("domains")
+    @Nullable
+    abstract Domains getDomains();
 }
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizationquotadefinitions/UpdateOrganizationQuotaDefinitionRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/organizationquotadefinitions/UpdateOrganizationQuotaDefinitionRequestTest.java
@@ -23,7 +23,7 @@
 final class UpdateOrganizationQuotaDefinitionRequestTest {
 
     @Test
-    void noOrganizationId() {
+    void noOrganizationQuotaDefinitionId() {
         assertThrows(
                 IllegalStateException.class,
                 () -> UpdateOrganizationQuotaDefinitionRequest.builder().build());
diff --git a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsV3.java b/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsV3.java
@@ -26,12 +26,14 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
+import org.cloudfoundry.client.v3.Metadata;
 import org.cloudfoundry.client.v3.processes.HealthCheckType;
 import org.cloudfoundry.client.v3.processes.ReadinessHealthCheckType;
 import org.yaml.snakeyaml.DumperOptions;
@@ -172,8 +174,14 @@ private static ManifestV3Application.Builder toApplicationManifest(
                 variables,
                 raw -> getSidecar((Map<String, Object>) raw, variables),
                 builder::sidecar);
-        as(application, "labels", variables, Map.class::cast, builder::labels);
-        as(application, "annotations", variables, Map.class::cast, builder::annotations);
+
+        as(
+                application,
+                "metadata",
+                variables,
+                raw -> getMetadata((Map<String, Object>) raw, variables),
+                builder::metadata);
+
         asBoolean(application, "default-route", variables, builder::defaultRoute);
 
         return builder;
@@ -253,6 +261,31 @@ private static ManifestV3Service getService(Object raw, Map<String, String> vari
         return builder.build();
     }
 
+    private static Metadata getMetadata(Map<String, Object> raw, Map<String, String> variables) {
+
+        if (raw == null) return null;
+
+        Map<String, String> labels = new HashMap<>();
+        Map<String, String> annotations = new HashMap<>();
+
+        asMap(raw, "labels", variables, String.class::cast, labels::put);
+
+        asMap(raw, "annotations", variables, String.class::cast, annotations::put);
+
+        if (labels.isEmpty() && annotations.isEmpty()) {
+            return null;
+        }
+
+        Metadata.Builder builder = Metadata.builder();
+        if (!labels.isEmpty()) {
+            builder.labels(labels);
+        }
+        if (!annotations.isEmpty()) {
+            builder.annotations(annotations);
+        }
+        return builder.build();
+    }
+
     private static Map<String, Object> toYaml(ManifestV3 manifest) {
         Map<String, Object> yaml = new TreeMap<>();
         yaml.put("version", manifest.getVersion());
@@ -282,8 +315,8 @@ private static Map<String, Object> toApplicationYaml(ManifestV3Application appli
                 "sidecars",
                 convertCollection(
                         application.getSidecars(), ApplicationManifestUtilsV3::toSidecarsYaml));
-        putIfPresent(yaml, "labels", application.getLabels());
-        putIfPresent(yaml, "annotations", application.getAnnotations());
+
+        putIfPresent(yaml, "metadata", toMetadataYaml(application.getMetadata()));
         return yaml;
     }
 
@@ -337,4 +370,12 @@ private static Map<String, Object> toProcessYaml(ManifestV3Process process) {
         putIfPresent(yaml, "timeout", process.getTimeout());
         return yaml;
     }
+
+    private static Map<String, Object> toMetadataYaml(Metadata metadata) {
+        if (metadata == null) return null;
+        Map<String, Object> map = new HashMap<>();
+        putIfPresent(map, "labels", metadata.getLabels());
+        putIfPresent(map, "annotations", metadata.getAnnotations());
+        return map.isEmpty() ? null : map;
+    }
 }
diff --git a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/_ManifestV3Application.java b/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/_ManifestV3Application.java
@@ -16,10 +16,9 @@
 
 package org.cloudfoundry.operations.applications;
 
-
-import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
+import org.cloudfoundry.client.v3.Metadata;
 
 import java.util.List;
 import java.util.Map;
@@ -31,25 +30,17 @@
 @Value.Immutable
 abstract class _ManifestV3Application extends _ApplicationManifestCommon {
 
-    /**
-     * The annotations configured for this application
-     */
-    @AllowNulls
-    @Nullable
-    abstract Map<String, String> getAnnotations();
-
     /**
      * Generate a default route based on the application name
      */
     @Nullable
     abstract Boolean getDefaultRoute();
 
     /**
-     * The labels configured for this application
+     * The metadata for this application
      */
-    @AllowNulls
     @Nullable
-    abstract Map<String, String> getLabels();
+    abstract Metadata getMetadata();
 
     /**
      * The collection of processes configured for this application
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsV3Test.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsV3Test.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import org.cloudfoundry.client.v3.Metadata;
 import org.cloudfoundry.client.v3.processes.ReadinessHealthCheckType;
 import org.junit.jupiter.api.Test;
 
@@ -60,6 +61,62 @@ void testWithDockerApp() throws IOException {
         assertSerializeDeserialize(manifest);
     }
 
+    @Test
+    void testWithMetadata() throws IOException {
+        ManifestV3 manifest =
+                ManifestV3.builder()
+                        .application(
+                                ManifestV3Application.builder()
+                                        .name("test-app")
+                                        .metadata(
+                                                Metadata.builder()
+                                                        .label("test-label", "test-label-value")
+                                                        .annotation(
+                                                                "test-annotation",
+                                                                "test-annotation-value")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        assertSerializeDeserialize(manifest);
+    }
+
+    @Test
+    void testWithMetadataOnlyLabel() throws IOException {
+        ManifestV3 manifest =
+                ManifestV3.builder()
+                        .application(
+                                ManifestV3Application.builder()
+                                        .name("test-app")
+                                        .metadata(
+                                                Metadata.builder()
+                                                        .label("test-label", "test-label-value")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        assertSerializeDeserialize(manifest);
+    }
+
+    @Test
+    void testWithMetadataOnlyAnnotation() throws IOException {
+        ManifestV3 manifest =
+                ManifestV3.builder()
+                        .application(
+                                ManifestV3Application.builder()
+                                        .name("test-app")
+                                        .metadata(
+                                                Metadata.builder()
+                                                        .annotation(
+                                                                "test-annotation",
+                                                                "test-annotation-value")
+                                                        .build())
+                                        .build())
+                        .build();
+
+        assertSerializeDeserialize(manifest);
+    }
+
     private void assertSerializeDeserialize(ManifestV3 manifest) throws IOException {
         Path file = Files.createTempFile("test-manifest-", ".yml");
         ApplicationManifestUtilsV3.write(file, manifest);
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationQuotaDefinitionsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationQuotaDefinitionsTest.java
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
