Skip to content

Commit b1aa7ad

Browse files
authored
Fix package conflict between feign-(apache)httpclient and feign-java11 (#829)
1 parent 78d5653 commit b1aa7ad

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

java11/src/main/java/feign/httpclient/Http2Client.java renamed to java11/src/main/java/feign/http2client/Http2Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* express or implied. See the License for the specific language governing permissions and
1212
* limitations under the License.
1313
*/
14-
package feign.httpclient;
14+
package feign.http2client;
1515

1616
import feign.*;
1717
import feign.Request.Options;

java11/src/test/java/feign/httpclient/test/Http2ClientTest.java renamed to java11/src/test/java/feign/http2client/test/Http2ClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* express or implied. See the License for the specific language governing permissions and
1212
* limitations under the License.
1313
*/
14-
package feign.httpclient.test;
14+
package feign.http2client.test;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
1717

1818
import feign.*;
1919
import feign.client.AbstractClientTest;
20-
import feign.httpclient.Http2Client;
20+
import feign.http2client.Http2Client;
2121
import java.io.IOException;
2222
import okhttp3.mockwebserver.MockResponse;
2323
import org.assertj.core.api.Assertions;

0 commit comments

Comments
 (0)