1 files changed, 30 insertions, 6 deletions

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java
index f10976a5..08e957f1 100644
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java
@@ -1,5 +1,6 @@
 package org.onap.ccsdk.sli.core.sli.provider;
 
+import java.util.HashMap;
 import org.onap.ccsdk.sli.core.sli.SvcLogicAdaptor;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 import org.onap.ccsdk.sli.core.sli.SvcLogicRecorder;
@@ -13,17 +14,40 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SvcLogicClassResolver implements SvcLogicResolver {
+
 	private static final Logger LOG = LoggerFactory.getLogger(SvcLogicClassResolver.class);
-	private static SvcLogicClassResolver instance = new SvcLogicClassResolver();
+	private static HashMap<String, SvcLogicAdaptor> adaptorMap = new HashMap<>();
+
+	public void registerAdaptor(SvcLogicAdaptor adaptor) {
+		String name = adaptor.getClass().getName();
+		LOG.info("Registering adaptor " + name);
+		adaptorMap.put(name, adaptor);
+
+	}
 
-	private SvcLogicClassResolver() {
+	public void unregisterAdaptor(String name) {
+		if (adaptorMap.containsKey(name)) {
+			LOG.info("Unregistering " + name);
+			adaptorMap.remove(name);
+		}
 	}
 
-	public static SvcLogicClassResolver getInstance() {
-		return instance;
+	private SvcLogicAdaptor getAdaptorInstance(String name) {
+		if (adaptorMap.containsKey(name)) {
+			return adaptorMap.get(name);
+		} else {
+
+			SvcLogicAdaptor adaptor = (SvcLogicAdaptor) resolve(name);
+
+			if (adaptor != null) {
+				registerAdaptor(adaptor);
+			}
+
+			return adaptor;
+		}
 	}
 
-	public Object resolve(String className) {
+	private Object resolve(String className) {
 
 		Bundle bundle = FrameworkUtil.getBundle(SvcLogicClassResolver.class);
 
@@ -68,7 +92,7 @@ public class SvcLogicClassResolver implements SvcLogicResolver {
 
 	@Override
 	public SvcLogicAdaptor getSvcLogicAdaptor(String adaptorName) {
-		return SvcLogicAdaptorFactory.getInstance(adaptorName);
+		return getAdaptorInstance(adaptorName);
 	}
 
 }