Moved TokenQuotaLimit class to different package

Author: tanya732

src/main/java/com/auth0/exception/RateLimitException.java

@@ -149,12 +149,8 @@ public RateLimitException build() {
                 ? new RateLimitException(this.limit, this.remaining, this.reset, this.values)
                 : new RateLimitException(this.limit, this.remaining, this.reset);
 
-            if(this.clientQuotaLimit != null) {
-                exception.clientQuotaLimit = this.clientQuotaLimit;
-            }
-            if(this.organizationQuotaLimit != null) {
-                exception.organizationQuotaLimit = this.organizationQuotaLimit;
-            }
+            exception.clientQuotaLimit = this.clientQuotaLimit;
+            exception.organizationQuotaLimit = this.organizationQuotaLimit;
 
             return exception;
         }

src/main/java/com/auth0/json/mgmt/tenants/DefaultTokenQuota.java

@@ -8,7 +8,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class DefaultTokenQuota {
     @JsonProperty("clients")
-    private Clients client;
+    private Clients clients;
 
     @JsonProperty("organizations")
     private Organizations organizations;
@@ -21,26 +21,26 @@ public DefaultTokenQuota() {}
     /**
      * Constructor for DefaultTokenQuota.
      *
-     * @param client the clients
+     * @param clients the clients
      * @param organizations the organizations
      */
-    public DefaultTokenQuota(Clients client, Organizations organizations) {
-        this.client = client;
+    public DefaultTokenQuota(Clients clients, Organizations organizations) {
+        this.clients = clients;
         this.organizations = organizations;
     }
 
     /**
      * @return the clients
      */
-    public Clients getClient() {
-        return client;
+    public Clients getClients() {
+        return clients;
     }
 
     /**
-     * @param client the clients to set
+     * @param clients the clients to set
      */
-    public void setClient(Clients client) {
-        this.client = client;
+    public void setClients(Clients clients) {
+        this.clients = clients;
     }
 
     /**

src/main/java/com/auth0/json/mgmt/tokenquota/ClientCredentials.java

@@ -9,6 +9,23 @@ public class ClientCredentials {
     private int perHour;
     @JsonProperty("enforce")
     private boolean enforce;
+    /**
+     * Default constructor for ClientCredentials.
+     */
+    public ClientCredentials() {}
+
+    /**
+     * Constructor for ClientCredentials.
+     *
+     * @param perDay the number of client credentials allowed per day
+     * @param perHour the number of client credentials allowed per hour
+     * @param enforce true if the quota is enforced, false otherwise
+     */
+    public ClientCredentials(int perDay, int perHour, boolean enforce) {
+        this.perDay = perDay;
+        this.perHour = perHour;
+        this.enforce = enforce;
+    }
 
     /**
      * @return the number of client credentials allowed per day

src/main/java/com/auth0/net/ResponseImpl.java

@@ -1,7 +1,5 @@
 package com.auth0.net;
 
-import com.auth0.json.auth.TokenQuotaLimit;
-
 import java.util.Collections;
 import java.util.Map;
 

src/main/java/com/auth0/net/TokenQuotaBucket.java

@@ -1,7 +1,5 @@
 package com.auth0.net;
 
-import com.auth0.json.auth.TokenQuotaLimit;
-
 public class TokenQuotaBucket {
     private TokenQuotaLimit perHour;
     private TokenQuotaLimit perDay;

…com/auth0/json/auth/TokenQuotaLimit.java …/java/com/auth0/net/TokenQuotaLimit.javasrc/main/java/com/auth0/json/auth/TokenQuotaLimit.java renamed to src/main/java/com/auth0/net/TokenQuotaLimit.java src/main/java/com/auth0/json/auth/TokenQuotaLimit.java renamed to src/main/java/com/auth0/net/TokenQuotaLimit.java

@@ -1,4 +1,4 @@
-package com.auth0.json.auth;
+package com.auth0.net;
 
 public class TokenQuotaLimit {
     private int quota;

src/main/java/com/auth0/utils/HttpResponseHeadersUtils.java

@@ -1,6 +1,6 @@
 package com.auth0.utils;
 
-import com.auth0.json.auth.TokenQuotaLimit;
+import com.auth0.net.TokenQuotaLimit;
 import com.auth0.net.TokenQuotaBucket;
 
 import java.util.Map;
@@ -14,10 +14,7 @@ public class HttpResponseHeadersUtils {
      * @return a TokenQuotaBucket containing client rate limits, or null if not present.
      */
     public static TokenQuotaBucket getClientQuotaLimit(Map<String, String> headers) {
-        String quotaHeader = headers.get("auth0-Quota-Client-Limit");
-        if( quotaHeader == null) {
-            quotaHeader = headers.get("auth0-quota-client-limit");
-        }
+        String quotaHeader = headers.get("auth0-quota-client-limit");
         if (quotaHeader != null) {
             return parseQuota(quotaHeader);
         }
@@ -31,10 +28,7 @@ public static TokenQuotaBucket getClientQuotaLimit(Map<String, String> headers)
      * @return a TokenQuotaBucket containing organization rate limits, or null if not present.
      */
     public static TokenQuotaBucket getOrganizationQuotaLimit(Map<String, String> headers) {
-        String quotaHeader = headers.get("auth0-Quota-Organization-Limit");
-        if( quotaHeader == null) {
-            quotaHeader = headers.get("auth0-quota-organization-limit");
-        }
+        String quotaHeader = headers.get("auth0-quota-organization-limit");
         if (quotaHeader != null) {
             return parseQuota(quotaHeader);
         }

src/test/java/com/auth0/json/mgmt/tenants/TenantTest.java

@@ -144,11 +144,11 @@ public void shouldDeserialize() throws Exception {
         assertThat(tenant.getMtls(), is(notNullValue()));
         assertThat(tenant.getMtls().getEnableEndpointAliases(), is(true));
         assertThat(tenant.getDefaultTokenQuota(), is(notNullValue()));
-        assertThat(tenant.getDefaultTokenQuota().getClient(), is(notNullValue()));
-        assertThat(tenant.getDefaultTokenQuota().getClient().getClientCredentials(), is(notNullValue()));
-        assertThat(tenant.getDefaultTokenQuota().getClient().getClientCredentials().getPerDay(), is(100));
-        assertThat(tenant.getDefaultTokenQuota().getClient().getClientCredentials().getPerHour(), is(20));
-        assertThat(tenant.getDefaultTokenQuota().getClient().getClientCredentials().isEnforce(), is(true));
+        assertThat(tenant.getDefaultTokenQuota().getClients(), is(notNullValue()));
+        assertThat(tenant.getDefaultTokenQuota().getClients().getClientCredentials(), is(notNullValue()));
+        assertThat(tenant.getDefaultTokenQuota().getClients().getClientCredentials().getPerDay(), is(100));
+        assertThat(tenant.getDefaultTokenQuota().getClients().getClientCredentials().getPerHour(), is(20));
+        assertThat(tenant.getDefaultTokenQuota().getClients().getClientCredentials().isEnforce(), is(true));
         assertThat(tenant.getDefaultTokenQuota().getOrganizations(), is(notNullValue()));
         assertThat(tenant.getDefaultTokenQuota().getOrganizations().getClientCredentials(), is(notNullValue()));
         assertThat(tenant.getDefaultTokenQuota().getOrganizations().getClientCredentials().getPerDay(), is(100));

src/test/java/com/auth0/net/BaseRequestTest.java

@@ -7,7 +7,6 @@
 import com.auth0.exception.Auth0Exception;
 import com.auth0.exception.RateLimitException;
 import com.auth0.json.auth.TokenHolder;
-import com.auth0.json.auth.TokenQuotaLimit;
 import com.auth0.net.client.*;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;

src/test/java/com/auth0/net/MultipartRequestTest.java

@@ -6,7 +6,6 @@
 import com.auth0.exception.Auth0Exception;
 import com.auth0.exception.RateLimitException;
 import com.auth0.json.auth.TokenHolder;
-import com.auth0.json.auth.TokenQuotaLimit;
 import com.auth0.net.client.Auth0HttpClient;
 import com.auth0.net.client.Auth0MultipartRequestBody;
 import com.auth0.net.client.DefaultHttpClient;