Skip to content

Commit 12ebdf2

Browse files
authored
chore: annotation mapping for DataElement (#23092)
* chore: annotation mapping for DataElement * minor * code format * code format * minor * minor * fix getters * add sortable annotation * fix short name translation * fix getter * fix clone Dimensional object * minor * move get de.ds.periodType to service * fix AnalyticsServiceTest * fix lazy exception * fix test * fix test * fix test * clean up * clean up * minor
1 parent 469e067 commit 12ebdf2

36 files changed

Lines changed: 612 additions & 207 deletions

File tree

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseMetadataObject.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
import jakarta.persistence.Temporal;
4242
import jakarta.persistence.TemporalType;
4343
import jakarta.persistence.Transient;
44+
import java.io.Serializable;
4445
import java.util.Date;
4546
import lombok.Setter;
47+
import org.hisp.dhis.audit.AuditAttribute;
4648
import org.hisp.dhis.common.annotation.Description;
4749
import org.hisp.dhis.schema.PropertyType;
4850
import org.hisp.dhis.schema.annotation.Gist;
@@ -60,10 +62,11 @@
6062
* database columns.
6163
*/
6264
@MappedSuperclass
63-
public class BaseMetadataObject implements MetadataObject {
65+
public class BaseMetadataObject implements MetadataObject, Serializable {
6466

6567
@Column(name = "uid", unique = true, nullable = false, length = 11)
6668
@Setter
69+
@AuditAttribute
6770
protected String uid;
6871

6972
@Column(name = "created", nullable = false, updatable = false)
@@ -97,7 +100,7 @@ public class BaseMetadataObject implements MetadataObject {
97100
@Transient @Setter protected String href;
98101

99102
/** Access information for this object. Applies to current user. */
100-
@Transient @Setter protected Access access;
103+
@Transient @Setter protected transient Access access;
101104

102105
// -------------------------------------------------------------------------------------------
103106
// Getters

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DataDimensionItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public void setIndicator(Indicator indicator) {
337337
}
338338

339339
@JsonProperty
340-
@JsonSerialize(as = BaseNameableObject.class)
340+
@JsonSerialize(as = NameableObject.class)
341341
@JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
342342
public DataElement getDataElement() {
343343
return dataElement;

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/PrefixedDimensions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static Collection<PrefixedDimension> ofDataElements(ProgramStage programS
7171
}
7272

7373
public static Collection<PrefixedDimension> ofItemsWithProgram(
74-
Program program, Collection<? extends BaseIdentifiableObject> objects) {
74+
Program program, Collection<? extends IdentifiableObject> objects) {
7575
return objects.stream()
7676
.map(item -> PrefixedDimension.builder().item(item).program(program).build())
7777
.collect(Collectors.toList());

0 commit comments

Comments
 (0)