Merge branch 'master' of https://github.com/apache/nifi into aws-web-api

Author: ottobackwards

nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java

@@ -189,17 +189,20 @@ protected Collection<ValidationResult> customValidate(final ValidationContext va
         }
 
         final boolean proxyHostSet = validationContext.getProperty(PROXY_HOST).isSet();
-        final boolean proxyHostPortSet = validationContext.getProperty(PROXY_HOST_PORT).isSet();
+        final boolean proxyPortSet = validationContext.getProperty(PROXY_HOST_PORT).isSet();
+
+        if ((proxyHostSet && !proxyPortSet) || (!proxyHostSet && proxyPortSet)) {
+            problems.add(new ValidationResult.Builder().subject("Proxy Host and Port").valid(false).explanation("If Proxy Host or Proxy Port is set, both must be set").build());
+        }
 
         final boolean proxyUserSet = validationContext.getProperty(PROXY_USERNAME).isSet();
         final boolean proxyPwdSet = validationContext.getProperty(PROXY_PASSWORD).isSet();
 
         if ((proxyUserSet && !proxyPwdSet) || (!proxyUserSet && proxyPwdSet)) {
             problems.add(new ValidationResult.Builder().subject("Proxy User and Password").valid(false).explanation("If Proxy Username or Proxy Password is set, both must be set").build());
         }
-
-        if ( ((!proxyHostSet) && proxyHostPortSet) || (proxyHostSet && (!proxyHostPortSet)) ) {
-            problems.add(new ValidationResult.Builder().input("Proxy Host Port").valid(false).explanation("Both proxy host and port must be set").build());
+        if (proxyUserSet && !proxyHostSet) {
+            problems.add(new ValidationResult.Builder().subject("Proxy").valid(false).explanation("If Proxy username is set, proxy host must be set").build());
         }
 
         ProxyConfiguration.validateProxySpec(validationContext, problems, PROXY_SPECS);

nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSProcessorProxyTest.java

@@ -67,4 +67,41 @@ public void testProxyHostAndPortValid() throws Throwable {
         runner.setProperty(AbstractAWSProcessor.PROXY_HOST, "proxyHost");
         runner.assertValid();
     }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testProxyUserNoPasswordInValid() throws Throwable {
+        runner.setProperty(AbstractAWSProcessor.PROXY_USERNAME, "foo");
+        runner.assertNotValid();
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testProxyNoUserPasswordInValid() throws Throwable {
+        runner.setProperty(AbstractAWSProcessor.PROXY_PASSWORD, "foo");
+        runner.assertNotValid();
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testProxyUserPasswordNoHostInValid() throws Throwable {
+        runner.setProperty(AbstractAWSProcessor.PROXY_USERNAME, "foo");
+        runner.setProperty(AbstractAWSProcessor.PROXY_PASSWORD, "foo");
+        runner.assertNotValid();
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testProxyUserPasswordHostValid() throws Throwable {
+        runner.setProperty(AbstractAWSProcessor.PROXY_HOST_PORT, "1");
+        runner.setProperty(AbstractAWSProcessor.PROXY_HOST, "proxyHost");
+        runner.setProperty(AbstractAWSProcessor.PROXY_USERNAME, "foo");
+        runner.setProperty(AbstractAWSProcessor.PROXY_PASSWORD, "foo");
+        runner.assertValid();
+    }
+
+
+
+
+
 }