Skip to content

Commit 41591a2

Browse files
SaifuddinMerchantSaifuddinMerchant
committed
Reorganize the package for organization quota and space quota to a common quota package to better structure the quota code
1 parent cbedd49 commit 41591a2

51 files changed

Lines changed: 95 additions & 251 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import org.cloudfoundry.client.v3.droplets.Droplets;
6060
import org.cloudfoundry.client.v3.isolationsegments.IsolationSegments;
6161
import org.cloudfoundry.client.v3.jobs.JobsV3;
62-
import org.cloudfoundry.client.v3.organizationquotas.OrganizationQuotasV3;
62+
import org.cloudfoundry.client.v3.quotas.organizations.OrganizationQuotasV3;
6363
import org.cloudfoundry.client.v3.organizations.OrganizationsV3;
6464
import org.cloudfoundry.client.v3.packages.Packages;
6565
import org.cloudfoundry.client.v3.processes.Processes;
@@ -72,7 +72,7 @@
7272
import org.cloudfoundry.client.v3.serviceinstances.ServiceInstancesV3;
7373
import org.cloudfoundry.client.v3.serviceofferings.ServiceOfferingsV3;
7474
import org.cloudfoundry.client.v3.serviceplans.ServicePlansV3;
75-
import org.cloudfoundry.client.v3.spacequotas.SpaceQuotasV3;
75+
import org.cloudfoundry.client.v3.quotas.spaces.SpaceQuotasV3;
7676
import org.cloudfoundry.client.v3.spaces.SpacesV3;
7777
import org.cloudfoundry.client.v3.stacks.StacksV3;
7878
import org.cloudfoundry.client.v3.tasks.Tasks;
@@ -119,7 +119,7 @@
119119
import org.cloudfoundry.reactor.client.v3.droplets.ReactorDroplets;
120120
import org.cloudfoundry.reactor.client.v3.isolationsegments.ReactorIsolationSegments;
121121
import org.cloudfoundry.reactor.client.v3.jobs.ReactorJobsV3;
122-
import org.cloudfoundry.reactor.client.v3.organizationquotas.ReactorOrganizationQuotasV3;
122+
import org.cloudfoundry.reactor.client.v3.quotas.organizations.ReactorOrganizationQuotasV3;
123123
import org.cloudfoundry.reactor.client.v3.organizations.ReactorOrganizationsV3;
124124
import org.cloudfoundry.reactor.client.v3.packages.ReactorPackages;
125125
import org.cloudfoundry.reactor.client.v3.processes.ReactorProcesses;
@@ -132,7 +132,7 @@
132132
import org.cloudfoundry.reactor.client.v3.serviceinstances.ReactorServiceInstancesV3;
133133
import org.cloudfoundry.reactor.client.v3.serviceofferings.ReactorServiceOfferingsV3;
134134
import org.cloudfoundry.reactor.client.v3.serviceplans.ReactorServicePlansV3;
135-
import org.cloudfoundry.reactor.client.v3.spacequotas.ReactorSpaceQuotasV3;
135+
import org.cloudfoundry.reactor.client.v3.quotas.spaces.ReactorSpaceQuotasV3;
136136
import org.cloudfoundry.reactor.client.v3.spaces.ReactorSpacesV3;
137137
import org.cloudfoundry.reactor.client.v3.stacks.ReactorStacksV3;
138138
import org.cloudfoundry.reactor.client.v3.tasks.ReactorTasks;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.cloudfoundry.reactor.client.v3.organizationquotas;
17+
package org.cloudfoundry.reactor.client.v3.quotas.organizations;
1818

1919
import java.util.Map;
20-
import org.cloudfoundry.client.v3.organizationquotas.*;
20+
import org.cloudfoundry.client.v3.quotas.organizations.*;
2121
import org.cloudfoundry.reactor.ConnectionContext;
2222
import org.cloudfoundry.reactor.TokenProvider;
2323
import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/spacequotas/ReactorSpaceQuotasV3.java renamed to cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/quotas/spaces/ReactorSpaceQuotasV3.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.cloudfoundry.reactor.client.v3.spacequotas;
17+
package org.cloudfoundry.reactor.client.v3.quotas.spaces;
1818

1919
import java.util.Map;
20-
import org.cloudfoundry.client.v3.spacequotas.*;
21-
import org.cloudfoundry.client.v3.spacequotas.CreateSpaceQuotaResponse;
20+
import org.cloudfoundry.client.v3.quotas.spaces.*;
2221
import org.cloudfoundry.reactor.ConnectionContext;
2322
import org.cloudfoundry.reactor.TokenProvider;
2423
import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/organizationquotas/ReactorOrganizationQuotasV3Test.java renamed to cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/quotas/organizations/ReactorOrganizationQuotasV3Test.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.cloudfoundry.reactor.client.v3.organizationquotas;
17+
package org.cloudfoundry.reactor.client.v3.quotas.organizations;
1818

1919
import static io.netty.handler.codec.http.HttpMethod.*;
2020
import static io.netty.handler.codec.http.HttpResponseStatus.ACCEPTED;
@@ -26,7 +26,8 @@
2626
import org.cloudfoundry.client.v3.Pagination;
2727
import org.cloudfoundry.client.v3.Relationship;
2828
import org.cloudfoundry.client.v3.ToManyRelationship;
29-
import org.cloudfoundry.client.v3.organizationquotas.*;
29+
import org.cloudfoundry.client.v3.quotas.*;
30+
import org.cloudfoundry.client.v3.quotas.organizations.*;
3031
import org.cloudfoundry.reactor.InteractionContext;
3132
import org.cloudfoundry.reactor.TestRequest;
3233
import org.cloudfoundry.reactor.TestResponse;

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/spacequotas/ReactorSpaceQuotasV3Test.java renamed to cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/quotas/spaces/ReactorSpaceQuotasV3Test.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.cloudfoundry.reactor.client.v3.spacequotas;
17+
package org.cloudfoundry.reactor.client.v3.quotas.spaces;
1818

1919
import static io.netty.handler.codec.http.HttpMethod.DELETE;
2020
import static io.netty.handler.codec.http.HttpMethod.GET;
@@ -30,8 +30,8 @@
3030
import org.cloudfoundry.client.v3.Relationship;
3131
import org.cloudfoundry.client.v3.ToManyRelationship;
3232
import org.cloudfoundry.client.v3.ToOneRelationship;
33-
import org.cloudfoundry.client.v3.spacequotas.*;
34-
import org.cloudfoundry.client.v3.spacequotas.SpaceQuotaResource;
33+
import org.cloudfoundry.client.v3.quotas.*;
34+
import org.cloudfoundry.client.v3.quotas.spaces.*;
3535
import org.cloudfoundry.reactor.InteractionContext;
3636
import org.cloudfoundry.reactor.TestRequest;
3737
import org.cloudfoundry.reactor.TestResponse;

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@
5757
import org.cloudfoundry.client.v3.droplets.Droplets;
5858
import org.cloudfoundry.client.v3.isolationsegments.IsolationSegments;
5959
import org.cloudfoundry.client.v3.jobs.JobsV3;
60-
import org.cloudfoundry.client.v3.organizationquotas.OrganizationQuotasV3;
6160
import org.cloudfoundry.client.v3.organizations.OrganizationsV3;
6261
import org.cloudfoundry.client.v3.packages.Packages;
6362
import org.cloudfoundry.client.v3.processes.Processes;
63+
import org.cloudfoundry.client.v3.quotas.organizations.OrganizationQuotasV3;
64+
import org.cloudfoundry.client.v3.quotas.spaces.SpaceQuotasV3;
6465
import org.cloudfoundry.client.v3.resourcematch.ResourceMatchV3;
6566
import org.cloudfoundry.client.v3.roles.RolesV3;
6667
import org.cloudfoundry.client.v3.routes.RoutesV3;
@@ -70,7 +71,6 @@
7071
import org.cloudfoundry.client.v3.serviceinstances.ServiceInstancesV3;
7172
import org.cloudfoundry.client.v3.serviceofferings.ServiceOfferingsV3;
7273
import org.cloudfoundry.client.v3.serviceplans.ServicePlansV3;
73-
import org.cloudfoundry.client.v3.spacequotas.SpaceQuotasV3;
7474
import org.cloudfoundry.client.v3.spaces.SpacesV3;
7575
import org.cloudfoundry.client.v3.stacks.StacksV3;
7676
import org.cloudfoundry.client.v3.tasks.Tasks;

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/organizationquotas/_Apps.java‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/organizationquotas/_Routes.java‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/organizationquotas/_Services.java‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/spacequotas/_Apps.java renamed to cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/quotas/_Apps.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.cloudfoundry.client.v3.spacequotas;
17+
package org.cloudfoundry.client.v3.quotas;
1818

1919
import com.fasterxml.jackson.annotation.JsonProperty;
2020
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -37,34 +37,34 @@ abstract class _Apps {
3737
abstract Integer getPerProcessMemoryInMb();
3838

3939
/**
40-
* Total memory allowed for all the started processes and running tasks in a space
41-
* @return the total memory allowed for all the started processes and running tasks in a space
40+
* Total memory allowed for all the started processes and running tasks
41+
* @return the total memory allowed for all the started processes and running tasks
4242
*/
4343
@JsonProperty("total_memory_in_mb")
4444
@Nullable
4545
abstract Integer getTotalMemoryInMb();
4646

4747
/**
48-
* Total instances of all the started processes allowed in a space
49-
* @return the total instances of all the started processes allowed in a space
48+
* Total instances of all the started processes allowed
49+
* @return the total instances of all the started processes allowed
5050
*/
5151
@JsonProperty("total_instances")
5252
@Nullable
5353
abstract Integer getTotalInstances();
5454

5555
/**
56-
* Total log rate limit allowed for all the started processes and running tasks in a space
56+
* Total log rate limit allowed for all the started processes and running tasks
57+
* @return the total log rate limit allowed for all the started processes and running tasks
5758
*/
5859
@JsonProperty("log_rate_limit_in_bytes_per_second")
5960
@Nullable
6061
abstract Integer getLogRateLimitInBytesPerSecond();
6162

6263
/**
63-
* Maximum number of running tasks in a space
64-
* @return the maximum number of running tasks in a space
64+
* Maximum number of running tasks
65+
* @return the maximum number of running tasks
6566
*/
6667
@JsonProperty("per_app_tasks")
6768
@Nullable
6869
abstract Integer getPerAppTasks();
69-
70-
}
70+
}

0 commit comments

Comments
 (0)