NIFI-197: Trim filenames and updated log message. This closes #501
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2cdb1c19 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2cdb1c19 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2cdb1c19 Branch: refs/heads/0.x Commit: 2cdb1c1900feb7cb92c97a888213846536c238e6 Parents: c600f15 Author: Mark Payne <[email protected]> Authored: Sat Jun 18 20:47:15 2016 -0400 Committer: Mark Payne <[email protected]> Committed: Sat Jun 18 20:47:15 2016 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/registry/FileVariableRegistry.java | 2 +- .../nifi/registry/PropertiesVariableRegistry.java | 8 +------- .../main/java/org/apache/nifi/util/NiFiProperties.java | 12 +++++++----- .../java/org/apache/nifi/controller/FlowController.java | 7 +++++-- 4 files changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2cdb1c19/nifi-api/src/main/java/org/apache/nifi/registry/FileVariableRegistry.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/registry/FileVariableRegistry.java b/nifi-api/src/main/java/org/apache/nifi/registry/FileVariableRegistry.java index 539f24e..bb977cb 100644 --- a/nifi-api/src/main/java/org/apache/nifi/registry/FileVariableRegistry.java +++ b/nifi-api/src/main/java/org/apache/nifi/registry/FileVariableRegistry.java @@ -49,7 +49,7 @@ abstract class FileVariableRegistry extends MultiMapVariableRegistry { private void addVariables(Path ...paths) throws IOException{ - if(paths != null) { + if (paths != null) { for (final Path path : paths) { registry.addMap(convertFile(path.toFile())); } http://git-wip-us.apache.org/repos/asf/nifi/blob/2cdb1c19/nifi-api/src/main/java/org/apache/nifi/registry/PropertiesVariableRegistry.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/registry/PropertiesVariableRegistry.java b/nifi-api/src/main/java/org/apache/nifi/registry/PropertiesVariableRegistry.java index bc5b15b..8a39f79 100644 --- a/nifi-api/src/main/java/org/apache/nifi/registry/PropertiesVariableRegistry.java +++ b/nifi-api/src/main/java/org/apache/nifi/registry/PropertiesVariableRegistry.java @@ -26,13 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - class PropertiesVariableRegistry extends FileVariableRegistry { - private static final Logger LOG = LoggerFactory.getLogger(PropertiesVariableRegistry.class); - PropertiesVariableRegistry(File... files) throws IOException{ super(files); } @@ -56,8 +51,7 @@ class PropertiesVariableRegistry extends FileVariableRegistry { @Override protected Map<String,String> convertFile(File file) throws IOException{ - - try(final InputStream inStream = new BufferedInputStream(new FileInputStream(file))) { + try (final InputStream inStream = new BufferedInputStream(new FileInputStream(file))) { Properties properties = new Properties(); properties.load(inStream); return convertToMap(properties); http://git-wip-us.apache.org/repos/asf/nifi/blob/2cdb1c19/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java index ecef74b..e7f1661 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -1085,17 +1085,19 @@ public class NiFiProperties extends Properties { public Path[] getVariableRegistryPropertiesPaths() { final List<Path> vrPropertiesPaths = new ArrayList<>(); - final String vrPropertiesFiles = getVariableRegistryProperties(); - if(!StringUtils.isEmpty(vrPropertiesFiles)) { + if(!StringUtils.isEmpty(vrPropertiesFiles)) { final List<String> vrPropertiesFileList = Arrays.asList(vrPropertiesFiles.split(",")); - for(String propertiesFile : vrPropertiesFileList){ - vrPropertiesPaths.add(Paths.get(propertiesFile)); + for (final String propertiesFile : vrPropertiesFileList) { + final String trimmed = propertiesFile.trim(); + if (!trimmed.isEmpty()) { + vrPropertiesPaths.add(Paths.get(trimmed)); + } } - return vrPropertiesPaths.toArray( new Path[vrPropertiesPaths.size()]); + return vrPropertiesPaths.toArray(new Path[vrPropertiesPaths.size()]); } else { return null; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2cdb1c19/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index 7c8763b..ae8e50f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@ -193,6 +193,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.file.Path; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -595,11 +596,13 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R private static VariableRegistry createVariableRegistry(final NiFiProperties properties){ VariableRegistry variableRegistry = VariableRegistryUtils.createVariableRegistry(); + + final Path[] registryPropPaths = properties.getVariableRegistryPropertiesPaths(); try { - VariableRegistry customRegistry = VariableRegistryFactory.getPropertiesInstance(properties.getVariableRegistryPropertiesPaths()); + VariableRegistry customRegistry = VariableRegistryFactory.getPropertiesInstance(registryPropPaths); variableRegistry.addRegistry(customRegistry); } catch (IOException ioe){ - LOG.error("Exception thrown while attempting to add properties to registry",ioe); + LOG.error("Failed to load Variable Registry from " + registryPropPaths, ioe); } return variableRegistry;
