hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-3743 introduce SectionData

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2017-11-07 18:58:19 +01:00
parent b2b035ca09
commit 595c0444eb
11 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

17
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/DataCollection.java Normal file
View File

@@ -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;
}
}

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

@@ -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;
}

6
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/DataLicense.java Normal file
View File

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

5
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/DataUpload.java Normal file
View File

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

6
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/step/SectionData.java Normal file
View File

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

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

@@ -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);
}

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

@@ -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) {
// TODO Auto-generated method stub
return null;
public SectionData getData(WorkspaceItem obj, SubmissionStepConfig config) {
DataCollection collection = new DataCollection();
collection.setCollection(obj.getCollection());
return collection;
}

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

@@ -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());

5
dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/LIcenseStep.java → dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/LicenseStep.java
View File

@@ -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;
}

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

@@ -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;
}