diff --git a/.classpath b/.classpath index 379bc98..10ccb85 100644 --- a/.classpath +++ b/.classpath @@ -28,9 +28,9 @@ - + - + diff --git a/.project b/.project index e3470d0..9b67c31 100644 --- a/.project +++ b/.project @@ -16,12 +16,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.wst.validation.validationbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6e80039..443e085 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index fb95c45..4f92af5 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java index 875d9f7..e12812a 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/BaseTaskConfiguration.java @@ -55,11 +55,11 @@ public interface BaseTaskConfiguration { /** - * Sets the access key to save this configuration in the workspace gcube properties. + * Gets the owner. * - * @param accessKey the access key + * @return the owner */ - void setConfigurationKey(String accessKey); + String getOwner(); } diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java index 78cd5c6..c5064b8 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java @@ -42,6 +42,7 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { @JsonIgnoreProperties private List listParameters; // optional private String configurationKey; + private String owner; /** * Instantiates a new task configuration. @@ -56,19 +57,21 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { * @param configurationKey the configuration key * @param taskId the task id * @param taskDescription the task description + * @param owner the owner * @param scope the scope * @param maskedToken the token * @param workspaceItemId the workspace item id * @param listParameters the map parameters */ public TaskConfiguration( - String configurationKey, String taskId, String taskDescription, String scope, + String configurationKey, String taskId, String taskDescription, String owner, String scope, String maskedToken, String workspaceItemId, List listParameters) { setConfigurationKey(configurationKey); this.taskId = taskId; this.taskDescription = taskDescription; + this.owner = owner; this.scope = scope; this.maskedToken = maskedToken; this.workspaceItemId = workspaceItemId; @@ -77,6 +80,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { /** + * Gets the scope. + * * @return the scope */ public String getScope() { @@ -86,6 +91,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { /** + * Sets the scope. + * * @param scope the scope to set */ public void setScope(String scope) { @@ -106,17 +113,24 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { return configurationKey; } - /* - * (non-Javadoc) - * @see org.gcube.common.workspacetaskexecutor.shared.BaseTaskConfiguration# - * setAccessKey(java.lang.String) + /** + * Sets the configuration key. + * + * @param configurationKey the new configuration key */ - @Override public void setConfigurationKey(String configurationKey) { this.configurationKey = configurationKey; } + /* (non-Javadoc) + * @see org.gcube.common.workspacetaskexecutor.shared.BaseTaskConfiguration#getOwner() + */ + @Override + public String getOwner() { + + return owner; + } /* * (non-Javadoc) * @see org.gcube.common.workspacetaskexecutor.TaskConfiguration#getTaskId() @@ -149,6 +163,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { /** + * Gets the list parameters. + * * @return the listParameters */ public List getListParameters() { @@ -158,6 +174,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { /** + * Sets the list parameters. + * * @param listParameters the listParameters to set */ public void setListParameters(List listParameters) { @@ -218,6 +236,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { /** + * Gets the masked token. + * * @return the maskedToken */ public String getMaskedToken() { @@ -227,6 +247,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable { /** + * Sets the masked token. + * * @param maskedToken the maskedToken to set */ public void setMaskedToken(String maskedToken) {