[01/12] incubator-nifi git commit: NIFI-271
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 1eb4387db - e62748273
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a52cf529/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.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/UserEntity.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.java
index 963e853..71554dd 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.java
@@ -20,9 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.nifi.web.api.dto.UserDTO;
/**
- * A serialized representation of this class can be placed in the entity body
of
- * a request or response to or from the API. This particular entity holds a
- * reference to a UserDTO.
+ * A serialized representation of this class can be placed in the entity body
of a request or response to or from the API. This particular entity holds a
reference to a UserDTO.
*/
@XmlRootElement(name = userEntity)
public class UserEntity extends Entity {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a52cf529/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.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/UserGroupEntity.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.java
index a6542c8..35a88d5 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.java
@@ -20,9 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.nifi.web.api.dto.UserGroupDTO;
/**
- * A serialized representation of this class can be placed in the entity body
of
- * a request or response to or from the API. This particular entity holds a
- * reference to a UserGroupDTO.
+ * A serialized representation of this class can be placed in the entity body
of a request or response to or from the API. This particular entity holds a
reference to a UserGroupDTO.
*/
@XmlRootElement(name = userGroupEntity)
public class UserGroupEntity extends Entity {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a52cf529/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 eece172..fcdeee3 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
@@ -22,9 +22,8 @@ import
org.apache.nifi.web.api.dto.search.UserGroupSearchResultDTO;
import org.apache.nifi.web.api.dto.search.UserSearchResultDTO;
/**
- * A serialized representation of this class can be placed in the entity body
of
- * a request or response to or from the API. This particular entity holds a
- * reference to UserSearchResultDTOs and UserGroupSearchResultDTOs.
+ * A serialized representation of this class can be placed in the entity body
of a request or response to or from the API. This particular entity holds a
reference to UserSearchResultDTOs and
+ * UserGroupSearchResultDTOs.
*/
@XmlRootElement(name = userSearchResultsEntity)
public class UserSearchResultsEntity {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a52cf529/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
[01/12] incubator-nifi git commit: NIFI-271
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 548188939 - d29a2d688
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/TestSplitText.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
index aeb887a..aa28cc0 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
@@ -36,16 +36,6 @@ public class TestSplitText {
final Path dataPath = Paths.get(src/test/resources/TestSplitText);
final Path file = dataPath.resolve(originalFilename);
-//public static void main(final String[] args) throws IOException {
-//for (int i=1; i = 4; i++) {
-//final Path path = Paths.get(src/test/resources/TestSplitText/
+ i + .txt);
-//final byte[] data = Files.readAllBytes(path);
-//final String text = new String(data, StandardCharsets.UTF_8);
-//final String updated = text.replace(\n, \r\n);
-//final Path updatedPath =
Paths.get(src/test/resources/TestSplitText/updated/ + i + .txt);
-//Files.write(updatedPath,
updated.getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE_NEW);
-//}
-//}
@Test
public void testRoutesToFailureIfHeaderLinesNotAllPresent() throws
IOException {
final TestRunner runner = TestRunners.newTestRunner(new SplitText());
@@ -81,22 +71,17 @@ public class TestSplitText {
runner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitText.REL_SPLITS, 4);
-final ListMockFlowFile splits = runner.
-getFlowFilesForRelationship(SplitText.REL_SPLITS);
+final ListMockFlowFile splits =
runner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
final String expected0 = Header Line #1\nHeader Line #2\nLine #1;
final String expected1 = Line #2\nLine #3\nLine #4;
final String expected2 = Line #5\nLine #6\nLine #7;
final String expected3 = Line #8\nLine #9\nLine #10;
-splits.get(0).
-assertContentEquals(expected0);
-splits.get(1).
-assertContentEquals(expected1);
-splits.get(2).
-assertContentEquals(expected2);
-splits.get(3).
-assertContentEquals(expected3);
+splits.get(0).assertContentEquals(expected0);
+splits.get(1).assertContentEquals(expected1);
+splits.get(2).assertContentEquals(expected2);
+splits.get(3).assertContentEquals(expected3);
}
@Test
@@ -112,14 +97,11 @@ public class TestSplitText {
runner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitText.REL_SPLITS, 4);
-final ListMockFlowFile splits = runner.
-getFlowFilesForRelationship(SplitText.REL_SPLITS);
+final ListMockFlowFile splits =
runner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
for (int i = 0; i splits.size(); i++) {
final MockFlowFile split = splits.get(i);
-split.assertContentEquals(file.getParent().
-resolve((i + 1) + .txt));
-split.assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.
-valueOf(i + 1));
+split.assertContentEquals(file.getParent().resolve((i + 1) +
.txt));
+split.assertAttributeEquals(SplitText.FRAGMENT_INDEX,
String.valueOf(i + 1));
}
}
@@ -136,26 +118,16 @@ public class TestSplitText {
runner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitText.REL_SPLITS, 2);
-final ListMockFlowFile splits = runner.
-getFlowFilesForRelationship(SplitText.REL_SPLITS);
-splits.get(0).
-assertContentEquals(file.getParent().
-resolve(5.txt));
-splits.get(0).
-assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.
-valueOf(1));
-splits.get(1).
-assertContentEquals(file.getParent().
-resolve(6.txt));
-splits.get(1).
-assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.
-valueOf(2));
+final ListMockFlowFile splits =
runner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
+
[01/12] incubator-nifi git commit: NIFI-271 checkpoint push because there are so many changes. Long way to go but got through dto library
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-271 8a296aacc - fe8e30a03
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/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
index 4c91f75..8fe7149 100644
---
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
+++
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
@@ -61,19 +61,19 @@ package org.apache.nifi.remote.io.socket.ssl;
@Ignore(For local testing only)
//public class TestSSLSocketChannel {
//public static final int DATA_SIZE = 4096;
-//
+//
//@Test
//@Ignore
//public void testSendingToLocalInstance() throws IOException,
InterruptedException, HandshakeException, UnknownPortException,
PortNotRunningException, URISyntaxException {
//System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH,
src/test/resources/nifi.properties);
-//
+//
//final NiFiProperties properties = NiFiProperties.getInstance();
//final SSLContext sslContext =
SslContextFactory.createSslContext(properties);
-//
+//
//final SSLSocketChannel channel = new SSLSocketChannel(sslContext,
localhost, 5000, true);
//channel.setTimeout(200);
//channel.connect();
-//
+//
//final CommunicationsSession commsSession;
//commsSession = new SSLSocketChannelCommunicationsSession(channel,
, null);
//commsSession.setUri(nifi://localhost:5000);
@@ -82,7 +82,7 @@ package org.apache.nifi.remote.io.socket.ssl;
//
//dos.write(CommunicationsProtocol.MAGIC_BYTES);
//dos.flush();
-//
+//
//final EventReporter eventReporter =
Mockito.mock(EventReporter.class);
//final StandardSiteToSiteProtocol proposedProtocol = new
StandardSiteToSiteProtocol(commsSession, eventReporter,
NiFiProperties.getInstance());
//final StandardSiteToSiteProtocol negotiatedProtocol =
(StandardSiteToSiteProtocol)
RemoteResourceFactory.initiateResourceNegotiation(proposedProtocol, dis, dos);
@@ -91,25 +91,25 @@ package org.apache.nifi.remote.io.socket.ssl;
//final RemoteProcessGroup rpg =
Mockito.mock(RemoteProcessGroup.class);
//
Mockito.when(rpg.getCommunicationsTimeout(Mockito.any(TimeUnit.class))).thenReturn(2000);
//Mockito.when(rpg.getTargetUri()).thenReturn( new
URI(https://localhost:5050/;) );
-//
+//
//final RemoteGroupPort port = Mockito.mock(RemoteGroupPort.class);
//
Mockito.when(port.getIdentifier()).thenReturn(90880680-d6da-40be-b2cc-a15423de2e1a);
//Mockito.when(port.getName()).thenReturn(Data In);
//Mockito.when(port.getRemoteProcessGroup()).thenReturn(rpg);
-//
+//
//negotiatedProtocol.initiateHandshake(port, TransferDirection.SEND);
//}
-//
+//
//@Test
//public void testWithSimpleSSLSocket() throws IOException,
InterruptedException {
//System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH,
src/test/resources/nifi.properties);
-//
+//
//final NiFiProperties properties = NiFiProperties.getInstance();
//final SSLContext sslContext =
SslContextFactory.createSslContext(properties);
-//
+//
//final ServerThread server = new ServerThread(sslContext);
//server.start();
-//
+//
//int port = server.getPort();
//while ( port = 0 ) {
//Thread.sleep(10L);
@@ -118,7 +118,7 @@ package org.apache.nifi.remote.io.socket.ssl;
//
//final Socket socket =
sslContext.getSocketFactory().createSocket(localhost, port);
//final OutputStream out = socket.getOutputStream();
-//
+//
//final byte[] sent = new byte[DATA_SIZE];
//for (int i=0; i sent.length; i++) {
//sent[i] = (byte) (i % 255);
@@ -133,17 +133,17 @@ package org.apache.nifi.remote.io.socket.ssl;
//final float MBperS = megabytes / seconds;
//System.out.println(Millis: + millis + ; MB/s: + MBperS);
//}
-//
+//
//@Test
//public void testDirectChannelComms() throws IOException,
InterruptedException {
//System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH,
src/test/resources/nifi.properties);
-//
+//
//final NiFiProperties
