Repository: nifi Updated Branches: refs/heads/master bf112d065 -> 70175816b
NIFI-3541 NIFI-3545 - check style violations Fix for checkstyle issues introduced by: 9e68f02f1fb7eb442f6c9580b46255f713d8b191 000414e7eaa4c4f459779e73c331f3021f9a5049 This closes #1569. Signed-off-by: Koji Kawamura <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/70175816 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/70175816 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/70175816 Branch: refs/heads/master Commit: 70175816b319974128da67c7fbd3c80ec8bc1ffe Parents: bf112d0 Author: Pierre Villard <[email protected]> Authored: Tue Mar 7 11:58:39 2017 +0100 Committer: Koji Kawamura <[email protected]> Committed: Tue Mar 7 22:17:23 2017 +0900 ---------------------------------------------------------------------- .../org/apache/nifi/remote/util/SiteToSiteRestApiClient.java | 4 ++-- .../test/java/org/apache/nifi/processors/standard/TestWait.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/70175816/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java index e6777b0..5655d36 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java @@ -245,7 +245,7 @@ public class SiteToSiteRestApiClient implements Closeable { if (localAddress != null) { requestConfigBuilder.setLocalAddress(localAddress); } - + if (proxy != null) { requestConfigBuilder.setProxy(proxy.getHttpHost()); } @@ -1347,7 +1347,7 @@ public class SiteToSiteRestApiClient implements Closeable { public void setCompress(final boolean compress) { this.compress = compress; } - + public void setLocalAddress(final InetAddress localAddress) { this.localAddress = localAddress; } http://git-wip-us.apache.org/repos/asf/nifi/blob/70175816/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestWait.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestWait.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestWait.java index eb196c9..71187b6 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestWait.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestWait.java @@ -30,10 +30,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.function.BiConsumer; -import java.util.function.Consumer; import java.util.stream.IntStream; -import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processors.standard.TestNotify.MockCacheClient; import org.apache.nifi.reporting.InitializationException;
