organization quotas and space quota are reorganized (#1322)

* Removing references to Definition from Organization Quota
* Reorganize the package for organization quota and space quota to a common quota package to better structure the quota code

Author: SaifuddinMerchant

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/_ReactorCloudFoundryClient.java

@@ -59,7 +59,7 @@
 import org.cloudfoundry.client.v3.droplets.Droplets;
 import org.cloudfoundry.client.v3.isolationsegments.IsolationSegments;
 import org.cloudfoundry.client.v3.jobs.JobsV3;
-import org.cloudfoundry.client.v3.organizationquotadefinitions.OrganizationQuotaDefinitionsV3;
+import org.cloudfoundry.client.v3.quotas.organizations.OrganizationQuotasV3;
 import org.cloudfoundry.client.v3.organizations.OrganizationsV3;
 import org.cloudfoundry.client.v3.packages.Packages;
 import org.cloudfoundry.client.v3.processes.Processes;
@@ -72,7 +72,7 @@
 import org.cloudfoundry.client.v3.serviceinstances.ServiceInstancesV3;
 import org.cloudfoundry.client.v3.serviceofferings.ServiceOfferingsV3;
 import org.cloudfoundry.client.v3.serviceplans.ServicePlansV3;
-import org.cloudfoundry.client.v3.spacequotas.SpaceQuotasV3;
+import org.cloudfoundry.client.v3.quotas.spaces.SpaceQuotasV3;
 import org.cloudfoundry.client.v3.spaces.SpacesV3;
 import org.cloudfoundry.client.v3.stacks.StacksV3;
 import org.cloudfoundry.client.v3.tasks.Tasks;
@@ -119,7 +119,7 @@
 import org.cloudfoundry.reactor.client.v3.droplets.ReactorDroplets;
 import org.cloudfoundry.reactor.client.v3.isolationsegments.ReactorIsolationSegments;
 import org.cloudfoundry.reactor.client.v3.jobs.ReactorJobsV3;
-import org.cloudfoundry.reactor.client.v3.organizationquotadefinitions.ReactorOrganizationQuotaDefinitionsV3;
+import org.cloudfoundry.reactor.client.v3.quotas.organizations.ReactorOrganizationQuotasV3;
 import org.cloudfoundry.reactor.client.v3.organizations.ReactorOrganizationsV3;
 import org.cloudfoundry.reactor.client.v3.packages.ReactorPackages;
 import org.cloudfoundry.reactor.client.v3.processes.ReactorProcesses;
@@ -132,7 +132,7 @@
 import org.cloudfoundry.reactor.client.v3.serviceinstances.ReactorServiceInstancesV3;
 import org.cloudfoundry.reactor.client.v3.serviceofferings.ReactorServiceOfferingsV3;
 import org.cloudfoundry.reactor.client.v3.serviceplans.ReactorServicePlansV3;
-import org.cloudfoundry.reactor.client.v3.spacequotas.ReactorSpaceQuotasV3;
+import org.cloudfoundry.reactor.client.v3.quotas.spaces.ReactorSpaceQuotasV3;
 import org.cloudfoundry.reactor.client.v3.spaces.ReactorSpacesV3;
 import org.cloudfoundry.reactor.client.v3.stacks.ReactorStacksV3;
 import org.cloudfoundry.reactor.client.v3.tasks.ReactorTasks;
@@ -284,8 +284,8 @@ public OrganizationQuotaDefinitions organizationQuotaDefinitions() {
 
     @Override
     @Value.Derived
-    public OrganizationQuotaDefinitionsV3 organizationQuotaDefinitionsV3() {
-        return new ReactorOrganizationQuotaDefinitionsV3(getConnectionContext(), getRootV3(), getTokenProvider(),
+    public OrganizationQuotasV3 organizationQuotasV3() {
+        return new ReactorOrganizationQuotasV3(getConnectionContext(), getRootV3(), getTokenProvider(),
                 getRequestTags());
     }
 

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/organizationquotadefinitions/ReactorOrganizationQuotaDefinitionsV3.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2013-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.reactor.client.v3.quotas.organizations;
+
+import java.util.Map;
+import org.cloudfoundry.client.v3.quotas.organizations.*;
+import org.cloudfoundry.reactor.ConnectionContext;
+import org.cloudfoundry.reactor.TokenProvider;
+import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;
+import reactor.core.publisher.Mono;
+
+/**
+ * The Reactor-based implementation of {@link ReactorOrganizationQuotasV3}
+ */
+public class ReactorOrganizationQuotasV3 extends AbstractClientV3Operations
+        implements OrganizationQuotasV3 {
+
+    /**
+     * 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 ReactorOrganizationQuotasV3(
+            ConnectionContext connectionContext,
+            Mono<String> root,
+            TokenProvider tokenProvider,
+            Map<String, String> requestTags) {
+        super(connectionContext, root, tokenProvider, requestTags);
+    }
+
+    @Override
+    public Mono<CreateOrganizationQuotaResponse> create(CreateOrganizationQuotaRequest request) {
+        return post(
+                        request,
+                        CreateOrganizationQuotaResponse.class,
+                        builder -> builder.pathSegment("organization_quotas"))
+                .checkpoint();
+    }
+
+    @Override
+    public Mono<GetOrganizationQuotaResponse> get(GetOrganizationQuotaRequest request) {
+        return get(
+                        request,
+                        GetOrganizationQuotaResponse.class,
+                        builder ->
+                                builder.pathSegment(
+                                        "organization_quotas", request.getOrganizationQuotaId()))
+                .checkpoint();
+    }
+
+    @Override
+    public Mono<ListOrganizationQuotasResponse> list(ListOrganizationQuotasRequest request) {
+        return get(
+                        request,
+                        ListOrganizationQuotasResponse.class,
+                        builder -> builder.pathSegment("organization_quotas"))
+                .checkpoint();
+    }
+
+    @Override
+    public Mono<UpdateOrganizationQuotaResponse> update(UpdateOrganizationQuotaRequest request) {
+        return patch(
+                        request,
+                        UpdateOrganizationQuotaResponse.class,
+                        builder ->
+                                builder.pathSegment(
+                                        "organization_quotas", request.getOrganizationQuotaId()))
+                .checkpoint();
+    }
+
+    @Override
+    public Mono<String> delete(DeleteOrganizationQuotaRequest request) {
+        return delete(
+                        request,
+                        builder ->
+                                builder.pathSegment(
+                                        "organization_quotas", request.getOrganizationQuotaId()))
+                .checkpoint();
+    }
+}

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/quotas/organizations/ReactorOrganizationQuotasV3.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.cloudfoundry.reactor.client.v3.spacequotas;
+package org.cloudfoundry.reactor.client.v3.quotas.spaces;
 
 import java.util.Map;
-import org.cloudfoundry.client.v3.spacequotas.*;
-import org.cloudfoundry.client.v3.spacequotas.CreateSpaceQuotaResponse;
+import org.cloudfoundry.client.v3.quotas.spaces.*;
 import org.cloudfoundry.reactor.ConnectionContext;
 import org.cloudfoundry.reactor.TokenProvider;
 import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;