Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 2df4500c0 -> cb84829b3
NIFI-250: - Renaming comment to comments. - Ensuring type is included in DTO and create request. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cb84829b Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cb84829b Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cb84829b Branch: refs/heads/NIFI-250 Commit: cb84829b31cd709cedf866ac41854c3a2e74a158 Parents: 2df4500 Author: Matt Gilman <[email protected]> Authored: Tue Jan 27 08:29:50 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Tue Jan 27 08:29:50 2015 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/web/api/dto/ControllerServiceDTO.java | 10 +++++----- .../org/apache/nifi/controller/FlowFromDOMFactory.java | 2 +- .../apache/nifi/controller/StandardFlowSynchronizer.java | 2 +- .../org/apache/nifi/fingerprint/FingerprintFactory.java | 2 +- .../apache/nifi/web/api/ControllerServiceResource.java | 1 + .../main/java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 ++ 6 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cb84829b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.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/ControllerServiceDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java index 94ac55a..05e6ad6 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java @@ -27,7 +27,7 @@ public class ControllerServiceDTO extends NiFiComponentDTO { private String name; private String type; - private String comment; + private String comments; private String availability; private Boolean enabled; @@ -67,12 +67,12 @@ public class ControllerServiceDTO extends NiFiComponentDTO { * The comment for the Controller Service * @return */ - public String getComment() { - return comment; + public String getComments() { + return comments; } - public void setComment(String comment) { - this.comment = comment; + public void setComments(String comments) { + this.comments = comments; } /** http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cb84829b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java index d0dc83e..a5d24cc 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java @@ -84,7 +84,7 @@ public class FlowFromDOMFactory { dto.setId(getString(element, "id")); dto.setName(getString(element, "name")); - dto.setComment(getString(element, "comment")); + dto.setComments(getString(element, "comment")); dto.setType(getString(element, "class")); dto.setEnabled(getBoolean(element, "enabled")); dto.setAvailability(getString(element, "availability")); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cb84829b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java index dbf9b2c..887363e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java @@ -348,7 +348,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer { final ControllerServiceNode node = controller.createControllerService(dto.getType(), false); node.setName(dto.getName()); node.setAvailability(Availability.valueOf(dto.getAvailability())); - node.setComment(dto.getComment()); + node.setComment(dto.getComments()); node.setDisabled(dto.getEnabled() != Boolean.TRUE); node.setAnnotationData(dto.getAnnotationData()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cb84829b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java index ee7cd54..88a2fdf 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java @@ -861,7 +861,7 @@ public final class FingerprintFactory { builder.append(dto.getId()); builder.append(dto.getType()); builder.append(dto.getName()); - builder.append(dto.getComment()); + builder.append(dto.getComments()); builder.append(dto.getAvailability()); builder.append(dto.getAnnotationData()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cb84829b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.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/ControllerServiceResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java index c40f821..c0cc62a 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java @@ -154,6 +154,7 @@ public class ControllerServiceResource extends ApplicationResource { // create the controller service DTO final ControllerServiceDTO controllerServiceDTO = new ControllerServiceDTO(); + controllerServiceDTO.setType(type); // create the revision final RevisionDTO revision = new RevisionDTO(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cb84829b/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 ec1fc4d..16ba1cd 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 @@ -842,8 +842,10 @@ public final class DtoFactory { final ControllerServiceDTO dto = new ControllerServiceDTO(); dto.setId(controllerServiceNode.getIdentifier()); dto.setName(controllerServiceNode.getName()); + dto.setType(controllerServiceNode.getControllerServiceImplementation().getClass().getName()); dto.setAvailability(controllerServiceNode.getAvailability().name()); dto.setEnabled(!controllerServiceNode.isDisabled()); + dto.setComments(controllerServiceNode.getComment()); // sort a copy of the properties final Map<PropertyDescriptor, String> sortedProperties = new TreeMap<>(new Comparator<PropertyDescriptor>() {
