Skip to content

Commit e966f74

Browse files
author
Stephane Landelle
committed
Move to proper per extras packages
1 parent 7faf5eb commit e966f74

20 files changed

+35
-32
lines changed

‎extras/guava/src/main/java/org/asynchttpclient/extra/ListenableFutureAdapter.java renamed to ‎extras/guava/src/main/java/org/asynchttpclient/extras/guava/ListenableFutureAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.guava;
1414

1515
import org.asynchttpclient.ListenableFuture;
1616

‎extras/guava/src/main/java/org/asynchttpclient/extra/RateLimitedThrottleRequestFilter.java renamed to ‎extras/guava/src/main/java/org/asynchttpclient/extras/guava/RateLimitedThrottleRequestFilter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
package org.asynchttpclient.extra;
1+
package org.asynchttpclient.extras.guava;
22

3+
import org.asynchttpclient.extra.AsyncHandlerWrapper;
4+
import org.asynchttpclient.extra.ThrottleRequestFilter;
35
import org.asynchttpclient.filter.FilterContext;
46
import org.asynchttpclient.filter.FilterException;
57
import org.asynchttpclient.filter.RequestFilter;

‎extras/jdeferred/src/main/java/org/asynchttpclient/extra/AsyncHttpDeferredObject.java renamed to ‎extras/jdeferred/src/main/java/org/asynchttpclient/extras/jdeferred/AsyncHttpDeferredObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.asynchttpclient.extra;
16+
package org.asynchttpclient.extras.jdeferred;
1717

1818
import org.asynchttpclient.AsyncCompletionHandler;
1919
import org.asynchttpclient.AsyncHandler;

‎extras/jdeferred/src/main/java/org/asynchttpclient/extra/ContentWriteProgress.java renamed to ‎extras/jdeferred/src/main/java/org/asynchttpclient/extras/jdeferred/ContentWriteProgress.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.asynchttpclient.extra;
16+
package org.asynchttpclient.extras.jdeferred;
1717

1818
public class ContentWriteProgress implements HttpProgress {
1919
private final long amount;

‎extras/jdeferred/src/main/java/org/asynchttpclient/extra/HttpProgress.java renamed to ‎extras/jdeferred/src/main/java/org/asynchttpclient/extras/jdeferred/HttpProgress.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.asynchttpclient.extra;
16+
package org.asynchttpclient.extras.jdeferred;
1717

1818
public interface HttpProgress {
1919
}

‎extras/jdeferred/src/main/java/org/asynchttpclient/extra/HttpResponseBodyPartProgress.java renamed to ‎extras/jdeferred/src/main/java/org/asynchttpclient/extras/jdeferred/HttpResponseBodyPartProgress.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.asynchttpclient.extra;
16+
package org.asynchttpclient.extras.jdeferred;
1717

1818
import org.asynchttpclient.HttpResponseBodyPart;
1919

‎extras/jdeferred/src/test/java/org/asynchttpclient/extra/AsyncHttpTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.asynchttpclient.AsyncHttpClient;
2222
import org.asynchttpclient.DefaultAsyncHttpClient;
2323
import org.asynchttpclient.Response;
24+
import org.asynchttpclient.extras.jdeferred.AsyncHttpDeferredObject;
25+
import org.asynchttpclient.extras.jdeferred.HttpProgress;
2426
import org.jdeferred.DoneCallback;
2527
import org.jdeferred.ProgressCallback;
2628
import org.jdeferred.Promise;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClient;
1616
import org.asynchttpclient.AsyncHttpClientConfig;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
@SuppressWarnings("serial")
1616
public class AsyncHttpClientImplException extends RuntimeException {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClient;
1616

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClient;
1616

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClient;
1616

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClient;
1616
import org.asynchttpclient.AsyncHttpClientConfig;
1717
import org.asynchttpclient.AsyncHttpProvider;
1818
import org.asynchttpclient.DefaultAsyncHttpClient;
1919
import org.asynchttpclient.Response;
2020
import org.asynchttpclient.TestAsyncHttpClient;
21-
import org.asynchttpclient.AsyncHttpClientConfig.Builder;
2221
import org.asynchttpclient.async.util.EchoHandler;
2322
import org.asynchttpclient.async.util.TestUtils;
24-
import org.asynchttpclient.extra.AsyncHttpClientFactory;
25-
import org.asynchttpclient.extra.AsyncHttpClientImplException;
26-
import org.asynchttpclient.extra.AsyncImplHelper;
23+
import org.asynchttpclient.extras.registry.AsyncHttpClientFactory;
24+
import org.asynchttpclient.extras.registry.AsyncHttpClientImplException;
25+
import org.asynchttpclient.extras.registry.AsyncImplHelper;
2726
import org.eclipse.jetty.server.Server;
2827
import org.testng.Assert;
2928
import org.testng.annotations.AfterClass;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClient;
16-
import org.asynchttpclient.extra.AsyncHttpClientFactory;
17-
import org.asynchttpclient.extra.AsyncHttpClientImplException;
18-
import org.asynchttpclient.extra.AsyncHttpClientRegistryImpl;
19-
import org.asynchttpclient.extra.AsyncImplHelper;
16+
import org.asynchttpclient.extras.registry.AsyncHttpClientFactory;
17+
import org.asynchttpclient.extras.registry.AsyncHttpClientImplException;
18+
import org.asynchttpclient.extras.registry.AsyncHttpClientRegistryImpl;
19+
import org.asynchttpclient.extras.registry.AsyncImplHelper;
2020
import org.testng.Assert;
2121
import org.testng.annotations.AfterClass;
2222
import org.testng.annotations.BeforeClass;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHandler;
1616
import org.asynchttpclient.AsyncHttpClient;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

15-
import org.asynchttpclient.extra.AsyncHttpClientImplException;
15+
import org.asynchttpclient.extras.registry.AsyncHttpClientImplException;
1616

1717
@SuppressWarnings("serial")
1818
public class BadAsyncHttpClientException extends AsyncHttpClientImplException {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

15-
import org.asynchttpclient.extra.AsyncHttpClientRegistryImpl;
15+
import org.asynchttpclient.extras.registry.AsyncHttpClientRegistryImpl;
1616

1717
public class BadAsyncHttpClientRegistry extends AsyncHttpClientRegistryImpl {
1818

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClientConfig;
1616
import org.asynchttpclient.AsyncHttpProvider;
17-
import org.asynchttpclient.extra.AbstractAsyncHttpClientFactoryTest;
17+
import org.asynchttpclient.extras.registry.AbstractAsyncHttpClientFactoryTest;
1818
import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
1919
import org.testng.annotations.Test;
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

1515
import org.asynchttpclient.AsyncHttpClientConfig;
1616
import org.asynchttpclient.AsyncHttpProvider;
17-
import org.asynchttpclient.extra.AbstractAsyncHttpClientFactoryTest;
17+
import org.asynchttpclient.extras.registry.AbstractAsyncHttpClientFactoryTest;
1818
import org.asynchttpclient.providers.netty.NettyAsyncHttpProvider;
1919
import org.testng.annotations.Test;
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.extra;
13+
package org.asynchttpclient.extras.registry;
1414

15-
import org.asynchttpclient.extra.AsyncHttpClientRegistryImpl;
15+
import org.asynchttpclient.extras.registry.AsyncHttpClientRegistryImpl;
1616

1717
public class TestAsyncHttpClientRegistry extends AsyncHttpClientRegistryImpl {
1818

0 commit comments

Comments
 (0)