Change base package name to com.infinum

infinum · Mar 11, 2021 · 85d528e · 85d528e
1 parent 05fb3c9
commit 85d528e
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 46 deletions.
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
diff --git a/...java/co/infinum/thrifty/ProtocolType.java → ...ava/com/infinum/thrifty/ProtocolType.java b/...java/co/infinum/thrifty/ProtocolType.java → ...ava/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/...inum/thrifty/ThriftyConverterFactory.java → ...inum/thrifty/ThriftyConverterFactory.java b/...inum/thrifty/ThriftyConverterFactory.java → ...inum/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/.../thrifty/ThriftyRequestBodyConverter.java → .../thrifty/ThriftyRequestBodyConverter.java b/.../thrifty/ThriftyRequestBodyConverter.java → .../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/...thrifty/ThriftyResponseBodyConverter.java → ...thrifty/ThriftyResponseBodyConverter.java b/...thrifty/ThriftyResponseBodyConverter.java → ...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
@@ -0,0 +1,4 @@
+@ParametersAreNonnullByDefault
+package com.infinum.thrifty;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/.../thrifty/ThriftyConverterFactoryTest.java → .../thrifty/ThriftyConverterFactoryTest.java b/.../thrifty/ThriftyConverterFactoryTest.java → .../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<co.infinum.thrifty.java.Phone> get();
+        Call<Phone> get();
 
         @POST("/")
-        Call<co.infinum.thrifty.java.Phone> post(@Body co.infinum.thrifty.java.Phone impl);
+        Call<Phone> post(@Body Phone impl);
 
         @GET("/")
-        Call<co.infinum.thrifty.kotlin.Phone> getKt();
+        Call<com.infinum.thrifty.kotlin.Phone> getKt();
 
         @POST("/")
-        Call<co.infinum.thrifty.kotlin.Phone> postKt(@Body co.infinum.thrifty.kotlin.Phone impl);
+        Call<com.infinum.thrifty.kotlin.Phone> postKt(@Body com.infinum.thrifty.kotlin.Phone impl);
 
         @GET("/")
         Call<String> 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<co.infinum.thrifty.java.Phone> call = service.post(phone);
-        Response<co.infinum.thrifty.java.Phone> response = call.execute();
-        co.infinum.thrifty.java.Phone bodyPhone = response.body();
+        Phone phone = new Phone.Builder().number(phoneNumber).build();
+        Call<Phone> call = service.post(phone);
+        Response<Phone> 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<co.infinum.thrifty.kotlin.Phone> call = service.postKt(phone);
-        Response<co.infinum.thrifty.kotlin.Phone> 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<com.infinum.thrifty.kotlin.Phone> call = service.postKt(phone);
+        Response<com.infinum.thrifty.kotlin.Phone> 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<java.lang.String> (parameter #1)\n"
                     + "    for method Service.postWrongType");
-            assertThat(e.getCause()).hasMessageStartingWith(""
-                    + "Could not locate RequestBody converter for java.util.List<java.lang.String>.\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<java.lang.String>\n"
                     + "    for method Service.getWrongType");
-            assertThat(e.getCause()).hasMessageStartingWith(""
-                    + "Could not locate ResponseBody converter for java.util.List<java.lang.String>.\n"
-                    + "  Tried:\n"
-                    + "   * retrofit2.BuiltInConverters\n"
-                    + "   * co.infinum.thrifty.ThriftyConverterFactory");
+            assertThat(e.getCause()).hasMessageMatching("(?s).*Tried:.*ThriftyConverterFactory.*");
         }
     }
 

diff --git a/...t/java/co/infinum/thrifty/java/Phone.java → .../java/com/infinum/thrifty/java/Phone.java b/...t/java/co/infinum/thrifty/java/Phone.java → .../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/.../co/infinum/thrifty/kotlin/BrokenPhone.kt → ...com/infinum/thrifty/kotlin/BrokenPhone.kt b/.../co/infinum/thrifty/kotlin/BrokenPhone.kt → ...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/...t/java/co/infinum/thrifty/kotlin/Phone.kt → .../java/com/infinum/thrifty/kotlin/Phone.kt b/...t/java/co/infinum/thrifty/kotlin/Phone.kt → .../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
@@ -1,4 +1,4 @@
-namespace java co.infinum.thrifty.java
+namespace java com.infinum.thrifty.java
 
 struct Phone {
     1: optional string number