From 7d7933c41bc8fd9601f546a0e1f4d6f37cb1371b Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 8 May 2018 13:31:17 +0000 Subject: [PATCH] Enhancement on Task #10070 Updated enum list git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/workspace-task-executor-library@167367 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../dataminer/WorkspaceDataMinerTaskExecutor.java | 6 +++--- .../workspacetaskexecutor/util/Converter.java | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index cfee443..1bb8e45 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ UTF-8 distro - 1.8 + 1.7 1.8 diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java index 54b44f6..79c9c45 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java @@ -325,10 +325,10 @@ public class WorkspaceDataMinerTaskExecutor implements ExecutableTask getParameterTypes(){ - String[] typeNames = Converter.convertEnumNamesToArraString(ParameterType.class); + List typeNames = Converter.getEnumList(ParameterType.class); List types = new ArrayList(); - for (String string : typeNames) { - types.add(new TaskParameterType(string)); + for (ParameterType parameterType : typeNames) { + types.add(new TaskParameterType(parameterType.name())); } return types; diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/util/Converter.java b/src/main/java/org/gcube/common/workspacetaskexecutor/util/Converter.java index 7a7fb65..5c29531 100644 --- a/src/main/java/org/gcube/common/workspacetaskexecutor/util/Converter.java +++ b/src/main/java/org/gcube/common/workspacetaskexecutor/util/Converter.java @@ -3,7 +3,9 @@ */ package org.gcube.common.workspacetaskexecutor.util; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskComputation; import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId; @@ -48,14 +50,14 @@ public class Converter { } - /** - * Convert enum names to arra string. + * Gets the enum list. * - * @param e the e - * @return the string[] + * @param the element type + * @param enumClass the enum class + * @return the enum list */ - public static String[] convertEnumNamesToArraString(Class> e){ - return Arrays.stream(e.getEnumConstants()).map(Enum::name).toArray(String[]::new); + public static > List getEnumList(Class enumClass) { + return new ArrayList(Arrays.asList(enumClass.getEnumConstants())); } }