From 9474a8b52210ab0554686abb4e0022768926328d Mon Sep 17 00:00:00 2001 From: Aldrin Piri Date: Thu, 11 Jan 2018 13:56:54 -0500 Subject: [PATCH] MINIFI-415 Adjusting logging when a bundle is automatically selected for a component when multiple options are available. --- .../org/apache/nifi/minifi/FlowEnricher.java | 19 +++++++------------ .../apache/nifi/minifi/FlowEnricherTest.java | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/FlowEnricher.java b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/FlowEnricher.java index 8f99fd080..690388078 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/FlowEnricher.java +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/FlowEnricher.java @@ -35,7 +35,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.regex.Pattern; import java.util.stream.Collectors; public class FlowEnricher { @@ -50,8 +49,6 @@ public class FlowEnricher { public static final String CONTROLLER_SERVICE_TAG_NAME = "controllerService"; public static final String REPORTING_TASK_TAG_NAME = "reportingTask"; - private static final Pattern UUID_PATTERN = Pattern.compile("[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}", Pattern.CASE_INSENSITIVE); - public FlowEnricher(MiNiFi minifi, FlowParser flowParser, NiFiProperties niFiProperties) { this.minifi = minifi; this.flowParser = flowParser; @@ -130,17 +127,15 @@ private void enrichComponent(EnrichingElementAdapter componentToEnrich, Map componentToEnrichBundleVersions = componentToEnrichVersionToBundles.values().stream() .map(bundle -> bundle.getBundleDetails().getCoordinate().getVersion()).collect(Collectors.toSet()); - final String componentToEnrichId = componentToEnrich.getComponentId(); - String bundleVersion = componentToEnrichBundleVersions.stream().sorted().reduce((version, otherVersion) -> otherVersion).orElse(null); - if (bundleVersion != null) { - componentToEnrich.setBundleInformation(componentToEnrichVersionToBundles.get(bundleVersion).getBundleDetails().getCoordinate()); - } - logger.info("Enriching {} with bundle {}", new Object[]{}); - + // Select the last version of those available for the enriching bundle + final String bundleVersion = componentToEnrichBundleVersions.stream().sorted().reduce((version, otherVersion) -> otherVersion).get(); + final BundleCoordinate enrichingCoordinate = componentToEnrichVersionToBundles.get(bundleVersion).getBundleDetails().getCoordinate(); + componentToEnrich.setBundleInformation(enrichingCoordinate); + logger.warn("Multiple enriching bundle options were available for component {}. The automatically selected enriching bundle was {}", + new Object[]{componentToEnrich.getComponentClass(), enrichingCoordinate}); } } else { logger.warn("Could not find any eligible bundles for {}. Automatic start of the flow cannot be guaranteed.", componentToEnrich.getComponentClass()); diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/test/java/org/apache/nifi/minifi/FlowEnricherTest.java b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/test/java/org/apache/nifi/minifi/FlowEnricherTest.java index 15f493e73..4cf360925 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/test/java/org/apache/nifi/minifi/FlowEnricherTest.java +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/test/java/org/apache/nifi/minifi/FlowEnricherTest.java @@ -88,7 +88,7 @@ public void enrichFlowWithBundleInformationTest() throws Exception { standardSvcsBundles.add(generateBundle(defaultGroup, standardSvcsId, anotherVersion)); // SSL Context Service Bundles - depends on nifi-standard-services-api - final String sslContextSvcId = " nifi-ssl-context-service-nar"; + final String sslContextSvcId = "nifi-ssl-context-service-nar"; final List sslBundles = new ArrayList<>(); sslBundles.add(generateBundle(defaultGroup, sslContextSvcId, aVersion, standardSvcsBundles.get(0).getBundleDetails().getCoordinate())); sslBundles.add(generateBundle(defaultGroup, sslContextSvcId, anotherVersion, standardSvcsBundles.get(1).getBundleDetails().getCoordinate()));