Merge pull request #18 from TIHBS/load-connection-profile-subtypes-at-start

Load ConnectionProfile subtype at start

Author: ghareeb-falazi

src/main/java/blockchains/iaas/uni/stuttgart/de/config/Application.java

@@ -5,8 +5,11 @@
 import blockchains.iaas.uni.stuttgart.de.management.BlockchainPluginManager;
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.pf4j.PluginState;
+import org.pf4j.PluginWrapper;
 
 import javax.ws.rs.ApplicationPath;
+import java.util.List;
 
 /********************************************************************************
  * Copyright (c) 2018 Institute for the Architecture of Application System -
@@ -23,8 +26,10 @@
 public class Application extends ResourceConfig {
     public Application() {
         // Required to load the plugins at startup
-        BlockchainPluginManager.getInstance();
-        
+        BlockchainPluginManager blockchainPluginManager = BlockchainPluginManager.getInstance();
+        if (Boolean.getBoolean("enablePluginsAtStart")) {
+            blockchainPluginManager.startPlugins();
+        }
         packages("blockchains.iaas.uni.stuttgart.de");
         register(ObjectMapperProvider.class);
         register(JacksonFeature.class);

src/main/java/blockchains/iaas/uni/stuttgart/de/config/ObjectMapperProvider.java

@@ -13,12 +13,17 @@
  *******************************************************************************/
 package blockchains.iaas.uni.stuttgart.de.config;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
 
+import blockchains.iaas.uni.stuttgart.de.management.BlockchainPluginManager;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import org.pf4j.PluginState;
+import org.pf4j.PluginWrapper;
 
+import java.util.List;
 
 
 @Provider
@@ -28,6 +33,13 @@ public class ObjectMapperProvider implements ContextResolver<ObjectMapper> {
 
     public ObjectMapperProvider() {
         defaultObjectMapper = createDefaultMapper();
+        if (Boolean.getBoolean("enablePluginsAtStart")) {
+            BlockchainPluginManager blockchainPluginManager = BlockchainPluginManager.getInstance();
+            List<PluginWrapper> plugins = blockchainPluginManager.getPlugins(PluginState.STARTED);
+            for (PluginWrapper pluginWrapper : plugins) {
+               blockchainPluginManager.registerConnectionProfileSubtypeClass(defaultObjectMapper, pluginWrapper.getPluginId());
+            }
+        }
     }
 
     @Override

src/main/java/blockchains/iaas/uni/stuttgart/de/management/BlockchainPluginManager.java

@@ -21,7 +21,6 @@
 import org.pf4j.PluginState;
 import org.pf4j.PluginWrapper;
 import org.pf4j.ManifestPluginDescriptorFinder;
-import org.pf4j.DependencyResolver.DependenciesNotFoundException;
 import org.pf4j.JarPluginLoader;
 import org.pf4j.PluginDescriptorFinder;
 import org.pf4j.PluginLoader;
@@ -31,7 +30,7 @@
 import java.nio.file.Path;
 import java.util.List;
 
-public class BlockchainPluginManager {
+public class BlockchainPluginManager{
 
     private static final Logger log = LoggerFactory.getLogger(BlockchainPluginManager.class);
 
@@ -56,9 +55,6 @@ protected PluginDescriptorFinder createPluginDescriptorFinder() {
 
         pluginManager.loadPlugins();
 
-        if (Boolean.getBoolean("enablePluginsAtStart")) {
-            pluginManager.startPlugins();
-        }
     }
 
     public static BlockchainPluginManager getInstance() {
@@ -90,8 +86,14 @@ public void unloadPlugin(String pluginId) {
 
     public void startPlugin(String pluginId) {
         pluginManager.startPlugin(pluginId);
+    }
 
+    public void startPlugins() {
+        pluginManager.startPlugins();
+    }
 
+    public List<PluginWrapper> getPlugins(PluginState pluginState) {
+        return pluginManager.getPlugins(pluginState);
     }
 
     public void disablePlugin(String pluginId) {