From e98829d01bb56f9dcd8a4427e965bc0a92635788 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 9 Jun 2021 10:47:29 +0200 Subject: [PATCH] Plugins must provide a property file with name .properties --- CHANGELOG.md | 1 + .../java/org/gcube/vremanagement/executor/plugin/Plugin.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee9655b..86b1109 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v3.0.0-SNAPSHOT] - Switched smart-executor JSON management to gcube-jackson [#19647] +- Plugins must provide a property file with name .properties [#21596] ## [v2.0.0] diff --git a/src/main/java/org/gcube/vremanagement/executor/plugin/Plugin.java b/src/main/java/org/gcube/vremanagement/executor/plugin/Plugin.java index c85bf23..b95de20 100644 --- a/src/main/java/org/gcube/vremanagement/executor/plugin/Plugin.java +++ b/src/main/java/org/gcube/vremanagement/executor/plugin/Plugin.java @@ -20,7 +20,7 @@ public abstract class Plugin implements PluginDefinition { private static Logger logger = LoggerFactory.getLogger(Plugin.class); - public static final String PLUGIN_PROPERTIES_FILENAME = "plugin.properties"; + public static final String PLUGIN_PROPERTIES_SUFFIX_FILENAME = ".properties"; public static final String GROUP_PROPERTY = "groupId"; public static final String NAME_PROPERTY = "artifactId"; @@ -52,7 +52,8 @@ public abstract class Plugin implements PluginDefinition { properties = new Properties(); try { - InputStream input = getClass().getClassLoader().getResourceAsStream("META-INF" + File.separator + PLUGIN_PROPERTIES_FILENAME); + String filename = this.getClass().getSimpleName() + PLUGIN_PROPERTIES_SUFFIX_FILENAME; + InputStream input = getClass().getClassLoader().getResourceAsStream("META-INF" + File.separator + filename); properties.load(input); } catch(IOException e) { throw new RuntimeException(e);