[08/12] incubator-nifi git commit: NIFI-271
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e1160f59/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
index 5d233f7..137cc07 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
@@ -85,8 +85,8 @@ public class ConnectionResource extends ApplicationResource {
/**
* Populate the uri's for the specified processors and their relationships.
*
- * @param connections
- * @return
+ * @param connections connections
+ * @return dtos
*/
public SetConnectionDTO
populateRemainingConnectionsContent(SetConnectionDTO connections) {
for (ConnectionDTO connection : connections) {
@@ -97,9 +97,6 @@ public class ConnectionResource extends ApplicationResource {
/**
* Populate the uri's for the specified processor and its relationships.
- *
- * @param connection
- * @return
*/
private ConnectionDTO populateRemainingConnectionContent(ConnectionDTO
connection) {
// populate the remaining properties
@@ -110,9 +107,7 @@ public class ConnectionResource extends ApplicationResource
{
/**
* Gets all the connections.
*
- * @param clientId Optional client id. If the client id is not specified, a
- * new one will be generated. This value (whether specified or generated)
is
- * included in the response.
+ * @param clientId Optional client id. If the client id is not specified,
a new one will be generated. This value (whether specified or generated) is
included in the response.
* @return A connectionsEntity.
*/
@GET
@@ -145,9 +140,7 @@ public class ConnectionResource extends ApplicationResource
{
/**
* Retrieves the specified connection.
*
- * @param clientId Optional client id. If the client id is not specified, a
- * new one will be generated. This value (whether specified or generated)
is
- * included in the response.
+ * @param clientId Optional client id. If the client id is not specified,
a new one will be generated. This value (whether specified or generated) is
included in the response.
* @param id The id of the connection.
* @return A connectionEntity.
*/
@@ -183,9 +176,7 @@ public class ConnectionResource extends ApplicationResource
{
/**
* Retrieves the specified connection status history.
*
- * @param clientId Optional client id. If the client id is not specified, a
- * new one will be generated. This value (whether specified or generated)
is
- * included in the response.
+ * @param clientId Optional client id. If the client id is not specified,
a new one will be generated. This value (whether specified or generated) is
included in the response.
* @param id The id of the connection to retrieve.
* @return A statusHistoryEntity.
*/
@@ -220,12 +211,9 @@ public class ConnectionResource extends
ApplicationResource {
/**
* Creates a connection.
*
- * @param httpServletRequest
- * @param version The revision is used to verify the client is working with
- * the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a
- * new one will be generated. This value (whether specified or generated)
is
- * included in the response.
+ * @param httpServletRequest request
+ * @param version The revision is used to verify the client is working
with the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified,
a new one will be generated. This value (whether specified or generated) is
included in the response.
* @param name The name of the connection.
* @param sourceId The id of the source connectable.
* @param sourceGroupId The parent group id for the source.
@@ -233,19 +221,14 @@ public class ConnectionResource extends
ApplicationResource {
* @param bends Array of bend points in string form [x,y, x,y, x,y]
* @param relationships Array of relationships.
* @param flowFileExpiration The flow file expiration in minutes
- * @param backPressureObjectThreshold The object count for when to apply
- * back pressure.
- * @param backPressureDataSizeThreshold The object size for
[08/12] incubator-nifi git commit: NIFI-271
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
index 0a076ca..21e6b4c 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
@@ -56,54 +56,54 @@ public class FTPTransfer implements FileTransfer {
public static final String PROXY_TYPE_HTTP = Proxy.Type.HTTP.name();
public static final String PROXY_TYPE_SOCKS = Proxy.Type.SOCKS.name();
-public static final PropertyDescriptor CONNECTION_MODE = new
PropertyDescriptor.Builder().
-name(Connection Mode).
-description(The FTP Connection Mode).
-allowableValues(CONNECTION_MODE_ACTIVE, CONNECTION_MODE_PASSIVE).
-defaultValue(CONNECTION_MODE_PASSIVE).
-build();
-public static final PropertyDescriptor TRANSFER_MODE = new
PropertyDescriptor.Builder().
-name(Transfer Mode).
-description(The FTP Transfer Mode).
-allowableValues(TRANSFER_MODE_BINARY, TRANSFER_MODE_ASCII).
-defaultValue(TRANSFER_MODE_BINARY).
-build();
-public static final PropertyDescriptor PORT = new
PropertyDescriptor.Builder().
-name(Port).
-description(The port that the remote system is listening on for
file transfers).
-addValidator(StandardValidators.PORT_VALIDATOR).
-required(true).
-defaultValue(21).
-build();
-public static final PropertyDescriptor PROXY_TYPE = new
PropertyDescriptor.Builder().
-name(Proxy Type).
-description(Proxy type used for file transfers).
-allowableValues(PROXY_TYPE_DIRECT, PROXY_TYPE_HTTP,
PROXY_TYPE_SOCKS).
-defaultValue(PROXY_TYPE_DIRECT).
-build();
-public static final PropertyDescriptor PROXY_HOST = new
PropertyDescriptor.Builder().
-name(Proxy Host).
-description(The fully qualified hostname or IP address of the
proxy server).
-addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
-build();
-public static final PropertyDescriptor PROXY_PORT = new
PropertyDescriptor.Builder().
-name(Proxy Port).
-description(The port of the proxy server).
-addValidator(StandardValidators.PORT_VALIDATOR).
-build();
-public static final PropertyDescriptor HTTP_PROXY_USERNAME = new
PropertyDescriptor.Builder().
-name(Http Proxy Username).
-description(Http Proxy Username).
-addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
-required(false).
-build();
-public static final PropertyDescriptor HTTP_PROXY_PASSWORD = new
PropertyDescriptor.Builder().
-name(Http Proxy Password).
-description(Http Proxy Password).
-addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
-required(false).
-sensitive(true).
-build();
+public static final PropertyDescriptor CONNECTION_MODE = new
PropertyDescriptor.Builder()
+.name(Connection Mode)
+.description(The FTP Connection Mode)
+.allowableValues(CONNECTION_MODE_ACTIVE, CONNECTION_MODE_PASSIVE)
+.defaultValue(CONNECTION_MODE_PASSIVE)
+.build();
+public static final PropertyDescriptor TRANSFER_MODE = new
PropertyDescriptor.Builder()
+.name(Transfer Mode)
+.description(The FTP Transfer Mode)
+.allowableValues(TRANSFER_MODE_BINARY, TRANSFER_MODE_ASCII)
+.defaultValue(TRANSFER_MODE_BINARY)
+.build();
+public static final PropertyDescriptor PORT = new
PropertyDescriptor.Builder()
+.name(Port)
+.description(The port that the remote system is listening on for
file transfers)
+.addValidator(StandardValidators.PORT_VALIDATOR)
+.required(true)
+.defaultValue(21)
+.build();
+public static final PropertyDescriptor PROXY_TYPE = new
PropertyDescriptor.Builder()
+.name(Proxy Type)
+.description(Proxy type used for file transfers)
+.allowableValues(PROXY_TYPE_DIRECT, PROXY_TYPE_HTTP,
PROXY_TYPE_SOCKS)
+
[08/12] 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-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/FieldEvaluator.java
--
diff --git
a/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/FieldEvaluator.java
b/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/FieldEvaluator.java
index 869c2d0..bc8046e 100644
---
a/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/FieldEvaluator.java
+++
b/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/FieldEvaluator.java
@@ -28,40 +28,41 @@ import org.apache.nifi.hl7.query.evaluator.IntegerEvaluator;
@SuppressWarnings(rawtypes)
public class FieldEvaluator implements EvaluatorList {
- private final SegmentEvaluator segmentEvaluator;
- private final IntegerEvaluator indexEvaluator;
-
- public FieldEvaluator(final SegmentEvaluator segmentEvaluator, final
IntegerEvaluator indexEvaluator) {
- this.segmentEvaluator = segmentEvaluator;
- this.indexEvaluator = indexEvaluator;
- }
-
- public ListHL7Field evaluate(final MapString, Object objectMap) {
- final ListHL7Segment segments =
segmentEvaluator.evaluate(objectMap);
- if ( segments == null ) {
- return Collections.emptyList();
- }
-
- final Integer index = indexEvaluator.evaluate(objectMap);
- if ( index == null ) {
- return Collections.emptyList();
- }
-
- final ListHL7Field fields = new ArrayList();
- for ( final HL7Segment segment : segments ) {
- final ListHL7Field segmentFields =
segment.getFields();
- if ( segmentFields.size() = index ) {
- continue;
- }
-
- fields.add(segmentFields.get(index));
- }
-
- return fields;
- }
- public Class? extends List getType() {
- return List.class;
- }
+private final SegmentEvaluator segmentEvaluator;
+private final IntegerEvaluator indexEvaluator;
+
+public FieldEvaluator(final SegmentEvaluator segmentEvaluator, final
IntegerEvaluator indexEvaluator) {
+this.segmentEvaluator = segmentEvaluator;
+this.indexEvaluator = indexEvaluator;
+}
+
+public ListHL7Field evaluate(final MapString, Object objectMap) {
+final ListHL7Segment segments = segmentEvaluator.evaluate(objectMap);
+if (segments == null) {
+return Collections.emptyList();
+}
+
+final Integer index = indexEvaluator.evaluate(objectMap);
+if (index == null) {
+return Collections.emptyList();
+}
+
+final ListHL7Field fields = new ArrayList();
+for (final HL7Segment segment : segments) {
+final ListHL7Field segmentFields = segment.getFields();
+if (segmentFields.size() = index) {
+continue;
+}
+
+fields.add(segmentFields.get(index));
+}
+
+return fields;
+}
+
+public Class? extends List getType() {
+return List.class;
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9faaef8c/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/MessageEvaluator.java
--
diff --git
a/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/MessageEvaluator.java
b/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/MessageEvaluator.java
index 5e08961..f430b50 100644
---
a/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/MessageEvaluator.java
+++
b/nifi/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/evaluator/message/MessageEvaluator.java
@@ -23,12 +23,12 @@ import org.apache.nifi.hl7.query.evaluator.Evaluator;
public class MessageEvaluator implements EvaluatorHL7Message {
- public HL7Message evaluate(final MapString, Object objectMap) {
- return (HL7Message) objectMap.get(Evaluator.MESSAGE_KEY);
- }
+public HL7Message evaluate(final MapString, Object objectMap) {
+return (HL7Message) objectMap.get(Evaluator.MESSAGE_KEY);
+}
- public Class? extends HL7Message getType() {
- return HL7Message.class;
- }
+public Class? extends HL7Message
