X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fintrospection%2FLoaderFactory.java;h=96fd7dbd42af0476d38f8ebaebbeba1948bc2d90;hb=a86d6a6644d6de3f3f814cd6e25cfe2213d5dd05;hp=12255d80c15c2bdc6ef98c4a344afdc205d96a42;hpb=a395fa69a28a04d0a667fe458b4f10497a1d6794;p=aai%2Faai-common.git

diff --git a/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java b/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java
index 12255d80..96fd7dbd 100644
--- a/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java
@@ -19,25 +19,56 @@
  */
 package org.onap.aai.introspection;
 
+import java.util.Map;
+
+import org.onap.aai.setup.SchemaVersion;
+import org.springframework.beans.factory.annotation.Autowired;
+
 public class LoaderFactory {
 
+	@Autowired
+	public Map<SchemaVersion, MoxyLoader> moxyLoaderInstance;
+
+	public LoaderFactory(Map<SchemaVersion, MoxyLoader> moxyLoaderInstance) {
+		this.moxyLoaderInstance = moxyLoaderInstance;
+	}
+
 	/**
 	 * Creates a new Loader object.
 	 *
-	 * @param type the type
-	 * @param version the version
-	 * @param llBuilder the ll builder
+	 * @param type
+	 *            the type
+	 * @param version
+	 *            the version
+	 * @param llBuilder
+	 *            the ll builder
 	 * @return the loader
 	 */
-	public static Loader createLoaderForVersion(ModelType type, Version version) {
-		
+	public Loader createLoaderForVersion(ModelType type, SchemaVersion version) {
+
+		if (type.equals(ModelType.MOXY)) {
+			return getMoxyLoaderInstance().get(version);
+		}
+
+		return null;
+
+	}
+
+	public Loader getLoaderStrategy(ModelType type, SchemaVersion version) {
+
 		if (type.equals(ModelType.MOXY)) {
-			return new MoxyLoader(version);
-		} else if (type.equals(ModelType.POJO)) {
-			return new PojoLoader(version);
+			return getMoxyLoaderInstance().get(version);
 		}
-		
 		return null;
-		
+
 	}
+
+	public Map<SchemaVersion, MoxyLoader> getMoxyLoaderInstance() {
+		return moxyLoaderInstance;
+	}
+
+	public void setMoxyLoaderInstance(Map<SchemaVersion, MoxyLoader> moxyLoaderInstance) {
+		this.moxyLoaderInstance = moxyLoaderInstance;
+	}
+
 }