NIFI-250: - Using a List when (de)serializing allowable values. This is preferable than calling out a specific Set implementation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b32e2712 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b32e2712 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b32e2712 Branch: refs/heads/NIFI-250 Commit: b32e2712c1735d57bf1d34debb0268e42a544c56 Parents: 2949beb Author: Matt Gilman <[email protected]> Authored: Mon Mar 30 14:19:49 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Mon Mar 30 14:19:49 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java | 8 ++++---- .../main/java/org/apache/nifi/web/api/dto/DtoFactory.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b32e2712/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java index 4d6d10f..d10a324 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import java.util.Set; +import java.util.List; import javax.xml.bind.annotation.XmlType; /** @@ -29,7 +29,7 @@ public class PropertyDescriptorDTO { private String displayName; private String description; private String defaultValue; - private Set<AllowableValueDTO> allowableValues; + private List<AllowableValueDTO> allowableValues; private boolean required; private boolean sensitive; private boolean dynamic; @@ -42,11 +42,11 @@ public class PropertyDescriptorDTO { * * @return */ - public Set<AllowableValueDTO> getAllowableValues() { + public List<AllowableValueDTO> getAllowableValues() { return allowableValues; } - public void setAllowableValues(Set<AllowableValueDTO> allowableValues) { + public void setAllowableValues(List<AllowableValueDTO> allowableValues) { this.allowableValues = allowableValues; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b32e2712/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index 4dcf650..7fe76ad 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -1965,7 +1965,7 @@ public final class DtoFactory { if (serviceDefinition == null) { dto.setAllowableValues(null); } else { - final Set<AllowableValueDTO> allowableValues = new LinkedHashSet<>(); + final List<AllowableValueDTO> allowableValues = new ArrayList<>(); for (final String serviceIdentifier : controllerServiceLookup.getControllerServiceIdentifiers(serviceDefinition)) { final String displayName = controllerServiceLookup.getControllerServiceName(serviceIdentifier); @@ -1977,7 +1977,7 @@ public final class DtoFactory { dto.setAllowableValues(allowableValues); } } else { - final Set<AllowableValueDTO> allowableValues = new LinkedHashSet<>(); + final List<AllowableValueDTO> allowableValues = new ArrayList<>(); for (final AllowableValue allowableValue : propertyDescriptor.getAllowableValues()) { final AllowableValueDTO allowableValueDto = new AllowableValueDTO(); allowableValueDto.setDisplayName(allowableValue.getDisplayName());
