You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2017/11/15 09:09:26 UTC
nifi git commit: NIFI-4608 Removed unnecessary NiFiProperties mocking
given enhancements to StringEncryptor. Fixed checkstyle issues. Fixed test
failure in FingerprintFactoryTest.
Repository: nifi
Updated Branches:
refs/heads/master b9c53083c -> 7f8007f22
NIFI-4608 Removed unnecessary NiFiProperties mocking given enhancements to StringEncryptor.
Fixed checkstyle issues.
Fixed test failure in FingerprintFactoryTest.
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2273.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7f8007f2
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7f8007f2
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7f8007f2
Branch: refs/heads/master
Commit: 7f8007f22a7be9e4c13505f9c41af541b5a676e8
Parents: b9c5308
Author: Andy LoPresto <al...@apache.org>
Authored: Tue Nov 14 10:36:35 2017 -0800
Committer: Pierre Villard <pi...@gmail.com>
Committed: Wed Nov 15 10:09:18 2017 +0100
----------------------------------------------------------------------
.../web/api/dto/RemoteProcessGroupPortDTO.java | 5 ++-
.../apache/nifi/encrypt/StringEncryptor.java | 2 +-
.../fingerprint/FingerprintFactoryTest.java | 34 ++++++--------------
3 files changed, 13 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/7f8007f2/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
index 1ebb70e..59c5631 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
@@ -17,7 +17,6 @@
package org.apache.nifi.web.api.dto;
import io.swagger.annotations.ApiModelProperty;
-
import javax.xml.bind.annotation.XmlType;
/**
@@ -80,12 +79,12 @@ public class RemoteProcessGroupPortDTO {
public void setId(String id) {
this.id = id;
}
-
+
@ApiModelProperty("The id of the target port.")
public String getTargetId() {
return targetId;
}
-
+
public void setTargetId(String targetId) {
this.targetId = targetId;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/7f8007f2/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
index 2f18a16..da3328b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
@@ -113,7 +113,7 @@ public class StringEncryptor {
* @param provider the JCA Security provider ({@link EncryptionMethod#provider})
* @param key the UTF-8 characters from nifi.properties -- nifi.sensitive.props.key
*/
- protected StringEncryptor(final String algorithm, final String provider, final String key) {
+ public StringEncryptor(final String algorithm, final String provider, final String key) {
this.algorithm = algorithm;
this.provider = provider;
this.key = null;
http://git-wip-us.apache.org/repos/asf/nifi/blob/7f8007f2/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
index 1e52cbb..ca3e95f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
@@ -21,14 +21,17 @@ import static org.apache.nifi.fingerprint.FingerprintFactory.FLOW_CONFIG_XSD;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Collections;
-
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.connectable.Position;
@@ -40,34 +43,24 @@ import org.apache.nifi.encrypt.StringEncryptor;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.remote.RemoteGroupPort;
import org.apache.nifi.remote.protocol.SiteToSiteTransportProtocol;
-import org.apache.nifi.util.NiFiProperties;
import org.junit.Before;
import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
/**
*/
public class FingerprintFactoryTest {
- private NiFiProperties nifiProperties;
private StringEncryptor encryptor;
private FingerprintFactory fingerprinter;
@Before
public void setup() {
- nifiProperties = getNiFiProperties();
- encryptor = StringEncryptor.createEncryptor(nifiProperties);
+ encryptor = new StringEncryptor("PBEWITHMD5AND256BITAES-CBC-OPENSSL", "BC", "nififtw!");
fingerprinter = new FingerprintFactory(encryptor);
}
@@ -186,14 +179,6 @@ public class FingerprintFactoryTest {
return rootElement;
}
- private NiFiProperties getNiFiProperties() {
- final NiFiProperties nifiProperties = mock(NiFiProperties.class);
- when(nifiProperties.getProperty(StringEncryptor.NF_SENSITIVE_PROPS_ALGORITHM)).thenReturn("PBEWITHMD5AND256BITAES-CBC-OPENSSL");
- when(nifiProperties.getProperty(StringEncryptor.NF_SENSITIVE_PROPS_PROVIDER)).thenReturn("BC");
- when(nifiProperties.getProperty(anyString(), anyString())).then(invocation -> invocation.getArgumentAt(1, String.class));
- return nifiProperties;
- }
-
private <T> String fingerprint(final String methodName, final Class<T> inputClass, final T input) throws Exception {
final Method fingerprintFromComponent = FingerprintFactory.class.getDeclaredMethod(methodName,
StringBuilder.class, inputClass);
@@ -306,6 +291,7 @@ public class FingerprintFactoryTest {
// Assert fingerprints with expected one.
final String expected = "portId" +
+ "NO_VALUE" +
"3" +
"true" +
"1234" +
@@ -314,6 +300,6 @@ public class FingerprintFactoryTest {
final Element rootElement = serializeElement(encryptor, RemoteProcessGroup.class, groupComponent, "addRemoteProcessGroup", IDENTITY_LOOKUP);
final Element componentElement = (Element) rootElement.getElementsByTagName("inputPort").item(0);
- assertEquals(expected.toString(), fingerprint("addRemoteGroupPortFingerprint", Element.class, componentElement));
+ assertEquals(expected, fingerprint("addRemoteGroupPortFingerprint", Element.class, componentElement));
}
}