You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/22 18:04:16 UTC

[27/79] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
deleted file mode 100644
index df59b13..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Date;
-import java.util.List;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * Details of a remote process group in this NiFi.
- */
-@XmlType(name = "remoteProcessGroup")
-public class RemoteProcessGroupDTO extends NiFiComponentDTO {
-
-    private String targetUri;
-    private Boolean targetSecure;
-
-    private String name;
-    private String comments;
-    private String communicationsTimeout;
-    private String yieldDuration;
-
-    private List<String> authorizationIssues;
-    private Boolean transmitting;
-
-    private Integer inputPortCount;
-    private Integer outputPortCount;
-
-    private Integer activeRemoteInputPortCount;
-    private Integer inactiveRemoteInputPortCount;
-    private Integer activeRemoteOutputPortCount;
-    private Integer inactiveRemoteOutputPortCount;
-
-    private Date flowRefreshed;
-
-    private RemoteProcessGroupContentsDTO contents;
-
-    public RemoteProcessGroupDTO() {
-        super();
-    }
-
-    public RemoteProcessGroupDTO(final RemoteProcessGroupDTO toCopy) {
-        setId(toCopy.getId());
-        setPosition(toCopy.getPosition());
-        targetUri = toCopy.getTargetUri();
-        name = toCopy.getName();
-    }
-
-    public void setTargetUri(final String targetUri) {
-        this.targetUri = targetUri;
-    }
-
-    /**
-     * The target uri of this remote process group.
-     *
-     * @return
-     */
-    public String getTargetUri() {
-        return this.targetUri;
-    }
-
-    /**
-     * The name of this remote process group.
-     *
-     * @param name
-     */
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Comments for this remote process group.
-     *
-     * @return
-     */
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * Returns any remote authorization issues for this remote process group.
-     *
-     * @return
-     */
-    public List<String> getAuthorizationIssues() {
-        return authorizationIssues;
-    }
-
-    public void setAuthorizationIssues(List<String> authorizationIssues) {
-        this.authorizationIssues = authorizationIssues;
-    }
-
-    /**
-     * Whether or not this remote process group is actively transmitting.
-     *
-     * @return
-     */
-    public Boolean isTransmitting() {
-        return transmitting;
-    }
-
-    public void setTransmitting(Boolean transmitting) {
-        this.transmitting = transmitting;
-    }
-
-    /**
-     * Whether or not the target is running securely.
-     *
-     * @return
-     */
-    public Boolean isTargetSecure() {
-        return targetSecure;
-    }
-
-    public void setTargetSecure(Boolean targetSecure) {
-        this.targetSecure = targetSecure;
-    }
-
-    /**
-     * Returns the time period used for the timeout when communicating with this
-     * RemoteProcessGroup.
-     *
-     * @return
-     */
-    public String getCommunicationsTimeout() {
-        return communicationsTimeout;
-    }
-
-    public void setCommunicationsTimeout(String communicationsTimeout) {
-        this.communicationsTimeout = communicationsTimeout;
-    }
-
-    /**
-     * When yielding, this amount of time must elaspe before this remote process
-     * group is scheduled again.
-     *
-     * @return
-     */
-    public String getYieldDuration() {
-        return yieldDuration;
-    }
-
-    public void setYieldDuration(String yieldDuration) {
-        this.yieldDuration = yieldDuration;
-    }
-
-    /**
-     * The number of active remote input ports.
-     *
-     * @return
-     */
-    public Integer getActiveRemoteInputPortCount() {
-        return activeRemoteInputPortCount;
-    }
-
-    public void setActiveRemoteInputPortCount(Integer activeRemoteInputPortCount) {
-        this.activeRemoteInputPortCount = activeRemoteInputPortCount;
-    }
-
-    /**
-     * The number of inactive remote input ports.
-     *
-     * @return
-     */
-    public Integer getInactiveRemoteInputPortCount() {
-        return inactiveRemoteInputPortCount;
-    }
-
-    public void setInactiveRemoteInputPortCount(Integer inactiveRemoteInputPortCount) {
-        this.inactiveRemoteInputPortCount = inactiveRemoteInputPortCount;
-    }
-
-    /**
-     * The number of active remote output ports.
-     *
-     * @return
-     */
-    public Integer getActiveRemoteOutputPortCount() {
-        return activeRemoteOutputPortCount;
-    }
-
-    public void setActiveRemoteOutputPortCount(Integer activeRemoteOutputPortCount) {
-        this.activeRemoteOutputPortCount = activeRemoteOutputPortCount;
-    }
-
-    /**
-     * The number of inactive remote output ports.
-     *
-     * @return
-     */
-    public Integer getInactiveRemoteOutputPortCount() {
-        return inactiveRemoteOutputPortCount;
-    }
-
-    public void setInactiveRemoteOutputPortCount(Integer inactiveRemoteOutputPortCount) {
-        this.inactiveRemoteOutputPortCount = inactiveRemoteOutputPortCount;
-    }
-
-    /**
-     * The number of Remote Input Ports currently available in the remote NiFi
-     * instance
-     *
-     * @return
-     */
-    public Integer getInputPortCount() {
-        return inputPortCount;
-    }
-
-    public void setInputPortCount(Integer inputPortCount) {
-        this.inputPortCount = inputPortCount;
-    }
-
-    /**
-     * The number of Remote Output Ports currently available in the remote NiFi
-     * instance
-     *
-     * @return
-     */
-    public Integer getOutputPortCount() {
-        return outputPortCount;
-    }
-
-    public void setOutputPortCount(Integer outputPortCount) {
-        this.outputPortCount = outputPortCount;
-    }
-
-    /**
-     * The contents of this remote process group. Will contain available
-     * input/output ports.
-     *
-     * @return
-     */
-    public RemoteProcessGroupContentsDTO getContents() {
-        return contents;
-    }
-
-    public void setContents(RemoteProcessGroupContentsDTO contents) {
-        this.contents = contents;
-    }
-
-    /**
-     * When the flow for this remote group was last refreshed.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getFlowRefreshed() {
-        return flowRefreshed;
-    }
-
-    public void setFlowRefreshed(Date flowRefreshed) {
-        this.flowRefreshed = flowRefreshed;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
deleted file mode 100644
index 7948dad..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Details of a port in a remote process group.
- */
-@XmlType(name = "remoteProcessGroupPort")
-public class RemoteProcessGroupPortDTO {
-
-    private String id;
-    private String groupId;
-    private String name;
-    private String comments;
-    private Integer concurrentlySchedulableTaskCount;
-    private Boolean transmitting;
-    private Boolean useCompression;
-    private Boolean exists;
-    private Boolean targetRunning;
-    private Boolean connected;
-
-    /**
-     * The comments as configured in the target port.
-     *
-     * @return
-     */
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * The number tasks that may transmit flow files to the target port
-     * concurrently.
-     *
-     * @return
-     */
-    public Integer getConcurrentlySchedulableTaskCount() {
-        return concurrentlySchedulableTaskCount;
-    }
-
-    public void setConcurrentlySchedulableTaskCount(Integer concurrentlySchedulableTaskCount) {
-        this.concurrentlySchedulableTaskCount = concurrentlySchedulableTaskCount;
-    }
-
-    /**
-     * The id of the target port.
-     *
-     * @return
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * The id of the remote process group that this port resides in.
-     *
-     * @return
-     */
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    /**
-     * The name of the target port.
-     *
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Whether or not this remote group port is configured for transmission.
-     *
-     * @return
-     */
-    public Boolean isTransmitting() {
-        return transmitting;
-    }
-
-    public void setTransmitting(Boolean transmitting) {
-        this.transmitting = transmitting;
-    }
-
-    /**
-     * Whether or not flow file are compressed when sent to this target port.
-     *
-     * @return
-     */
-    public Boolean getUseCompression() {
-        return useCompression;
-    }
-
-    public void setUseCompression(Boolean useCompression) {
-        this.useCompression = useCompression;
-    }
-
-    /**
-     * Whether or not the target port exists.
-     *
-     * @return
-     */
-    public Boolean getExists() {
-        return exists;
-    }
-
-    public void setExists(Boolean exists) {
-        this.exists = exists;
-    }
-
-    /**
-     * Whether or not the target port is running.
-     *
-     * @return
-     */
-    public Boolean isTargetRunning() {
-        return targetRunning;
-    }
-
-    public void setTargetRunning(Boolean targetRunning) {
-        this.targetRunning = targetRunning;
-    }
-
-    /**
-     * Whether or not this port has either an incoming or outgoing connection.
-     *
-     * @return
-     */
-    public Boolean isConnected() {
-        return connected;
-    }
-
-    public void setConnected(Boolean connected) {
-        this.connected = connected;
-    }
-
-    @Override
-    public int hashCode() {
-        return 923847 + String.valueOf(name).hashCode();
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof RemoteProcessGroupPortDTO)) {
-            return false;
-        }
-        final RemoteProcessGroupPortDTO other = (RemoteProcessGroupPortDTO) obj;
-        if (name == null && other.name == null) {
-            return true;
-        }
-
-        if (name == null) {
-            return false;
-        }
-        return name.equals(other.name);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
deleted file mode 100644
index e608a7e..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Current revision for this NiFi.
- */
-@XmlType(name = "revision")
-public class RevisionDTO {
-
-    private String clientId;
-    private Long version;
-
-    /* getters / setters */
-    /**
-     * A client identifier used to make a request. By including a client
-     * identifier, the API can allow multiple requests without needing the
-     * current revision. Due to the asynchronous nature of requests/responses
-     * this was implemented to allow the client to make numerous requests
-     * without having to wait for the previous response to come back.
-     *
-     * @return The client id
-     */
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    /**
-     * NiFi employs an optimistic locking strategy where the client must include
-     * a revision in their request when performing an update. In a response,
-     * this field represents the updated base version.
-     *
-     * @return The revision
-     */
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
deleted file mode 100644
index 2ee1310..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.HashSet;
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The contents of a snippet of a flow.
- */
-@XmlType(name = "snippet")
-public class SnippetDTO {
-
-    private String id;
-    private String uri;
-    private String parentGroupId;
-    private Boolean linked;
-
-    // when specified these are only considered during creation
-    private Set<String> processGroups = new HashSet<>();
-    private Set<String> remoteProcessGroups = new HashSet<>();
-    private Set<String> processors = new HashSet<>();
-    private Set<String> inputPorts = new HashSet<>();
-    private Set<String> outputPorts = new HashSet<>();
-    private Set<String> connections = new HashSet<>();
-    private Set<String> labels = new HashSet<>();
-    private Set<String> funnels = new HashSet<>();
-
-    private FlowSnippetDTO contents;
-
-    /**
-     * The id of this snippet.
-     *
-     * @return
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * The uri of this snippet.
-     *
-     * @return
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    /**
-     * The group id for the components in this snippet.
-     *
-     * @return
-     */
-    public String getParentGroupId() {
-        return parentGroupId;
-    }
-
-    public void setParentGroupId(String parentGroupId) {
-        this.parentGroupId = parentGroupId;
-    }
-
-    /**
-     * Whether or not this snippet is linked to the underlying data flow.
-     *
-     * @return
-     */
-    public Boolean isLinked() {
-        return linked;
-    }
-
-    public void setLinked(Boolean linked) {
-        this.linked = linked;
-    }
-
-    /**
-     * The ids of the connections in this snippet. These ids will be populated
-     * within each response. They can be specified when creating a snippet.
-     * However, once a snippet has been created its contents cannot be modified
-     * (these ids are ignored during update requests).
-     *
-     * @return
-     */
-    public Set<String> getConnections() {
-        return connections;
-    }
-
-    public void setConnections(Set<String> connections) {
-        this.connections = connections;
-    }
-
-    /**
-     * The ids of the funnels in this snippet. These ids will be populated
-     * within each response. They can be specified when creating a snippet.
-     * However, once a snippet has been created its contents cannot be modified
-     * (these ids are ignored during update requests).
-     *
-     * @param funnels
-     */
-    public Set<String> getFunnels() {
-        return funnels;
-    }
-
-    public void setFunnels(Set<String> funnels) {
-        this.funnels = funnels;
-    }
-
-    /**
-     * The ids of the input port in this snippet. These ids will be populated
-     * within each response. They can be specified when creating a snippet.
-     * However, once a snippet has been created its contents cannot be modified
-     * (these ids are ignored during update requests).
-     *
-     * @return
-     */
-    public Set<String> getInputPorts() {
-        return inputPorts;
-    }
-
-    public void setInputPorts(Set<String> inputPorts) {
-        this.inputPorts = inputPorts;
-    }
-
-    /**
-     * The ids of the labels in this snippet. These ids will be populated within
-     * each response. They can be specified when creating a snippet. However,
-     * once a snippet has been created its contents cannot be modified (these
-     * ids are ignored during update requests).
-     *
-     * @return
-     */
-    public Set<String> getLabels() {
-        return labels;
-    }
-
-    public void setLabels(Set<String> labels) {
-        this.labels = labels;
-    }
-
-    /**
-     * The ids of the output ports in this snippet. These ids will be populated
-     * within each response. They can be specified when creating a snippet.
-     * However, once a snippet has been created its contents cannot be modified
-     * (these ids are ignored during update requests).
-     *
-     * @return
-     */
-    public Set<String> getOutputPorts() {
-        return outputPorts;
-    }
-
-    public void setOutputPorts(Set<String> outputPorts) {
-        this.outputPorts = outputPorts;
-    }
-
-    /**
-     * The ids of the process groups in this snippet. These ids will be
-     * populated within each response. They can be specified when creating a
-     * snippet. However, once a snippet has been created its contents cannot be
-     * modified (these ids are ignored during update requests).
-     *
-     * @return
-     */
-    public Set<String> getProcessGroups() {
-        return processGroups;
-    }
-
-    public void setProcessGroups(Set<String> processGroups) {
-        this.processGroups = processGroups;
-    }
-
-    /**
-     * The ids of the processors in this snippet. These ids will be populated
-     * within each response. They can be specified when creating a snippet.
-     * However, once a snippet has been created its contents cannot be modified
-     * (these ids are ignored during update requests).
-     *
-     * @return
-     */
-    public Set<String> getProcessors() {
-        return processors;
-    }
-
-    public void setProcessors(Set<String> processors) {
-        this.processors = processors;
-    }
-
-    /**
-     * The ids of the remote process groups in this snippet. These ids will be
-     * populated within each response. They can be specified when creating a
-     * snippet. However, once a snippet has been created its contents cannot be
-     * modified (these ids are ignored during update requests).
-     *
-     * @return
-     */
-    public Set<String> getRemoteProcessGroups() {
-        return remoteProcessGroups;
-    }
-
-    public void setRemoteProcessGroups(Set<String> remoteProcessGroups) {
-        this.remoteProcessGroups = remoteProcessGroups;
-    }
-
-    /**
-     * The contents of the configuration for this snippet.
-     *
-     * @return
-     */
-    public FlowSnippetDTO getContents() {
-        return contents;
-    }
-
-    public void setContents(FlowSnippetDTO contents) {
-        this.contents = contents;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
deleted file mode 100644
index 0b20852..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Date;
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.TimeAdapter;
-
-/**
- * The diagnostics of the system this NiFi is running on.
- */
-@XmlType(name = "systemDiagnostics")
-public class SystemDiagnosticsDTO {
-
-    private String totalNonHeap;
-    private String usedNonHeap;
-    private String freeNonHeap;
-    private String maxNonHeap;
-    private String nonHeapUtilization;
-
-    private String totalHeap;
-    private String usedHeap;
-    private String freeHeap;
-    private String maxHeap;
-    private String heapUtilization;
-
-    private Integer availableProcessors;
-    private Double processorLoadAverage;
-
-    private Integer totalThreads;
-    private Integer daemonThreads;
-
-    private StorageUsageDTO flowFileRepositoryStorageUsage;
-    private Set<StorageUsageDTO> contentRepositoryStorageUsage;
-    private Set<GarbageCollectionDTO> garbageCollection;
-
-    private Date statsLastRefreshed;
-
-    /* getters / setters */
-    /**
-     * The number of available processors, if supported.
-     *
-     * @return
-     */
-    public Integer getAvailableProcessors() {
-        return availableProcessors;
-    }
-
-    public void setAvailableProcessors(Integer availableProcessors) {
-        this.availableProcessors = availableProcessors;
-    }
-
-    /**
-     * The number of daemon threads.
-     *
-     * @return
-     */
-    public Integer getDaemonThreads() {
-        return daemonThreads;
-    }
-
-    public void setDaemonThreads(Integer daemonThreads) {
-        this.daemonThreads = daemonThreads;
-    }
-
-    /**
-     * The amount of free heap.
-     *
-     * @return
-     */
-    public String getFreeHeap() {
-        return freeHeap;
-    }
-
-    public void setFreeHeap(String freeHeap) {
-        this.freeHeap = freeHeap;
-    }
-
-    /**
-     * The amount of free non-heap.
-     *
-     * @return
-     */
-    public String getFreeNonHeap() {
-        return freeNonHeap;
-    }
-
-    public void setFreeNonHeap(String freeNonHeap) {
-        this.freeNonHeap = freeNonHeap;
-    }
-
-    /**
-     * The max size of the heap.
-     *
-     * @return
-     */
-    public String getMaxHeap() {
-        return maxHeap;
-    }
-
-    public void setMaxHeap(String maxHeap) {
-        this.maxHeap = maxHeap;
-    }
-
-    /**
-     * The max size of the non-heap.
-     *
-     * @return
-     */
-    public String getMaxNonHeap() {
-        return maxNonHeap;
-    }
-
-    public void setMaxNonHeap(String maxNonHeap) {
-        this.maxNonHeap = maxNonHeap;
-    }
-
-    /**
-     * The processor load average, if supported.
-     *
-     * @return
-     */
-    public Double getProcessorLoadAverage() {
-        return processorLoadAverage;
-    }
-
-    public void setProcessorLoadAverage(Double processorLoadAverage) {
-        this.processorLoadAverage = processorLoadAverage;
-    }
-
-    /**
-     * The total size of the heap.
-     *
-     * @return
-     */
-    public String getTotalHeap() {
-        return totalHeap;
-    }
-
-    public void setTotalHeap(String totalHeap) {
-        this.totalHeap = totalHeap;
-    }
-
-    /**
-     * The total size of non-heap.
-     *
-     * @return
-     */
-    public String getTotalNonHeap() {
-        return totalNonHeap;
-    }
-
-    public void setTotalNonHeap(String totalNonHeap) {
-        this.totalNonHeap = totalNonHeap;
-    }
-
-    /**
-     * The total number of threads.
-     *
-     * @return
-     */
-    public Integer getTotalThreads() {
-        return totalThreads;
-    }
-
-    public void setTotalThreads(Integer totalThreads) {
-        this.totalThreads = totalThreads;
-    }
-
-    /**
-     * The amount of used heap.
-     *
-     * @return
-     */
-    public String getUsedHeap() {
-        return usedHeap;
-    }
-
-    public void setUsedHeap(String usedHeap) {
-        this.usedHeap = usedHeap;
-    }
-
-    /**
-     * The amount of used non-heap.
-     *
-     * @return
-     */
-    public String getUsedNonHeap() {
-        return usedNonHeap;
-    }
-
-    public void setUsedNonHeap(String usedNonHeap) {
-        this.usedNonHeap = usedNonHeap;
-    }
-
-    /**
-     * The heap utilization.
-     *
-     * @return
-     */
-    public String getHeapUtilization() {
-        return heapUtilization;
-    }
-
-    public void setHeapUtilization(String heapUtilization) {
-        this.heapUtilization = heapUtilization;
-    }
-
-    /**
-     * The non-heap utilization.
-     *
-     * @return
-     */
-    public String getNonHeapUtilization() {
-        return nonHeapUtilization;
-    }
-
-    public void setNonHeapUtilization(String nonHeapUsage) {
-        this.nonHeapUtilization = nonHeapUsage;
-    }
-
-    /**
-     * The content repository storage usage.
-     *
-     * @return
-     */
-    public Set<StorageUsageDTO> getContentRepositoryStorageUsage() {
-        return contentRepositoryStorageUsage;
-    }
-
-    public void setContentRepositoryStorageUsage(Set<StorageUsageDTO> contentRepositoryStorageUsage) {
-        this.contentRepositoryStorageUsage = contentRepositoryStorageUsage;
-    }
-
-    /**
-     * The flowfile repository storage usage.
-     *
-     * @return
-     */
-    public StorageUsageDTO getFlowFileRepositoryStorageUsage() {
-        return flowFileRepositoryStorageUsage;
-    }
-
-    public void setFlowFileRepositoryStorageUsage(StorageUsageDTO flowFileRepositoryStorageUsage) {
-        this.flowFileRepositoryStorageUsage = flowFileRepositoryStorageUsage;
-    }
-
-    /**
-     * Garbage collection details.
-     *
-     * @return
-     */
-    public Set<GarbageCollectionDTO> getGarbageCollection() {
-        return garbageCollection;
-    }
-
-    public void setGarbageCollection(Set<GarbageCollectionDTO> garbageCollection) {
-        this.garbageCollection = garbageCollection;
-    }
-
-    /**
-     * When these diagnostics were generated.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(TimeAdapter.class)
-    public Date getStatsLastRefreshed() {
-        return statsLastRefreshed;
-    }
-
-    public void setStatsLastRefreshed(Date statsLastRefreshed) {
-        this.statsLastRefreshed = statsLastRefreshed;
-    }
-
-    /**
-     * Details of storage usage.
-     */
-    @XmlType(name = "storageUsage")
-    public static class StorageUsageDTO {
-
-        private String identifier;
-        private String freeSpace;
-        private String totalSpace;
-        private String usedSpace;
-        private Long freeSpaceBytes;
-        private Long totalSpaceBytes;
-        private Long usedSpaceBytes;
-        private String utilization;
-
-        /**
-         * The identifier for this storage location.
-         *
-         * @return
-         */
-        public String getIdentifier() {
-            return identifier;
-        }
-
-        public void setIdentifier(String identifier) {
-            this.identifier = identifier;
-        }
-
-        /**
-         * The amount of free space.
-         *
-         * @return
-         */
-        public String getFreeSpace() {
-            return freeSpace;
-        }
-
-        public void setFreeSpace(String freeSpace) {
-            this.freeSpace = freeSpace;
-        }
-
-        /**
-         * The amount of total space.
-         *
-         * @param freeSpace
-         */
-        public String getTotalSpace() {
-            return totalSpace;
-        }
-
-        public void setTotalSpace(String totalSpace) {
-            this.totalSpace = totalSpace;
-        }
-
-        /**
-         * The amount of used space.
-         *
-         * @return
-         */
-        public String getUsedSpace() {
-            return usedSpace;
-        }
-
-        public void setUsedSpace(String usedSpace) {
-            this.usedSpace = usedSpace;
-        }
-
-        /**
-         * The utilization of this storage location.
-         *
-         * @return
-         */
-        public String getUtilization() {
-            return utilization;
-        }
-
-        public void setUtilization(String utilization) {
-            this.utilization = utilization;
-        }
-
-        /**
-         * The number of bytes of free space.
-         *
-         * @return
-         */
-        public Long getFreeSpaceBytes() {
-            return freeSpaceBytes;
-        }
-
-        public void setFreeSpaceBytes(Long freeSpaceBytes) {
-            this.freeSpaceBytes = freeSpaceBytes;
-        }
-
-        /**
-         * The number of bytes of total space.
-         *
-         * @return
-         */
-        public Long getTotalSpaceBytes() {
-            return totalSpaceBytes;
-        }
-
-        public void setTotalSpaceBytes(Long totalSpaceBytes) {
-            this.totalSpaceBytes = totalSpaceBytes;
-        }
-
-        /**
-         * The number of bytes of used space.
-         *
-         * @return
-         */
-        public Long getUsedSpaceBytes() {
-            return usedSpaceBytes;
-        }
-
-        public void setUsedSpaceBytes(Long usedSpaceBytes) {
-            this.usedSpaceBytes = usedSpaceBytes;
-        }
-    }
-
-    /**
-     * Details for garbage collection.
-     */
-    @XmlType(name = "garbageCollection")
-    public static class GarbageCollectionDTO {
-
-        private String name;
-        private long collectionCount;
-        private String collectionTime;
-
-        /**
-         * The name of the garbage collector.
-         *
-         * @return
-         */
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public long getCollectionCount() {
-            return collectionCount;
-        }
-
-        /**
-         * The number of times garbage collection has run.
-         *
-         * @param collectionCount
-         */
-        public void setCollectionCount(long collectionCount) {
-            this.collectionCount = collectionCount;
-        }
-
-        /**
-         * The total amount of time spent garbage collecting.
-         *
-         * @return
-         */
-        public String getCollectionTime() {
-            return collectionTime;
-        }
-
-        public void setCollectionTime(String collectionTime) {
-            this.collectionTime = collectionTime;
-        }
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
deleted file mode 100644
index 156a6e9..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * Defines a template.
- */
-@XmlRootElement(name = "template")
-public class TemplateDTO {
-
-    private String uri;
-
-    private String id;
-    private String name;
-    private String description;
-    private Date timestamp;
-
-    private FlowSnippetDTO snippet;
-
-    /**
-     * The id for this template.
-     *
-     * @return
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * The uri for this template.
-     *
-     * @return
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    /**
-     * The name of this template.
-     *
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * The description of this template.
-     *
-     * @return
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    /**
-     * The timestamp when this template was created.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    /**
-     * The snippet in this template.
-     *
-     * @return
-     */
-    public FlowSnippetDTO getSnippet() {
-        return snippet;
-    }
-
-    public void setSnippet(FlowSnippetDTO snippet) {
-        this.snippet = snippet;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
deleted file mode 100644
index 85c82dc..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Date;
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * A user of this NiFi.
- */
-@XmlType(name = "user")
-public class UserDTO {
-
-    private String id;
-    private String dn;
-    private String userName;
-    private String userGroup;
-    private String justification;
-    private Date creation;
-    private String status;
-
-    private Date lastVerified;
-    private Date lastAccessed;
-    private Set<String> authorities;
-
-    /**
-     * The user id.
-     *
-     * @return
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * The users authorities.
-     *
-     * @return
-     */
-    public Set<String> getAuthorities() {
-        return authorities;
-    }
-
-    public void setAuthorities(Set<String> authorities) {
-        this.authorities = authorities;
-    }
-
-    /**
-     * The creation time for this users account.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getCreation() {
-        return creation;
-    }
-
-    public void setCreation(Date creation) {
-        this.creation = creation;
-    }
-
-    /**
-     * The users DN.
-     *
-     * @return
-     */
-    public String getDn() {
-        return dn;
-    }
-
-    public void setDn(String dn) {
-        this.dn = dn;
-    }
-
-    /**
-     * The users name. If the name could not be extracted from the DN, this
-     * value will be the entire DN.
-     *
-     * @return
-     */
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    /**
-     * The user group.
-     *
-     * @return
-     */
-    public String getUserGroup() {
-        return userGroup;
-    }
-
-    public void setUserGroup(String userGroup) {
-        this.userGroup = userGroup;
-    }
-
-    /**
-     * The users account justification.
-     *
-     * @return
-     */
-    public String getJustification() {
-        return justification;
-    }
-
-    public void setJustification(String justification) {
-        this.justification = justification;
-    }
-
-    /**
-     * The time that the user last accessed the system.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getLastAccessed() {
-        return lastAccessed;
-    }
-
-    public void setLastAccessed(Date lastAccessed) {
-        this.lastAccessed = lastAccessed;
-    }
-
-    /**
-     * The time that the users credentials were last verified.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getLastVerified() {
-        return lastVerified;
-    }
-
-    public void setLastVerified(Date lastVerified) {
-        this.lastVerified = lastVerified;
-    }
-
-    /**
-     * The status of the users account.
-     *
-     * @return
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
deleted file mode 100644
index 285c355..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A user group in this NiFi.
- */
-@XmlType(name = "userGroup")
-public class UserGroupDTO {
-
-    private String group;
-    private Set<String> userIds;
-    private Set<String> authorities;
-    private String status;
-
-    /**
-     * The user group.
-     *
-     * @return
-     */
-    public String getGroup() {
-        return group;
-    }
-
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    /**
-     * The users in this group.
-     *
-     * @return
-     */
-    public Set<String> getUserIds() {
-        return userIds;
-    }
-
-    public void setUserIds(Set<String> userIds) {
-        this.userIds = userIds;
-    }
-
-    /**
-     * The status of the users account.
-     *
-     * @return
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    /**
-     * The users authorities.
-     *
-     * @return
-     */
-    public Set<String> getAuthorities() {
-        return authorities;
-    }
-
-    public void setAuthorities(Set<String> authorities) {
-        this.authorities = authorities;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
deleted file mode 100644
index 8402480..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.action.component.details.ComponentDetailsDTO;
-import org.apache.nifi.web.api.dto.action.details.ActionDetailsDTO;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * An action performed in this NiFi.
- */
-@XmlType(name = "action")
-public class ActionDTO {
-
-    private Integer id;
-    private String userDn;
-    private String userName;
-    private Date timestamp;
-
-    private String sourceId;
-    private String sourceName;
-    private String sourceType;
-    private ComponentDetailsDTO componentDetails;
-
-    private String operation;
-    private ActionDetailsDTO actionDetails;
-
-    /**
-     * The action id.
-     *
-     * @return
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * The user dn who perform this action.
-     *
-     * @return
-     */
-    public String getUserDn() {
-        return userDn;
-    }
-
-    public void setUserDn(String userDn) {
-        this.userDn = userDn;
-    }
-
-    /**
-     * The user name who perform this action.
-     *
-     * @return
-     */
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    /**
-     * This action's timestamp.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    /**
-     * The id of the source component of this action.
-     *
-     * @return
-     */
-    public String getSourceId() {
-        return sourceId;
-    }
-
-    public void setSourceId(String sourceId) {
-        this.sourceId = sourceId;
-    }
-
-    /**
-     * The name of the source component of this action.
-     *
-     * @return
-     */
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    /**
-     * The type of the source component of this action.
-     *
-     * @return
-     */
-    public String getSourceType() {
-        return sourceType;
-    }
-
-    public void setSourceType(String sourceType) {
-        this.sourceType = sourceType;
-    }
-
-    /**
-     * The component details (if any) for this action.
-     *
-     * @return
-     */
-    public ComponentDetailsDTO getComponentDetails() {
-        return componentDetails;
-    }
-
-    public void setComponentDetails(ComponentDetailsDTO componentDetails) {
-        this.componentDetails = componentDetails;
-    }
-
-    /**
-     * The operation being performed in this action.
-     *
-     * @return
-     */
-    public String getOperation() {
-        return operation;
-    }
-
-    public void setOperation(String operation) {
-        this.operation = operation;
-    }
-
-    /**
-     * The action details (if any) for this action.
-     *
-     * @return
-     */
-    public ActionDetailsDTO getActionDetails() {
-        return actionDetails;
-    }
-
-    public void setActionDetails(ActionDetailsDTO actionDetails) {
-        this.actionDetails = actionDetails;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
deleted file mode 100644
index 9ab47ed..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action;
-
-import java.util.Collection;
-import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.TimeAdapter;
-
-/**
- * NiFi action history.
- */
-@XmlType(name = "history")
-public class HistoryDTO {
-
-    private Integer total;
-    private Date lastRefreshed;
-    private Collection<ActionDTO> actions;
-
-    /**
-     * The total number of actions.
-     *
-     * @return
-     */
-    public Integer getTotal() {
-        return total;
-    }
-
-    public void setTotal(Integer total) {
-        this.total = total;
-    }
-
-    /**
-     * Timestamp when these records were returned.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(TimeAdapter.class)
-    public Date getLastRefreshed() {
-        return lastRefreshed;
-    }
-
-    public void setLastRefreshed(Date lastRefreshed) {
-        this.lastRefreshed = lastRefreshed;
-    }
-
-    /**
-     * The actions for this range.
-     *
-     * @return
-     */
-    public Collection<ActionDTO> getActions() {
-        return actions;
-    }
-
-    public void setActions(Collection<ActionDTO> actions) {
-        this.actions = actions;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
deleted file mode 100644
index e8e11e5..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * A history query to find desired actions.
- */
-@XmlType(name = "historyQuery")
-public class HistoryQueryDTO {
-
-    private String userName;
-    private String sourceId;
-    private Date startDate;
-    private Date endDate;
-    private Integer offset;
-    private Integer count;
-    private String sortColumn;
-    private String sortOrder;
-
-    /**
-     * The user name.
-     *
-     * @return
-     */
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    /**
-     * The source component id.
-     *
-     * @return
-     */
-    public String getSourceId() {
-        return sourceId;
-    }
-
-    public void setSourceId(String sourceId) {
-        this.sourceId = sourceId;
-    }
-
-    /**
-     * The start date.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
-    }
-
-    /**
-     * The end date.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-
-    /**
-     * The offset.
-     *
-     * @return
-     */
-    public Integer getOffset() {
-        return offset;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    /**
-     * The desired row count.
-     *
-     * @return
-     */
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    /**
-     * The desired sort column.
-     *
-     * @return
-     */
-    public String getSortColumn() {
-        return sortColumn;
-    }
-
-    public void setSortColumn(String sortColumn) {
-        this.sortColumn = sortColumn;
-    }
-
-    /**
-     * The desired sort order.
-     *
-     * @return
-     */
-    public String getSortOrder() {
-        return sortOrder;
-    }
-
-    public void setSortOrder(String sortOrder) {
-        this.sortOrder = sortOrder;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java
deleted file mode 100644
index 58086ce..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.component.details;
-
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- *
- */
-@XmlType(name = "componentDetails")
-@XmlSeeAlso({
-    ProcessorDetailsDTO.class,
-    RemoteProcessGroupDetailsDTO.class
-})
-public class ComponentDetailsDTO {
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java
deleted file mode 100644
index 3523f62..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.component.details;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Processor details for an action.
- */
-@XmlType(name = "processorDetails")
-public class ProcessorDetailsDTO extends ComponentDetailsDTO {
-
-    private String type;
-
-    /**
-     * The processors type.
-     *
-     * @return
-     */
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
deleted file mode 100644
index 2809398..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.component.details;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Remote process group details for an action.
- */
-@XmlType(name = "remoteProcessGroupDetails")
-public class RemoteProcessGroupDetailsDTO extends ComponentDetailsDTO {
-
-    private String uri;
-
-    /**
-     * The URI of the remote process group.
-     *
-     * @return
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java
deleted file mode 100644
index 4074cba..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.details;
-
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- *
- */
-@XmlType(name = "details")
-@XmlSeeAlso({
-    ConfigureDetailsDTO.class,
-    MoveDetailsDTO.class,
-    ConnectDetailsDTO.class,
-    PurgeDetailsDTO.class
-})
-public class ActionDetailsDTO {
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
deleted file mode 100644
index 4011b00..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.details;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Configuration details for an Action.
- */
-@XmlType(name = "configureDetails")
-public class ConfigureDetailsDTO extends ActionDetailsDTO {
-
-    private String name;
-    private String previousValue;
-    private String value;
-
-    /**
-     * The name of the property that was modified.
-     *
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * The previous value.
-     *
-     * @return
-     */
-    public String getPreviousValue() {
-        return previousValue;
-    }
-
-    public void setPreviousValue(String previousValue) {
-        this.previousValue = previousValue;
-    }
-
-    /**
-     * The new value.
-     *
-     * @return
-     */
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
deleted file mode 100644
index ba88bd1..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.details;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Details for connect Actions.
- */
-@XmlType(name = "connectDetails")
-public class ConnectDetailsDTO extends ActionDetailsDTO {
-
-    private String sourceId;
-    private String sourceName;
-    private String sourceType;
-    private String relationship;
-    private String destinationId;
-    private String destinationName;
-    private String destinationType;
-
-    /**
-     * The id of the source of the connection.
-     *
-     * @return
-     */
-    public String getSourceId() {
-        return sourceId;
-    }
-
-    public void setSourceId(String sourceId) {
-        this.sourceId = sourceId;
-    }
-
-    /**
-     * The name of the source of the connection.
-     *
-     * @return
-     */
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    /**
-     * The type of the source of the connection.
-     *
-     * @return
-     */
-    public String getSourceType() {
-        return sourceType;
-    }
-
-    public void setSourceType(String sourceType) {
-        this.sourceType = sourceType;
-    }
-
-    /**
-     * The name of the relationship that was connected.
-     *
-     * @return
-     */
-    public String getRelationship() {
-        return relationship;
-    }
-
-    public void setRelationship(String relationship) {
-        this.relationship = relationship;
-    }
-
-    /**
-     * The id of the destination of the connection.
-     *
-     * @return
-     */
-    public String getDestinationId() {
-        return destinationId;
-    }
-
-    public void setDestinationId(String destinationId) {
-        this.destinationId = destinationId;
-    }
-
-    /**
-     * The name of the destination of the connection.
-     *
-     * @return
-     */
-    public String getDestinationName() {
-        return destinationName;
-    }
-
-    public void setDestinationName(String destinationName) {
-        this.destinationName = destinationName;
-    }
-
-    /**
-     * The type of the destination of the connection.
-     *
-     * @return
-     */
-    public String getDestinationType() {
-        return destinationType;
-    }
-
-    public void setDestinationType(String destinationType) {
-        this.destinationType = destinationType;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
deleted file mode 100644
index c6f0450..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.details;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Details of the move operation.
- */
-@XmlType(name = "moveDetails")
-public class MoveDetailsDTO extends ActionDetailsDTO {
-
-    private String previousGroupId;
-    private String previousGroup;
-    private String groupId;
-    private String group;
-
-    /**
-     * The id of the group the components previously belonged to.
-     *
-     * @return
-     */
-    public String getPreviousGroupId() {
-        return previousGroupId;
-    }
-
-    public void setPreviousGroupId(String previousGroupId) {
-        this.previousGroupId = previousGroupId;
-    }
-
-    /**
-     * The name of the group of the components previously belonged to.
-     *
-     * @return
-     */
-    public String getPreviousGroup() {
-        return previousGroup;
-    }
-
-    public void setPreviousGroup(String previousGroup) {
-        this.previousGroup = previousGroup;
-    }
-
-    /**
-     * The id of the group the components belong to.
-     *
-     * @return
-     */
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    /**
-     * The name of the group the components belong to.
-     *
-     * @return
-     */
-    public String getGroup() {
-        return group;
-    }
-
-    public void setGroup(String group) {
-        this.group = group;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
deleted file mode 100644
index b5a5bcb..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.action.details;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * Details of a purge operation.
- */
-@XmlType(name = "purgeDetails")
-public class PurgeDetailsDTO extends ActionDetailsDTO {
-
-    private Date endDate;
-
-    /**
-     * The end date for this purge action.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(DateTimeAdapter.class)
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
deleted file mode 100644
index ed58077..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.provenance;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Represents a processor's attribute for a provenance event.
- */
-@XmlType(name = "attribute")
-public class AttributeDTO {
-
-    private String name;
-    private String value;
-    private String previousValue;
-
-    /**
-     * The attribute name.
-     *
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * The attribute value.
-     *
-     * @return
-     */
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * The value of this attribute before the event took place.
-     *
-     * @return
-     */
-    public String getPreviousValue() {
-        return previousValue;
-    }
-
-    public void setPreviousValue(String previousValue) {
-        this.previousValue = previousValue;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
deleted file mode 100644
index 90dd119..0000000
--- a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.provenance;
-
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.nifi.web.api.dto.util.TimestampAdapter;
-
-/**
- * A provenance submission. Incorporates the request, its current status, and
- * the results.
- */
-@XmlType(name = "provenance")
-public class ProvenanceDTO {
-
-    private String id;
-    private String uri;
-    private String clusterNodeId;
-
-    private Date submissionTime;
-    private Date expiration;
-
-    private Integer percentCompleted;
-    private Boolean finished;
-
-    private ProvenanceRequestDTO request;
-    private ProvenanceResultsDTO results;
-
-    /**
-     * The id of this provenance query.
-     *
-     * @return
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * The URI for this query. Used for obtaining the requests at a later time.
-     *
-     * @return
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    /**
-     * The id of the node in the cluster where this provenance originated.
-     *
-     * @return
-     */
-    public String getClusterNodeId() {
-        return clusterNodeId;
-    }
-
-    public void setClusterNodeId(String clusterNodeId) {
-        this.clusterNodeId = clusterNodeId;
-    }
-
-    /**
-     * The time the query was submitted.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(TimestampAdapter.class)
-    public Date getSubmissionTime() {
-        return submissionTime;
-    }
-
-    public void setSubmissionTime(Date submissionTime) {
-        this.submissionTime = submissionTime;
-    }
-
-    /**
-     * The expiration time of the query results.
-     *
-     * @return
-     */
-    @XmlJavaTypeAdapter(TimestampAdapter.class)
-    public Date getExpiration() {
-        return expiration;
-    }
-
-    public void setExpiration(Date expiration) {
-        this.expiration = expiration;
-    }
-
-    /**
-     * The percent completed.
-     *
-     * @return
-     */
-    public Integer getPercentCompleted() {
-        return percentCompleted;
-    }
-
-    public void setPercentCompleted(Integer percentCompleted) {
-        this.percentCompleted = percentCompleted;
-    }
-
-    /**
-     * Whether the query has finished.
-     *
-     * @return
-     */
-    public Boolean isFinished() {
-        return finished;
-    }
-
-    public void setFinished(Boolean finished) {
-        this.finished = finished;
-    }
-
-    /**
-     * The provenance request.
-     *
-     * @return
-     */
-    public ProvenanceRequestDTO getRequest() {
-        return request;
-    }
-
-    public void setRequest(ProvenanceRequestDTO request) {
-        this.request = request;
-    }
-
-    /**
-     * The results of this query.
-     *
-     * @return
-     */
-    public ProvenanceResultsDTO getResults() {
-        return results;
-    }
-
-    public void setResults(ProvenanceResultsDTO results) {
-        this.results = results;
-    }
-
-}