Fix ObjectMapper not picked up by conenctionProfilesManager

Author: ghareeb-falazi

pom.xml

@@ -26,10 +26,6 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>local-maven-repo</id>
-            <url>file:///${project.basedir}/local-maven-repo</url>
-        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -68,9 +64,9 @@
             <version>${jersey.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.web3j</groupId>
-            <artifactId>core</artifactId>
-            <version>4.5.6</version>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.TIHBS</groupId>
@@ -88,11 +84,7 @@
             <artifactId>jackson-core</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -136,7 +128,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>RELEASE</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/blockchains/iaas/uni/stuttgart/de/Permissions.java

@@ -12,9 +12,10 @@
 import java.util.List;
 
 /********************************************************************************
- * Copyright (c) 2018 Institute for the Architecture of Application System -
+ * Copyright (c) 2018-2023 Institute for the Architecture of Application System -
  * University of Stuttgart
  * Author: Ghareeb Falazi
+ * Co-Author: Akshay Patel
  *
  * This program and the accompanying materials are made available under the
  * terms the Apache Software License 2.0
@@ -25,14 +26,19 @@
 @ApplicationPath("")
 public class Application extends ResourceConfig {
     public Application() {
+        register(ObjectMapperProvider.class);
+        register(JacksonFeature.class);
+        packages("blockchains.iaas.uni.stuttgart.de");
+
         // Required to load the plugins at startup
-        BlockchainPluginManager blockchainPluginManager = BlockchainPluginManager.getInstance();
         if (Boolean.getBoolean("enablePluginsAtStart")) {
+            BlockchainPluginManager blockchainPluginManager = BlockchainPluginManager.getInstance();
             blockchainPluginManager.startPlugins();
-        }
-        packages("blockchains.iaas.uni.stuttgart.de");
-        register(ObjectMapperProvider.class);
-        register(JacksonFeature.class);
+            List<PluginWrapper> plugins = blockchainPluginManager.getPlugins(PluginState.STARTED);
 
+            for (PluginWrapper pluginWrapper : plugins) {
+                blockchainPluginManager.registerConnectionProfileSubtypeClass(pluginWrapper.getPluginId());
+            }
+        }
     }
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2017 University of Stuttgart
+ * Copyright 2017-2023 University of Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -33,13 +33,6 @@ 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/config/ObjectMapperProvider.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Institute for the Architecture of Application System
+ * Copyright (c) 2019-2023 Institute for the Architecture of Application System
  * - University of Stuttgart
  * Author: Ghareeb Falazi
  * Co-author: Akshay Patel
@@ -17,14 +17,17 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import blockchains.iaas.uni.stuttgart.de.api.IAdapterExtension;
 import blockchains.iaas.uni.stuttgart.de.api.connectionprofiles.AbstractConnectionProfile;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.jsontype.NamedType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,16 +41,12 @@ public class ConnectionProfilesManager {
     private static ConnectionProfilesManager instance;
     private ConnectionProfileListener listener;
 
-    private Map<String, AbstractConnectionProfile> connectionProfilesMap;
-    private ObjectReader reader;
-    private ObjectWriter writer;
+
+    private final Map<String, AbstractConnectionProfile> connectionProfilesMap;
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     private ConnectionProfilesManager() {
         this.connectionProfilesMap = new HashMap<>();
-        this.reader = new ObjectMapper().readerFor(new TypeReference<Map<String, AbstractConnectionProfile>>() {
-        });
-        this.writer = new ObjectMapper().writerFor(new TypeReference<Map<String, AbstractConnectionProfile>>() {
-        });
     }
 
     public Map<String, AbstractConnectionProfile> getConnectionProfiles() {
@@ -56,7 +55,9 @@ public Map<String, AbstractConnectionProfile> getConnectionProfiles() {
 
 
     public String getConnectionProfilesAsJson() throws JsonProcessingException {
-        return this.writer.writeValueAsString(this.connectionProfilesMap);
+        ObjectWriter writer = mapper.writerFor(new TypeReference<Map<String, AbstractConnectionProfile>>() {
+        });
+        return writer.writeValueAsString(this.connectionProfilesMap);
     }
 
     /**
@@ -82,7 +83,9 @@ public void resetConnectionProfiles() {
 
     public void loadConnectionProfilesFromFile(File file) {
         try {
-            Map<String, AbstractConnectionProfile> newMap = this.reader.readValue(file);
+            ObjectReader reader = mapper.readerFor(new TypeReference<Map<String, AbstractConnectionProfile>>() {
+            });
+            Map<String, AbstractConnectionProfile> newMap = reader.readValue(file);
             this.loadConnectionProfiles(newMap);
         } catch (IOException e) {
             log.error("Failed to load connection profiles from the file!", e);
@@ -91,6 +94,8 @@ public void loadConnectionProfilesFromFile(File file) {
 
     public void loadConnectionProfilesFromJson(String jsonString) {
         try {
+            ObjectReader reader = mapper.readerFor(new TypeReference<Map<String, AbstractConnectionProfile>>() {
+            });
             Map<String, AbstractConnectionProfile> newMap = reader.readValue(jsonString);
             this.loadConnectionProfiles(newMap);
         } catch (IOException e) {
@@ -111,6 +116,10 @@ public void setListener(ConnectionProfileListener listener) {
         this.listener = listener;
     }
 
+    public static void registerConnectionProfileSubtypeClass(Class<? extends AbstractConnectionProfile> clazz, String typeName) {
+        mapper.registerSubtypes(new NamedType(clazz, typeName));
+    }
+
     /**
      * Should only be used for testing purposes!
      */

src/main/java/blockchains/iaas/uni/stuttgart/de/connectionprofiles/ConnectionProfilesManager.java

@@ -1,7 +1,8 @@
 /********************************************************************************
- * Copyright (c) 2022 Institute for the Architecture of Application System -
+ * Copyright (c) 2022-2023 Institute for the Architecture of Application System -
  * University of Stuttgart
  * Author: Akshay Patel
+ * Co-Author: Ghareeb Falazi
  *
  * This program and the accompanying materials are made available under the
  * terms the Apache Software License 2.0
@@ -14,6 +15,7 @@
 import blockchains.iaas.uni.stuttgart.de.Constants;
 import blockchains.iaas.uni.stuttgart.de.api.IAdapterExtension;
 
+import blockchains.iaas.uni.stuttgart.de.connectionprofiles.ConnectionProfilesManager;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import org.pf4j.DefaultPluginManager;
@@ -27,7 +29,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Singleton;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 public class BlockchainPluginManager{
@@ -38,6 +42,8 @@ public class BlockchainPluginManager{
     private static BlockchainPluginManager instance = null;
 
     private BlockchainPluginManager() {
+        String property = System.getProperty("pf4j.pluginsDir");
+        Path PLUGINS_DIRECTORY = Paths.get(property);
         this.pluginManager = new DefaultPluginManager(Constants.PLUGINS_DIRECTORY) {
             //
             @Override
@@ -112,11 +118,11 @@ public PluginState getPluginState(String pluginId) {
         return pluginManager.getPlugin(pluginId).getPluginState();
     }
 
-    public void registerConnectionProfileSubtypeClass(ObjectMapper objectMapper, String pluginId) {
+    public void registerConnectionProfileSubtypeClass(String pluginId) {
         List<IAdapterExtension> adapterExtensions = this.pluginManager.getExtensions(IAdapterExtension.class, pluginId);
         for (IAdapterExtension adapterExtension : adapterExtensions) {
             String namedType = adapterExtension.getConnectionProfileNamedType();
-            objectMapper.registerSubtypes(new NamedType(adapterExtension.getConnectionProfileClass(), namedType));
+            ConnectionProfilesManager.registerConnectionProfileSubtypeClass(adapterExtension.getConnectionProfileClass(), namedType);
         }
     }
 }