Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-6336 Added code to catch port value when it is 0. 

Added unit tests validating port value format, valid port value, and catching port value of 0.
This commit is contained in:
mtien 2019-12-12 12:09:42 -08:00
parent ba6d050ba8
commit 92b9a05309
2 changed files with 98 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
View File

@ -743,6 +743,9 @@ public abstract class NiFiProperties {
socketAddress = "localhost";
}
int socketPort = getClusterNodeProtocolPort();
if (socketPort == 0) {
throw new RuntimeException("Load balance port cannot be 0. Port must be inclusively in the range [1, 65535].");
}
return InetSocketAddress.createUnresolved(socketAddress, socketPort);
} catch (Exception ex) {
throw new RuntimeException("Invalid node protocol address/port due to: " + ex, ex);

96
nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
View File

@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.File;
import java.net.InetSocketAddress;
import java.net.URISyntaxException;
import java.nio.file.Path;
import java.util.HashMap;
@ -167,4 +168,97 @@ public class NiFiPropertiesTest {
return NiFiProperties.createBasicNiFiProperties(realPath, additionalProperties);
}
}
@Test
public void testShouldVerifyValidFormatPortValue() {
// Testing with CLUSTER_NODE_PROTOCOL_PORT
// Arrange
String portValue = "8000";
Map<String, String> additionalProperties = new HashMap<>();
additionalProperties.put(NiFiProperties.CLUSTER_NODE_PROTOCOL_PORT, portValue);
NiFiProperties properties = loadNiFiProperties("/NiFiProperties/conf/nifi.blank.properties", additionalProperties);
// Act
Integer clusterProtocolPort = properties.getClusterNodeProtocolPort();
// Assert
assertEquals(Integer.parseInt(portValue), clusterProtocolPort.intValue());
}
@Test(expected = NumberFormatException.class)
public void testShouldVerifyExceptionThrownWhenInValidFormatPortValue() {
// Testing with CLUSTER_NODE_PROTOCOL_PORT
// Arrange
// Port Value is invalid Format
String portValue = "8000a";
Map<String, String> additionalProperties = new HashMap<>();
additionalProperties.put(NiFiProperties.CLUSTER_NODE_PROTOCOL_PORT, portValue);
NiFiProperties properties = loadNiFiProperties("/NiFiProperties/conf/nifi.blank.properties", additionalProperties);
// Act
Integer clusterProtocolPort = properties.getClusterNodeProtocolPort();
// Assert
// Expect NumberFormatException thrown
assertEquals(Integer.parseInt(portValue), clusterProtocolPort.intValue());
}
@Test
public void testShouldVerifyValidPortValue() {
// Testing with CLUSTER_NODE_ADDRESS
// Arrange
String portValue = "8000";
String addressValue = "127.0.0.1";
Map<String, String> additionalProperties = new HashMap<>();
additionalProperties.put(NiFiProperties.CLUSTER_NODE_PROTOCOL_PORT, portValue);
additionalProperties.put(NiFiProperties.CLUSTER_NODE_ADDRESS, addressValue);
NiFiProperties properties = loadNiFiProperties("/NiFiProperties/conf/nifi.blank.properties", additionalProperties);
// Act
InetSocketAddress clusterProtocolAddress = properties.getClusterNodeProtocolAddress();
// Assert
assertEquals(Integer.parseInt(portValue), clusterProtocolAddress.getPort());
}
@Test(expected = RuntimeException.class)
public void testShouldVerifyExceptionThrownWhenInvalidPortValue() {
// Testing with CLUSTER_NODE_ADDRESS
// Arrange
// Port value is out of range
String portValue = "70000";
String addressValue = "127.0.0.1";
Map<String, String> additionalProperties = new HashMap<>();
additionalProperties.put(NiFiProperties.CLUSTER_NODE_PROTOCOL_PORT, portValue);
additionalProperties.put(NiFiProperties.CLUSTER_NODE_ADDRESS, addressValue);
NiFiProperties properties = loadNiFiProperties("/NiFiProperties/conf/nifi.blank.properties", additionalProperties);
// Act
InetSocketAddress clusterProtocolAddress = properties.getClusterNodeProtocolAddress();
// Assert
// Expect RuntimeException thrown
assertEquals(Integer.parseInt(portValue), clusterProtocolAddress.getPort());
}
@Test(expected = RuntimeException.class)
public void testShouldVerifyExceptionThrownWhenPortValueIsZero() {
// Arrange
String portValue = "0";
String addressValue = "127.0.0.1";
Map<String, String> additionalProperties = new HashMap<>();
additionalProperties.put(NiFiProperties.CLUSTER_NODE_PROTOCOL_PORT, portValue);
additionalProperties.put(NiFiProperties.CLUSTER_NODE_ADDRESS, addressValue);
NiFiProperties properties = loadNiFiProperties("/NiFiProperties/conf/nifi.blank.properties", additionalProperties);
// Act
InetSocketAddress clusterProtocolAddress = properties.getClusterNodeProtocolAddress();
// Assert
// Expect RuntimeException thrown
assertEquals(Integer.parseInt(portValue), clusterProtocolAddress.getPort());
}
}