Added getParentName
This commit is contained in:
parent
8afcf0e7a3
commit
dc7bff999c
|
@ -32,7 +32,7 @@
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="owner.project.facets" value="java"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/classes"/>
|
<classpathentry kind="output" path="target/classes"/>
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||||
org.eclipse.jdt.core.compiler.compliance=1.7
|
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||||
org.eclipse.jdt.core.compiler.release=disabled
|
org.eclipse.jdt.core.compiler.release=disabled
|
||||||
org.eclipse.jdt.core.compiler.source=1.7
|
org.eclipse.jdt.core.compiler.source=1.8
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<faceted-project>
|
<faceted-project>
|
||||||
<installed facet="java" version="1.7"/>
|
|
||||||
<installed facet="jst.utility" version="1.0"/>
|
<installed facet="jst.utility" version="1.0"/>
|
||||||
|
<installed facet="java" version="1.8"/>
|
||||||
</faceted-project>
|
</faceted-project>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -32,7 +32,7 @@
|
||||||
</developers>
|
</developers>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
<maven.compiler.source>1.8</maven.compiler.source>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,10 @@ public class MockDocumentConfigurationReader {
|
||||||
filePath = "/home/francescomangiacrapa/git/geoportal-data-common/src/test/resources/geoportal-config3.json";
|
filePath = "/home/francescomangiacrapa/git/geoportal-data-common/src/test/resources/geoportal-config3.json";
|
||||||
dc = getDocumentConfigVO(filePath);
|
dc = getDocumentConfigVO(filePath);
|
||||||
listDocumentConfigsDV.add(dc);
|
listDocumentConfigsDV.add(dc);
|
||||||
|
|
||||||
|
filePath = "/home/francescomangiacrapa/git/geoportal-data-common/src/test/resources/geoportal-config4.json";
|
||||||
|
dc = getDocumentConfigVO(filePath);
|
||||||
|
listDocumentConfigsDV.add(dc);
|
||||||
}
|
}
|
||||||
|
|
||||||
private DocumentConfigDV getDocumentConfigVO(String filePath) throws JsonProcessingException, IOException {
|
private DocumentConfigDV getDocumentConfigVO(String filePath) throws JsonProcessingException, IOException {
|
||||||
|
|
|
@ -26,6 +26,9 @@ public class GcubeProfile {
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private String gcubeName;
|
private String gcubeName;
|
||||||
|
|
||||||
|
@JsonProperty
|
||||||
|
private String parentName;
|
||||||
|
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private String sectionName;
|
private String sectionName;
|
||||||
|
|
||||||
|
@ -51,4 +54,5 @@ public class GcubeProfile {
|
||||||
private List<FilePath> filePaths;
|
private List<FilePath> filePaths;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,13 @@ package org.gcube.application.geoportalcommon.shared.geoportalconfig;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Class GcubeProfileDV.
|
||||||
|
*
|
||||||
|
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||||
|
*
|
||||||
|
* Mar 7, 2022
|
||||||
|
*/
|
||||||
public class GcubeProfileDV implements Serializable {
|
public class GcubeProfileDV implements Serializable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -16,6 +23,7 @@ public class GcubeProfileDV implements Serializable {
|
||||||
private String gcubeName;
|
private String gcubeName;
|
||||||
private String sectionName;
|
private String sectionName;
|
||||||
private String sectionTitle;
|
private String sectionTitle;
|
||||||
|
private String parentName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 0: Not specified means Not Mandatory. The Gcube Profile is not mandatory and
|
* 0: Not specified means Not Mandatory. The Gcube Profile is not mandatory and
|
||||||
|
@ -32,65 +40,174 @@ public class GcubeProfileDV implements Serializable {
|
||||||
|
|
||||||
private List<FilePathDV> filePaths;
|
private List<FilePathDV> filePaths;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new gcube profile DV.
|
||||||
|
*/
|
||||||
public GcubeProfileDV() {
|
public GcubeProfileDV() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the serialversionuid.
|
||||||
|
*
|
||||||
|
* @return the serialversionuid
|
||||||
|
*/
|
||||||
|
public static long getSerialversionuid() {
|
||||||
|
return serialVersionUID;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the gcube secondary type.
|
||||||
|
*
|
||||||
|
* @return the gcube secondary type
|
||||||
|
*/
|
||||||
public String getGcubeSecondaryType() {
|
public String getGcubeSecondaryType() {
|
||||||
return gcubeSecondaryType;
|
return gcubeSecondaryType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the gcube name.
|
||||||
|
*
|
||||||
|
* @return the gcube name
|
||||||
|
*/
|
||||||
public String getGcubeName() {
|
public String getGcubeName() {
|
||||||
return gcubeName;
|
return gcubeName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the section name.
|
||||||
|
*
|
||||||
|
* @return the section name
|
||||||
|
*/
|
||||||
public String getSectionName() {
|
public String getSectionName() {
|
||||||
return sectionName;
|
return sectionName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the section title.
|
||||||
|
*
|
||||||
|
* @return the section title
|
||||||
|
*/
|
||||||
public String getSectionTitle() {
|
public String getSectionTitle() {
|
||||||
return sectionTitle;
|
return sectionTitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the parent name. If is null or empty return the "" /(empty string) as default.
|
||||||
|
*
|
||||||
|
* @return the parent name
|
||||||
|
*/
|
||||||
|
public String getParentName() {
|
||||||
|
if (parentName == null)
|
||||||
|
return "";
|
||||||
|
|
||||||
|
return parentName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the min occurs.
|
||||||
|
*
|
||||||
|
* @return the min occurs
|
||||||
|
*/
|
||||||
public int getMinOccurs() {
|
public int getMinOccurs() {
|
||||||
return minOccurs;
|
return minOccurs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the max occurs.
|
||||||
|
*
|
||||||
|
* @return the max occurs
|
||||||
|
*/
|
||||||
public int getMaxOccurs() {
|
public int getMaxOccurs() {
|
||||||
return maxOccurs;
|
return maxOccurs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the file paths.
|
||||||
|
*
|
||||||
|
* @return the file paths
|
||||||
|
*/
|
||||||
public List<FilePathDV> getFilePaths() {
|
public List<FilePathDV> getFilePaths() {
|
||||||
return filePaths;
|
return filePaths;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the gcube secondary type.
|
||||||
|
*
|
||||||
|
* @param gcubeSecondaryType the new gcube secondary type
|
||||||
|
*/
|
||||||
public void setGcubeSecondaryType(String gcubeSecondaryType) {
|
public void setGcubeSecondaryType(String gcubeSecondaryType) {
|
||||||
this.gcubeSecondaryType = gcubeSecondaryType;
|
this.gcubeSecondaryType = gcubeSecondaryType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the gcube name.
|
||||||
|
*
|
||||||
|
* @param gcubeName the new gcube name
|
||||||
|
*/
|
||||||
public void setGcubeName(String gcubeName) {
|
public void setGcubeName(String gcubeName) {
|
||||||
this.gcubeName = gcubeName;
|
this.gcubeName = gcubeName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the section name.
|
||||||
|
*
|
||||||
|
* @param sectionName the new section name
|
||||||
|
*/
|
||||||
public void setSectionName(String sectionName) {
|
public void setSectionName(String sectionName) {
|
||||||
this.sectionName = sectionName;
|
this.sectionName = sectionName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the section title.
|
||||||
|
*
|
||||||
|
* @param sectionTitle the new section title
|
||||||
|
*/
|
||||||
public void setSectionTitle(String sectionTitle) {
|
public void setSectionTitle(String sectionTitle) {
|
||||||
this.sectionTitle = sectionTitle;
|
this.sectionTitle = sectionTitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the parent name.
|
||||||
|
*
|
||||||
|
* @param parentName the new parent name
|
||||||
|
*/
|
||||||
|
public void setParentName(String parentName) {
|
||||||
|
this.parentName = parentName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the min occurs.
|
||||||
|
*
|
||||||
|
* @param minOccurs the new min occurs
|
||||||
|
*/
|
||||||
public void setMinOccurs(int minOccurs) {
|
public void setMinOccurs(int minOccurs) {
|
||||||
this.minOccurs = minOccurs;
|
this.minOccurs = minOccurs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the max occurs.
|
||||||
|
*
|
||||||
|
* @param maxOccurs the new max occurs
|
||||||
|
*/
|
||||||
public void setMaxOccurs(int maxOccurs) {
|
public void setMaxOccurs(int maxOccurs) {
|
||||||
this.maxOccurs = maxOccurs;
|
this.maxOccurs = maxOccurs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the file paths.
|
||||||
|
*
|
||||||
|
* @param filePaths the new file paths
|
||||||
|
*/
|
||||||
public void setFilePaths(List<FilePathDV> filePaths) {
|
public void setFilePaths(List<FilePathDV> filePaths) {
|
||||||
this.filePaths = filePaths;
|
this.filePaths = filePaths;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To string.
|
||||||
|
*
|
||||||
|
* @return the string
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
|
@ -102,6 +219,8 @@ public class GcubeProfileDV implements Serializable {
|
||||||
builder.append(sectionName);
|
builder.append(sectionName);
|
||||||
builder.append(", sectionTitle=");
|
builder.append(", sectionTitle=");
|
||||||
builder.append(sectionTitle);
|
builder.append(sectionTitle);
|
||||||
|
builder.append(", parentName=");
|
||||||
|
builder.append(parentName);
|
||||||
builder.append(", minOccurs=");
|
builder.append(", minOccurs=");
|
||||||
builder.append(minOccurs);
|
builder.append(minOccurs);
|
||||||
builder.append(", maxOccurs=");
|
builder.append(", maxOccurs=");
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
"gcubeName": "Immagine_Rappresentativa_di_Scavo",
|
"gcubeName": "Immagine_Rappresentativa_di_Scavo",
|
||||||
"sectionName": "immagini",
|
"sectionName": "immagini",
|
||||||
"sectionTitle": "Immagini Rappresentative",
|
"sectionTitle": "Immagini Rappresentative",
|
||||||
"minOccurs": 1,
|
"minOccurs": 3,
|
||||||
"maxOccurs": 8,
|
"maxOccurs": 8,
|
||||||
"parentName": "$.",
|
"parentName": "$.",
|
||||||
"filePaths": [
|
"filePaths": [
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"id": "geoportal-data-entry-app",
|
||||||
|
"type": "DATA_ENTRY_GUI",
|
||||||
|
"item_type": "Dataset",
|
||||||
|
"configuration": {
|
||||||
|
"gcubeProfiles": [
|
||||||
|
{
|
||||||
|
"gcubeSecondaryType": "DataCatalogueMetadata",
|
||||||
|
"gcubeName": "ResourceCatalogue_Dataset",
|
||||||
|
"sectionName": "$.",
|
||||||
|
"sectionTitle": "Dataset"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"saveStep": "SUBMIT-FOR-REVIEW"
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue