chore: Clean-up [DHIS2-18370]

dhis2 · Dec 16, 2024 · d31972d · d31972d
1 parent 08f3b09
commit d31972d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 28 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java
@@ -46,7 +46,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.tuple.Triple;
-import org.hisp.dhis.analytics.Aggregation;
 import org.hisp.dhis.analytics.AggregationType;
 import org.hisp.dhis.analytics.QueryKey;
 import org.hisp.dhis.eventvisualization.EventRepetition;
@@ -87,12 +86,6 @@ public class BaseDimensionalObject extends BaseNameableObject implements Dimensi
   /** The option set associated with the dimension, if any. */
   private transient OptionSet optionSet;
 
-  /** The option set saved by the client, if any. */
-  private transient OptionSet optionSetItem;
-
-  /** The client's aggregation type. */
-  private transient Aggregation aggregation;
-
   /** The dimensional items for this dimension. */
   private List<DimensionalItemObject> items = new ArrayList<>();
 
@@ -423,20 +416,6 @@ public OptionSet getOptionSet() {
     return optionSet;
   }
 
-  @Override
-  @JsonProperty
-  @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
-  public OptionSet getOptionSetItem() {
-    return optionSetItem;
-  }
-
-  @Override
-  @JsonProperty
-  @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
-  public Aggregation getAggregation() {
-    return aggregation;
-  }
-
   @Override
   @JsonProperty
   @JsonDeserialize(contentAs = BaseDimensionalItemObject.class)

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java
@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.hisp.dhis.analytics.Aggregation;
 import org.hisp.dhis.analytics.AggregationType;
 import org.hisp.dhis.category.Category;
 import org.hisp.dhis.category.CategoryOption;
@@ -159,12 +158,6 @@ public interface DimensionalObject extends NameableObject, GroupableItem {
   /** Returns the option set of the dimension, if any. */
   OptionSet getOptionSet();
 
-  /** The option set saved by the client, if any. */
-  OptionSet getOptionSetItem();
-
-  /** The client's aggregation type. */
-  Aggregation getAggregation();
-
   /** Dimension items. */
   List<DimensionalItemObject> getItems();