Skip to content

Commit 5b81f9b

Browse files
authored
Fix package conflict between feign-(apache)httpclient and feign-java11 (OpenFeign#829)
1 parent 23f2815 commit 5b81f9b

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
* or implied. See the License for the specific language governing permissions and limitations under
1212
* the License.
1313
*/
14-
package feign.httpclient;
14+
package feign.http2client;
1515

1616
import java.io.ByteArrayInputStream;
1717
import java.io.IOException;

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,15 +11,15 @@
1111
* or implied. See the License for the specific language governing permissions and limitations under
1212
* the License.
1313
*/
14-
package feign.httpclient.test;
14+
package feign.http2client.test;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
1717
import org.assertj.core.api.Assertions;
1818
import org.junit.Test;
1919
import java.io.IOException;
2020
import feign.*;
2121
import feign.client.AbstractClientTest;
22-
import feign.httpclient.Http2Client;
22+
import feign.http2client.Http2Client;
2323
import okhttp3.mockwebserver.MockResponse;
2424

2525
/**

0 commit comments

Comments
 (0)