NIFI-250: Renamed 'getComment' and 'setComment' in ControllerServiceNode and ReportingTaskNode to 'getComments' and 'setComments' to be more consistent with how naming throughout the rest of the app
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ea17dbec Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ea17dbec Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ea17dbec Branch: refs/heads/NIFI-250 Commit: ea17dbec6e1b4384c91fab9e54e30b29c6190c8d Parents: f14a34f Author: Mark Payne <[email protected]> Authored: Tue Jan 27 09:48:45 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Tue Jan 27 09:48:45 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/controller/ReportingTaskNode.java | 4 ++-- .../apache/nifi/controller/service/ControllerServiceNode.java | 4 ++-- .../java/org/apache/nifi/controller/StandardFlowSerializer.java | 4 ++-- .../org/apache/nifi/controller/StandardFlowSynchronizer.java | 4 ++-- .../nifi/controller/reporting/AbstractReportingTaskNode.java | 4 ++-- .../nifi/controller/service/StandardControllerServiceNode.java | 4 ++-- .../src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ea17dbec/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java index cf81352..c4960a9 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java @@ -68,9 +68,9 @@ public interface ReportingTaskNode extends ConfiguredComponent { void setScheduledState(ScheduledState state); - String getComment(); + String getComments(); - void setComment(String comment); + void setComments(String comment); void verifyCanStart(); void verifyCanStop(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ea17dbec/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java index 32b9d9e..bf6b888 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java @@ -40,8 +40,8 @@ public interface ControllerServiceNode extends ConfiguredComponent { void removeReference(ConfiguredComponent referringComponent); - void setComment(String comment); - String getComment(); + void setComments(String comment); + String getComments(); void verifyCanEnable(); void verifyCanDisable(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ea17dbec/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java index 218813a..1f483ed 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java @@ -410,7 +410,7 @@ public class StandardFlowSerializer implements FlowSerializer { final Element serviceElement = element.getOwnerDocument().createElement("controllerService"); addTextElement(serviceElement, "id", serviceNode.getIdentifier()); addTextElement(serviceElement, "name", serviceNode.getName()); - addTextElement(serviceElement, "comment", serviceNode.getComment()); + addTextElement(serviceElement, "comment", serviceNode.getComments()); addTextElement(serviceElement, "class", serviceNode.getControllerServiceImplementation().getClass().getCanonicalName()); addTextElement(serviceElement, "enabled", String.valueOf(!serviceNode.isDisabled())); addTextElement(serviceElement, "availability", serviceNode.getAvailability().toString()); @@ -424,7 +424,7 @@ public class StandardFlowSerializer implements FlowSerializer { final Element taskElement = element.getOwnerDocument().createElement("reportingTask"); addTextElement(taskElement, "id", taskNode.getIdentifier()); addTextElement(taskElement, "name", taskNode.getName()); - addTextElement(taskElement, "comment", taskNode.getComment()); + addTextElement(taskElement, "comment", taskNode.getComments()); addTextElement(taskElement, "class", taskNode.getReportingTask().getClass().getCanonicalName()); addTextElement(taskElement, "schedulingPeriod", taskNode.getSchedulingPeriod()); addTextElement(taskElement, "scheduledState", taskNode.getScheduledState().name()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ea17dbec/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 887363e..560c884 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.getComments()); + node.setComments(dto.getComments()); node.setDisabled(dto.getEnabled() != Boolean.TRUE); node.setAnnotationData(dto.getAnnotationData()); @@ -377,7 +377,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer { final ReportingTaskNode reportingTask = controller.createReportingTask(dto.getType(), false); reportingTask.setName(dto.getName()); - reportingTask.setComment(dto.getComment()); + reportingTask.setComments(dto.getComment()); reportingTask.setAvailability(Availability.valueOf(dto.getAvailability())); reportingTask.setScheduldingPeriod(dto.getSchedulingPeriod()); reportingTask.setScheduledState(ScheduledState.valueOf(dto.getScheduledState())); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ea17dbec/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java index 014fe55..8a131d0 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java @@ -160,12 +160,12 @@ public abstract class AbstractReportingTaskNode extends AbstractConfiguredCompon } @Override - public String getComment() { + public String getComments() { return comment; } @Override - public void setComment(final String comment) { + public void setComments(final String comment) { this.comment = comment; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ea17dbec/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java index f5776ce..dd06f40 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java @@ -196,7 +196,7 @@ public class StandardControllerServiceNode extends AbstractConfiguredComponent i } @Override - public String getComment() { + public String getComments() { readLock.lock(); try { return comment; @@ -206,7 +206,7 @@ public class StandardControllerServiceNode extends AbstractConfiguredComponent i } @Override - public void setComment(final String comment) { + public void setComments(final String comment) { writeLock.lock(); try { this.comment = comment; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ea17dbec/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 16ba1cd..132797d 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 @@ -845,7 +845,7 @@ public final class DtoFactory { dto.setType(controllerServiceNode.getControllerServiceImplementation().getClass().getName()); dto.setAvailability(controllerServiceNode.getAvailability().name()); dto.setEnabled(!controllerServiceNode.isDisabled()); - dto.setComments(controllerServiceNode.getComment()); + dto.setComments(controllerServiceNode.getComments()); // sort a copy of the properties final Map<PropertyDescriptor, String> sortedProperties = new TreeMap<>(new Comparator<PropertyDescriptor>() {
