AC-634 Migrated POJO classes to Kotlin

openmrs-client/build.gradle

@@ -181,6 +181,7 @@ dependencies {
     implementation 'com.github.AppIntro:AppIntro:5.1.0'
     testImplementation(
             'org.mockito:mockito-core:2.8.9',
+            'org.mockito:mockito-inline:2.13.0',
             'junit:junit:4.12',
             'org.powermock:powermock-api-mockito2:2.0.2',
             'org.powermock:powermock-module-junit4:2.0.2'

openmrs-client/src/main/java/org/openmrs/mobile/activities/visitdashboard/VisitExpandableListAdapter.java

@@ -86,9 +86,6 @@ private List<ViewGroup> generateChildLayouts() {
                     layouts.add(convertView);
                     break;
                 case EncounterType.DISCHARGE:
-                    convertView = openMRSInflater.addSingleStringView(contentLayout, mContext.getString(R.string.list_item_encounter_no_notes));
-                    layouts.add(convertView);
-                    break;
                 case EncounterType.ADMISSION:
                     convertView = openMRSInflater.addSingleStringView(contentLayout, mContext.getString(R.string.list_item_encounter_no_notes));
                     layouts.add(convertView);

openmrs-client/src/main/java/org/openmrs/mobile/api/repository/VisitRepository.java

@@ -168,7 +168,7 @@ public void startVisit(final Patient patient, @Nullable final StartVisitResponse
         visit.setPatient(patient);
         visit.setLocation(locationDAO.findLocationByName(OpenMRS.getInstance().getLocation()));
 
-        visit.setVisitType(new VisitType(null, OpenMRS.getInstance().getVisitTypeUUID()));
+        visit.setVisitType(new VisitType("", OpenMRS.getInstance().getVisitTypeUUID()));
 
         Call<Visit> call = restApi.startVisit(visit);
         call.enqueue(new Callback<Visit>() {

openmrs-client/src/main/java/org/openmrs/mobile/databases/entities/EncounterEntity.java

@@ -1,10 +1,9 @@
 package org.openmrs.mobile.databases.entities;
 
-import org.openmrs.mobile.models.Resource;
-
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
+import org.openmrs.mobile.models.Resource;
 
 @Entity(tableName = "encounters")
 public class EncounterEntity extends Resource {

openmrs-client/src/main/java/org/openmrs/mobile/databases/entities/LocationEntity.java

@@ -1,10 +1,9 @@
 package org.openmrs.mobile.databases.entities;
 
-import org.openmrs.mobile.models.Resource;
-
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
+import org.openmrs.mobile.models.Resource;
 
 @Entity(tableName = "locations")
 public class LocationEntity extends Resource {

openmrs-client/src/main/java/org/openmrs/mobile/databases/entities/ObservationEntity.java

@@ -1,10 +1,9 @@
 package org.openmrs.mobile.databases.entities;
 
-import org.openmrs.mobile.models.Resource;
-
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
+import org.openmrs.mobile.models.Resource;
 
 @Entity(tableName = "observations")
 public class ObservationEntity extends Resource {

openmrs-client/src/main/java/org/openmrs/mobile/databases/entities/PatientEntity.java

@@ -1,12 +1,11 @@
 package org.openmrs.mobile.databases.entities;
 
-import org.openmrs.mobile.models.Resource;
-
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Embedded;
 import androidx.room.Entity;
 import androidx.room.RoomWarnings;
+import org.openmrs.mobile.models.Resource;
 
 @Entity(tableName = "patients")
 public class PatientEntity extends Resource {

openmrs-client/src/main/java/org/openmrs/mobile/databases/entities/VisitEntity.java

@@ -1,10 +1,9 @@
 package org.openmrs.mobile.databases.entities;
 
-import org.openmrs.mobile.models.Resource;
-
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
+import org.openmrs.mobile.models.Resource;
 
 @Entity(tableName = "visits")
 public class VisitEntity extends Resource {

openmrs-client/src/main/java/org/openmrs/mobile/models/Answer.kt

@@ -0,0 +1,65 @@
+/*
+ * The contents of this file are subject to the OpenMRS Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://license.openmrs.org
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ */
+
+package org.openmrs.mobile.models
+
+import android.annotation.SuppressLint
+import android.os.Parcel
+import android.os.Parcelable
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+import java.io.Serializable
+
+class Answer : Serializable, Parcelable {
+
+    @SerializedName("concept")
+    @Expose
+    var concept: String? = null
+
+    @SerializedName("label")
+    @Expose
+    var label: String? = null
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(this.concept)
+        dest.writeString(this.label)
+    }
+
+    constructor() {}
+
+    constructor(`in`: Parcel) {
+        this.concept = `in`.readString()
+        this.label = `in`.readString()
+    }
+
+    companion object {
+
+        @SuppressLint("ParcelCreator")
+        val CREATOR: Parcelable.Creator<Answer> = object : Parcelable.Creator<Answer> {
+            override fun createFromParcel(source: Parcel): Answer {
+                return Answer(source)
+            }
+
+            override fun newArray(size: Int): Array<Answer?> {
+                return arrayOfNulls(size)
+            }
+        }
+    }
+}

openmrs-client/src/main/java/org/openmrs/mobile/models/Concept.kt

@@ -0,0 +1,32 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ *
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
+
+package org.openmrs.mobile.models
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class Concept : Resource() {
+
+    override var id: Long? = null
+
+    @SerializedName("datatype")
+    @Expose
+    var datatype: Datatype? = null
+
+    @SerializedName("name")
+    @Expose
+    var name: String? = null
+
+    @SerializedName("conceptClass")
+    @Expose
+    var conceptClass: ConceptClass? = null
+
+}

openmrs-client/src/main/java/org/openmrs/mobile/models/Datatype.java → openmrs-client/src/main/java/org/openmrs/mobile/models/ConceptClass.kt

@@ -12,8 +12,6 @@
  * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
  */
 
-package org.openmrs.mobile.models;
+package org.openmrs.mobile.models
 
-public class Datatype extends Resource {
-
-}
+class ConceptClass : Resource()

openmrs-client/src/main/java/org/openmrs/mobile/models/ConceptClass.java → openmrs-client/src/main/java/org/openmrs/mobile/models/Datatype.kt

@@ -12,8 +12,6 @@
  * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
  */
 
-package org.openmrs.mobile.models;
+package org.openmrs.mobile.models
 
-public class ConceptClass extends Resource {
-
-}
+class Datatype : Resource()