Move registry stuff to extra module

Author: Stephane Landelle

extras/pom.xml

@@ -46,6 +46,7 @@
     <modules>
         <module>guava</module>
         <module>jdeferred</module>
+        <module>registry</module>
     </modules>
 
     <dependencies>

extras/registry/pom.xml

@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.asynchttpclient</groupId>
+        <artifactId>async-http-client-extras-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>async-http-client-extras-registry</artifactId>
+    <name>Asynchronous Http Client Registry Extras</name>
+    <description>
+        The Async Http Client Registry Extras.
+    </description>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.asynchttpclient</groupId>
+            <artifactId>async-http-client-netty-provider</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.asynchttpclient</groupId>
+            <artifactId>async-http-client-grizzly-provider</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

api/src/main/java/org/asynchttpclient/AsyncHttpClientFactory.java renamed to extras/registry/src/main/java/org/asynchttpclient/extra/AsyncHttpClientFactory.java

@@ -10,9 +10,12 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
 
-import org.asynchttpclient.util.AsyncImplHelper;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.AsyncHttpProvider;
+import org.asynchttpclient.DefaultAsyncHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

api/src/main/java/org/asynchttpclient/AsyncHttpClientImplException.java renamed to extras/registry/src/main/java/org/asynchttpclient/extra/AsyncHttpClientImplException.java

@@ -10,7 +10,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
 
 @SuppressWarnings("serial")
 public class AsyncHttpClientImplException extends RuntimeException {

api/src/main/java/org/asynchttpclient/AsyncHttpClientRegistry.java renamed to extras/registry/src/main/java/org/asynchttpclient/extra/AsyncHttpClientRegistry.java

@@ -10,7 +10,9 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
+
+import org.asynchttpclient.AsyncHttpClient;
 
 import java.util.Set;
 
@@ -79,4 +81,3 @@ public interface AsyncHttpClientRegistry {
 
     void clearAllInstances();
 }
-

api/src/main/java/org/asynchttpclient/AsyncHttpClientRegistryImpl.java renamed to extras/registry/src/main/java/org/asynchttpclient/extra/AsyncHttpClientRegistryImpl.java

@@ -10,9 +10,9 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
 
-import org.asynchttpclient.util.AsyncImplHelper;
+import org.asynchttpclient.AsyncHttpClient;
 
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

api/src/main/java/org/asynchttpclient/util/AsyncImplHelper.java renamed to extras/registry/src/main/java/org/asynchttpclient/extra/AsyncImplHelper.java

@@ -10,11 +10,9 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.util;
+package org.asynchttpclient.extra;
 
 import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.AsyncHttpClientFactory;
-import org.asynchttpclient.AsyncHttpClientImplException;
 
 import java.io.IOException;
 import java.io.InputStream;

providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/GrizzlyAsyncHttpClientFactoryTest.java renamed to extras/registry/src/main/java/org/asynchttpclient/extra/GrizzlyAsyncHttpClientFactoryTest.java

@@ -10,11 +10,12 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.providers.grizzly;
+package org.asynchttpclient.extra;
 
-import org.asynchttpclient.AbstractAsyncHttpClientFactoryTest;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.AsyncHttpProvider;
+import org.asynchttpclient.extra.AbstractAsyncHttpClientFactoryTest;
+import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
 import org.testng.annotations.Test;
 
 @Test

providers/netty/src/test/java/org/asynchttpclient/providers/netty/NettyAsyncHttpClientFactoryTest.java renamed to extras/registry/src/main/java/org/asynchttpclient/extra/NettyAsyncHttpClientFactoryTest.java

@@ -10,11 +10,12 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.providers.netty;
+package org.asynchttpclient.extra;
 
-import org.asynchttpclient.AbstractAsyncHttpClientFactoryTest;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.AsyncHttpProvider;
+import org.asynchttpclient.extra.AbstractAsyncHttpClientFactoryTest;
+import org.asynchttpclient.providers.netty.NettyAsyncHttpProvider;
 import org.testng.annotations.Test;
 
 @Test

api/src/test/java/org/asynchttpclient/AbstractAsyncHttpClientFactoryTest.java renamed to extras/registry/src/test/java/org/asynchttpclient/extra/AbstractAsyncHttpClientFactoryTest.java

@@ -10,11 +10,20 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
-
+package org.asynchttpclient.extra;
+
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.AsyncHttpProvider;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.Response;
+import org.asynchttpclient.TestAsyncHttpClient;
+import org.asynchttpclient.AsyncHttpClientConfig.Builder;
 import org.asynchttpclient.async.util.EchoHandler;
 import org.asynchttpclient.async.util.TestUtils;
-import org.asynchttpclient.util.AsyncImplHelper;
+import org.asynchttpclient.extra.AsyncHttpClientFactory;
+import org.asynchttpclient.extra.AsyncHttpClientImplException;
+import org.asynchttpclient.extra.AsyncImplHelper;
 import org.eclipse.jetty.server.Server;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -23,6 +32,7 @@
 import org.testng.annotations.Test;
 
 import java.lang.reflect.InvocationTargetException;
+
 import junit.extensions.PA;
 
 public abstract class AbstractAsyncHttpClientFactoryTest {

api/src/test/java/org/asynchttpclient/AsyncHttpClientRegistryTest.java renamed to extras/registry/src/test/java/org/asynchttpclient/extra/AsyncHttpClientRegistryTest.java

@@ -10,9 +10,13 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
 
-import org.asynchttpclient.util.AsyncImplHelper;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.extra.AsyncHttpClientFactory;
+import org.asynchttpclient.extra.AsyncHttpClientImplException;
+import org.asynchttpclient.extra.AsyncHttpClientRegistryImpl;
+import org.asynchttpclient.extra.AsyncImplHelper;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;

api/src/test/java/org/asynchttpclient/BadAsyncHttpClient.java renamed to extras/registry/src/test/java/org/asynchttpclient/extra/BadAsyncHttpClient.java

@@ -10,7 +10,17 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
+
+import org.asynchttpclient.AsyncHandler;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.AsyncHttpProvider;
+import org.asynchttpclient.BoundRequestBuilder;
+import org.asynchttpclient.ListenableFuture;
+import org.asynchttpclient.Request;
+import org.asynchttpclient.Response;
+import org.asynchttpclient.SignatureCalculator;
 
 import java.io.IOException;
 

api/src/test/java/org/asynchttpclient/BadAsyncHttpClientException.java renamed to extras/registry/src/test/java/org/asynchttpclient/extra/BadAsyncHttpClientException.java

@@ -10,7 +10,9 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
+
+import org.asynchttpclient.extra.AsyncHttpClientImplException;
 
 @SuppressWarnings("serial")
 public class BadAsyncHttpClientException extends AsyncHttpClientImplException {

api/src/test/java/org/asynchttpclient/BadAsyncHttpClientRegistry.java renamed to extras/registry/src/test/java/org/asynchttpclient/extra/BadAsyncHttpClientRegistry.java

@@ -10,7 +10,9 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
+
+import org.asynchttpclient.extra.AsyncHttpClientRegistryImpl;
 
 public class BadAsyncHttpClientRegistry extends AsyncHttpClientRegistryImpl {
 

api/src/test/java/org/asynchttpclient/TestAsyncHttpClientRegistry.java renamed to extras/registry/src/test/java/org/asynchttpclient/extra/TestAsyncHttpClientRegistry.java

@@ -10,7 +10,9 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient;
+package org.asynchttpclient.extra;
+
+import org.asynchttpclient.extra.AsyncHttpClientRegistryImpl;
 
 public class TestAsyncHttpClientRegistry extends AsyncHttpClientRegistryImpl {