DS-3743 introduce SectionData

dspace-spring-rest/src/main/java/org/dspace/app/rest/model/WorkspaceItemRest.java

@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.Map;
 
 import org.dspace.app.rest.RestResourceController;
+import org.dspace.app.rest.model.step.SectionData;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -26,7 +27,7 @@ public class WorkspaceItemRest extends BaseObjectRest<Integer> {
 
 	private Date lastModified = new Date();
 
-	private Map<String, RestModel> sections;
+	private Map<String, SectionData> sections;
 	
 	@JsonIgnore
 	private ItemRest item;
@@ -84,11 +85,11 @@ public class WorkspaceItemRest extends BaseObjectRest<Integer> {
 		return RestResourceController.class;
 	}
 
-	public Map<String, RestModel> getSections() {
+	public Map<String, SectionData> getSections() {
 		return sections;
 	}
 
-	public void setSections(Map<String, RestModel> sections) {
+	public void setSections(Map<String, SectionData> sections) {
 		this.sections = sections;
 	}
 }

dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/DataCollection.java

@@ -0,0 +1,17 @@
+package org.dspace.app.rest.model.step;
+
+import org.dspace.content.Collection;
+
+public class DataCollection implements SectionData {
+	
+	private Collection collection;
+
+	public Collection getCollection() {
+		return collection;
+	}
+
+	public void setCollection(Collection collection) {
+		this.collection = collection;
+	}
+
+}

dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/DataDescribe.java

@@ -14,28 +14,10 @@ import java.util.Map;
 import org.dspace.app.rest.model.MetadataValueRest;
 import org.dspace.app.rest.model.RestModel;
 
-public class DataDescribe implements RestModel {
+public class DataDescribe implements SectionData {
 
 	private Map<String, List<MetadataValueRest>> metadata = new HashMap<>();
 
-	@Override
-	public String getCategory() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getType() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Class getController() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	public Map<String, List<MetadataValueRest>> getMetadata() {
 		return metadata;
 	}

dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/DataLicense.java

@@ -0,0 +1,6 @@
+package org.dspace.app.rest.model.step;
+
+public class DataLicense implements SectionData {
+	
+
+}

dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/DataUpload.java

@@ -0,0 +1,5 @@
+package org.dspace.app.rest.model.step;
+
+public class DataUpload implements SectionData {
+	
+}

dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/SectionData.java

@@ -0,0 +1,6 @@
+package org.dspace.app.rest.model.step;
+
+import java.io.Serializable;
+
+public interface SectionData extends Serializable {
+}

dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/AbstractRestProcessingStep.java

@@ -1,12 +1,13 @@
 package org.dspace.app.rest.submit;
 
 import org.dspace.app.rest.model.RestModel;
+import org.dspace.app.rest.model.step.SectionData;
 import org.dspace.app.util.SubmissionStepConfig;
 import org.dspace.content.WorkspaceItem;
 
 public interface AbstractRestProcessingStep {
 
-	public RestModel getData(WorkspaceItem obj, SubmissionStepConfig config);
+	public SectionData getData(WorkspaceItem obj, SubmissionStepConfig config);
 
 
 }

dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/CollectionStep.java

@@ -1,6 +1,7 @@
 package org.dspace.app.rest.submit.step;
 
-import org.dspace.app.rest.model.RestModel;
+import org.dspace.app.rest.model.step.DataCollection;
+import org.dspace.app.rest.model.step.SectionData;
 import org.dspace.app.rest.submit.AbstractRestProcessingStep;
 import org.dspace.app.util.SubmissionStepConfig;
 import org.dspace.content.WorkspaceItem;
@@ -8,9 +9,10 @@ import org.dspace.content.WorkspaceItem;
 public class CollectionStep extends org.dspace.submit.step.SelectCollectionStep implements AbstractRestProcessingStep {
 
 	@Override
-	public RestModel getData(WorkspaceItem obj, SubmissionStepConfig config) {
+	public SectionData getData(WorkspaceItem obj, SubmissionStepConfig config) {
-		// TODO Auto-generated method stub
+		DataCollection collection = new DataCollection();
-		return null;
+		collection.setCollection(obj.getCollection());
+		return collection;
 	}
 
 

dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java

@@ -7,6 +7,7 @@ import org.apache.log4j.Logger;
 import org.dspace.app.rest.model.MetadataValueRest;
 import org.dspace.app.rest.model.RestModel;
 import org.dspace.app.rest.model.step.DataDescribe;
+import org.dspace.app.rest.model.step.SectionData;
 import org.dspace.app.rest.submit.AbstractRestProcessingStep;
 import org.dspace.app.util.DCInput;
 import org.dspace.app.util.DCInputSet;
@@ -32,7 +33,7 @@ public class DescribeStep extends org.dspace.submit.step.DescribeStep implements
 	}
 	
 	@Override
-	public RestModel getData(WorkspaceItem obj, SubmissionStepConfig config) {		
+	public SectionData getData(WorkspaceItem obj, SubmissionStepConfig config) {		
 		DataDescribe data = new DataDescribe();
 		try {
 			DCInputSet inputConfig = inputReader.getInputsByFormName(config.getId());

dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/LicenseStep.java

@@ -1,14 +1,15 @@
 package org.dspace.app.rest.submit.step;
 
 import org.dspace.app.rest.model.RestModel;
+import org.dspace.app.rest.model.step.SectionData;
 import org.dspace.app.rest.submit.AbstractRestProcessingStep;
 import org.dspace.app.util.SubmissionStepConfig;
 import org.dspace.content.WorkspaceItem;
 
-public class LIcenseStep extends org.dspace.submit.step.LicenseStep implements AbstractRestProcessingStep {
+public class LicenseStep extends org.dspace.submit.step.LicenseStep implements AbstractRestProcessingStep {
 
 	@Override
-	public RestModel getData(WorkspaceItem obj, SubmissionStepConfig config) {
+	public SectionData getData(WorkspaceItem obj, SubmissionStepConfig config) {
 		// TODO Auto-generated method stub
 		return null;
 	}

dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/UploadStep.java

@@ -1,6 +1,6 @@
 package org.dspace.app.rest.submit.step;
 
-import org.dspace.app.rest.model.RestModel;
+import org.dspace.app.rest.model.step.SectionData;
 import org.dspace.app.rest.submit.AbstractRestProcessingStep;
 import org.dspace.app.util.SubmissionStepConfig;
 import org.dspace.content.WorkspaceItem;
@@ -8,7 +8,7 @@ import org.dspace.content.WorkspaceItem;
 public class UploadStep extends org.dspace.submit.step.UploadStep implements AbstractRestProcessingStep {
 
 	@Override
-	public RestModel getData(WorkspaceItem obj, SubmissionStepConfig config) {
+	public SectionData getData(WorkspaceItem obj, SubmissionStepConfig config) {
 		// TODO Auto-generated method stub
 		return null;
 	}