Tobias Jeger pushed to branch feature/ESSENTIALS-971 at cms-community /
hippo-essentials
Commits:
9eaa0294 by Tobias Jeger at 2016-05-24T16:12:58+02:00
ESSENTIALS-971 Refactored after review
- - - - -
1 changed file:
- dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java
Changes:
=====================================
dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java
=====================================
---
a/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java
+++
b/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java
@@ -220,19 +220,21 @@ public class PluginStore {
}
private List<PluginDescriptorRestful> getLocalDescriptors() {
- final InputStream stream =
PluginStore.class.getResourceAsStream("/plugin_descriptor.json");
- final String json = GlobalUtils.readStreamAsText(stream);
- // check also for project specific descriptor:
- final InputStream projectStream =
PluginStore.class.getResourceAsStream("/project_plugin_descriptor.json");
- final String projectJson = GlobalUtils.readStreamAsText(projectStream);
- final List<PluginDescriptorRestful> builtInDescriptors =
parsePlugins(json).getItems();
- final List<PluginDescriptorRestful> projectDescriptors =
parsePlugins(projectJson).getItems();
final List<PluginDescriptorRestful> descriptors = new ArrayList<>();
- descriptors.addAll(builtInDescriptors);
- descriptors.addAll(projectDescriptors);
+
+
descriptors.addAll(loadPluginDescriptorsFromResource("/plugin_descriptor.json"));
+
descriptors.addAll(loadPluginDescriptorsFromResource("/project_plugin_descriptor.json"));
+
return descriptors;
}
+ private List<PluginDescriptorRestful>
loadPluginDescriptorsFromResource(final String resource) {
+ final InputStream stream =
PluginStore.class.getResourceAsStream(resource);
+ final String json = GlobalUtils.readStreamAsText(stream);
+
+ return parsePlugins(json).getItems();
+ }
+
private RestfulList<PluginDescriptorRestful> parsePlugins(final String
jsonString) {
if (!Strings.isNullOrEmpty(jsonString)) {
final ObjectMapper mapper = new ObjectMapper();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/9eaa02944db50bd3db522d1a653d18fb2a19e48d
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
