Moved classes around plus some cleanup

hzalaz · hzalaz · commit 007dea88009f · 2016-01-25T09:28:38.000-03:00
diff --git a/core/src/main/java/com/auth0/APIException.java b/core/src/main/java/com/auth0/APIException.java
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api;
-
-import com.auth0.Auth0Exception;
+package com.auth0;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/auth0/RequestBodyBuildException.java b/core/src/main/java/com/auth0/RequestBodyBuildException.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api;
+package com.auth0;
 
 import com.auth0.Auth0Exception;
 
diff --git a/core/src/main/java/com/auth0/authentication/AuthenticationAPIClient.java b/core/src/main/java/com/auth0/authentication/AuthenticationAPIClient.java
@@ -24,21 +24,21 @@
 
 package com.auth0.authentication;
 
-import com.auth0.authentication.api.ParameterBuilder;
-import com.auth0.authentication.api.ParameterizableRequest;
-import com.auth0.authentication.api.Request;
-import com.auth0.authentication.api.internal.RequestFactory;
 import com.auth0.Auth0;
-import com.auth0.DatabaseUser;
-import com.auth0.Token;
-import com.auth0.UserProfile;
+import com.auth0.authentication.result.DatabaseUser;
+import com.auth0.authentication.result.Delegation;
+import com.auth0.authentication.result.Token;
+import com.auth0.authentication.result.UserProfile;
+import com.auth0.internal.RequestFactory;
+import com.auth0.request.ParameterizableRequest;
+import com.auth0.request.Request;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.squareup.okhttp.HttpUrl;
 import com.squareup.okhttp.OkHttpClient;
 
 import java.util.Map;
 
-import static com.auth0.authentication.api.ParameterBuilder.GRANT_TYPE_PASSWORD;
+import static com.auth0.authentication.ParameterBuilder.GRANT_TYPE_PASSWORD;
 
 /**
  * API client for Auth0 Authentication API.
diff --git a/core/src/main/java/com/auth0/authentication/AuthenticationRequest.java b/core/src/main/java/com/auth0/authentication/AuthenticationRequest.java
@@ -25,12 +25,12 @@
 package com.auth0.authentication;
 
 import com.auth0.Auth0Exception;
-import com.auth0.authentication.api.ParameterBuilder;
-import com.auth0.authentication.api.ParameterizableRequest;
-import com.auth0.authentication.api.Request;
-import com.auth0.authentication.api.callback.BaseCallback;
-import com.auth0.Token;
-import com.auth0.UserProfile;
+import com.auth0.request.ParameterizableRequest;
+import com.auth0.request.Request;
+import com.auth0.callback.BaseCallback;
+import com.auth0.authentication.result.Token;
+import com.auth0.authentication.result.UserProfile;
+import com.auth0.authentication.result.Authentication;
 
 import java.util.Map;
 
diff --git a/core/src/main/java/com/auth0/authentication/ChangePasswordRequest.java b/core/src/main/java/com/auth0/authentication/ChangePasswordRequest.java
@@ -25,8 +25,8 @@
 package com.auth0.authentication;
 
 import com.auth0.Auth0Exception;
-import com.auth0.authentication.api.ParameterizableRequest;
-import com.auth0.authentication.api.callback.BaseCallback;
+import com.auth0.request.ParameterizableRequest;
+import com.auth0.callback.BaseCallback;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/auth0/authentication/DelegationRequest.java b/core/src/main/java/com/auth0/authentication/DelegationRequest.java
@@ -25,10 +25,10 @@
 package com.auth0.authentication;
 
 import com.auth0.Auth0Exception;
-import com.auth0.authentication.api.ParameterBuilder;
-import com.auth0.authentication.api.ParameterizableRequest;
-import com.auth0.authentication.api.Request;
-import com.auth0.authentication.api.callback.BaseCallback;
+import com.auth0.request.ParameterizableRequest;
+import com.auth0.request.Request;
+import com.auth0.callback.BaseCallback;
+import com.auth0.authentication.result.Delegation;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/auth0/authentication/ParameterBuilder.java b/core/src/main/java/com/auth0/authentication/ParameterBuilder.java
@@ -22,10 +22,9 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api;
+package com.auth0.authentication;
 
-import com.auth0.authentication.PasswordlessType;
-import com.auth0.authentication.api.util.CheckHelper;
+import com.auth0.util.CheckHelper;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/auth0/authentication/SignUpRequest.java b/core/src/main/java/com/auth0/authentication/SignUpRequest.java
@@ -25,10 +25,11 @@
 package com.auth0.authentication;
 
 import com.auth0.Auth0Exception;
-import com.auth0.authentication.api.ParameterizableRequest;
-import com.auth0.authentication.api.Request;
-import com.auth0.authentication.api.callback.BaseCallback;
-import com.auth0.DatabaseUser;
+import com.auth0.request.ParameterizableRequest;
+import com.auth0.request.Request;
+import com.auth0.callback.BaseCallback;
+import com.auth0.authentication.result.DatabaseUser;
+import com.auth0.authentication.result.Authentication;
 
 import java.util.Map;
 
diff --git a/core/src/main/java/com/auth0/authentication/api/callback/AuthenticationCallback.java b/core/src/main/java/com/auth0/authentication/api/callback/AuthenticationCallback.java
diff --git a/core/src/main/java/com/auth0/authentication/api/callback/RefreshIdTokenCallback.java b/core/src/main/java/com/auth0/authentication/api/callback/RefreshIdTokenCallback.java
diff --git a/core/src/main/java/com/auth0/authentication/result/Authentication.java b/core/src/main/java/com/auth0/authentication/result/Authentication.java
@@ -22,13 +22,10 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication;
+package com.auth0.authentication.result;
 
 
-import com.auth0.Token;
-import com.auth0.UserProfile;
-
-import static com.auth0.authentication.api.util.CheckHelper.checkArgument;
+import static com.auth0.util.CheckHelper.checkArgument;
 
 /**
  * The result of a successful authentication against Auth0
diff --git a/core/src/main/java/com/auth0/authentication/result/DatabaseUser.java b/core/src/main/java/com/auth0/authentication/result/DatabaseUser.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0;
+package com.auth0.authentication.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/core/src/main/java/com/auth0/authentication/result/Delegation.java b/core/src/main/java/com/auth0/authentication/result/Delegation.java
@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication;
+package com.auth0.authentication.result;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import static com.auth0.authentication.api.util.CheckHelper.checkArgument;
+import static com.auth0.util.CheckHelper.checkArgument;
 
 /**
  * The result of a successful delegation to an Auth0 app.
diff --git a/core/src/main/java/com/auth0/authentication/result/Token.java b/core/src/main/java/com/auth0/authentication/result/Token.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0;
+package com.auth0.authentication.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/core/src/main/java/com/auth0/authentication/result/UserIdentity.java b/core/src/main/java/com/auth0/authentication/result/UserIdentity.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0;
+package com.auth0.authentication.result;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/core/src/main/java/com/auth0/authentication/result/UserProfile.java b/core/src/main/java/com/auth0/authentication/result/UserProfile.java
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
-package com.auth0;
+package com.auth0.authentication.result;
 
-import com.auth0.authentication.api.util.CheckHelper;
+import com.auth0.util.CheckHelper;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/core/src/main/java/com/auth0/callback/BaseCallback.java b/core/src/main/java/com/auth0/callback/BaseCallback.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api.callback;
+package com.auth0.callback;
 
 /**
  * Callback that receives a single value on success.
diff --git a/core/src/main/java/com/auth0/callback/Callback.java b/core/src/main/java/com/auth0/callback/Callback.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api.callback;
+package com.auth0.callback;
 
 import com.auth0.Auth0Exception;
 
diff --git a/core/src/main/java/com/auth0/internal/BaseRequest.java b/core/src/main/java/com/auth0/internal/BaseRequest.java
@@ -22,14 +22,14 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api.internal;
+package com.auth0.internal;
 
 import com.auth0.Auth0Exception;
-import com.auth0.authentication.api.APIException;
-import com.auth0.authentication.api.AuthorizableRequest;
-import com.auth0.authentication.api.ParameterizableRequest;
-import com.auth0.authentication.api.RequestBodyBuildException;
-import com.auth0.authentication.api.callback.BaseCallback;
+import com.auth0.APIException;
+import com.auth0.request.AuthorizableRequest;
+import com.auth0.request.ParameterizableRequest;
+import com.auth0.RequestBodyBuildException;
+import com.auth0.callback.BaseCallback;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.squareup.okhttp.Callback;
diff --git a/core/src/main/java/com/auth0/internal/JsonRequestBodyBuilder.java b/core/src/main/java/com/auth0/internal/JsonRequestBodyBuilder.java
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api.internal;
+package com.auth0.internal;
 
-import com.auth0.authentication.api.RequestBodyBuildException;
+import com.auth0.RequestBodyBuildException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.squareup.okhttp.MediaType;
diff --git a/core/src/main/java/com/auth0/internal/RequestFactory.java b/core/src/main/java/com/auth0/internal/RequestFactory.java
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api.internal;
+package com.auth0.internal;
 
-import com.auth0.authentication.api.AuthorizableRequest;
-import com.auth0.authentication.api.ParameterizableRequest;
+import com.auth0.request.AuthorizableRequest;
+import com.auth0.request.ParameterizableRequest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.squareup.okhttp.HttpUrl;
 import com.squareup.okhttp.OkHttpClient;
diff --git a/core/src/main/java/com/auth0/internal/SimpleRequest.java b/core/src/main/java/com/auth0/internal/SimpleRequest.java
@@ -22,12 +22,12 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api.internal;
+package com.auth0.internal;
 
 import com.auth0.Auth0Exception;
-import com.auth0.authentication.api.APIException;
-import com.auth0.authentication.api.ParameterizableRequest;
-import com.auth0.authentication.api.RequestBodyBuildException;
+import com.auth0.APIException;
+import com.auth0.request.ParameterizableRequest;
+import com.auth0.RequestBodyBuildException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.squareup.okhttp.Callback;
diff --git a/core/src/main/java/com/auth0/internal/VoidRequest.java b/core/src/main/java/com/auth0/internal/VoidRequest.java
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api.internal;
+package com.auth0.internal;
 
 import com.auth0.Auth0Exception;
-import com.auth0.authentication.api.APIException;
+import com.auth0.APIException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.squareup.okhttp.Callback;
diff --git a/core/src/main/java/com/auth0/request/AuthorizableRequest.java b/core/src/main/java/com/auth0/request/AuthorizableRequest.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api;
+package com.auth0.request;
 
 /**
  * Interface for a Auth0 request that need Authorization using a JWT
diff --git a/core/src/main/java/com/auth0/request/ParameterizableRequest.java b/core/src/main/java/com/auth0/request/ParameterizableRequest.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.auth0.authentication.api;
+package com.auth0.request;
 
 import java.util.Map;
 
diff --git a/core/src/main/java/com/auth0/request/Request.java b/core/src/main/java/com/auth0/request/Request.java
diff --git a/core/src/main/java/com/auth0/util/CheckHelper.java b/core/src/main/java/com/auth0/util/CheckHelper.java
diff --git a/core/src/test/java/com/auth0/UserProfileTest.java b/core/src/test/java/com/auth0/UserProfileTest.java
diff --git a/core/src/test/java/com/auth0/authentication/AuthenticationAPIClientTest.java b/core/src/test/java/com/auth0/authentication/AuthenticationAPIClientTest.java
diff --git a/core/src/test/java/com/auth0/authentication/ParameterBuilderTest.java b/core/src/test/java/com/auth0/authentication/ParameterBuilderTest.java
diff --git a/core/src/test/java/com/auth0/internal/BaseRequestTest.java b/core/src/test/java/com/auth0/internal/BaseRequestTest.java
diff --git a/core/src/test/java/com/auth0/util/AuthenticationAPI.java b/core/src/test/java/com/auth0/util/AuthenticationAPI.java
diff --git a/core/src/test/java/com/auth0/util/CallbackMatcher.java b/core/src/test/java/com/auth0/util/CallbackMatcher.java
diff --git a/core/src/test/java/com/auth0/util/MockBaseCallback.java b/core/src/test/java/com/auth0/util/MockBaseCallback.java
