Merge pull request #3666 from keeps/staging

Staging

Author: luis100

.github/workflows/CI.yml

@@ -33,7 +33,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
       - name: Install clamdscan
-        run: sudo apt-get install clamdscan -y
+        run: sudo apt-get update && sudo apt-get install clamdscan -y
       - name: Test
         run:
           mvn $MAVEN_CLI_OPTS -Dtestng.groups="travis" -Denforcer.skip=true clean org.jacoco:jacoco-maven-plugin:prepare-agent clean test

.github/workflows/staging.yml

@@ -30,7 +30,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
       - name: Install clamdscan
-        run: sudo apt-get install clamdscan -y
+        run: sudo apt-get update && sudo apt-get install clamdscan -y
       - name: Run tests & install
         run: mvn $MAVEN_CLI_OPTS -Dtestng.groups="travis" -Denforcer.skip=true clean org.jacoco:jacoco-maven-plugin:prepare-agent install
         env:

roda-common/roda-common-data/src/main/java/org/roda/core/data/common/RodaConstants.java

@@ -10,8 +10,12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
+import org.roda.core.data.v2.disposal.schedule.DisposalActionCode;
+import org.roda.core.data.v2.disposal.schedule.DisposalScheduleState;
+import org.roda.core.data.v2.disposal.schedule.RetentionPeriodIntervalCode;
 import org.roda.core.data.v2.ip.Permissions.PermissionType;
 
 public final class RodaConstants {
@@ -932,6 +936,9 @@ public enum OrchestratorType {
   public static final String INDEX_DIP_FILE = "DIPFile";
   public static final String INDEX_REPRESENTATION_INFORMATION = "RepresentationInformation";
   public static final String INDEX_DISPOSAL_CONFIRMATION = "DisposalConfirmation";
+  public static final String INDEX_DISPOSAL_SCHEDULE = "DisposalSchedule";
+  public static final String INDEX_DISPOSAL_HOLD = "DisposalHold";
+  public static final String INDEX_DISPOSAL_RULE = "DisposalRule";
 
   /*
    * INDEXED CLASSES
@@ -946,7 +953,10 @@ public enum OrchestratorType {
       "org.roda.core.data.v2.risks.RiskIncidence", "org.roda.core.data.v2.ri.RepresentationInformation",
       "org.roda.core.data.v2.ip.TransferredResource", "org.roda.core.data.v2.user.User",
       "org.roda.core.data.v2.user.Group", "org.roda.core.data.v2.user.RODAMember",
-      "org.roda.core.data.v2.ip.disposal.DisposalConfirmation", "org.roda.core.data.v2.user.RodaPrincipal",
+      "org.roda.core.data.v2.disposal.hold.DisposalHold",
+      "org.roda.core.data.v2.disposal.schedule.DisposalSchedule",
+      "org.roda.core.data.v2.disposal.rule.DisposalRule",
+      "org.roda.core.data.v2.disposal.confirmation.DisposalConfirmation", "org.roda.core.data.v2.user.RodaPrincipal",
       "org.roda.core.data.v2.ip.AIP", "org.roda.core.data.v2.risks.Risk", "org.roda.core.events.pekko.CRDTWrapper",
       "org.roda.core.data.v2.ip.DIP", "org.roda.core.data.v2.ip.metadata.DescriptiveMetadata",
       "org.roda.core.data.v2.ip.disposal.DisposalConfirmationAIPEntry",
@@ -1307,8 +1317,32 @@ public enum OrchestratorType {
   public static final String DISPOSAL_CONFIRMATION_EXTRA_INFO = "extraInformation";
   public static final String DISPOSAL_CONFIRMATION_STORAGE_SIZE = "size";
 
+  public static final String DISPOSAL_SCHEDULE_TITLE = "title";
+  public static final String DISPOSAL_SCHEDULE_DESCRIPTION = "description";
+  public static final String DISPOSAL_SCHEDULE_MANDATE = "mandate";
+  public static final String DISPOSAL_SCHEDULE_SCOPE_NOTES = "scopeNotes";
+  public static final String DISPOSAL_SCHEDULE_STATE = "state";
+  public static final String DISPOSAL_SCHEDULE_ACTION = "action";
+  public static final String DISPOSAL_SCHEDULE_RETENTION_PERIOD_INTERVAL_CODE =  "retentionPeriodIntervalCode";
+  public static final String DISPOSAL_SCHEDULE_RETENTION_PERIOD_DURATION = "retentionPeriodDuration";
+
+  public static final String DISPOSAL_HOLD_TITLE = "title";
+  public static final String DISPOSAL_HOLD_DESCRIPTION = "description";
+  public static final String DISPOSAL_HOLD_MANDATE = "mandate";
+  public static final String DISPOSAL_HOLD_SCOPE_NOTES = "scopeNotes";
+  public static final String DISPOSAL_HOLD_STATE = "state";
+
+  public static final String DISPOSAL_RULE_ORDER = "order";
+  public static final String DISPOSAL_RULE_TITLE = "title";
+  public static final String DISPOSAL_RULE_DESCRIPTION = "description";
+  public static final String DISPOSAL_RULE_SELECTION_METHOD = "selectionMethod";
+  public static final String DISPOSAL_RULE_CONDITION_KEY = "conditionKey";
+  public static final String DISPOSAL_RULE_CONDITION_VALUE = "conditionvalue";
+  public static final String DISPOSAL_RULE_SCHEDULE_ID = "scheduleId";
+
   /* Disposal related parameters */
   public static final String DISPOSAL_HOLD_FILE_EXTENSION = ".json";
+  public static final String DISPOSAL_RULE_FILE_EXTENSION = ".json";
 
   /* Distributed related parameters */
   public static final String DISTRIBUTED_INSTANCE_FILE_EXTENSION = ".json";
@@ -2169,6 +2203,7 @@ public enum RODA_TYPE {
 
   public static final String PERMISSION_METHOD_CREATE_DISPOSAL_RULE = "org.roda.wui.api.v2.controller.DisposalRuleController.createDisposalRule";
   public static final String PERMISSION_METHOD_UPDATE_DISPOSAL_RULE = "org.roda.wui.api.v2.controller.DisposalRuleController.updateDisposalRule";
+  public static final String PERMISSION_METHOD_DELETE_DISPOSAL_RULE = "org.roda.wui.api.v2.controller.DisposalRuleController.deleteDisposalRule";
 
   public static final String PERMISSION_METHOD_CREATE_DISPOSAL_SCHEDULE = "org.roda.wui.api.v2.controller.DisposalScheduleController.createDisposalSchedule";
   public static final String PERMISSION_METHOD_UPDATE_DISPOSAL_SCHEDULE = "org.roda.wui.api.v2.controller.DisposalScheduleController.updateDisposalSchedule";

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/common/RODAObjectList.java

@@ -14,9 +14,9 @@
 
 public interface RODAObjectList<T extends IsRODAObject> extends Serializable {
 
-  public List<T> getObjects();
+  List<T> getObjects();
 
-  public void setObjects(List<T> objects);
+  void setObjects(List<T> objects);
 
-  public void addObject(T object);
+  void addObject(T object);
 }

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/disposal/hold/DisposalHold.java

@@ -7,23 +7,31 @@
  */
 package org.roda.core.data.v2.disposal.hold;
 
+import java.io.Serial;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import org.roda.core.data.common.RodaConstants;
 import org.roda.core.data.v2.IsModelObject;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import org.roda.core.data.v2.index.IsIndexed;
+import org.roda.core.data.v2.ip.HasId;
 
 /**
  * @author Tiago Fraga <tfraga@keep.pt>
  */
 
 @jakarta.xml.bind.annotation.XmlRootElement(name = RodaConstants.RODA_OBJECT_DISPOSAL_HOLD)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class DisposalHold implements IsModelObject {
+public class DisposalHold implements IsIndexed, IsModelObject, HasId {
 
+  @Serial
   private static final long serialVersionUID = 8291490773422089586L;
 
   private String id;
@@ -57,6 +65,8 @@ public class DisposalHold implements IsModelObject {
 
   private DisposalHoldState state;
 
+  private Map<String, Object> fields = new HashMap<>();
+
   public DisposalHold() {
     super();
     this.state = DisposalHoldState.ACTIVE;
@@ -242,4 +252,38 @@ public String toString() {
       + ", liftedBy='" + liftedBy + '\'' + ", firstTimeUsed=" + firstTimeUsed + ", aipCounter=" + aipCounter
       + ", state=" + state + '}';
   }
+
+  @JsonIgnore
+  @Override
+  public String getUUID() {
+    return getId();
+  }
+
+  @Override
+  public List<String> toCsvHeaders() {
+    return Arrays.asList("id", "title", "description", "mandate", "scopeNotes", "createOn", "createBy", "updatedOn",
+      "updatedBy", "originatedOn", "originatedBy", "liftedOn", "liftedBy", "firstTimeUsed", "state");
+  }
+
+  @Override
+  public List<Object> toCsvValues() {
+    return Arrays.asList(id, title, description, mandate, scopeNotes, createdOn, createdBy, updatedOn, updatedBy,
+      originatedOn, originatedBy, liftedOn, liftedBy, firstTimeUsed, state);
+  }
+
+  @Override
+  public List<String> liteFields() {
+    return List.of();
+  }
+
+  @Override
+  public Map<String, Object> getFields() {
+    return this.fields;
+  }
+
+  @Override
+  public void setFields(Map<String, Object> fields) {
+    fields.entrySet().stream().filter(p -> p.getValue() != null)
+      .forEach(e -> this.fields.put(e.getKey(), e.getValue()));
+  }
 }

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/disposal/hold/DisposalHoldState.java

@@ -11,5 +11,9 @@
  * @author Tiago Fraga <tfraga@keep.pt>
  */
 public enum DisposalHoldState {
-  ACTIVE, LIFTED
+  ACTIVE, LIFTED;
+
+  public static DisposalHoldState getDefault() {
+    return ACTIVE;
+  }
 }

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/disposal/rule/ChangeOrderRequest.java

@@ -0,0 +1,53 @@
+package org.roda.core.data.v2.disposal.rule;
+
+import org.roda.core.data.v2.generics.select.SelectedItemsRequest;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author Miguel Guimarães <mguimaraes@keep.pt>
+ */
+
+public class ChangeOrderRequest implements Serializable {
+  @Serial
+  private static final long serialVersionUID = -1604170151297177958L;
+
+  private SelectedItemsRequest items;
+  private OrderPositions position;
+  private int newOrder;
+
+  public ChangeOrderRequest() {
+    position = OrderPositions.TOP;
+  }
+
+  public ChangeOrderRequest(SelectedItemsRequest items, OrderPositions position, int newOrder) {
+    this.items = items;
+    this.position = position;
+    this.newOrder = newOrder;
+  }
+
+  public SelectedItemsRequest getItems() {
+    return items;
+  }
+
+  public void setItems(SelectedItemsRequest items) {
+    this.items = items;
+  }
+
+  public int getNewOrder() {
+    return newOrder;
+  }
+
+  public void setNewOrder(int newOrder) {
+    this.newOrder = newOrder;
+  }
+
+  public OrderPositions getPosition() {
+    return position;
+  }
+
+  public void setPosition(OrderPositions position) {
+    this.position = position;
+  }
+}

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/disposal/rule/ConditionType.java

@@ -11,5 +11,9 @@
  * @author Tiago Fraga <tfraga@keep.pt>
  */
 public enum ConditionType {
-  IS_CHILD_OF, METADATA_FIELD
+  IS_CHILD_OF, METADATA_FIELD;
+
+  public static ConditionType getDefault() {
+    return IS_CHILD_OF;
+  }
 }

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/disposal/rule/DisposalRule.java

@@ -8,11 +8,15 @@
 package org.roda.core.data.v2.disposal.rule;
 
 import java.io.Serial;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import org.roda.core.data.common.RodaConstants;
 import org.roda.core.data.v2.IsModelObject;
+import org.roda.core.data.v2.index.IsIndexed;
 import org.roda.core.data.v2.ip.HasId;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -23,7 +27,7 @@
  */
 @jakarta.xml.bind.annotation.XmlRootElement(name = RodaConstants.RODA_OBJECT_DISPOSAL_RULE)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class DisposalRule implements IsModelObject, HasId, Comparable<DisposalRule> {
+public class DisposalRule implements IsModelObject, IsIndexed, HasId, Comparable<DisposalRule> {
 
   private static final int VERSION = 1;
   @Serial
@@ -50,6 +54,8 @@ public class DisposalRule implements IsModelObject, HasId, Comparable<DisposalRu
   private Date updatedOn = null;
   private String updatedBy = null;
 
+  private Map<String, Object> fields;
+
   public DisposalRule() {
     super();
   }
@@ -201,4 +207,37 @@ public int getClassVersion() {
   public int compareTo(DisposalRule otherRule) {
     return Integer.compare(this.getOrder(), otherRule.getOrder());
   }
+
+  @JsonIgnore
+  @Override
+  public String getUUID() {
+    return getId();
+  }
+
+  @Override
+  public List<String> toCsvHeaders() {
+    return Arrays.asList("id", "title", "description", "type", "conditionKey", "conditionValue", "disposalScheduleId",
+      "disposalScheduleName", "order", "createdOn", "createdBy", "updatedOn", "updatedBy");
+  }
+
+  @Override
+  public List<Object> toCsvValues() {
+    return Arrays.asList(id, title, description, type, conditionKey, conditionValue, disposalScheduleId,
+      disposalScheduleName, order, createdOn, createdBy, updatedOn, updatedBy);
+  }
+
+  @Override
+  public List<String> liteFields() {
+    return List.of();
+  }
+
+  @Override
+  public Map<String, Object> getFields() {
+    return this.fields;
+  }
+
+  @Override
+  public void setFields(Map<String, Object> fields) {
+    this.fields = fields;
+  }
 }

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/disposal/rule/DisposalRules.java

@@ -7,6 +7,7 @@
  */
 package org.roda.core.data.v2.disposal.rule;
 
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -23,6 +24,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class DisposalRules implements RODAObjectList<DisposalRule> {
 
+  @Serial
+  private static final long serialVersionUID = 5273072223178069428L;
   private List<DisposalRule> disposalRuleList;
 
   public DisposalRules() {