You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2015/04/22 23:12:58 UTC
[08/49] incubator-nifi git commit: NIFI-271 checkpoint push because
there are so many changes. Long way to go but got through dto library
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
index 334adad..18539be 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
@@ -42,8 +42,6 @@ public class ProcessorStatusDTO extends StatusDTO {
/* getters / setters */
/**
- * The id for the processor.
- *
* @return The processor id
*/
public String getId() {
@@ -55,8 +53,6 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The name of the processor.
- *
* @return The processor name
*/
public String getName() {
@@ -68,8 +64,6 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The type of the processor.
- *
* @return The processor type
*/
public String getType() {
@@ -81,9 +75,7 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The run status of this processor.
- *
- * @return
+ * @return run status of this processor
*/
public String getRunStatus() {
return runStatus;
@@ -94,10 +86,8 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The total count and size of flow files that have been accepted in the
- * last five minutes.
- *
- * @return The total processed
+ * @return The total count and size of flow files that have been accepted in the
+ * last five minutes
*/
public String getInput() {
return input;
@@ -108,9 +98,7 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The number of bytes read.
- *
- * @return
+ * @return number of bytes read
*/
public String getRead() {
return read;
@@ -121,9 +109,7 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The number of bytes written.
- *
- * @return
+ * @return number of bytes written
*/
public String getWritten() {
return written;
@@ -134,8 +120,6 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The ID of the Process Group to which this processor belongs.
- *
* @return the ID of the Process Group to which this processor belongs.
*/
public String getGroupId() {
@@ -147,10 +131,8 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The total count and size of flow files that have been processed in the
- * last five minutes.
- *
- * @return The total output
+ * @return The total count and size of flow files that have been processed in the
+ * last five minutes
*/
public String getOutput() {
return output;
@@ -161,9 +143,7 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The number of threads currently running for this Processor
- *
- * @return
+ * @return number of threads currently running for this Processor
*/
public Integer getActiveThreadCount() {
return activeThreadCount;
@@ -174,9 +154,7 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The number of task this connectable has had over the last 5 minutes.
- *
- * @return
+ * @return number of task this connectable has had over the last 5 minutes
*/
public String getTasks() {
return tasks;
@@ -187,10 +165,8 @@ public class ProcessorStatusDTO extends StatusDTO {
}
/**
- * The total duration of all tasks for this connectable over the last 5
- * minutes.
- *
- * @return
+ * @return total duration of all tasks for this connectable over the last 5
+ * minutes
*/
public String getTasksDuration() {
return tasksDuration;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
index a8fcc9f..58f6161 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
@@ -31,9 +31,7 @@ public class RemotePortStatusDTO {
private Boolean exists;
/**
- * The id of the connection this remote port is connected to.
- *
- * @return
+ * @return id of the connection this remote port is connected to
*/
public String getConnectionId() {
return connectionId;
@@ -44,9 +42,7 @@ public class RemotePortStatusDTO {
}
/**
- * The id of the remote port.
- *
- * @return
+ * @return id of the remote port
*/
public String getId() {
return id;
@@ -57,9 +53,7 @@ public class RemotePortStatusDTO {
}
/**
- * The name of the remote port.
- *
- * @return
+ * @return name of the remote port
*/
public String getName() {
return name;
@@ -70,9 +64,7 @@ public class RemotePortStatusDTO {
}
/**
- * Whether or not the remote port exists.
- *
- * @return
+ * @return whether or not the remote port exists
*/
public Boolean getExists() {
return exists;
@@ -83,9 +75,7 @@ public class RemotePortStatusDTO {
}
/**
- * Whether or not the remote port is running.
- *
- * @return
+ * @return whether or not the remote port is running
*/
public Boolean getRunning() {
return running;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
index 363d4da..68aa5d6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
@@ -38,8 +38,6 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
private String received;
/**
- * The id for the remote process group.
- *
* @return The id for the remote process group
*/
public String getId() {
@@ -51,9 +49,7 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * The id of the group this remote process group is in.
- *
- * @return
+ * @return id of the group this remote process group is in
*/
public String getGroupId() {
return groupId;
@@ -64,9 +60,7 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * The URI of the target system.
- *
- * @return
+ * @return URI of the target system
*/
public String getTargetUri() {
return targetUri;
@@ -77,9 +71,7 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * The name of this remote process group.
- *
- * @return
+ * @return name of this remote process group
*/
public String getName() {
return name;
@@ -90,9 +82,7 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * The transmission status of this remote process group.
- *
- * @return
+ * @return transmission status of this remote process group
*/
public String getTransmissionStatus() {
return transmissionStatus;
@@ -103,9 +93,7 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * The number of active threads.
- *
- * @return
+ * @return number of active threads
*/
public Integer getActiveThreadCount() {
return activeThreadCount;
@@ -116,9 +104,7 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * Returns any remote authorization issues for this remote process group.
- *
- * @return
+ * @return any remote authorization issues for this remote process group
*/
public List<String> getAuthorizationIssues() {
return authorizationIssues;
@@ -129,10 +115,8 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * Formatted description of the amount of data sent to this remote process
- * group.
- *
- * @return
+ * @return Formatted description of the amount of data sent to this remote process
+ * group
*/
public String getSent() {
return sent;
@@ -143,10 +127,8 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
}
/**
- * Formatted description of the amount of data received from this remote
- * process group.
- *
- * @return
+ * @return Formatted description of the amount of data received from this remote
+ * process group
*/
public String getReceived() {
return received;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
index e4e7a45..e922b70 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
@@ -29,9 +29,7 @@ public abstract class StatusDTO {
private List<BulletinDTO> bulletins;
/**
- * Bulletins for this component.
- *
- * @return
+ * @return Bulletins for this component
*/
public List<BulletinDTO> getBulletins() {
return bulletins;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
index a203e10..65823d5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
@@ -47,9 +47,7 @@ public class StatusDescriptorDTO {
}
/**
- * The name of this status field.
- *
- * @return
+ * @return name of this status field
*/
public String getField() {
return field;
@@ -60,9 +58,7 @@ public class StatusDescriptorDTO {
}
/**
- * The label of this status field.
- *
- * @return
+ * @return label of this status field
*/
public String getLabel() {
return label;
@@ -73,9 +69,7 @@ public class StatusDescriptorDTO {
}
/**
- * The description of this status field.
- *
- * @return
+ * @return description of this status field
*/
public String getDescription() {
return description;
@@ -86,9 +80,7 @@ public class StatusDescriptorDTO {
}
/**
- * The formatter for this descriptor.
- *
- * @return
+ * @return formatter for this descriptor
*/
public String getFormatter() {
return formatter;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
index 5b97c16..a996365 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
@@ -37,9 +37,7 @@ public class StatusHistoryDTO {
private List<StatusSnapshotDTO> statusSnapshots;
/**
- * When this status history was generated.
- *
- * @return
+ * @return when this status history was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
public Date getGenerated() {
@@ -51,9 +49,7 @@ public class StatusHistoryDTO {
}
/**
- * The component details for this status history.
- *
- * @return
+ * @return The component details for this status history
*/
public LinkedHashMap<String, String> getDetails() {
return details;
@@ -64,9 +60,7 @@ public class StatusHistoryDTO {
}
/**
- * Descriptors for each supported status field.
- *
- * @return
+ * @return Descriptors for each supported status field
*/
public List<StatusDescriptorDTO> getFieldDescriptors() {
return fieldDescriptors;
@@ -77,9 +71,7 @@ public class StatusHistoryDTO {
}
/**
- * The status snapshots.
- *
- * @return
+ * @return The status snapshots
*/
public List<StatusSnapshotDTO> getStatusSnapshots() {
return statusSnapshots;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
index b9d16bb..4ebb5e3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
@@ -28,9 +28,7 @@ public class StatusHistoryDetailDTO {
private String value;
/**
- * The label for this status detail.
- *
- * @return
+ * @return label for this status detail
*/
public String getLabel() {
return label;
@@ -41,9 +39,7 @@ public class StatusHistoryDetailDTO {
}
/**
- * The value for this status detail.
- *
- * @return
+ * @return value for this status detail
*/
public String getValue() {
return value;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
index cc6894a..b39fd60 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
@@ -30,9 +30,7 @@ public class StatusSnapshotDTO {
private Map<String, Long> statusMetrics;
/**
- * The timestamp of this snapshot.
- *
- * @return
+ * @return timestamp of this snapshot
*/
public Date getTimestamp() {
return timestamp;
@@ -43,9 +41,7 @@ public class StatusSnapshotDTO {
}
/**
- * The status metrics.
- *
- * @return
+ * @return status metrics
*/
public Map<String, Long> getStatusMetrics() {
return statusMetrics;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java
index eed1305..103a937 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java
@@ -32,9 +32,7 @@ public class AuthorityEntity extends Entity {
private Set<String> authorities;
/**
- * The current user id.
- *
- * @return
+ * @return current user id
*/
public String getUserId() {
return userId;
@@ -45,9 +43,7 @@ public class AuthorityEntity extends Entity {
}
/**
- * The set of authorities that are being serialized.
- *
- * @return
+ * @return set of authorities that are being serialized
*/
public Set<String> getAuthorities() {
return authorities;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java
index 546bd8b..ad1c1a5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java
@@ -31,9 +31,7 @@ public class ClusterSearchResultsEntity {
private List<NodeSearchResultDTO> nodeResults;
/**
- * The node search results.
- *
- * @return
+ * @return node search results
*/
public List<NodeSearchResultDTO> getNodeResults() {
return nodeResults;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
index 69ae937..2791bfa 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
@@ -30,9 +30,7 @@ public class ConnectionEntity extends Entity {
private ConnectionDTO connection;
/**
- * The RelationshipDTO that is being serialized.
- *
- * @return
+ * @return RelationshipDTO that is being serialized
*/
public ConnectionDTO getConnection() {
return connection;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
index c69c69a..7988d12 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
@@ -32,9 +32,7 @@ public class ConnectionsEntity extends Entity {
private Set<ConnectionDTO> connections;
/**
- * The list of ConnectionDTOs that are being serialized.
- *
- * @return
+ * @return list of ConnectionDTOs that are being serialized
*/
public Set<ConnectionDTO> getConnections() {
return connections;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceEntity.java
index 44364e7..65c38a9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceEntity.java
@@ -21,7 +21,7 @@ import org.apache.nifi.web.api.dto.ControllerServiceDTO;
/**
* A serialized representation of this class can be placed in the entity body of
- * a response to the API. This particular entity holds a reference to a
+ * a response to the API. This particular entity holds a reference to a
* controller service.
*/
@XmlRootElement(name = "controllerServiceEntity")
@@ -30,9 +30,7 @@ public class ControllerServiceEntity extends Entity {
private ControllerServiceDTO controllerService;
/**
- * The controller service that is being serialized.
- *
- * @return
+ * @return controller service that is being serialized
*/
public ControllerServiceDTO getControllerService() {
return controllerService;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceReferencingComponentsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceReferencingComponentsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceReferencingComponentsEntity.java
index 6010f93..6999927 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceReferencingComponentsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceReferencingComponentsEntity.java
@@ -31,9 +31,8 @@ public class ControllerServiceReferencingComponentsEntity extends Entity {
private Set<ControllerServiceReferencingComponentDTO> controllerServiceReferencingComponents;
/**
- * The list of controller service referencing components that are being serialized.
- *
- * @return
+ * @return list of controller service referencing components that are being
+ * serialized
*/
public Set<ControllerServiceReferencingComponentDTO> getControllerServiceReferencingComponents() {
return controllerServiceReferencingComponents;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceTypesEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceTypesEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceTypesEntity.java
index dafb8c2..580a76e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceTypesEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServiceTypesEntity.java
@@ -31,9 +31,7 @@ public class ControllerServiceTypesEntity extends Entity {
private Set<DocumentedTypeDTO> controllerServiceTypes;
/**
- * The list of controller service types that are being serialized.
- *
- * @return
+ * @return list of controller service types that are being serialized
*/
public Set<DocumentedTypeDTO> getControllerServiceTypes() {
return controllerServiceTypes;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java
index 4485b43..cda93c4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java
@@ -31,9 +31,7 @@ public class ControllerServicesEntity extends Entity {
private Set<ControllerServiceDTO> controllerServices;
/**
- * The list of controller services that are being serialized.
- *
- * @return
+ * @return list of controller services that are being serialized
*/
public Set<ControllerServiceDTO> getControllerServices() {
return controllerServices;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java
index 666dc75..ef329b8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java
@@ -30,9 +30,7 @@ public class CounterEntity extends Entity {
private CounterDTO counter;
/**
- * Get the counter.
- *
- * @return
+ * @return the counter
*/
public CounterDTO getCounter() {
return counter;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java
index bee7669..c1991a1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java
@@ -30,10 +30,8 @@ public class CountersEntity extends Entity {
private CountersDTO counters;
/**
- * Get the counters which contains all the counter groups and a generation
- * date.
- *
- * @return
+ * @return the counters which contains all the counter groups and a generation
+ * date
*/
public CountersDTO getCounters() {
return counters;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
index 6abcbf3..e2bb3e7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
@@ -28,9 +28,7 @@ public class Entity {
private RevisionDTO revision;
/**
- * A revision for this request/response.
- *
- * @return
+ * @return revision for this request/response
*/
public RevisionDTO getRevision() {
return revision;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java
index 2b8cbc8..4586c9d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java
@@ -32,9 +32,7 @@ public class FunnelsEntity extends Entity {
private Set<FunnelDTO> funnels;
/**
- * The collection of FunnelDTOs that are being serialized.
- *
- * @return
+ * @return collection of FunnelDTOs that are being serialized
*/
public Set<FunnelDTO> getFunnels() {
return funnels;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java
index 9fec9d8..dc497b5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java
@@ -30,9 +30,7 @@ public class InputPortEntity extends Entity {
private PortDTO inputPort;
/**
- * The input PortDTO that are being serialized.
- *
- * @return
+ * @return input PortDTO that are being serialized
*/
public PortDTO getInputPort() {
return inputPort;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java
index 8637596..a112fdd 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java
@@ -32,9 +32,7 @@ public class InputPortsEntity extends Entity {
private Set<PortDTO> inputPorts;
/**
- * The collection of input PortDTOs that are being serialized.
- *
- * @return
+ * @return collection of input PortDTOs that are being serialized
*/
public Set<PortDTO> getInputPorts() {
return inputPorts;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java
index 063eeaf..d4b9681 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java
@@ -32,9 +32,7 @@ public class LabelsEntity extends Entity {
private Set<LabelDTO> labels;
/**
- * The collection of LabelDTOs that are being serialized.
- *
- * @return
+ * @return collection of LabelDTOs that are being serialized
*/
public Set<LabelDTO> getLabels() {
return labels;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java
index 07fdab7..7c5145e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java
@@ -30,9 +30,7 @@ public class OutputPortEntity extends Entity {
private PortDTO outputPort;
/**
- * The output PortDTO that are being serialized.
- *
- * @return
+ * @return output PortDTO that are being serialized
*/
public PortDTO getOutputPort() {
return outputPort;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java
index 9fa398d..0127190 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java
@@ -32,9 +32,7 @@ public class OutputPortsEntity extends Entity {
private Set<PortDTO> outputPorts;
/**
- * The collection of output PortDTOs that are being serialized.
- *
- * @return
+ * @return collection of output PortDTOs that are being serialized
*/
public Set<PortDTO> getOutputPorts() {
return outputPorts;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java
index 2ddddd8..2e3f545 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java
@@ -31,9 +31,7 @@ public class PrioritizerTypesEntity extends Entity {
private Set<DocumentedTypeDTO> prioritizerTypes;
/**
- * The list of prioritizer types that are being serialized.
- *
- * @return
+ * @return list of prioritizer types that are being serialized
*/
public Set<DocumentedTypeDTO> getPrioritizerTypes() {
return prioritizerTypes;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java
index 23237fe..fa584ce 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java
@@ -31,9 +31,7 @@ public class ProcessorTypesEntity extends Entity {
private Set<DocumentedTypeDTO> processorTypes;
/**
- * The list of processor types that are being serialized.
- *
- * @return
+ * @return list of processor types that are being serialized
*/
public Set<DocumentedTypeDTO> getProcessorTypes() {
return processorTypes;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java
index 4962b38..201f5aa 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java
@@ -32,9 +32,7 @@ public class ProcessorsEntity extends Entity {
private Set<ProcessorDTO> processors;
/**
- * The collection of ProcessorDTOs that are being serialized.
- *
- * @return
+ * @return collection of ProcessorDTOs that are being serialized
*/
public Set<ProcessorDTO> getProcessors() {
return processors;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PropertyDescriptorEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PropertyDescriptorEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PropertyDescriptorEntity.java
index 9251b7f..87ca4a3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PropertyDescriptorEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PropertyDescriptorEntity.java
@@ -17,7 +17,6 @@
package org.apache.nifi.web.api.entity;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
import org.apache.nifi.web.api.dto.PropertyDescriptorDTO;
/**
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java
index 72a8528..c26f9aa 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java
@@ -25,9 +25,7 @@ public class ProvenanceEntity extends Entity {
private ProvenanceDTO provenance;
/**
- * The provenance .
- *
- * @return
+ * @return provenance
*/
public ProvenanceDTO getProvenance() {
return provenance;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java
index a04c789..a94b42f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java
@@ -32,9 +32,7 @@ public class RemoteProcessGroupsEntity extends Entity {
private Set<RemoteProcessGroupDTO> remoteProcessGroups;
/**
- * The collection of RemoteProcessGroupDTOs that are being serialized.
- *
- * @return
+ * @return collection of RemoteProcessGroupDTOs that are being serialized
*/
public Set<RemoteProcessGroupDTO> getRemoteProcessGroups() {
return remoteProcessGroups;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskEntity.java
index a372751..2177564 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskEntity.java
@@ -21,7 +21,7 @@ import org.apache.nifi.web.api.dto.ReportingTaskDTO;
/**
* A serialized representation of this class can be placed in the entity body of
- * a response to the API. This particular entity holds a reference to a
+ * a response to the API. This particular entity holds a reference to a
* reporting task.
*/
@XmlRootElement(name = "reportingTaskEntity")
@@ -30,9 +30,7 @@ public class ReportingTaskEntity extends Entity {
private ReportingTaskDTO reportingTask;
/**
- * The reporting task that is being serialized.
- *
- * @return
+ * @return reporting task that is being serialized
*/
public ReportingTaskDTO getReportingTask() {
return reportingTask;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskTypesEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskTypesEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskTypesEntity.java
index 4b021ef..c527ec7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskTypesEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTaskTypesEntity.java
@@ -31,9 +31,7 @@ public class ReportingTaskTypesEntity extends Entity {
private Set<DocumentedTypeDTO> reportingTaskTypes;
/**
- * The list of reporting task types that are being serialized.
- *
- * @return
+ * @return list of reporting task types that are being serialized
*/
public Set<DocumentedTypeDTO> getReportingTaskTypes() {
return reportingTaskTypes;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTasksEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTasksEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTasksEntity.java
index 4699d5d..4f7be11 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTasksEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ReportingTasksEntity.java
@@ -31,9 +31,7 @@ public class ReportingTasksEntity extends Entity {
private Set<ReportingTaskDTO> reportingTasks;
/**
- * The list of reporting tasks that are being serialized.
- *
- * @return
+ * @return list of reporting tasks that are being serialized
*/
public Set<ReportingTaskDTO> getReportingTasks() {
return reportingTasks;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java
index 6b9a88b..01e6918 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java
@@ -31,9 +31,7 @@ public class SearchResultsEntity {
private SearchResultsDTO searchResultsDTO;
/**
- * The search results.
- *
- * @return
+ * @return search results
*/
public SearchResultsDTO getSearchResultsDTO() {
return searchResultsDTO;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java
index 3400045..3ff5bc6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java
@@ -48,9 +48,7 @@ public class TemplatesEntity extends Entity {
}
/**
- * When this content was generated.
- *
- * @return
+ * @return When this content was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
public Date getGenerated() {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java
index baffe15..eece172 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java
@@ -33,9 +33,7 @@ public class UserSearchResultsEntity {
private List<UserGroupSearchResultDTO> userGroupResults;
/**
- * The user search results.
- *
- * @return
+ * @return user search results
*/
public List<UserSearchResultDTO> getUserResults() {
return userResults;
@@ -46,9 +44,7 @@ public class UserSearchResultsEntity {
}
/**
- * The user group search results.
- *
- * @return
+ * @return user group search results
*/
public List<UserGroupSearchResultDTO> getUserGroupResults() {
return userGroupResults;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java
index 2d11d1f..180b650 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java
@@ -48,9 +48,7 @@ public class UsersEntity extends Entity {
}
/**
- * When this content was generated.
- *
- * @return
+ * @return When this content was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
public Date getGenerated() {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
index 66ed652..b70b829 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
@@ -18,6 +18,7 @@ package org.apache.nifi.framework.security.util;
/**
* Represents the exceptional case when a SSL context failed creation.
+ *
* @author unattributed
*/
public class SslContextCreationException extends SslException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
index ebb1f91..82a6458 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
@@ -32,33 +32,36 @@ import org.apache.nifi.util.NiFiProperties;
import org.apache.commons.lang3.StringUtils;
/**
- * A factory for creating SSL contexts using the application's security properties.
+ * A factory for creating SSL contexts using the application's security
+ * properties.
+ *
* @author unattributed
*/
public final class SslContextFactory {
public static enum ClientAuth {
+
WANT,
REQUIRED,
NONE
}
-
+
public static SSLContext createSslContext(final NiFiProperties props)
throws SslContextCreationException {
return createSslContext(props, false);
}
-
+
public static SSLContext createSslContext(final NiFiProperties props, final boolean strict)
throws SslContextCreationException {
final boolean hasKeystoreProperties = hasKeystoreProperties(props);
- if(hasKeystoreProperties == false) {
- if(strict) {
+ if (hasKeystoreProperties == false) {
+ if (strict) {
throw new SslContextCreationException("SSL context cannot be created because keystore properties have not been configured.");
} else {
return null;
}
- } else if(props.getNeedClientAuth() && hasTruststoreProperties(props) == false) {
+ } else if (props.getNeedClientAuth() && hasTruststoreProperties(props) == false) {
throw new SslContextCreationException("Need client auth is set to 'true', but no truststore properties are configured.");
}
@@ -66,7 +69,7 @@ public final class SslContextFactory {
// prepare the trust store
final KeyStore trustStore;
- if(hasTruststoreProperties(props)) {
+ if (hasTruststoreProperties(props)) {
trustStore = KeyStore.getInstance(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE));
try (final InputStream trustStoreStream = new FileInputStream(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE))) {
trustStore.load(trustStoreStream, props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD).toCharArray());
@@ -83,7 +86,7 @@ public final class SslContextFactory {
keyStore.load(keyStoreStream, props.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).toCharArray());
}
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-
+
// if the key password is provided, try to use that - otherwise default to the keystore password
if (StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_KEY_PASSWD))) {
keyManagerFactory.init(keyStore, props.getProperty(NiFiProperties.SECURITY_KEY_PASSWD).toCharArray());
@@ -94,26 +97,26 @@ public final class SslContextFactory {
// initialize the ssl context
final SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(keyManagerFactory.getKeyManagers(),
- trustManagerFactory.getTrustManagers(), null);
+ trustManagerFactory.getTrustManagers(), null);
sslContext.getDefaultSSLParameters().setNeedClientAuth(props.getNeedClientAuth());
return sslContext;
-
- } catch(final KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException | UnrecoverableKeyException | KeyManagementException e) {
+
+ } catch (final KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException | UnrecoverableKeyException | KeyManagementException e) {
throw new SslContextCreationException(e);
}
}
private static boolean hasKeystoreProperties(final NiFiProperties props) {
- return (StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_KEYSTORE)) &&
- StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD)) &&
- StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)) );
+ return (StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_KEYSTORE))
+ && StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD))
+ && StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)));
}
private static boolean hasTruststoreProperties(final NiFiProperties props) {
- return (StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)) &&
- StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD)) &&
- StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE)) );
+ return (StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE))
+ && StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD))
+ && StringUtils.isNotBlank(props.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE)));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
index 0ec9672..e623a4c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
@@ -18,6 +18,7 @@ package org.apache.nifi.framework.security.util;
/**
* Base class for SSL related exceptions.
+ *
* @author unattributed
*/
public class SslException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java
index b7acd6d..59ea312 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java
@@ -25,29 +25,30 @@ import javax.net.ssl.SSLServerSocketFactory;
import org.apache.nifi.util.NiFiProperties;
/**
- * Implements a server socket factory for creating secure server sockets based on
- * the application's configuration properties. If the properties are configured
- * for SSL (one-way or two-way), then a SSLServerSocketFactory is created and used
- * based on those properties. Otherwise, Java's default SSLServerSocketFactory
- * is used. Specifically, SSLContext.getDefault().getServerSocketFactory().
+ * Implements a server socket factory for creating secure server sockets based
+ * on the application's configuration properties. If the properties are
+ * configured for SSL (one-way or two-way), then a SSLServerSocketFactory is
+ * created and used based on those properties. Otherwise, Java's default
+ * SSLServerSocketFactory is used. Specifically,
+ * SSLContext.getDefault().getServerSocketFactory().
*/
public class SslServerSocketFactory extends SSLServerSocketFactory {
-
+
private SSLServerSocketFactory sslServerSocketFactory;
public SslServerSocketFactory() {
final SSLContext sslCtx = SslContextFactory.createSslContext(NiFiProperties.getInstance());
- if(sslCtx == null) {
+ if (sslCtx == null) {
try {
sslServerSocketFactory = SSLContext.getDefault().getServerSocketFactory();
- } catch(final NoSuchAlgorithmException nsae) {
+ } catch (final NoSuchAlgorithmException nsae) {
throw new SslServerSocketFactoryCreationException(nsae);
}
} else {
sslServerSocketFactory = sslCtx.getServerSocketFactory();
}
}
-
+
@Override
public ServerSocket createServerSocket(int i, int i1, InetAddress ia) throws IOException {
return sslServerSocketFactory.createServerSocket(i, i1, ia);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
index 06c305c..faa726a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
@@ -17,7 +17,9 @@
package org.apache.nifi.framework.security.util;
/**
- * Represents the exceptional case when a SslServerSocketFactory failed creation.
+ * Represents the exceptional case when a SslServerSocketFactory failed
+ * creation.
+ *
* @author unattributed
*/
public class SslServerSocketFactoryCreationException extends SslException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java
index 006b352..da0e7fb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java
@@ -26,10 +26,11 @@ import javax.net.ssl.SSLSocketFactory;
import org.apache.nifi.util.NiFiProperties;
/**
- * Implements a socket factory for creating secure sockets based on the application's
- * configuration properties. If the properties are configured for SSL (one-way or two-way),
- * then a SSLSocketFactory is created and used based on those properties. Otherwise,
- * Java's default SSLSocketFactory is used. Specifically, SSLContext.getDefault().getSocketFactory().
+ * Implements a socket factory for creating secure sockets based on the
+ * application's configuration properties. If the properties are configured for
+ * SSL (one-way or two-way), then a SSLSocketFactory is created and used based
+ * on those properties. Otherwise, Java's default SSLSocketFactory is used.
+ * Specifically, SSLContext.getDefault().getSocketFactory().
*/
public class SslSocketFactory extends SSLSocketFactory {
@@ -37,17 +38,17 @@ public class SslSocketFactory extends SSLSocketFactory {
public SslSocketFactory() {
final SSLContext sslCtx = SslContextFactory.createSslContext(NiFiProperties.getInstance());
- if(sslCtx == null) {
+ if (sslCtx == null) {
try {
sslSocketFactory = SSLContext.getDefault().getSocketFactory();
- } catch(final NoSuchAlgorithmException nsae) {
+ } catch (final NoSuchAlgorithmException nsae) {
throw new SslSocketFactoryCreationException(nsae);
}
} else {
sslSocketFactory = sslCtx.getSocketFactory();
}
}
-
+
@Override
public String[] getSupportedCipherSuites() {
return sslSocketFactory.getSupportedCipherSuites();
@@ -57,7 +58,7 @@ public class SslSocketFactory extends SSLSocketFactory {
public String[] getDefaultCipherSuites() {
return sslSocketFactory.getDefaultCipherSuites();
}
-
+
@Override
public Socket createSocket(Socket socket, String string, int i, boolean bln) throws IOException {
return sslSocketFactory.createSocket(socket, string, i, bln);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
index 6795f90..02c242e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
@@ -18,6 +18,7 @@ package org.apache.nifi.framework.security.util;
/**
* Represents the exceptional case when a SslSocketFactory failed creation.
+ *
* @author unattributed
*/
public class SslSocketFactoryCreationException extends SslException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
index e619e80..8ecb798 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.nifi.framework.security.util;
-import org.apache.nifi.framework.security.util.SslContextFactory;
import org.apache.nifi.security.util.KeystoreType;
import java.io.File;
import org.apache.nifi.util.NiFiProperties;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* @author unattributed
@@ -38,13 +38,13 @@ public class SslContextFactoryTest {
final File ksFile = new File(SslContextFactoryTest.class.getResource("/localhost-ks.jks").toURI());
final File trustFile = new File(SslContextFactoryTest.class.getResource("/localhost-ts.jks").toURI());
-
+
authProps = mock(NiFiProperties.class);
when(authProps.getProperty(NiFiProperties.SECURITY_KEYSTORE)).thenReturn(ksFile.getAbsolutePath());
when(authProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)).thenReturn(KeystoreType.JKS.toString());
when(authProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD)).thenReturn("localtest");
when(authProps.getNeedClientAuth()).thenReturn(false);
-
+
mutualAuthProps = mock(NiFiProperties.class);
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_KEYSTORE)).thenReturn(ksFile.getAbsolutePath());
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)).thenReturn(KeystoreType.JKS.toString());
@@ -53,17 +53,17 @@ public class SslContextFactoryTest {
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE)).thenReturn(KeystoreType.JKS.toString());
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD)).thenReturn("localtest");
when(mutualAuthProps.getNeedClientAuth()).thenReturn(true);
-
- }
+
+ }
@Test
public void testCreateSslContextWithMutualAuth() {
- Assert.assertNotNull(SslContextFactory.createSslContext(mutualAuthProps));
+ Assert.assertNotNull(SslContextFactory.createSslContext(mutualAuthProps));
}
@Test
public void testCreateSslContextWithNoMutualAuth() {
- Assert.assertNotNull(SslContextFactory.createSslContext(authProps));
+ Assert.assertNotNull(SslContextFactory.createSslContext(authProps));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
index 3b086bb..173e2cf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
@@ -59,8 +59,8 @@
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-site-to-site-client</artifactId>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-site-to-site-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java
index 10208f8..8f1f7f6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java
@@ -46,42 +46,41 @@ public class RemoteProcessGroupUtils {
private static final int CONNECT_TIMEOUT = 10000;
private static final int READ_TIMEOUT = 10000;
-
+
private final Client client;
-
+
public RemoteProcessGroupUtils(final SSLContext sslContext) {
this.client = getClient(sslContext);
}
-
/**
* Gets the content at the specified URI.
*
- * @param uri
- * @param timeoutMillis
- * @return
- * @throws ClientHandlerException
- * @throws UniformInterfaceException
+ * @param uri the URI to get the content of
+ * @param timeoutMillis the period of time to wait
+ * @return the response of the request
+ * @throws ClientHandlerException issues handling the response
+ * @throws UniformInterfaceException issues with the request
*/
public ClientResponse get(final URI uri, final int timeoutMillis) throws ClientHandlerException, UniformInterfaceException {
return get(uri, timeoutMillis, null);
}
-
+
/**
* Gets the content at the specified URI using the given query parameters.
*
- * @param uri
- * @param timeoutMillis
- * @param queryParams
- * @return
- * @throws ClientHandlerException
- * @throws UniformInterfaceException
+ * @param uri the uri to get the content of
+ * @param timeoutMillis the period of time to wait for a response
+ * @param queryParams the query params of the request
+ * @return the client response of the request
+ * @throws ClientHandlerException issues with the response
+ * @throws UniformInterfaceException issues with the request
*/
public ClientResponse get(final URI uri, final int timeoutMillis, final Map<String, String> queryParams) throws ClientHandlerException, UniformInterfaceException {
// perform the request
WebResource webResource = client.resource(uri);
- if ( queryParams != null ) {
- for ( final Map.Entry<String, String> queryEntry : queryParams.entrySet() ) {
+ if (queryParams != null) {
+ for (final Map.Entry<String, String> queryEntry : queryParams.entrySet()) {
webResource = webResource.queryParam(queryEntry.getKey(), queryEntry.getValue());
}
}
@@ -95,11 +94,11 @@ public class RemoteProcessGroupUtils {
/**
* Performs a HEAD request to the specified URI.
*
- * @param uri
- * @param timeoutMillis
- * @return
- * @throws ClientHandlerException
- * @throws UniformInterfaceException
+ * @param uri the uri to request the head of
+ * @param timeoutMillis the period of time to wait for a reponse
+ * @return the client response
+ * @throws ClientHandlerException issues with the request
+ * @throws UniformInterfaceException issues with the response
*/
public ClientResponse head(final URI uri, final int timeoutMillis) throws ClientHandlerException, UniformInterfaceException {
// perform the request
@@ -110,10 +109,10 @@ public class RemoteProcessGroupUtils {
}
/**
- * Gets a client based on the specified URI.
- *
- * @param uri
- * @return
+ * Gets a client for the given sslContext
+ *
+ * @param sslContext the ssl context to get a client for
+ * @return the client
*/
private Client getClient(final SSLContext sslContext) {
final Client client;
@@ -128,26 +127,28 @@ public class RemoteProcessGroupUtils {
return client;
}
-
-
+
/**
- * Returns the port on which the remote instance is listening for Flow File transfers, or <code>null</code> if the remote instance
- * is not configured to use Site-to-Site transfers.
- *
- * @param uri the base URI of the remote instance. This should include the path only to the nifi-api level, as well as the protocol, host, and port.
- * @param timeoutMillis
- * @return
- * @throws IOException
+ * Returns the port on which the remote instance is listening for Flow File
+ * transfers, or <code>null</code> if the remote instance is not configured
+ * to use Site-to-Site transfers.
+ *
+ * @param uri the base URI of the remote instance. This should include the
+ * path only to the nifi-api level, as well as the protocol, host, and port.
+ * @param timeoutMillis the period of time to wait for the port
+ * @return the port
+ * @throws IOException if an error occurs getting the remote port
+ * information
*/
public Integer getRemoteListeningPort(final String uri, final int timeoutMillis) throws IOException {
- try {
- final URI uriObject = new URI(uri + CONTROLLER_URI_PATH);
- return getRemoteListeningPort(uriObject, timeoutMillis);
- } catch (URISyntaxException e) {
- throw new IOException("Unable to establish connection to remote host because URI is invalid: " + uri);
- }
+ try {
+ final URI uriObject = new URI(uri + CONTROLLER_URI_PATH);
+ return getRemoteListeningPort(uriObject, timeoutMillis);
+ } catch (URISyntaxException e) {
+ throw new IOException("Unable to establish connection to remote host because URI is invalid: " + uri);
+ }
}
-
+
public String getRemoteRootGroupId(final String uri, final int timeoutMillis) throws IOException {
try {
final URI uriObject = new URI(uri + CONTROLLER_URI_PATH);
@@ -156,7 +157,7 @@ public class RemoteProcessGroupUtils {
throw new IOException("Unable to establish connection to remote host because URI is invalid: " + uri);
}
}
-
+
public String getRemoteInstanceId(final String uri, final int timeoutMillis) throws IOException {
try {
final URI uriObject = new URI(uri + CONTROLLER_URI_PATH);
@@ -165,26 +166,27 @@ public class RemoteProcessGroupUtils {
throw new IOException("Unable to establish connection to remote host because URI is invalid: " + uri);
}
}
-
+
/**
- * Returns the port on which the remote instance is listening for Flow File transfers, or <code>null</code> if the remote instance
- * is not configured to use Site-to-Site transfers.
- *
+ * Returns the port on which the remote instance is listening for Flow File
+ * transfers, or <code>null</code> if the remote instance is not configured
+ * to use Site-to-Site transfers.
+ *
* @param uri the full URI to fetch, including the path.
- * @return
- * @throws IOException
+ * @return the remote listening port
+ * @throws IOException if unable to get port
*/
private Integer getRemoteListeningPort(final URI uri, final int timeoutMillis) throws IOException {
- return getController(uri, timeoutMillis).getRemoteSiteListeningPort();
+ return getController(uri, timeoutMillis).getRemoteSiteListeningPort();
}
-
+
private String getRemoteRootGroupId(final URI uri, final int timeoutMillis) throws IOException {
return getController(uri, timeoutMillis).getId();
}
-
+
private ControllerDTO getController(final URI uri, final int timeoutMillis) throws IOException {
final ClientResponse response = get(uri, timeoutMillis);
-
+
if (Status.OK.getStatusCode() == response.getStatusInfo().getStatusCode()) {
final ControllerEntity entity = response.getEntity(ControllerEntity.class);
return entity.getController();
@@ -193,12 +195,12 @@ public class RemoteProcessGroupUtils {
throw new IOException("Got HTTP response Code " + response.getStatusInfo().getStatusCode() + ": " + response.getStatusInfo().getReasonPhrase() + " with explanation: " + responseMessage);
}
}
-
+
/**
* Issues a registration request on behalf of the current user.
- *
- * @param baseApiUri
- * @return
+ *
+ * @param baseApiUri the URI to issue a request to
+ * @return the response of the request
*/
public ClientResponse issueRegistrationRequest(String baseApiUri) {
final URI uri = URI.create(String.format("%s/%s", baseApiUri, "/controller/users"));
@@ -206,10 +208,10 @@ public class RemoteProcessGroupUtils {
// set up the query params
MultivaluedMapImpl entity = new MultivaluedMapImpl();
entity.add("justification", "A Remote instance of NiFi has attempted to create a reference to this NiFi. This action must be approved first.");
-
+
// create the web resource
WebResource webResource = client.resource(uri);
-
+
// get the client utils and make the request
return webResource.accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_FORM_URLENCODED).entity(entity).post(ClientResponse.class);
}