You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/19 20:55:20 UTC
incubator-nifi git commit: NIFI-250: - Removing enabled flag from
controller service DTOs.
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 767f37b83 -> ee63a10b8
NIFI-250:
- Removing enabled flag from controller service DTOs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ee63a10b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ee63a10b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ee63a10b
Branch: refs/heads/NIFI-250
Commit: ee63a10b8654c7a635e359eba9a7531aaf70fe6d
Parents: 767f37b
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 19 14:55:11 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 19 14:55:11 2015 -0500
----------------------------------------------------------------------
.../nifi/web/api/dto/ControllerServiceDTO.java | 23 ++++++++++----------
...ontrollerServiceReferencingComponentDTO.java | 15 -------------
2 files changed, 11 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ee63a10b/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 2f73f3f..76f1f62 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
@@ -31,14 +31,14 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
private String type;
private String comments;
private String availability;
- private Boolean enabled;
+ private String state;
private Map<String, String> properties;
private Map<String, PropertyDescriptorDTO> descriptors;
private String annotationData;
- private Set<ControllerServiceReferencingComponentDTO> references;
+ private Set<ControllerServiceReferencingComponentDTO> referencingComponents;
private Collection<String> validationErrors;
@@ -82,7 +82,7 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
}
/**
- * Where this service is available. Possible values are CLUSTER_MANAGER_ONLY, NODE_ONLY, BOTH.
+ * Where this service is available. Possible values are NCM, NODE.
*
* @return
*/
@@ -95,16 +95,15 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
}
/**
- * Whether the controller service is enabled.
- *
+ * The state of this controller service. Possible values are ENABLED, ENABLING, DISABLED, DISABLING.
* @return
*/
- public Boolean getEnabled() {
- return enabled;
+ public String getState() {
+ return state;
}
- public void setEnabled(Boolean enabled) {
- this.enabled = enabled;
+ public void setState(String state) {
+ this.state = state;
}
/**
@@ -152,11 +151,11 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
* @return
*/
public Set<ControllerServiceReferencingComponentDTO> getReferencingComponents() {
- return references;
+ return referencingComponents;
}
- public void setReferencingComponents(Set<ControllerServiceReferencingComponentDTO> references) {
- this.references = references;
+ public void setReferencingComponents(Set<ControllerServiceReferencingComponentDTO> referencingComponents) {
+ this.referencingComponents = referencingComponents;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ee63a10b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.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/ControllerServiceReferencingComponentDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
index f9dcd97..9032f9f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
@@ -31,7 +31,6 @@ public class ControllerServiceReferencingComponentDTO {
private String name;
private String type;
private String state;
- private Boolean enabled;
private String referenceType;
private Integer activeThreadCount;
@@ -105,20 +104,6 @@ public class ControllerServiceReferencingComponentDTO {
}
/**
- * The enabled state of the controller service referencing a controller service.
- * If this component is a processor, this field is blank.
- *
- * @return
- */
- public Boolean getEnabled() {
- return enabled;
- }
-
- public void setEnabled(Boolean enabled) {
- this.enabled = enabled;
- }
-
- /**
* The type of reference this is (Processor, ControllerService, or ReportingTask).
* @return
*/