Merge remote-tracking branch 'origin/models_to_kotlin' into models_to…

…_kotlin

# Conflicts:
#	app/src/main/java/org/apache/fineract/data/remote/NullOnEmptyConverterFactory.java

app/src/main/java/org/apache/fineract/data/remote/NullOnEmptyConverterFactory.java

@@ -1,22 +0,0 @@
-package org.apache.fineract.data.remote;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import okhttp3.ResponseBody;
-import retrofit2.Converter;
-import retrofit2.Retrofit;
-
-public class NullOnEmptyConverterFactory extends Converter.Factory {
-
-    @Override
-    public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations,
-            Retrofit retrofit) {
-        final Converter<ResponseBody, ?> delegate = retrofit.nextResponseBodyConverter(this, type,
-                annotations);
-        return (Converter<ResponseBody, Object>) body -> {
-            if (body.contentLength() == 0) return null;
-            return delegate.convert(body);
-        };
-    }
-}

app/src/main/java/org/apache/fineract/data/remote/NullOnEmptyConverterFactory.kt

@@ -0,0 +1,19 @@
+package org.apache.fineract.data.remote
+
+import okhttp3.ResponseBody
+import retrofit2.Converter
+import retrofit2.Retrofit
+import java.lang.reflect.Type
+
+/**
+ * Created by Ahmad Jawid Muhammadi on 1/6/20
+ */
+
+class NullOnEmptyConverterFactory : Converter.Factory() {
+    override fun responseBodyConverter(type: Type?, annotations: Array<Annotation?>?,
+                                       retrofit: Retrofit): Converter<ResponseBody, *> {
+        val delegate: Converter<ResponseBody, *> = retrofit.nextResponseBodyConverter<Any>(this, type,
+                annotations)
+        return Converter { body -> if (body.contentLength() == 0L) null else delegate.convert(body) }
+    }
+}