From 05dcebb1eee6a3471542070466ffed5c19f00248 Mon Sep 17 00:00:00 2001 From: adriancole Date: Sat, 17 Aug 2013 15:16:41 -0700 Subject: [PATCH] flattened project structure so that eclipse gradle plugin will work --- .../src/main/java/feign/Body.java | 0 .../src/main/java/feign/Client.java | 0 .../src/main/java/feign/Contract.java | 0 .../src/main/java/feign/Feign.java | 0 .../src/main/java/feign/FeignException.java | 0 .../src/main/java/feign/Headers.java | 0 .../src/main/java/feign/Logger.java | 0 .../src/main/java/feign/MethodHandler.java | 0 .../src/main/java/feign/MethodMetadata.java | 0 .../src/main/java/feign/Observable.java | 0 .../src/main/java/feign/Observer.java | 0 .../src/main/java/feign/ReflectiveFeign.java | 0 .../src/main/java/feign/Request.java | 0 .../src/main/java/feign/RequestLine.java | 0 .../src/main/java/feign/RequestTemplate.java | 0 .../src/main/java/feign/Response.java | 0 .../main/java/feign/RetryableException.java | 0 .../src/main/java/feign/Retryer.java | 0 .../src/main/java/feign/Subscription.java | 0 .../src/main/java/feign/Target.java | 0 .../src/main/java/feign/Types.java | 0 .../src/main/java/feign/Util.java | 0 .../java/feign/codec/DecodeException.java | 0 .../src/main/java/feign/codec/Decoder.java | 0 .../src/main/java/feign/codec/Decoders.java | 0 .../java/feign/codec/EncodeException.java | 0 .../src/main/java/feign/codec/Encoder.java | 0 .../main/java/feign/codec/ErrorDecoder.java | 0 .../java/feign/codec/IncrementalDecoder.java | 0 .../src/main/java/feign/codec/SAXDecoder.java | 0 .../main/java/feign/codec/StringDecoder.java | 0 .../feign/codec/StringIncrementalDecoder.java | 0 .../test/java/feign/DefaultContractTest.java | 0 .../test/java/feign/DefaultRetryerTest.java | 0 .../src/test/java/feign/FeignTest.java | 0 .../src/test/java/feign/LoggerTest.java | 0 .../test/java/feign/RequestTemplateTest.java | 0 .../java/feign/TrustingSSLSocketFactory.java | 0 .../src/test/java/feign/UtilTest.java | 0 .../feign/codec/DefaultErrorDecoderTest.java | 0 .../feign/codec/RetryAfterDecoderTest.java | 0 .../feign/examples/AWSSignatureVersion4.java | 0 .../java/feign/examples/GitHubExample.java | 0 .../test/java/feign/examples/IAMExample.java | 0 .../build.gradle | 0 .../feign/example/github/GitHubExample.java | 0 .../build.gradle | 0 .../example/wikipedia/ResponseDecoder.java | 0 .../example/wikipedia/WikipediaExample.java | 0 .../java/feign/jaxrs/examples/IAMExample.java | 76 ------------------- {feign-gson => gson}/README.md | 0 .../src/main/java/feign/gson/GsonModule.java | 0 .../test/java/feign/gson/GsonModuleTest.java | 0 {feign-jaxrs => jaxrs}/README.md | 0 .../main/java/feign/jaxrs/JAXRSModule.java | 0 .../java/feign/jaxrs/JAXRSContractTest.java | 0 .../feign/jaxrs/examples/GitHubExample.java | 0 {feign-ribbon => ribbon}/README.md | 0 .../src/main/java/feign/ribbon/LBClient.java | 0 .../feign/ribbon/LoadBalancingTarget.java | 0 .../main/java/feign/ribbon/RibbonModule.java | 0 .../feign/ribbon/LoadBalancingTargetTest.java | 0 .../java/feign/ribbon/RibbonClientTest.java | 0 settings.gradle | 6 +- 64 files changed, 5 insertions(+), 77 deletions(-) rename {feign-core => core}/src/main/java/feign/Body.java (100%) rename {feign-core => core}/src/main/java/feign/Client.java (100%) rename {feign-core => core}/src/main/java/feign/Contract.java (100%) rename {feign-core => core}/src/main/java/feign/Feign.java (100%) rename {feign-core => core}/src/main/java/feign/FeignException.java (100%) rename {feign-core => core}/src/main/java/feign/Headers.java (100%) rename {feign-core => core}/src/main/java/feign/Logger.java (100%) rename {feign-core => core}/src/main/java/feign/MethodHandler.java (100%) rename {feign-core => core}/src/main/java/feign/MethodMetadata.java (100%) rename {feign-core => core}/src/main/java/feign/Observable.java (100%) rename {feign-core => core}/src/main/java/feign/Observer.java (100%) rename {feign-core => core}/src/main/java/feign/ReflectiveFeign.java (100%) rename {feign-core => core}/src/main/java/feign/Request.java (100%) rename {feign-core => core}/src/main/java/feign/RequestLine.java (100%) rename {feign-core => core}/src/main/java/feign/RequestTemplate.java (100%) rename {feign-core => core}/src/main/java/feign/Response.java (100%) rename {feign-core => core}/src/main/java/feign/RetryableException.java (100%) rename {feign-core => core}/src/main/java/feign/Retryer.java (100%) rename {feign-core => core}/src/main/java/feign/Subscription.java (100%) rename {feign-core => core}/src/main/java/feign/Target.java (100%) rename {feign-core => core}/src/main/java/feign/Types.java (100%) rename {feign-core => core}/src/main/java/feign/Util.java (100%) rename {feign-core => core}/src/main/java/feign/codec/DecodeException.java (100%) rename {feign-core => core}/src/main/java/feign/codec/Decoder.java (100%) rename {feign-core => core}/src/main/java/feign/codec/Decoders.java (100%) rename {feign-core => core}/src/main/java/feign/codec/EncodeException.java (100%) rename {feign-core => core}/src/main/java/feign/codec/Encoder.java (100%) rename {feign-core => core}/src/main/java/feign/codec/ErrorDecoder.java (100%) rename {feign-core => core}/src/main/java/feign/codec/IncrementalDecoder.java (100%) rename {feign-core => core}/src/main/java/feign/codec/SAXDecoder.java (100%) rename {feign-core => core}/src/main/java/feign/codec/StringDecoder.java (100%) rename {feign-core => core}/src/main/java/feign/codec/StringIncrementalDecoder.java (100%) rename {feign-core => core}/src/test/java/feign/DefaultContractTest.java (100%) rename {feign-core => core}/src/test/java/feign/DefaultRetryerTest.java (100%) rename {feign-core => core}/src/test/java/feign/FeignTest.java (100%) rename {feign-core => core}/src/test/java/feign/LoggerTest.java (100%) rename {feign-core => core}/src/test/java/feign/RequestTemplateTest.java (100%) rename {feign-core => core}/src/test/java/feign/TrustingSSLSocketFactory.java (100%) rename {feign-core => core}/src/test/java/feign/UtilTest.java (100%) rename {feign-core => core}/src/test/java/feign/codec/DefaultErrorDecoderTest.java (100%) rename {feign-core => core}/src/test/java/feign/codec/RetryAfterDecoderTest.java (100%) rename {feign-core => core}/src/test/java/feign/examples/AWSSignatureVersion4.java (100%) rename {feign-core => core}/src/test/java/feign/examples/GitHubExample.java (100%) rename {feign-core => core}/src/test/java/feign/examples/IAMExample.java (100%) rename {examples/feign-example-github => example-github}/build.gradle (100%) rename {examples/feign-example-github => example-github}/src/main/java/feign/example/github/GitHubExample.java (100%) rename {examples/feign-example-wikipedia => example-wikipedia}/build.gradle (100%) rename {examples/feign-example-wikipedia => example-wikipedia}/src/main/java/feign/example/wikipedia/ResponseDecoder.java (100%) rename {examples/feign-example-wikipedia => example-wikipedia}/src/main/java/feign/example/wikipedia/WikipediaExample.java (100%) delete mode 100644 feign-jaxrs/src/test/java/feign/jaxrs/examples/IAMExample.java rename {feign-gson => gson}/README.md (100%) rename {feign-gson => gson}/src/main/java/feign/gson/GsonModule.java (100%) rename {feign-gson => gson}/src/test/java/feign/gson/GsonModuleTest.java (100%) rename {feign-jaxrs => jaxrs}/README.md (100%) rename {feign-jaxrs => jaxrs}/src/main/java/feign/jaxrs/JAXRSModule.java (100%) rename {feign-jaxrs => jaxrs}/src/test/java/feign/jaxrs/JAXRSContractTest.java (100%) rename {feign-jaxrs => jaxrs}/src/test/java/feign/jaxrs/examples/GitHubExample.java (100%) rename {feign-ribbon => ribbon}/README.md (100%) rename {feign-ribbon => ribbon}/src/main/java/feign/ribbon/LBClient.java (100%) rename {feign-ribbon => ribbon}/src/main/java/feign/ribbon/LoadBalancingTarget.java (100%) rename {feign-ribbon => ribbon}/src/main/java/feign/ribbon/RibbonModule.java (100%) rename {feign-ribbon => ribbon}/src/test/java/feign/ribbon/LoadBalancingTargetTest.java (100%) rename {feign-ribbon => ribbon}/src/test/java/feign/ribbon/RibbonClientTest.java (100%) diff --git a/feign-core/src/main/java/feign/Body.java b/core/src/main/java/feign/Body.java similarity index 100% rename from feign-core/src/main/java/feign/Body.java rename to core/src/main/java/feign/Body.java diff --git a/feign-core/src/main/java/feign/Client.java b/core/src/main/java/feign/Client.java similarity index 100% rename from feign-core/src/main/java/feign/Client.java rename to core/src/main/java/feign/Client.java diff --git a/feign-core/src/main/java/feign/Contract.java b/core/src/main/java/feign/Contract.java similarity index 100% rename from feign-core/src/main/java/feign/Contract.java rename to core/src/main/java/feign/Contract.java diff --git a/feign-core/src/main/java/feign/Feign.java b/core/src/main/java/feign/Feign.java similarity index 100% rename from feign-core/src/main/java/feign/Feign.java rename to core/src/main/java/feign/Feign.java diff --git a/feign-core/src/main/java/feign/FeignException.java b/core/src/main/java/feign/FeignException.java similarity index 100% rename from feign-core/src/main/java/feign/FeignException.java rename to core/src/main/java/feign/FeignException.java diff --git a/feign-core/src/main/java/feign/Headers.java b/core/src/main/java/feign/Headers.java similarity index 100% rename from feign-core/src/main/java/feign/Headers.java rename to core/src/main/java/feign/Headers.java diff --git a/feign-core/src/main/java/feign/Logger.java b/core/src/main/java/feign/Logger.java similarity index 100% rename from feign-core/src/main/java/feign/Logger.java rename to core/src/main/java/feign/Logger.java diff --git a/feign-core/src/main/java/feign/MethodHandler.java b/core/src/main/java/feign/MethodHandler.java similarity index 100% rename from feign-core/src/main/java/feign/MethodHandler.java rename to core/src/main/java/feign/MethodHandler.java diff --git a/feign-core/src/main/java/feign/MethodMetadata.java b/core/src/main/java/feign/MethodMetadata.java similarity index 100% rename from feign-core/src/main/java/feign/MethodMetadata.java rename to core/src/main/java/feign/MethodMetadata.java diff --git a/feign-core/src/main/java/feign/Observable.java b/core/src/main/java/feign/Observable.java similarity index 100% rename from feign-core/src/main/java/feign/Observable.java rename to core/src/main/java/feign/Observable.java diff --git a/feign-core/src/main/java/feign/Observer.java b/core/src/main/java/feign/Observer.java similarity index 100% rename from feign-core/src/main/java/feign/Observer.java rename to core/src/main/java/feign/Observer.java diff --git a/feign-core/src/main/java/feign/ReflectiveFeign.java b/core/src/main/java/feign/ReflectiveFeign.java similarity index 100% rename from feign-core/src/main/java/feign/ReflectiveFeign.java rename to core/src/main/java/feign/ReflectiveFeign.java diff --git a/feign-core/src/main/java/feign/Request.java b/core/src/main/java/feign/Request.java similarity index 100% rename from feign-core/src/main/java/feign/Request.java rename to core/src/main/java/feign/Request.java diff --git a/feign-core/src/main/java/feign/RequestLine.java b/core/src/main/java/feign/RequestLine.java similarity index 100% rename from feign-core/src/main/java/feign/RequestLine.java rename to core/src/main/java/feign/RequestLine.java diff --git a/feign-core/src/main/java/feign/RequestTemplate.java b/core/src/main/java/feign/RequestTemplate.java similarity index 100% rename from feign-core/src/main/java/feign/RequestTemplate.java rename to core/src/main/java/feign/RequestTemplate.java diff --git a/feign-core/src/main/java/feign/Response.java b/core/src/main/java/feign/Response.java similarity index 100% rename from feign-core/src/main/java/feign/Response.java rename to core/src/main/java/feign/Response.java diff --git a/feign-core/src/main/java/feign/RetryableException.java b/core/src/main/java/feign/RetryableException.java similarity index 100% rename from feign-core/src/main/java/feign/RetryableException.java rename to core/src/main/java/feign/RetryableException.java diff --git a/feign-core/src/main/java/feign/Retryer.java b/core/src/main/java/feign/Retryer.java similarity index 100% rename from feign-core/src/main/java/feign/Retryer.java rename to core/src/main/java/feign/Retryer.java diff --git a/feign-core/src/main/java/feign/Subscription.java b/core/src/main/java/feign/Subscription.java similarity index 100% rename from feign-core/src/main/java/feign/Subscription.java rename to core/src/main/java/feign/Subscription.java diff --git a/feign-core/src/main/java/feign/Target.java b/core/src/main/java/feign/Target.java similarity index 100% rename from feign-core/src/main/java/feign/Target.java rename to core/src/main/java/feign/Target.java diff --git a/feign-core/src/main/java/feign/Types.java b/core/src/main/java/feign/Types.java similarity index 100% rename from feign-core/src/main/java/feign/Types.java rename to core/src/main/java/feign/Types.java diff --git a/feign-core/src/main/java/feign/Util.java b/core/src/main/java/feign/Util.java similarity index 100% rename from feign-core/src/main/java/feign/Util.java rename to core/src/main/java/feign/Util.java diff --git a/feign-core/src/main/java/feign/codec/DecodeException.java b/core/src/main/java/feign/codec/DecodeException.java similarity index 100% rename from feign-core/src/main/java/feign/codec/DecodeException.java rename to core/src/main/java/feign/codec/DecodeException.java diff --git a/feign-core/src/main/java/feign/codec/Decoder.java b/core/src/main/java/feign/codec/Decoder.java similarity index 100% rename from feign-core/src/main/java/feign/codec/Decoder.java rename to core/src/main/java/feign/codec/Decoder.java diff --git a/feign-core/src/main/java/feign/codec/Decoders.java b/core/src/main/java/feign/codec/Decoders.java similarity index 100% rename from feign-core/src/main/java/feign/codec/Decoders.java rename to core/src/main/java/feign/codec/Decoders.java diff --git a/feign-core/src/main/java/feign/codec/EncodeException.java b/core/src/main/java/feign/codec/EncodeException.java similarity index 100% rename from feign-core/src/main/java/feign/codec/EncodeException.java rename to core/src/main/java/feign/codec/EncodeException.java diff --git a/feign-core/src/main/java/feign/codec/Encoder.java b/core/src/main/java/feign/codec/Encoder.java similarity index 100% rename from feign-core/src/main/java/feign/codec/Encoder.java rename to core/src/main/java/feign/codec/Encoder.java diff --git a/feign-core/src/main/java/feign/codec/ErrorDecoder.java b/core/src/main/java/feign/codec/ErrorDecoder.java similarity index 100% rename from feign-core/src/main/java/feign/codec/ErrorDecoder.java rename to core/src/main/java/feign/codec/ErrorDecoder.java diff --git a/feign-core/src/main/java/feign/codec/IncrementalDecoder.java b/core/src/main/java/feign/codec/IncrementalDecoder.java similarity index 100% rename from feign-core/src/main/java/feign/codec/IncrementalDecoder.java rename to core/src/main/java/feign/codec/IncrementalDecoder.java diff --git a/feign-core/src/main/java/feign/codec/SAXDecoder.java b/core/src/main/java/feign/codec/SAXDecoder.java similarity index 100% rename from feign-core/src/main/java/feign/codec/SAXDecoder.java rename to core/src/main/java/feign/codec/SAXDecoder.java diff --git a/feign-core/src/main/java/feign/codec/StringDecoder.java b/core/src/main/java/feign/codec/StringDecoder.java similarity index 100% rename from feign-core/src/main/java/feign/codec/StringDecoder.java rename to core/src/main/java/feign/codec/StringDecoder.java diff --git a/feign-core/src/main/java/feign/codec/StringIncrementalDecoder.java b/core/src/main/java/feign/codec/StringIncrementalDecoder.java similarity index 100% rename from feign-core/src/main/java/feign/codec/StringIncrementalDecoder.java rename to core/src/main/java/feign/codec/StringIncrementalDecoder.java diff --git a/feign-core/src/test/java/feign/DefaultContractTest.java b/core/src/test/java/feign/DefaultContractTest.java similarity index 100% rename from feign-core/src/test/java/feign/DefaultContractTest.java rename to core/src/test/java/feign/DefaultContractTest.java diff --git a/feign-core/src/test/java/feign/DefaultRetryerTest.java b/core/src/test/java/feign/DefaultRetryerTest.java similarity index 100% rename from feign-core/src/test/java/feign/DefaultRetryerTest.java rename to core/src/test/java/feign/DefaultRetryerTest.java diff --git a/feign-core/src/test/java/feign/FeignTest.java b/core/src/test/java/feign/FeignTest.java similarity index 100% rename from feign-core/src/test/java/feign/FeignTest.java rename to core/src/test/java/feign/FeignTest.java diff --git a/feign-core/src/test/java/feign/LoggerTest.java b/core/src/test/java/feign/LoggerTest.java similarity index 100% rename from feign-core/src/test/java/feign/LoggerTest.java rename to core/src/test/java/feign/LoggerTest.java diff --git a/feign-core/src/test/java/feign/RequestTemplateTest.java b/core/src/test/java/feign/RequestTemplateTest.java similarity index 100% rename from feign-core/src/test/java/feign/RequestTemplateTest.java rename to core/src/test/java/feign/RequestTemplateTest.java diff --git a/feign-core/src/test/java/feign/TrustingSSLSocketFactory.java b/core/src/test/java/feign/TrustingSSLSocketFactory.java similarity index 100% rename from feign-core/src/test/java/feign/TrustingSSLSocketFactory.java rename to core/src/test/java/feign/TrustingSSLSocketFactory.java diff --git a/feign-core/src/test/java/feign/UtilTest.java b/core/src/test/java/feign/UtilTest.java similarity index 100% rename from feign-core/src/test/java/feign/UtilTest.java rename to core/src/test/java/feign/UtilTest.java diff --git a/feign-core/src/test/java/feign/codec/DefaultErrorDecoderTest.java b/core/src/test/java/feign/codec/DefaultErrorDecoderTest.java similarity index 100% rename from feign-core/src/test/java/feign/codec/DefaultErrorDecoderTest.java rename to core/src/test/java/feign/codec/DefaultErrorDecoderTest.java diff --git a/feign-core/src/test/java/feign/codec/RetryAfterDecoderTest.java b/core/src/test/java/feign/codec/RetryAfterDecoderTest.java similarity index 100% rename from feign-core/src/test/java/feign/codec/RetryAfterDecoderTest.java rename to core/src/test/java/feign/codec/RetryAfterDecoderTest.java diff --git a/feign-core/src/test/java/feign/examples/AWSSignatureVersion4.java b/core/src/test/java/feign/examples/AWSSignatureVersion4.java similarity index 100% rename from feign-core/src/test/java/feign/examples/AWSSignatureVersion4.java rename to core/src/test/java/feign/examples/AWSSignatureVersion4.java diff --git a/feign-core/src/test/java/feign/examples/GitHubExample.java b/core/src/test/java/feign/examples/GitHubExample.java similarity index 100% rename from feign-core/src/test/java/feign/examples/GitHubExample.java rename to core/src/test/java/feign/examples/GitHubExample.java diff --git a/feign-core/src/test/java/feign/examples/IAMExample.java b/core/src/test/java/feign/examples/IAMExample.java similarity index 100% rename from feign-core/src/test/java/feign/examples/IAMExample.java rename to core/src/test/java/feign/examples/IAMExample.java diff --git a/examples/feign-example-github/build.gradle b/example-github/build.gradle similarity index 100% rename from examples/feign-example-github/build.gradle rename to example-github/build.gradle diff --git a/examples/feign-example-github/src/main/java/feign/example/github/GitHubExample.java b/example-github/src/main/java/feign/example/github/GitHubExample.java similarity index 100% rename from examples/feign-example-github/src/main/java/feign/example/github/GitHubExample.java rename to example-github/src/main/java/feign/example/github/GitHubExample.java diff --git a/examples/feign-example-wikipedia/build.gradle b/example-wikipedia/build.gradle similarity index 100% rename from examples/feign-example-wikipedia/build.gradle rename to example-wikipedia/build.gradle diff --git a/examples/feign-example-wikipedia/src/main/java/feign/example/wikipedia/ResponseDecoder.java b/example-wikipedia/src/main/java/feign/example/wikipedia/ResponseDecoder.java similarity index 100% rename from examples/feign-example-wikipedia/src/main/java/feign/example/wikipedia/ResponseDecoder.java rename to example-wikipedia/src/main/java/feign/example/wikipedia/ResponseDecoder.java diff --git a/examples/feign-example-wikipedia/src/main/java/feign/example/wikipedia/WikipediaExample.java b/example-wikipedia/src/main/java/feign/example/wikipedia/WikipediaExample.java similarity index 100% rename from examples/feign-example-wikipedia/src/main/java/feign/example/wikipedia/WikipediaExample.java rename to example-wikipedia/src/main/java/feign/example/wikipedia/WikipediaExample.java diff --git a/feign-jaxrs/src/test/java/feign/jaxrs/examples/IAMExample.java b/feign-jaxrs/src/test/java/feign/jaxrs/examples/IAMExample.java deleted file mode 100644 index f3037750..00000000 --- a/feign-jaxrs/src/test/java/feign/jaxrs/examples/IAMExample.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2013 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package feign.jaxrs.examples; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; - -import dagger.Module; -import dagger.Provides; -import feign.Feign; -import feign.Request; -import feign.RequestTemplate; -import feign.Target; -import feign.codec.Decoder; -import feign.codec.Decoders; -import feign.examples.AWSSignatureVersion4; -import feign.jaxrs.JAXRSModule; - -import static dagger.Provides.Type.SET; - -public class IAMExample { - - interface IAM { - @GET @Path("/?Action=GetUser&Version=2010-05-08") String arn(); - } - - public static void main(String... args) { - - IAM iam = Feign.create(new IAMTarget(args[0], args[1]), new IAMModule()); - System.out.println(iam.arn()); - } - - static class IAMTarget extends AWSSignatureVersion4 implements Target { - - @Override public Class type() { - return IAM.class; - } - - @Override public String name() { - return "iam"; - } - - @Override public String url() { - return "https://iam.amazonaws.com"; - } - - private IAMTarget(String accessKey, String secretKey) { - super(accessKey, secretKey); - } - - @Override public Request apply(RequestTemplate in) { - in.insert(0, url()); - return super.apply(in); - } - } - - @Module(overrides = true, library = true, includes = JAXRSModule.class) - static class IAMModule { - @Provides(type = SET) Decoder decoder() { - return Decoders.firstGroup("([\\S&&[^<]]+)"); - } - } -} diff --git a/feign-gson/README.md b/gson/README.md similarity index 100% rename from feign-gson/README.md rename to gson/README.md diff --git a/feign-gson/src/main/java/feign/gson/GsonModule.java b/gson/src/main/java/feign/gson/GsonModule.java similarity index 100% rename from feign-gson/src/main/java/feign/gson/GsonModule.java rename to gson/src/main/java/feign/gson/GsonModule.java diff --git a/feign-gson/src/test/java/feign/gson/GsonModuleTest.java b/gson/src/test/java/feign/gson/GsonModuleTest.java similarity index 100% rename from feign-gson/src/test/java/feign/gson/GsonModuleTest.java rename to gson/src/test/java/feign/gson/GsonModuleTest.java diff --git a/feign-jaxrs/README.md b/jaxrs/README.md similarity index 100% rename from feign-jaxrs/README.md rename to jaxrs/README.md diff --git a/feign-jaxrs/src/main/java/feign/jaxrs/JAXRSModule.java b/jaxrs/src/main/java/feign/jaxrs/JAXRSModule.java similarity index 100% rename from feign-jaxrs/src/main/java/feign/jaxrs/JAXRSModule.java rename to jaxrs/src/main/java/feign/jaxrs/JAXRSModule.java diff --git a/feign-jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java b/jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java similarity index 100% rename from feign-jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java rename to jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java diff --git a/feign-jaxrs/src/test/java/feign/jaxrs/examples/GitHubExample.java b/jaxrs/src/test/java/feign/jaxrs/examples/GitHubExample.java similarity index 100% rename from feign-jaxrs/src/test/java/feign/jaxrs/examples/GitHubExample.java rename to jaxrs/src/test/java/feign/jaxrs/examples/GitHubExample.java diff --git a/feign-ribbon/README.md b/ribbon/README.md similarity index 100% rename from feign-ribbon/README.md rename to ribbon/README.md diff --git a/feign-ribbon/src/main/java/feign/ribbon/LBClient.java b/ribbon/src/main/java/feign/ribbon/LBClient.java similarity index 100% rename from feign-ribbon/src/main/java/feign/ribbon/LBClient.java rename to ribbon/src/main/java/feign/ribbon/LBClient.java diff --git a/feign-ribbon/src/main/java/feign/ribbon/LoadBalancingTarget.java b/ribbon/src/main/java/feign/ribbon/LoadBalancingTarget.java similarity index 100% rename from feign-ribbon/src/main/java/feign/ribbon/LoadBalancingTarget.java rename to ribbon/src/main/java/feign/ribbon/LoadBalancingTarget.java diff --git a/feign-ribbon/src/main/java/feign/ribbon/RibbonModule.java b/ribbon/src/main/java/feign/ribbon/RibbonModule.java similarity index 100% rename from feign-ribbon/src/main/java/feign/ribbon/RibbonModule.java rename to ribbon/src/main/java/feign/ribbon/RibbonModule.java diff --git a/feign-ribbon/src/test/java/feign/ribbon/LoadBalancingTargetTest.java b/ribbon/src/test/java/feign/ribbon/LoadBalancingTargetTest.java similarity index 100% rename from feign-ribbon/src/test/java/feign/ribbon/LoadBalancingTargetTest.java rename to ribbon/src/test/java/feign/ribbon/LoadBalancingTargetTest.java diff --git a/feign-ribbon/src/test/java/feign/ribbon/RibbonClientTest.java b/ribbon/src/test/java/feign/ribbon/RibbonClientTest.java similarity index 100% rename from feign-ribbon/src/test/java/feign/ribbon/RibbonClientTest.java rename to ribbon/src/test/java/feign/ribbon/RibbonClientTest.java diff --git a/settings.gradle b/settings.gradle index bd5c8dd9..a7bf6997 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,6 @@ rootProject.name='feign' -include 'feign-core', 'feign-gson', 'feign-jaxrs', 'feign-ribbon', 'examples:feign-example-github', 'examples:feign-example-wikipedia' +include 'core', 'gson', 'jaxrs', 'ribbon', 'example-github', 'example-wikipedia' + +rootProject.children.each { childProject -> + childProject.name = 'feign-' + childProject.name +}