NIFI-175 extremely trivial removal of extraneous pom entries and quieted needless logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9c2c3991 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9c2c3991 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9c2c3991 Branch: refs/heads/nifi-27 Commit: 9c2c399198a3faf5f6392740b23086cebfe7037c Parents: 575cc42 Author: joewitt <[email protected]> Authored: Tue Dec 16 16:41:41 2014 -0500 Committer: joewitt <[email protected]> Committed: Tue Dec 16 16:41:41 2014 -0500 ---------------------------------------------------------------------- nar-bundles/standard-bundle/standard-processors/pom.xml | 2 +- .../cache/client/DistributedMapCacheClientService.java | 8 ++++++-- .../cache/client/DistributedSetCacheClientService.java | 7 +++++-- .../distributed-cache-server/pom.xml | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c2c3991/nar-bundles/standard-bundle/standard-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nar-bundles/standard-bundle/standard-processors/pom.xml b/nar-bundles/standard-bundle/standard-processors/pom.xml index 244f524..6e08598 100644 --- a/nar-bundles/standard-bundle/standard-processors/pom.xml +++ b/nar-bundles/standard-bundle/standard-processors/pom.xml @@ -135,7 +135,6 @@ <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> </dependency> - <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> @@ -152,6 +151,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>distributed-cache-client-service</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>joda-time</groupId> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c2c3991/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java ---------------------------------------------------------------------- diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java index ee96660..4a67864 100644 --- a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java @@ -248,13 +248,16 @@ public class DistributedMapCacheClientService extends AbstractControllerService } catch (final IOException e) { } } - logger.info("Closed {}", new Object[] { getIdentifier() }); + if (logger.isDebugEnabled() && getIdentifier() != null) { + logger.debug("Closed {}", new Object[]{getIdentifier()}); + } } @Override protected void finalize() throws Throwable { - if (!closed) + if (!closed) { close(); + } logger.debug("Finalize called"); } @@ -295,6 +298,7 @@ public class DistributedMapCacheClientService extends AbstractControllerService } private static interface CommsAction<T> { + T execute(CommsSession commsSession) throws IOException; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c2c3991/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java ---------------------------------------------------------------------- diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java index 1d7c94c..c588249 100644 --- a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java @@ -161,13 +161,16 @@ public class DistributedSetCacheClientService extends AbstractControllerService } catch (final IOException e) { } } - logger.info("Closed {}", new Object[] { getIdentifier() }); + if (logger.isDebugEnabled() && getIdentifier() != null) { + logger.debug("Closed {}", new Object[]{getIdentifier()}); + } } @Override protected void finalize() throws Throwable { - if (!closed) + if (!closed) { close(); + } logger.debug("Finalize called"); } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c2c3991/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml ---------------------------------------------------------------------- diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml index b57d284..ca96d82 100644 --- a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml @@ -73,6 +73,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>ssl-context-service</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> \ No newline at end of file
