nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject [7/7] nifi git commit: NIFI-1742: - Addressing issues when creating a new inline controller service. - Ensuring controller service referencing components are updated. - Including revisions and status with each component. - Dynamically updating component
Date Thu, 12 May 2016 16:42:04 GMT
NIFI-1742:
- Addressing issues when creating a new inline controller service.
- Ensuring controller service referencing components are updated.
- Including revisions and status with each component.
- Dynamically updating component and authorization states.
- This closes #435


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3cc16d35
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3cc16d35
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3cc16d35

Branch: refs/heads/master
Commit: 3cc16d35ed93446a70cda7f3d8360ab3563e4179
Parents: 687a686
Author: Matt Gilman <matt.c.gilman@gmail.com>
Authored: Thu May 12 11:17:48 2016 -0400
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Thu May 12 12:41:11 2016 -0400

----------------------------------------------------------------------
 .../web/api/dto/flow/ProcessGroupFlowDTO.java   |  14 +
 .../nifi/web/api/entity/ConnectionEntity.java   |  16 +
 .../apache/nifi/web/api/entity/PortEntity.java  |  17 +
 .../nifi/web/api/entity/ProcessGroupEntity.java | 139 +++++
 .../api/entity/RemoteProcessGroupEntity.java    |  48 ++
 .../org/apache/nifi/web/NiFiServiceFacade.java  |  56 +-
 .../nifi/web/StandardNiFiServiceFacade.java     | 585 ++++++++++++-------
 .../apache/nifi/web/api/ControllerResource.java |  16 +-
 .../org/apache/nifi/web/api/FlowResource.java   |  97 ++-
 .../nifi/web/api/ProcessGroupResource.java      | 245 +++-----
 .../org/apache/nifi/web/api/dto/DtoFactory.java | 189 ++++--
 .../apache/nifi/web/api/dto/EntityFactory.java  |  32 +-
 .../nifi/web/controller/ControllerFacade.java   |  68 +--
 .../nifi-web-ui/src/main/webapp/css/header.css  |   2 +-
 .../src/main/webapp/css/navigation.css          |   2 +-
 .../propertytable/jquery.propertytable.js       |  26 +-
 .../nf-ng-canvas-operate-controller.js          |   5 +-
 .../header/components/nf-ng-funnel-component.js |   4 -
 .../header/components/nf-ng-group-component.js  |   4 -
 .../components/nf-ng-input-port-component.js    |   4 -
 .../header/components/nf-ng-label-component.js  |   4 -
 .../components/nf-ng-output-port-component.js   |   4 -
 .../components/nf-ng-processor-component.js     |   4 -
 .../nf-ng-remote-process-group-component.js     |   4 -
 .../components/nf-ng-template-component.js      |   4 -
 .../src/main/webapp/js/nf/canvas/nf-actions.js  |  57 +-
 .../main/webapp/js/nf/canvas/nf-canvas-utils.js |  69 ++-
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   | 257 +++-----
 .../webapp/js/nf/canvas/nf-component-state.js   |  14 +-
 .../main/webapp/js/nf/canvas/nf-connectable.js  | 368 ++++++------
 .../js/nf/canvas/nf-connection-configuration.js |  10 +-
 .../main/webapp/js/nf/canvas/nf-connection.js   | 350 ++++++-----
 .../main/webapp/js/nf/canvas/nf-context-menu.js |   2 +-
 .../js/nf/canvas/nf-controller-service.js       |  45 +-
 .../main/webapp/js/nf/canvas/nf-draggable.js    |  22 +-
 .../src/main/webapp/js/nf/canvas/nf-funnel.js   | 123 ++--
 .../src/main/webapp/js/nf/canvas/nf-graph.js    | 101 ++--
 .../js/nf/canvas/nf-label-configuration.js      |   5 +-
 .../src/main/webapp/js/nf/canvas/nf-label.js    | 454 +++++++-------
 .../js/nf/canvas/nf-port-configuration.js       |   5 +-
 .../src/main/webapp/js/nf/canvas/nf-port.js     | 143 +++--
 .../nf/canvas/nf-process-group-configuration.js |  19 +-
 .../webapp/js/nf/canvas/nf-process-group.js     | 537 +++++++++--------
 .../js/nf/canvas/nf-processor-configuration.js  |  11 +-
 .../main/webapp/js/nf/canvas/nf-processor.js    | 240 ++++----
 .../nf-remote-process-group-configuration.js    |   5 +-
 .../nf/canvas/nf-remote-process-group-ports.js  |  12 +-
 .../js/nf/canvas/nf-remote-process-group.js     | 366 ++++++------
 .../webapp/js/nf/canvas/nf-reporting-task.js    |  14 +-
 .../src/main/webapp/js/nf/canvas/nf-settings.js |  48 +-
 .../src/main/webapp/js/nf/canvas/nf-snippet.js  | 102 ++--
 .../src/main/webapp/js/nf/nf-client.js          |  65 +--
 .../src/main/webapp/js/nf/nf-common.js          |   3 +-
 53 files changed, 2719 insertions(+), 2317 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/3cc16d35/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java
index f0f56f7..3970d63 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java
@@ -17,8 +17,11 @@
 package org.apache.nifi.web.api.dto.flow;
 
 import com.wordnik.swagger.annotations.ApiModelProperty;
+import org.apache.nifi.web.api.dto.util.TimeAdapter;
 
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Date;
 
 /**
  * The NiFi flow starting at a given Process Group.
@@ -31,6 +34,7 @@ public class ProcessGroupFlowDTO {
     private String parentGroupId;
     private FlowBreadcrumbDTO breadcrumb;
     private FlowDTO flow;
+    private Date lastRefreshed;
 
     /**
      * @return contents of this process group. This field will be populated if the request
is marked verbose
@@ -108,5 +112,15 @@ public class ProcessGroupFlowDTO {
         this.uri = uri;
     }
 
+    @XmlJavaTypeAdapter(TimeAdapter.class)
+    @ApiModelProperty(
+        value = "The time the flow for the process group was last refreshed."
+    )
+    public Date getLastRefreshed() {
+        return lastRefreshed;
+    }
 
+    public void setLastRefreshed(Date lastRefreshed) {
+        this.lastRefreshed = lastRefreshed;
+    }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/3cc16d35/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
index ed4a38f..1b48ca4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
@@ -19,6 +19,7 @@ package org.apache.nifi.web.api.entity;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 import org.apache.nifi.web.api.dto.ConnectionDTO;
 import org.apache.nifi.web.api.dto.PositionDTO;
+import org.apache.nifi.web.api.dto.status.ConnectionStatusDTO;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
@@ -30,6 +31,7 @@ import java.util.List;
 public class ConnectionEntity extends ComponentEntity {
 
     private ConnectionDTO component;
+    private ConnectionStatusDTO status;
     private List<PositionDTO> bends;
     private Integer labelIndex;
     private String sourceId;
@@ -49,6 +51,20 @@ public class ConnectionEntity extends ComponentEntity {
     }
 
     /**
+     * @return the connection status
+     */
+    @ApiModelProperty(
+        value = "The status of the connection."
+    )
+    public ConnectionStatusDTO getStatus() {
+        return status;
+    }
+
+    public void setStatus(ConnectionStatusDTO status) {
+        this.status = status;
+    }
+
+    /**
      * @return position of the bend points on this connection
      */
     @ApiModelProperty(

http://git-wip-us.apache.org/repos/asf/nifi/blob/3cc16d35/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java
index 0dc4fdc..1594664 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java
@@ -16,7 +16,9 @@
  */
 package org.apache.nifi.web.api.entity;
 
+import com.wordnik.swagger.annotations.ApiModelProperty;
 import org.apache.nifi.web.api.dto.PortDTO;
+import org.apache.nifi.web.api.dto.status.PortStatusDTO;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -27,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class PortEntity extends ComponentEntity {
 
     private PortDTO component;
+    private PortStatusDTO status;
     private String portType;
 
     /**
@@ -40,6 +43,20 @@ public class PortEntity extends ComponentEntity {
         this.component = component;
     }
 
+    /**
+     * @return the port status
+     */
+    @ApiModelProperty(
+        value = "The status of the port."
+    )
+    public PortStatusDTO getStatus() {
+        return status;
+    }
+
+    public void setStatus(PortStatusDTO status) {
+        this.status = status;
+    }
+
     public String getPortType() {
         return portType;
     }

http://git-wip-us.apache.org/repos/asf/nifi/blob/3cc16d35/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
index 06e78e5..6f649bf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
@@ -17,7 +17,10 @@
 package org.apache.nifi.web.api.entity;
 
 import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiModelProperty;
 import org.apache.nifi.web.api.dto.ProcessGroupDTO;
+import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO;
 
 /**
  * A serialized representation of this class can be placed in the entity body of a request
or response to or from the API. This particular entity holds a reference to a ProcessGroupDTO.
@@ -26,6 +29,17 @@ import org.apache.nifi.web.api.dto.ProcessGroupDTO;
 public class ProcessGroupEntity extends ComponentEntity {
 
     private ProcessGroupDTO component;
+    private ProcessGroupStatusDTO status;
+
+    private Integer runningCount;
+    private Integer stoppedCount;
+    private Integer invalidCount;
+    private Integer disabledCount;
+    private Integer activeRemotePortCount;
+    private Integer inactiveRemotePortCount;
+
+    private Integer inputPortCount;
+    private Integer outputPortCount;
 
     /**
      * The ProcessGroupDTO that is being serialized.
@@ -40,4 +54,129 @@ public class ProcessGroupEntity extends ComponentEntity {
         this.component = component;
     }
 
+    /**
+     * @return the process group status
+     */
+    @ApiModelProperty(
+        value = "The status of the process group."
+    )
+    public ProcessGroupStatusDTO getStatus() {
+        return status;
+    }
+
+    public void setStatus(ProcessGroupStatusDTO status) {
+        this.status = status;
+    }
+
+    /**
+     * @return number of input ports contained in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of input ports in the process group."
+    )
+    public Integer getInputPortCount() {
+        return inputPortCount;
+    }
+
+    public void setInputPortCount(Integer inputPortCount) {
+        this.inputPortCount = inputPortCount;
+    }
+
+    /**
+     * @return number of invalid components in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of invalid components in the process group."
+    )
+    public Integer getInvalidCount() {
+        return invalidCount;
+    }
+
+    public void setInvalidCount(Integer invalidCount) {
+        this.invalidCount = invalidCount;
+    }
+
+    /**
+     * @return number of output ports in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of output ports in the process group."
+    )
+    public Integer getOutputPortCount() {
+        return outputPortCount;
+    }
+
+    public void setOutputPortCount(Integer outputPortCount) {
+        this.outputPortCount = outputPortCount;
+    }
+
+    /**
+     * @return number of running component in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of running componetns in this process group."
+    )
+    public Integer getRunningCount() {
+        return runningCount;
+    }
+
+    public void setRunningCount(Integer runningCount) {
+        this.runningCount = runningCount;
+    }
+
+    /**
+     * @return number of stopped components in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of stopped components in the process group."
+    )
+    public Integer getStoppedCount() {
+        return stoppedCount;
+    }
+
+    public void setStoppedCount(Integer stoppedCount) {
+        this.stoppedCount = stoppedCount;
+    }
+
+    /**
+     * @return number of disabled components in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of disabled components in the process group."
+    )
+    public Integer getDisabledCount() {
+        return disabledCount;
+    }
+
+    public void setDisabledCount(Integer disabledCount) {
+        this.disabledCount = disabledCount;
+    }
+
+    /**
+     * @return number of active remote ports in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of active remote ports in the process group."
+    )
+    public Integer getActiveRemotePortCount() {
+        return activeRemotePortCount;
+    }
+
+    public void setActiveRemotePortCount(Integer activeRemotePortCount) {
+        this.activeRemotePortCount = activeRemotePortCount;
+    }
+
+    /**
+     * @return number of inactive remote ports in this process group
+     */
+    @ApiModelProperty(
+        value = "The number of inactive remote ports in the process group."
+    )
+    public Integer getInactiveRemotePortCount() {
+        return inactiveRemotePortCount;
+    }
+
+    public void setInactiveRemotePortCount(Integer inactiveRemotePortCount) {
+        this.inactiveRemotePortCount = inactiveRemotePortCount;
+    }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/3cc16d35/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
index 3183cde..84f13f2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
@@ -17,7 +17,10 @@
 package org.apache.nifi.web.api.entity;
 
 import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiModelProperty;
 import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
+import org.apache.nifi.web.api.dto.status.RemoteProcessGroupStatusDTO;
 
 /**
  * A serialized representation of this class can be placed in the entity body of a request
or response to or from the API. This particular entity holds a reference to a RemoteProcessGroupDTO.
@@ -26,6 +29,10 @@ import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
 public class RemoteProcessGroupEntity extends ComponentEntity {
 
     private RemoteProcessGroupDTO component;
+    private RemoteProcessGroupStatusDTO status;
+
+    private Integer inputPortCount;
+    private Integer outputPortCount;
 
     /**
      * The RemoteProcessGroupDTO that is being serialized.
@@ -40,4 +47,45 @@ public class RemoteProcessGroupEntity extends ComponentEntity {
         this.component = component;
     }
 
+    /**
+     * @return the remote process group status
+     */
+    @ApiModelProperty(
+        value = "The status of the remote process group."
+    )
+    public RemoteProcessGroupStatusDTO getStatus() {
+        return status;
+    }
+
+    public void setStatus(RemoteProcessGroupStatusDTO status) {
+        this.status = status;
+    }
+
+    /**
+     * @return number of Remote Input Ports currently available in the remote NiFi instance
+     */
+    @ApiModelProperty(
+        value = "The number of remote input ports currently available on the target."
+    )
+    public Integer getInputPortCount() {
+        return inputPortCount;
+    }
+
+    public void setInputPortCount(Integer inputPortCount) {
+        this.inputPortCount = inputPortCount;
+    }
+
+    /**
+     * @return number of Remote Output Ports currently available in the remote NiFi instance
+     */
+    @ApiModelProperty(
+        value = "The number of remote output ports currently available on the target."
+    )
+    public Integer getOutputPortCount() {
+        return outputPortCount;
+    }
+
+    public void setOutputPortCount(Integer outputPortCount) {
+        this.outputPortCount = outputPortCount;
+    }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/3cc16d35/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
index 44f69bf..47d0594 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
@@ -16,10 +16,6 @@
  */
 package org.apache.nifi.web;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.nifi.controller.ScheduledState;
 import org.apache.nifi.controller.repository.claim.ContentDirection;
 import org.apache.nifi.controller.service.ControllerServiceState;
@@ -49,7 +45,6 @@ import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
 import org.apache.nifi.web.api.dto.RemoteProcessGroupPortDTO;
 import org.apache.nifi.web.api.dto.ReportingTaskDTO;
 import org.apache.nifi.web.api.dto.ResourceDTO;
-import org.apache.nifi.web.api.dto.RevisionDTO;
 import org.apache.nifi.web.api.dto.SnippetDTO;
 import org.apache.nifi.web.api.dto.SystemDiagnosticsDTO;
 import org.apache.nifi.web.api.dto.TemplateDTO;
@@ -83,6 +78,10 @@ import org.apache.nifi.web.api.entity.RemoteProcessGroupPortEntity;
 import org.apache.nifi.web.api.entity.ReportingTaskEntity;
 import org.apache.nifi.web.api.entity.SnippetEntity;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
 /**
  * Defines the NiFiServiceFacade interface.
  */
@@ -214,10 +213,9 @@ public interface NiFiServiceFacade {
     /**
      * Creates a new archive of the flow configuration.
      *
-     * @param revision Revision to compare with current base revision
      * @return snapshot
      */
-    ProcessGroupEntity createArchive(Revision revision);
+    ProcessGroupEntity createArchive();
 
     /**
      * Sets the annotation data for a processor.
@@ -297,13 +295,6 @@ public interface NiFiServiceFacade {
      */
     Set<DocumentedTypeDTO> getWorkQueuePrioritizerTypes();
 
-    /**
-     * Returns the current revision.
-     *
-     * @return revision
-     */
-    RevisionDTO getRevision();
-
     // ----------------------------------------
     // Template methods
     // ----------------------------------------
@@ -328,14 +319,13 @@ public interface NiFiServiceFacade {
     /**
      * Instantiate the corresponding template.
      *
-     * @param revision revision
      * @param groupId group id
      * @param templateId template id
      * @param originX x
      * @param originY y
      * @return snapshot
      */
-    FlowEntity createTemplateInstance(Revision revision, String groupId, Double originX,
Double originY, String templateId);
+    FlowEntity createTemplateInstance(String groupId, Double originX, Double originY, String
templateId);
 
     /**
      * Gets the template with the specified id.
@@ -373,12 +363,11 @@ public interface NiFiServiceFacade {
     /**
      * Creates a new Processor.
      *
-     * @param revision Revision to compare with current base revision
      * @param groupId Group id
      * @param processorDTO The processor DTO
      * @return The new processor DTO
      */
-    ProcessorEntity createProcessor(Revision revision, String groupId, ProcessorDTO processorDTO);
+    ProcessorEntity createProcessor(String groupId, ProcessorDTO processorDTO);
 
     /**
      * Gets the Processor transfer object for the specified id.
@@ -492,12 +481,11 @@ public interface NiFiServiceFacade {
     /**
      * Creates a new Relationship target.
      *
-     * @param revision Revision to compare with current base revision
      * @param groupId group
      * @param connectionDTO The Connection DTO
      * @return The Connection DTO
      */
-    ConnectionEntity createConnection(Revision revision, String groupId, ConnectionDTO connectionDTO);
+    ConnectionEntity createConnection(String groupId, ConnectionDTO connectionDTO);
 
     /**
      * Determines if this connection can be listed.
@@ -618,12 +606,11 @@ public interface NiFiServiceFacade {
     /**
      * Creates a new input port.
      *
-     * @param revision Revision to compare with current base revision
      * @param groupId The id of the group this port should be create in
      * @param inputPortDTO The input PortDTO
      * @return snapshot
      */
-    PortEntity createInputPort(Revision revision, String groupId, PortDTO inputPortDTO);
+    PortEntity createInputPort(String groupId, PortDTO inputPortDTO);
 
     /**
      * Gets an input port.
@@ -687,12 +674,11 @@ public interface NiFiServiceFacade {
     /**
      * Creates a new output port.
      *
-     * @param revision Revision to compare with current base revision
      * @param groupId The id of the group this port should be create in
      * @param outputPortDTO The output PortDTO
      * @return snapshot
      */
-    PortEntity createOutputPort(Revision revision, String groupId, PortDTO outputPortDTO);
+    PortEntity createOutputPort( String groupId, PortDTO outputPortDTO);
 
     /**
      * Gets an output port.
@@ -769,11 +755,10 @@ public interface NiFiServiceFacade {
      * Creates a new process group.
      *
      * @param parentGroupId The id of the parent group
-     * @param revision Revision to compare with current base revision
      * @param processGroupDTO The ProcessGroupDTO
      * @return snapshot
      */
-    ProcessGroupEntity createProcessGroup(String parentGroupId, Revision revision, ProcessGroupDTO
processGroupDTO);
+    ProcessGroupEntity createProcessGroup(String parentGroupId, ProcessGroupDTO processGroupDTO);
 
     /**
      * Returns the process group.
@@ -829,12 +814,11 @@ public interface NiFiServiceFacade {
     /**
      * Creates a new remote process group.
      *
-     * @param revision Revision to compare with current base revision
      * @param groupId The id of the parent group
      * @param remoteProcessGroupDTO The RemoteProcessGroupDTO
      * @return snapshot
      */
-    RemoteProcessGroupEntity createRemoteProcessGroup(Revision revision, String groupId,
RemoteProcessGroupDTO remoteProcessGroupDTO);
+    RemoteProcessGroupEntity createRemoteProcessGroup(String groupId, RemoteProcessGroupDTO
remoteProcessGroupDTO);
 
     /**
      * Gets a remote process group.
@@ -942,12 +926,11 @@ public interface NiFiServiceFacade {
     /**
      * Creates a funnel.
      *
-     * @param revision Revision to compare with current base revision
      * @param groupId group
      * @param funnelDTO funnel
      * @return The funnel DTO
      */
-    FunnelEntity createFunnel(Revision revision, String groupId, FunnelDTO funnelDTO);
+    FunnelEntity createFunnel(String groupId, FunnelDTO funnelDTO);
 
     /**
      * Gets the specified funnel.
@@ -1072,12 +1055,11 @@ public interface NiFiServiceFacade {
     /**
      * Creates a label.
      *
-     * @param revision Revision to compare with current base revision
      * @param groupId group
      * @param labelDTO The label DTO
      * @return The label DTO
      */
-    LabelEntity createLabel(Revision revision, String groupId, LabelDTO labelDTO);
+    LabelEntity createLabel(String groupId, LabelDTO labelDTO);
 
     /**
      * Gets the specified label.
@@ -1320,23 +1302,21 @@ public interface NiFiServiceFacade {
     /**
      * Creates a new snippet based off the existing snippet.
      *
-     * @param revision revision
      * @param groupId group id
      * @param snippetId snippet id
      * @param originX x
      * @param originY y
      * @return snapshot
      */
-    FlowEntity copySnippet(Revision revision, String groupId, String snippetId, Double originX,
Double originY);
+    FlowEntity copySnippet(String groupId, String snippetId, Double originX, Double originY);
 
     /**
      * Creates a new snippet.
      *
-     * @param revision revision
      * @param snippet snippet
      * @return snapshot
      */
-    ConfigurationSnapshot<SnippetDTO> createSnippet(Revision revision, SnippetDTO snippet);
+    SnippetEntity createSnippet(SnippetDTO snippet);
 
     /**
      * Gets the specified snippet.
@@ -1344,7 +1324,7 @@ public interface NiFiServiceFacade {
      * @param snippetId id
      * @return snippet
      */
-    SnippetDTO getSnippet(String snippetId);
+    SnippetEntity getSnippet(String snippetId);
 
     /**
      * Determines if this snippet can be updated.
@@ -1360,7 +1340,7 @@ public interface NiFiServiceFacade {
      * @param snippetDto snippet
      * @return snapshot
      */
-    ConfigurationSnapshot<SnippetDTO> updateSnippet(Revision revision, SnippetDTO snippetDto);
+    UpdateResult<SnippetEntity> updateSnippet(Revision revision, SnippetDTO snippetDto);
 
     /**
      * Determines if this snippet can be removed.


Mime
View raw message