[06/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/UserGroupResource.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/UserGroupResource.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java
index 573c407..f7b2009 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java
@@ -54,7 +54,7 @@ public class UserGroupResource extends ApplicationResource {
/*
* Developer Note: Clustering assumes a centralized security provider. The
- * cluster manager will manage user accounts when in clustered mode and
+ * cluster manager will manage user accounts when in clustered mode and
* interface with the authorization provider. However, when nodes perform
* Site-to-Site, the authorization details of the remote NiFi will be
cached
* locally. These details need to be invalidated when certain actions are
@@ -68,18 +68,14 @@ public class UserGroupResource extends ApplicationResource {
/**
* Updates a new user group.
*
- * @param httpServletRequest
- * @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 userIds A collection of user ids to include in this group. If a
- * user already belongs to another group, they will be placed in this group
- * instead. Existing users in this group will remain in this group.
+ * @param httpServletRequest request
+ * @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 userIds A collection of user ids to include in this group. If a
user already belongs to another group, they will be placed in this group
instead. Existing users in this group will remain
+ * in this group.
* @param group The name of the group.
- * @param rawAuthorities Array of authorities to assign to the specified
- * user.
+ * @param rawAuthorities Array of authorities to assign to the specified
user.
* @param status The status of the specified users account.
- * @param formParams
+ * @param formParams form params
* @return A userGroupEntity.
*/
@PUT
@@ -132,7 +128,7 @@ public class UserGroupResource extends ApplicationResource {
/**
* Creates a new user group with the specified users.
*
- * @param httpServletRequest
+ * @param httpServletRequest request
* @param group The user group.
* @param userGroupEntity A userGroupEntity.
* @return A userGroupEntity.
@@ -177,7 +173,7 @@ public class UserGroupResource extends ApplicationResource {
// this user is being modified, replicate to the nodes to invalidate
this account
// so that it will be re-authorized during the next attempted access -
if this wasn't
// done the account would remain stale for up to the configured cache
duration. this
-// is acceptable sometimes but when updating a users authorities or
groups via the UI
+// is acceptable sometimes but when updating a users authorities or
groups via the UI
// they shouldn't have to wait for the changes to take effect`
if (properties.isClusterManager()) {
// change content type to JSON for serializing entity
@@ -233,15 +229,12 @@ public class UserGroupResource extends
ApplicationResource {
}
/**
- * Deletes the user from the specified group. The user will not be removed,
- * just the fact that they were in this group.
+ * Deletes the user from the specified group. The user will not be
removed, just the fact that they were in this group.
*
- * @param httpServletRequest
+ * @param httpServletRequest request
* @param group The user group.
* @param userId The user id to remove.
- * @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 userGroupEntity.
*/
@DELETE
@@
[06/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/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
index f5fea2c..699db39 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
@@ -30,133 +30,100 @@ public class TestCompressContent {
@Test
public void testBzip2DecompressConcatenated() throws Exception {
-final TestRunner runner = TestRunners.
-newTestRunner(CompressContent.class);
+final TestRunner runner =
TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, decompress);
runner.setProperty(CompressContent.COMPRESSION_FORMAT, bzip2);
runner.setProperty(CompressContent.UPDATE_FILENAME, false);
-runner.enqueue(Paths.
-
get(src/test/resources/CompressedData/SampleFileConcat.txt.bz2));
+
runner.enqueue(Paths.get(src/test/resources/CompressedData/SampleFileConcat.txt.bz2));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
-MockFlowFile flowFile = runner.
-getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
-get(0);
-flowFile.assertContentEquals(Paths.
-get(src/test/resources/CompressedData/SampleFileConcat.txt));
+MockFlowFile flowFile =
runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+
flowFile.assertContentEquals(Paths.get(src/test/resources/CompressedData/SampleFileConcat.txt));
flowFile.assertAttributeEquals(filename,
SampleFileConcat.txt.bz2); // not updating filename
}
@Test
public void testBzip2Decompress() throws Exception {
-final TestRunner runner = TestRunners.
-newTestRunner(CompressContent.class);
+final TestRunner runner =
TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, decompress);
runner.setProperty(CompressContent.COMPRESSION_FORMAT, bzip2);
runner.setProperty(CompressContent.UPDATE_FILENAME, true);
-runner.enqueue(Paths.
-get(src/test/resources/CompressedData/SampleFile.txt.bz2));
+
runner.enqueue(Paths.get(src/test/resources/CompressedData/SampleFile.txt.bz2));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
-MockFlowFile flowFile = runner.
-getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
-get(0);
-flowFile.assertContentEquals(Paths.
-get(src/test/resources/CompressedData/SampleFile.txt));
+MockFlowFile flowFile =
runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+
flowFile.assertContentEquals(Paths.get(src/test/resources/CompressedData/SampleFile.txt));
flowFile.assertAttributeEquals(filename, SampleFile.txt);
runner.clearTransferState();
-runner.enqueue(Paths.
-get(src/test/resources/CompressedData/SampleFile1.txt.bz2));
+
runner.enqueue(Paths.get(src/test/resources/CompressedData/SampleFile1.txt.bz2));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
-flowFile = runner.
-getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
-get(0);
-flowFile.assertContentEquals(Paths.
-get(src/test/resources/CompressedData/SampleFile.txt));
+flowFile =
runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+
flowFile.assertContentEquals(Paths.get(src/test/resources/CompressedData/SampleFile.txt));
flowFile.assertAttributeEquals(filename, SampleFile1.txt);
}
@Test
public void testGzipDecompress() throws Exception {
-final TestRunner runner = TestRunners.
-newTestRunner(CompressContent.class);
+final TestRunner runner =
TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, decompress);
runner.setProperty(CompressContent.COMPRESSION_FORMAT, gzip);
-assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, true).
-
[06/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.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/PositionDTO.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
index ab077f3..5b0f386 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
@@ -37,9 +37,7 @@ public class PositionDTO {
/* getters / setters */
/**
- * The x coordinate.
- *
- * @return
+ * @return the x coordinate
*/
public Double getX() {
return x;
@@ -50,9 +48,7 @@ public class PositionDTO {
}
/**
- * The y coordinate.
- *
- * @return
+ * @return the y coordinate
*/
public Double getY() {
return y;
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/PreviousValueDTO.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/PreviousValueDTO.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
index fb33c67..458a2b3 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
@@ -32,9 +32,7 @@ public class PreviousValueDTO {
private String userName;
/**
- * The previous value.
- *
- * @return
+ * @return previous value
*/
public String getPreviousValue() {
return previousValue;
@@ -45,9 +43,7 @@ public class PreviousValueDTO {
}
/**
- * When it was modified.
- *
- * @return
+ * @return when it was modified
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
public Date getTimestamp() {
@@ -59,9 +55,7 @@ public class PreviousValueDTO {
}
/**
- * The user who changed the previous value.
- *
- * @return
+ * @return user who changed the previous value
*/
public String getUserName() {
return userName;
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/ProcessGroupDTO.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/ProcessGroupDTO.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
index 4140046..870c32a 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
@@ -73,9 +73,7 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
}
/**
- * The comments for this process group.
- *
- * @return
+ * @return comments for this process group
*/
public String getComments() {
return comments;
@@ -86,10 +84,8 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
}
/**
- * The contents of this process group. This field will be populated if the
- * request is marked verbose.
- *
- * @return
+ * @return contents of this process group. This field will be populated if
the
+ * request is marked verbose
*/
public FlowSnippetDTO getContents() {
return contents;
@@ -100,9 +96,7 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
}
/**
- * The number of input ports contained in this process group.
- *
- * @return
+ * @return number of input ports contained in this process group
*/
public Integer getInputPortCount() {
return inputPortCount;
@@ -113,9 +107,7 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
}
/**
-
