Refine Agent to create CADI Configs

Issue-ID: AAF-378
Change-Id: I4bb70ff582a3990d0344d23aaac2b750e931a6b1
Signed-off-by: Instrumental <jonathan.gathman@att.com>

6 files changed, 10 insertions, 6 deletions

diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
index 9986c60a..8371ff14 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
@@ -62,6 +62,7 @@ import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Data;
 import org.onap.aaf.misc.env.Env;
+import org.onap.aaf.misc.rosetta.env.RosettaEnv;
 
 import com.datastax.driver.core.Cluster;
 
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java
index cff70f03..84fc20a5 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java
@@ -29,9 +29,10 @@ import org.onap.aaf.auth.locate.service.LocateServiceImpl;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Data;
 
-import locate_local.v1_0.Error;
 import locate_local.v1_0.InRequest;
 import locate_local.v1_0.Out;
+import locate_local.v1_0.Error;;
+
 
 
 public class LocateFacadeFactory {
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java
index af6ad1c1..f7b9c363 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java
@@ -62,6 +62,7 @@ import org.onap.aaf.misc.rosetta.env.RosettaData;
 
 import locate_local.v1_0.Api;
 
+
 /**
  * AuthzFacade
  * 
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java
index d044b731..87d98361 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java
@@ -28,10 +28,11 @@ import org.onap.aaf.misc.env.Data;
 
 import locate.v1_0.Endpoints;
 import locate.v1_0.MgmtEndpoints;
-import locate_local.v1_0.Error;
+import locate.v1_1.Configuration;
 import locate_local.v1_0.InRequest;
 import locate_local.v1_0.Out;
-import locate_local.v1_1.Configuration;
+import locate_local.v1_0.Error;
+
 
 public class LocateFacade_1_1 extends LocateFacadeImpl<InRequest,Out,Endpoints,MgmtEndpoints,Configuration,Error>
 {
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java
index 61178951..2edb54f9 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java
@@ -32,10 +32,10 @@ import locate.v1_0.Endpoint;
 import locate.v1_0.Endpoints;
 import locate.v1_0.MgmtEndpoint;
 import locate.v1_0.MgmtEndpoints;
+import locate.v1_1.Configuration;
 import locate_local.v1_0.Error;
 import locate_local.v1_0.InRequest;
 import locate_local.v1_0.Out;
-import locate_local.v1_1.Configuration;
 
 public class Mapper_1_1 implements Mapper<InRequest,Out,Endpoints,MgmtEndpoints,Configuration,Error> {
 	
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
index 9789ad0e..595a6857 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
@@ -38,8 +38,8 @@ import org.onap.aaf.misc.env.APIException;
 import locate.v1_0.Endpoints;
 import locate.v1_0.MgmtEndpoint;
 import locate.v1_0.MgmtEndpoints;
-import locate_local.v1_1.Configuration;
-import locate_local.v1_1.Configuration.Props;
+import locate.v1_1.Configuration;
+import locate.v1_1.Configuration.Props;
 
 public class LocateServiceImpl<IN,OUT,ERROR> 
 	  implements LocateService<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> {