From 85d528e7c559ad71730f4c7ba5c79ed1d3118094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Kovac=CC=8C?= Date: Thu, 11 Mar 2021 19:00:42 +0100 Subject: [PATCH] Change base package name to com.infinum --- .../java/co/infinum/thrifty/package-info.java | 4 -- .../infinum/thrifty/ProtocolType.java | 2 +- .../thrifty/ThriftyConverterFactory.java | 2 +- .../thrifty/ThriftyRequestBodyConverter.java | 2 +- .../thrifty/ThriftyResponseBodyConverter.java | 2 +- .../com/infinum/thrifty/package-info.java | 4 ++ .../thrifty/ThriftyConverterFactoryTest.java | 53 +++++++------------ .../infinum/thrifty/java/Phone.java | 2 +- .../infinum/thrifty/kotlin/BrokenPhone.kt | 2 +- .../infinum/thrifty/kotlin/Phone.kt | 2 +- .../src/test/resources/phone.thrift | 2 +- 11 files changed, 31 insertions(+), 46 deletions(-) delete mode 100644 retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/package-info.java rename retrofit-converter-thrifty/src/main/java/{co => com}/infinum/thrifty/ProtocolType.java (97%) rename retrofit-converter-thrifty/src/main/java/{co => com}/infinum/thrifty/ThriftyConverterFactory.java (98%) rename retrofit-converter-thrifty/src/main/java/{co => com}/infinum/thrifty/ThriftyRequestBodyConverter.java (97%) rename retrofit-converter-thrifty/src/main/java/{co => com}/infinum/thrifty/ThriftyResponseBodyConverter.java (97%) create mode 100644 retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/package-info.java rename retrofit-converter-thrifty/src/test/java/{co => com}/infinum/thrifty/ThriftyConverterFactoryTest.java (82%) rename retrofit-converter-thrifty/src/test/java/{co => com}/infinum/thrifty/java/Phone.java (99%) rename retrofit-converter-thrifty/src/test/java/{co => com}/infinum/thrifty/kotlin/BrokenPhone.kt (95%) rename retrofit-converter-thrifty/src/test/java/{co => com}/infinum/thrifty/kotlin/Phone.kt (99%) diff --git a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/package-info.java b/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/package-info.java deleted file mode 100644 index 7e449a9..0000000 --- a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ParametersAreNonnullByDefault -package co.infinum.thrifty; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ProtocolType.java b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ProtocolType.java similarity index 97% rename from retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ProtocolType.java rename to retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ProtocolType.java index 451eb5a..27e9498 100644 --- a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ProtocolType.java +++ b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ProtocolType.java @@ -1,4 +1,4 @@ -package co.infinum.thrifty; +package com.infinum.thrifty; import com.microsoft.thrifty.protocol.BinaryProtocol; import com.microsoft.thrifty.protocol.CompactProtocol; diff --git a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyConverterFactory.java b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyConverterFactory.java similarity index 98% rename from retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyConverterFactory.java rename to retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyConverterFactory.java index 6e03fed..209728b 100644 --- a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyConverterFactory.java +++ b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyConverterFactory.java @@ -1,4 +1,4 @@ -package co.infinum.thrifty; +package com.infinum.thrifty; import com.microsoft.thrifty.Adapter; import com.microsoft.thrifty.Struct; diff --git a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyRequestBodyConverter.java b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyRequestBodyConverter.java similarity index 97% rename from retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyRequestBodyConverter.java rename to retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyRequestBodyConverter.java index 09d1fd4..a011e3d 100644 --- a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyRequestBodyConverter.java +++ b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyRequestBodyConverter.java @@ -1,4 +1,4 @@ -package co.infinum.thrifty; +package com.infinum.thrifty; import com.microsoft.thrifty.Adapter; import com.microsoft.thrifty.StructBuilder; diff --git a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyResponseBodyConverter.java b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyResponseBodyConverter.java similarity index 97% rename from retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyResponseBodyConverter.java rename to retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyResponseBodyConverter.java index ac189b6..9430139 100644 --- a/retrofit-converter-thrifty/src/main/java/co/infinum/thrifty/ThriftyResponseBodyConverter.java +++ b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/ThriftyResponseBodyConverter.java @@ -1,4 +1,4 @@ -package co.infinum.thrifty; +package com.infinum.thrifty; import com.microsoft.thrifty.Adapter; import com.microsoft.thrifty.StructBuilder; diff --git a/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/package-info.java b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/package-info.java new file mode 100644 index 0000000..9364291 --- /dev/null +++ b/retrofit-converter-thrifty/src/main/java/com/infinum/thrifty/package-info.java @@ -0,0 +1,4 @@ +@ParametersAreNonnullByDefault +package com.infinum.thrifty; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/ThriftyConverterFactoryTest.java b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/ThriftyConverterFactoryTest.java similarity index 82% rename from retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/ThriftyConverterFactoryTest.java rename to retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/ThriftyConverterFactoryTest.java index 84191a7..6ac3e6d 100644 --- a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/ThriftyConverterFactoryTest.java +++ b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/ThriftyConverterFactoryTest.java @@ -18,9 +18,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package co.infinum.thrifty; +package com.infinum.thrifty; -import co.infinum.thrifty.kotlin.BrokenPhone; +import com.infinum.thrifty.kotlin.BrokenPhone; +import com.infinum.thrifty.java.Phone; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; @@ -46,16 +47,16 @@ public final class ThriftyConverterFactoryTest { interface Service { @GET("/") - Call get(); + Call get(); @POST("/") - Call post(@Body co.infinum.thrifty.java.Phone impl); + Call post(@Body Phone impl); @GET("/") - Call getKt(); + Call getKt(); @POST("/") - Call postKt(@Body co.infinum.thrifty.kotlin.Phone impl); + Call postKt(@Body com.infinum.thrifty.kotlin.Phone impl); @GET("/") Call getWrongClass(); @@ -110,10 +111,10 @@ private void serializeAndDeserialize(ProtocolType type, String phoneNumber, Stri ByteString bodyByteString = isBodyBase64 ? ByteString.decodeBase64(body) : ByteString.encodeUtf8(body); server.enqueue(new MockResponse().setBody(new Buffer().write(bodyByteString))); - co.infinum.thrifty.java.Phone phone = new co.infinum.thrifty.java.Phone.Builder().number(phoneNumber).build(); - Call call = service.post(phone); - Response response = call.execute(); - co.infinum.thrifty.java.Phone bodyPhone = response.body(); + Phone phone = new Phone.Builder().number(phoneNumber).build(); + Call call = service.post(phone); + Response response = call.execute(); + Phone bodyPhone = response.body(); assertThat(bodyPhone.number).isEqualTo(phoneNumber); RecordedRequest request = server.takeRequest(); @@ -128,10 +129,10 @@ private void serializeAndDeserializeKt(ProtocolType type, String phoneNumber, St ByteString bodyByteString = isBodyBase64 ? ByteString.decodeBase64(body) : ByteString.encodeUtf8(body); server.enqueue(new MockResponse().setBody(new Buffer().write(bodyByteString))); - co.infinum.thrifty.kotlin.Phone phone = new co.infinum.thrifty.kotlin.Phone.Builder().number(phoneNumber).build(); - Call call = service.postKt(phone); - Response response = call.execute(); - co.infinum.thrifty.kotlin.Phone bodyPhone = response.body(); + com.infinum.thrifty.kotlin.Phone phone = new com.infinum.thrifty.kotlin.Phone.Builder().number(phoneNumber).build(); + Call call = service.postKt(phone); + Response response = call.execute(); + com.infinum.thrifty.kotlin.Phone bodyPhone = response.body(); assertThat(bodyPhone.number).isEqualTo(phoneNumber); RecordedRequest request = server.takeRequest(); @@ -165,11 +166,7 @@ private void serializeWrongClass(ProtocolType type) throws IOException { assertThat(e).hasMessage("" + "Unable to create @Body converter for class java.lang.String (parameter #1)\n" + " for method Service.postWrongClass"); - assertThat(e.getCause()).hasMessageStartingWith("" - + "Could not locate RequestBody converter for class java.lang.String.\n" - + " Tried:\n" - + " * retrofit2.BuiltInConverters\n" - + " * co.infinum.thrifty.ThriftyConverterFactory"); + assertThat(e.getCause()).hasMessageMatching("(?s).*Tried:.*ThriftyConverterFactory.*"); } } @@ -200,11 +197,7 @@ private void deserializeWrongClass(ProtocolType type, String body, boolean isBod assertThat(e).hasMessage("" + "Unable to create converter for class java.lang.String\n" + " for method Service.getWrongClass"); - assertThat(e.getCause()).hasMessageStartingWith("" - + "Could not locate ResponseBody converter for class java.lang.String.\n" - + " Tried:\n" - + " * retrofit2.BuiltInConverters\n" - + " * co.infinum.thrifty.ThriftyConverterFactory"); + assertThat(e.getCause()).hasMessageMatching("(?s).*Tried:.*ThriftyConverterFactory.*"); } } @@ -234,11 +227,7 @@ private void serializeWrongType(ProtocolType type) throws IOException { assertThat(e).hasMessage("" + "Unable to create @Body converter for java.util.List (parameter #1)\n" + " for method Service.postWrongType"); - assertThat(e.getCause()).hasMessageStartingWith("" - + "Could not locate RequestBody converter for java.util.List.\n" - + " Tried:\n" - + " * retrofit2.BuiltInConverters\n" - + " * co.infinum.thrifty.ThriftyConverterFactory"); + assertThat(e.getCause()).hasMessageMatching("(?s).*Tried:.*ThriftyConverterFactory.*"); } } @@ -269,11 +258,7 @@ private void deserializeWrongType(ProtocolType type, String body, boolean isBody assertThat(e).hasMessage("" + "Unable to create converter for java.util.List\n" + " for method Service.getWrongType"); - assertThat(e.getCause()).hasMessageStartingWith("" - + "Could not locate ResponseBody converter for java.util.List.\n" - + " Tried:\n" - + " * retrofit2.BuiltInConverters\n" - + " * co.infinum.thrifty.ThriftyConverterFactory"); + assertThat(e.getCause()).hasMessageMatching("(?s).*Tried:.*ThriftyConverterFactory.*"); } } diff --git a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/java/Phone.java b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/java/Phone.java similarity index 99% rename from retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/java/Phone.java rename to retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/java/Phone.java index 1743128..0f05fa4 100644 --- a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/java/Phone.java +++ b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/java/Phone.java @@ -1,7 +1,7 @@ // Automatically generated by the Thrifty compiler; do not edit! // Generated on: 2021-03-11T13:23:16.134262292Z // Source: /home/dino/work/thrifty-retrofit-converter/retrofit-converter-thrifty/src/test/resources/phone.thrift: (3, 1) -package co.infinum.thrifty.java; +package com.infinum.thrifty.java; import com.microsoft.thrifty.Adapter; import com.microsoft.thrifty.Struct; diff --git a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/kotlin/BrokenPhone.kt b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/kotlin/BrokenPhone.kt similarity index 95% rename from retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/kotlin/BrokenPhone.kt rename to retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/kotlin/BrokenPhone.kt index f599025..70b1573 100644 --- a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/kotlin/BrokenPhone.kt +++ b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/kotlin/BrokenPhone.kt @@ -1,4 +1,4 @@ -package co.infinum.thrifty.kotlin +package com.infinum.thrifty.kotlin import com.microsoft.thrifty.Adapter import com.microsoft.thrifty.Struct diff --git a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/kotlin/Phone.kt b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/kotlin/Phone.kt similarity index 99% rename from retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/kotlin/Phone.kt rename to retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/kotlin/Phone.kt index 0086a13..b437005 100644 --- a/retrofit-converter-thrifty/src/test/java/co/infinum/thrifty/kotlin/Phone.kt +++ b/retrofit-converter-thrifty/src/test/java/com/infinum/thrifty/kotlin/Phone.kt @@ -1,4 +1,4 @@ -package co.infinum.thrifty.kotlin +package com.infinum.thrifty.kotlin import com.microsoft.thrifty.Adapter import com.microsoft.thrifty.Struct diff --git a/retrofit-converter-thrifty/src/test/resources/phone.thrift b/retrofit-converter-thrifty/src/test/resources/phone.thrift index 69162a2..e85caaa 100644 --- a/retrofit-converter-thrifty/src/test/resources/phone.thrift +++ b/retrofit-converter-thrifty/src/test/resources/phone.thrift @@ -1,4 +1,4 @@ -namespace java co.infinum.thrifty.java +namespace java com.infinum.thrifty.java struct Phone { 1: optional string number