Skip to content

Commit a390b1c

Browse files
vgarciabnzvgarciabnz
authored
chore: [ANDROSDK-2322] Migrate organisationUnit package to data class; migrate OrganisationUnitTree (#2638)
2 parents 1fa493e + 5f5b514 commit a390b1c

15 files changed

Lines changed: 589 additions & 437 deletions

‎core/api/core.api‎

Lines changed: 254 additions & 37 deletions
Large diffs are not rendered by default.

core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroup.java renamed to core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroup.kt

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004-2023, University of Oslo
2+
* Copyright (c) 2004-2026, University of Oslo
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -26,37 +26,35 @@
2626
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727
*/
2828

29-
package org.hisp.dhis.android.core.organisationunit;
29+
package org.hisp.dhis.android.core.organisationunit
3030

31-
import androidx.annotation.Nullable;
31+
import org.hisp.dhis.android.annotations.ModelBuilder
32+
import org.hisp.dhis.android.core.common.BaseIdentifiableObjectKt
33+
import org.hisp.dhis.android.core.common.CoreObject
34+
import java.util.Date
3235

33-
import com.google.auto.value.AutoValue;
36+
@ModelBuilder
37+
data class OrganisationUnitGroup(
38+
override val uid: String,
39+
override val code: String?,
40+
override val name: String?,
41+
override val displayName: String?,
42+
override val created: Date?,
43+
override val lastUpdated: Date?,
44+
override val deleted: Boolean?,
45+
val shortName: String?,
46+
val displayShortName: String?,
47+
) : BaseIdentifiableObjectKt, CoreObject {
3448

35-
import org.hisp.dhis.android.core.common.BaseIdentifiableObAuVa;
36-
import org.hisp.dhis.android.core.common.CoreObject;
49+
fun shortName(): String? = shortName
50+
fun displayShortName(): String? = displayShortName
3751

38-
@AutoValue
39-
public abstract class OrganisationUnitGroup extends BaseIdentifiableObAuVa implements CoreObject {
52+
fun toBuilder(): Builder = OrganisationUnitGroupBuilder.from(this)
4053

41-
@Nullable
42-
public abstract String shortName();
54+
class Builder : OrganisationUnitGroupBuilder()
4355

44-
@Nullable
45-
public abstract String displayShortName();
46-
47-
public static Builder builder() {
48-
return new AutoValue_OrganisationUnitGroup.Builder();
49-
}
50-
51-
public abstract Builder toBuilder();
52-
53-
@AutoValue.Builder
54-
public abstract static class Builder extends BaseIdentifiableObAuVa.Builder<Builder> {
55-
56-
public abstract Builder shortName(String shortName);
57-
58-
public abstract Builder displayShortName(String displayShortName);
59-
60-
public abstract OrganisationUnitGroup build();
56+
companion object {
57+
@JvmStatic
58+
fun builder(): Builder = Builder()
6159
}
6260
}

core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLink.java renamed to core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevel.kt

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004-2023, University of Oslo
2+
* Copyright (c) 2004-2026, University of Oslo
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -26,36 +26,33 @@
2626
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727
*/
2828

29-
package org.hisp.dhis.android.core.organisationunit;
29+
package org.hisp.dhis.android.core.organisationunit
3030

31-
import androidx.annotation.Nullable;
31+
import org.hisp.dhis.android.annotations.ModelBuilder
32+
import org.hisp.dhis.android.core.common.BaseIdentifiableObjectKt
33+
import org.hisp.dhis.android.core.common.CoreObject
34+
import java.util.Date
3235

33-
import com.google.auto.value.AutoValue;
36+
@ModelBuilder
37+
data class OrganisationUnitLevel(
38+
override val uid: String,
39+
override val code: String?,
40+
override val name: String?,
41+
override val displayName: String?,
42+
override val created: Date?,
43+
override val lastUpdated: Date?,
44+
override val deleted: Boolean?,
45+
val level: Int?,
46+
) : BaseIdentifiableObjectKt, CoreObject {
3447

35-
import org.hisp.dhis.android.core.common.CoreObject;
48+
fun level(): Int? = level
3649

37-
@AutoValue
38-
public abstract class OrganisationUnitOrganisationUnitGroupLink implements CoreObject {
50+
fun toBuilder(): Builder = OrganisationUnitLevelBuilder.from(this)
3951

40-
@Nullable
41-
public abstract String organisationUnit();
52+
class Builder : OrganisationUnitLevelBuilder()
4253

43-
@Nullable
44-
public abstract String organisationUnitGroup();
45-
46-
public static Builder builder() {
47-
return new AutoValue_OrganisationUnitOrganisationUnitGroupLink.Builder();
48-
}
49-
50-
public abstract Builder toBuilder();
51-
52-
@AutoValue.Builder
53-
public abstract static class Builder {
54-
55-
public abstract Builder organisationUnit(String organisationUnit);
56-
57-
public abstract Builder organisationUnitGroup(String organisationUnitGroup);
58-
59-
public abstract OrganisationUnitOrganisationUnitGroupLink build();
54+
companion object {
55+
@JvmStatic
56+
fun builder(): Builder = Builder()
6057
}
6158
}

core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevel.java renamed to core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLink.kt

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004-2023, University of Oslo
2+
* Copyright (c) 2004-2026, University of Oslo
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -26,31 +26,26 @@
2626
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727
*/
2828

29-
package org.hisp.dhis.android.core.organisationunit;
29+
package org.hisp.dhis.android.core.organisationunit
3030

31-
import androidx.annotation.Nullable;
31+
import org.hisp.dhis.android.annotations.ModelBuilder
32+
import org.hisp.dhis.android.core.common.CoreObject
3233

33-
import com.google.auto.value.AutoValue;
34+
@ModelBuilder
35+
data class OrganisationUnitOrganisationUnitGroupLink(
36+
val organisationUnit: String,
37+
val organisationUnitGroup: String,
38+
) : CoreObject {
3439

35-
import org.hisp.dhis.android.core.common.BaseIdentifiableObAuVa;
36-
import org.hisp.dhis.android.core.common.CoreObject;
40+
fun organisationUnit(): String = organisationUnit
41+
fun organisationUnitGroup(): String = organisationUnitGroup
3742

38-
@AutoValue
39-
public abstract class OrganisationUnitLevel extends BaseIdentifiableObAuVa implements CoreObject {
43+
fun toBuilder(): Builder = OrganisationUnitOrganisationUnitGroupLinkBuilder.from(this)
4044

41-
@Nullable
42-
public abstract Integer level();
45+
class Builder : OrganisationUnitOrganisationUnitGroupLinkBuilder()
4346

44-
public abstract Builder toBuilder();
45-
46-
public static Builder builder() {
47-
return new AutoValue_OrganisationUnitLevel.Builder();
48-
}
49-
50-
@AutoValue.Builder
51-
public abstract static class Builder extends BaseIdentifiableObAuVa.Builder<Builder> {
52-
public abstract Builder level(Integer level);
53-
54-
public abstract OrganisationUnitLevel build();
47+
companion object {
48+
@JvmStatic
49+
fun builder(): Builder = Builder()
5550
}
5651
}

core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLink.java renamed to core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLink.kt

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004-2023, University of Oslo
2+
* Copyright (c) 2004-2026, University of Oslo
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -25,36 +25,27 @@
2525
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2626
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727
*/
28-
package org.hisp.dhis.android.core.organisationunit;
2928

30-
import androidx.annotation.Nullable;
29+
package org.hisp.dhis.android.core.organisationunit
3130

32-
import com.google.auto.value.AutoValue;
31+
import org.hisp.dhis.android.annotations.ModelBuilder
32+
import org.hisp.dhis.android.core.common.CoreObject
3333

34-
import org.hisp.dhis.android.core.common.CoreObject;
34+
@ModelBuilder
35+
data class OrganisationUnitProgramLink(
36+
val program: String,
37+
val organisationUnit: String,
38+
) : CoreObject {
3539

36-
@AutoValue
37-
public abstract class OrganisationUnitProgramLink implements CoreObject {
40+
fun program(): String = program
41+
fun organisationUnit(): String = organisationUnit
3842

39-
@Nullable
40-
public abstract String program();
43+
fun toBuilder(): Builder = OrganisationUnitProgramLinkBuilder.from(this)
4144

42-
@Nullable
43-
public abstract String organisationUnit();
45+
class Builder : OrganisationUnitProgramLinkBuilder()
4446

45-
public static Builder builder() {
46-
return new AutoValue_OrganisationUnitProgramLink.Builder();
47-
}
48-
49-
public abstract Builder toBuilder();
50-
51-
@AutoValue.Builder
52-
public abstract static class Builder {
53-
54-
public abstract Builder program(@Nullable String program);
55-
56-
public abstract Builder organisationUnit(@Nullable String organisationUnit);
57-
58-
public abstract OrganisationUnitProgramLink build();
47+
companion object {
48+
@JvmStatic
49+
fun builder(): Builder = Builder()
5950
}
6051
}

‎core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitTree.java‎

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)