AC-634 Migrated POJO classes to Kotlin by rishabh-997 · Pull Request #675 · openmrs/openmrs-contrib-android-client

rishabh-997 · 2020-01-16T15:36:10Z

Description of what I changed

I migrated 38/40 classes to Kotlin to remove unnecessary boilerplate code
Updated other files respectively in order to run tests successfully as Kotlin does not support null assignment
Since null could not be assigned to nonnull Bitmap variable, so I didnt migrated two base POJO files to Kotlin.

Issue I worked on

JIRA Issue: https://issues.openmrs.org/browse/AC-634

Checklist: I completed these to help reviewers :)

My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).

I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)

All new and existing tests passed.

My pull request is based on the latest changes of the master branch.

rishabh-997 · 2020-01-16T15:41:56Z

@f4ww4z sir, please review the changes😅😅. Had a tough time migrating it to Kotlin as it is very difficult to handle null point exceptions in Kotlin. I have passed all 104 tests locally.
@everyone, I will squash the commits once all the changes are completed and no more changes are requested...

codecov-io · 2020-01-16T15:51:03Z

Codecov Report

Merging #675 into master will decrease coverage by 0.36%.
The diff coverage is 35.81%.

@@            Coverage Diff             @@
##           master     #675      +/-   ##
==========================================
- Coverage   12.36%   11.99%   -0.37%     
==========================================
  Files         236      233       -3     
  Lines       10857    10414     -443     
  Branches     1002     1002              
==========================================
- Hits         1342     1249      -93     
+ Misses       9434     9084     -350     
  Partials       81       81

Impacted Files	Coverage Δ
...s/mobile/databases/entities/ObservationEntity.java	`0% <ø> (ø)`	⬆️
...enmrs/mobile/databases/entities/PatientEntity.java	`0% <ø> (ø)`	⬆️
...nmrs/mobile/databases/entities/LocationEntity.java	`0% <ø> (ø)`	⬆️
...openmrs/mobile/databases/entities/VisitEntity.java	`0% <ø> (ø)`	⬆️
...mrs/mobile/databases/entities/EncounterEntity.java	`0% <ø> (ø)`	⬆️
...enmrs/mobile/databases/entities/ConceptEntity.java	`0% <ø> (ø)`	⬆️
...ies/visitdashboard/VisitExpandableListAdapter.java	`0% <ø> (ø)`	⬆️
.../src/main/java/org/openmrs/mobile/models/Answer.kt	`0% <0%> (ø)`
...nt/src/main/java/org/openmrs/mobile/models/Link.kt	`0% <0%> (ø)`
...rc/main/java/org/openmrs/mobile/models/FormData.kt	`0% <0%> (ø)`
... and 86 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cac05ed...31a3fcd. Read the comment docs.

f4ww4z

@rishabh-997 These are my current reviews... haven't checked everything yet, since there's 81 files being changed. Also, make sure to apply my comments to other files if there's a similar pattern.

openmrs-client/build.gradle

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

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

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

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

openmrs-client/src/test/java/org/openmrs/mobile/test/ACUnitTestBase.java

f4ww4z · 2020-01-19T08:47:49Z

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

+
+class SystemSetting : Resource() {
+
+    @Expose


Do we need to serialize every variable in model classes anymore?

I think its important because of following line in the code

openmrs-contrib-android-client/openmrs-client/src/main/java/org/openmrs/mobile/api/RestServiceBuilder.java

Line 86 in d786247

.excludeFieldsWithoutExposeAnnotation()

What are your suggestions to this @f4ww4z sir ?

f4ww4z · 2020-02-20T02:05:22Z

@rishabh-997 how is your progress for this?

rishabh-997 · 2020-02-20T20:08:02Z

@rishabh-997 how is your progress for this?

Actually I was trying to resolve the above conversations but faced many null pointer exceptions and then got engaged in admission_Form PR. I will continue this from next week after my university exams...

f4ww4z

@rishabh-997 please address these comments

Remove redundant custom getters and setters. Only use custom getters for computed properties. See this doc.
Remove star imports.

Just tested this and the app runs fine.

f4ww4z · 2020-03-22T05:04:55Z

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

+import com.google.gson.annotations.SerializedName
+import org.openmrs.mobile.utilities.DateUtils
+import java.io.Serializable
+import java.util.*


Please avoid star imports.

f4ww4z · 2020-03-22T05:05:19Z

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

+
+    override var uuid: String?
+        get() = uuid
+        set(uuid) {


These getters and setters are redundant. Remove them.

Updated User.kt Using lateinit to avoid initialization removed unused imports removed redundant getters squashing commits

f4ww4z

LGTM @rishabh-997 !

rishabh-997 requested review from AdamGrzybkowski and f4ww4z January 16, 2020 15:51

f4ww4z requested changes Jan 19, 2020

View reviewed changes

rishabh-997 force-pushed the AC-634-kotlin branch from 6f296eb to bf27b3d Compare February 26, 2020 16:29

rishabh-997 requested a review from f4ww4z February 26, 2020 20:34

f4ww4z requested changes Mar 22, 2020

View reviewed changes

rishabh-997 force-pushed the AC-634-kotlin branch from 9678d41 to 97f863d Compare March 27, 2020 13:41

rishabh-997 requested a review from f4ww4z March 27, 2020 13:42

rishabh-997 force-pushed the AC-634-kotlin branch from 97f863d to f1daacf Compare March 31, 2020 05:50

resolving conflicts

31a3fcd

Updated User.kt Using lateinit to avoid initialization removed unused imports removed redundant getters squashing commits

rishabh-997 force-pushed the AC-634-kotlin branch from f1daacf to 31a3fcd Compare March 31, 2020 05:52

rishabh-997 changed the title ~~AC 634 Migrated POJO classes to Kotlin~~ AC-634 Migrated POJO classes to Kotlin Mar 31, 2020

f4ww4z approved these changes Apr 4, 2020

View reviewed changes

f4ww4z merged commit 28bd0b3 into openmrs:master Apr 4, 2020

rishabh-997 deleted the AC-634-kotlin branch April 4, 2020 14:45

Conversation

rishabh-997 commented Jan 16, 2020

Description of what I changed

Issue I worked on

Checklist: I completed these to help reviewers :)

Uh oh!

rishabh-997 commented Jan 16, 2020

Uh oh!

codecov-io commented Jan 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

f4ww4z Jan 19, 2020

Choose a reason for hiding this comment

Uh oh!

rishabh-997 Mar 6, 2020

Choose a reason for hiding this comment

Uh oh!

rishabh-997 Mar 6, 2020

Choose a reason for hiding this comment

Uh oh!

f4ww4z commented Feb 20, 2020

Uh oh!

rishabh-997 commented Feb 20, 2020

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

f4ww4z Mar 22, 2020

Choose a reason for hiding this comment

Uh oh!

f4ww4z Mar 22, 2020

Choose a reason for hiding this comment

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov-io commented Jan 16, 2020 •

edited

Loading