11 files changed, 121 insertions, 464 deletions

diff --git a/jar/pom.xml b/jar/pom.xml
index 683ffb3c..71a9512d 100755
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC</artifactId>
     <packaging>jar</packaging>
-    <version>2.5.9-SNAPSHOT</version>
+    <version>2.5.10-SNAPSHOT</version>
     <description>
             This is the MUSIC REST interface, packaged as a war file.
     </description>
@@ -338,7 +338,7 @@
             <artifactId>jBCrypt</artifactId>
             <version>0.4.1</version>
         </dependency>
-       <!-- <dependency>
+        <!-- <dependency>
             <groupId>org.mindrot</groupId>
             <artifactId>jbcrypt</artifactId>
             <version>0.4</version>
diff --git a/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java b/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java
index 2fbca444..3cd8baeb 100644
--- a/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java
+++ b/jar/src/main/java/org/onap/music/datastore/MusicDataStore.java
@@ -168,20 +168,18 @@ public class MusicDataStore {
         .setConnectionsPerHost(HostDistance.REMOTE, 2, 4);
         while (it.hasNext()) {
             try {
-            	if(MusicUtil.getCassName() != null && MusicUtil.getCassPwd() != null) {
-                    logger.info(EELFLoggerDelegate.applicationLogger,
-                            "Building with credentials "+MusicUtil.getCassName()+" & "+MusicUtil.getCassPwd());
+                if(MusicUtil.getCassName() != null && MusicUtil.getCassPwd() != null) {
                     cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
-                                       .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
+                        .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
                                        //.withLoadBalancingPolicy(new RoundRobinPolicy())
-                                       .withoutJMXReporting()
-                                       .withPoolingOptions(poolingOptions)
-                                       .addContactPoints(addresses).build();
+                        .withoutJMXReporting()
+                        .withPoolingOptions(poolingOptions)
+                        .addContactPoints(addresses).build();
                 }
                 else
                     cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
                                          //.withLoadBalancingPolicy(new RoundRobinPolicy())
-                                         .addContactPoints(addresses).build();
+                        .addContactPoints(addresses).build();
                 
                 Metadata metadata = cluster.getMetadata();
                 logger.info(EELFLoggerDelegate.applicationLogger, "Connected to cassa cluster "
@@ -213,19 +211,15 @@ public class MusicDataStore {
         addresses = address.split(",");
         PoolingOptions poolingOptions = new PoolingOptions();
         poolingOptions
-        .setConnectionsPerHost(HostDistance.LOCAL,  4, 10)
-        .setConnectionsPerHost(HostDistance.REMOTE, 2, 4);
+            .setConnectionsPerHost(HostDistance.LOCAL,  4, 10)
+            .setConnectionsPerHost(HostDistance.REMOTE, 2, 4);
         if(MusicUtil.getCassName() != null && MusicUtil.getCassPwd() != null) {
-            logger.info(EELFLoggerDelegate.applicationLogger,
-                    "Building with credentials "+MusicUtil.getCassName()+" & "+MusicUtil.getCassPwd());
             cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
-                       .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
-                       //.withLoadBalancingPolicy(new RoundRobinPolicy())
-                       .withoutJMXReporting()
-                       .withPoolingOptions(poolingOptions)
-                       .addContactPoints(addresses).build();
-        }
-        else {
+                .withCredentials(MusicUtil.getCassName(), MusicUtil.getCassPwd())
+                .withoutJMXReporting()
+                .withPoolingOptions(poolingOptions)
+                .addContactPoints(addresses).build();
+        } else {
             cluster = Cluster.builder().withPort(MusicUtil.getCassandraPort())
                         //.withLoadBalancingPolicy(new RoundRobinPolicy())
                         .withoutJMXReporting()
@@ -238,7 +232,9 @@ public class MusicDataStore {
         try {
             session = cluster.connect();
         } catch (Exception ex) {
-            logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),AppMessages.CASSANDRACONNECTIVITY, ErrorSeverity.ERROR, ErrorTypes.SERVICEUNAVAILABLE);
+            logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),
+                AppMessages.CASSANDRACONNECTIVITY, 
+                ErrorSeverity.ERROR, ErrorTypes.SERVICEUNAVAILABLE);
             throw new MusicServiceException(
                             "Error while connecting to Cassandra cluster.. " + ex.getMessage());
         }
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java b/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java
deleted file mode 100644
index 3544e068..00000000
--- a/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- * Modifications Copyright (c) 2018 IBM
- * ===================================================================
- *  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
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
-
-package org.onap.music.datastore.jsonobjects;
-
-import java.util.List;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-@ApiModel(value = "JsonTable", description = "Reponse class for AAF request")
-public class AAFResponse {
-
-    private List<NameSpace> ns = null;
-
-    @ApiModelProperty(value = "Namespace value")
-    public List<NameSpace> getNs() {
-        return ns;
-    }
-
-    public void setNs(List<NameSpace> ns) {
-        this.ns = ns;
-    }
-
-}
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonOnboard.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonOnboard.java
deleted file mode 100755
index 5b3bbd48..00000000
--- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonOnboard.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  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
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
-
-package org.onap.music.datastore.jsonobjects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-@ApiModel(value = "JsonOnboard", description = "Defines the Json for Onboarding an application.")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class JsonOnboard {
-    private String appname;
-    private String userId;
-    private String password;
-    private String isAAF;
-    private String aid;
-    private String keyspace;
-
-	@ApiModelProperty(value = "Application Keyspace")
-    public String getKeyspace() {
-		return keyspace;
-	}
-
-	public void setKeyspace_name(String keyspace) {
-		this.keyspace = keyspace;
-	}
-
-	@ApiModelProperty(value = "Application Password")
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @ApiModelProperty(value = "Application UUID")
-    public String getAid() {
-        return aid;
-    }
-
-    public void setAid(String aid) {
-        this.aid = aid;
-    }
-
-    @ApiModelProperty(value = "Application name")
-    public String getAppname() {
-        return appname;
-    }
-
-    public void setAppname(String appname) {
-        this.appname = appname;
-    }
-
-    @ApiModelProperty(value = "User Id")
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    @ApiModelProperty(value = "Is AAF Application", allowableValues = "true, false")
-    public String getIsAAF() {
-        return isAAF;
-    }
-
-    public void setIsAAF(String isAAF) {
-        this.isAAF = isAAF;
-    }
-
-}
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/MusicResponse.java b/src/main/java/org/onap/music/datastore/jsonobjects/MusicResponse.java
deleted file mode 100644
index 97131fd7..00000000
--- a/src/main/java/org/onap/music/datastore/jsonobjects/MusicResponse.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  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
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
-package org.onap.music.datastore.jsonobjects;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.onap.music.rest.Application;
-
-public class MusicResponse implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	private List<Application> applicationList = new ArrayList<>();
-	private String message;
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	private String status;
-
-	public void setSucces(boolean isSucces) {
-		this.isSucces = isSucces;
-	}
-
-	private boolean isSucces;
-
-	public boolean isSucces() {
-		return isSucces;
-	}
-
-	public void setisSucces(boolean isSucces) {
-		this.isSucces = isSucces;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	public List<Application> getApplicationList() {
-		return applicationList;
-	}
-
-	public void setApplicationList(List<Application> applicationList) {
-		this.applicationList = applicationList;
-	}
-
-	public void setResposne(String status, String message) {
-		this.status = status;
-		this.message = message;
-	}
-	
-	public void addAppToList(Application app) {
-		applicationList.add(app);
-	}
-}
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/NameSpace.java b/src/main/java/org/onap/music/datastore/jsonobjects/NameSpace.java
deleted file mode 100644
index 3c18c791..00000000
--- a/src/main/java/org/onap/music/datastore/jsonobjects/NameSpace.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  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
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
-
-package org.onap.music.datastore.jsonobjects;
-
-import java.util.List;
-
-
-public class NameSpace {
-    private String name;
-    private List<String> admin;
-
-    public List<String> getAdmin() {
-        return admin;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setAdmin(List<String> admin) {
-        this.admin = admin;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-}
diff --git a/src/test/java/org/onap/music/datastore/PreparedQueryObjectTest.java b/src/test/java/org/onap/music/datastore/PreparedQueryObjectTest.java
new file mode 100644
index 00000000..71e484a7
--- /dev/null
+++ b/src/test/java/org/onap/music/datastore/PreparedQueryObjectTest.java
@@ -0,0 +1,75 @@
+/*
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ *  Copyright (c) 2019 IBM.
+ * ===================================================================
+ *  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
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * e
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * 
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+
+package org.onap.music.datastore;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class PreparedQueryObjectTest {
+    
+    private PreparedQueryObject preparedQueryObject;
+    
+    @Before
+    public void setUp()
+    {
+        preparedQueryObject = new PreparedQueryObject();
+    }
+    
+    @Test
+    public void testKeyspaceName()
+    {
+        preparedQueryObject.setKeyspaceName("keyspaceName");
+        assertEquals("keyspaceName", preparedQueryObject.getKeyspaceName());
+    }
+    
+    @Test
+    public void testConsistency()
+    {
+        preparedQueryObject.setConsistency("consistency");
+        assertEquals("consistency", preparedQueryObject.getConsistency());
+    }
+    
+    @Test
+    public void testTableName()
+    {
+        preparedQueryObject.setTableName("tableName");
+        assertEquals("tableName", preparedQueryObject.getTableName());
+    }
+    
+    @Test
+    public void testoperation()
+    {
+        preparedQueryObject.setOperation("operation");
+        assertEquals("operation", preparedQueryObject.getOperation());
+    }
+    
+    @Test
+    public void testprimaryKeyValue()
+    {
+        preparedQueryObject.setPrimaryKeyValue("primaryKeyValue");
+        assertEquals("primaryKeyValue", preparedQueryObject.getPrimaryKeyValue());
+    }
+    
+}
diff --git a/src/test/java/org/onap/music/unittests/jsonobjects/NameSpaceTest.java b/src/test/java/org/onap/music/unittests/authentication/AuthorizationErrorTest.java
index ee4d3933..b432072a 100644
--- a/src/test/java/org/onap/music/unittests/jsonobjects/NameSpaceTest.java
+++ b/src/test/java/org/onap/music/unittests/authentication/AuthorizationErrorTest.java
@@ -2,55 +2,50 @@
  * ============LICENSE_START==========================================
  * org.onap.music
  * ===================================================================
- *  Copyright (c) 2018 IBM.
+ *  Copyright (c) 2019 IBM.
  * ===================================================================
  *  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
- *
+ * 
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
+ * 
  * ============LICENSE_END=============================================
  * ====================================================================
  */
 
-package org.onap.music.unittests.jsonobjects;
+package org.onap.music.unittests.authentication;
+
+import static org.junit.Assert.assertEquals;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.music.authentication.AuthorizationError;
 
-import org.onap.music.datastore.jsonobjects.NameSpace;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+public class AuthorizationErrorTest {
 
-public class NameSpaceTest {
-    private NameSpace nameSpace;
+    private AuthorizationError authorizationError;
 
     @Before
     public void setUp() {
-        nameSpace = new NameSpace();
+        authorizationError = new AuthorizationError();
     }
 
     @Test
-    public void testGetSetAdmin() {
-        List<String> list = new ArrayList<String>();
-        list.add("admin");
-        nameSpace.setAdmin(list);
-        Assert.assertEquals(list, nameSpace.getAdmin());
+    public void testResponseCode() {
+        authorizationError.setResponseCode(400);
+        assertEquals(400, authorizationError.getResponseCode());
     }
 
     @Test
-    public void testGetSetName() {
-        nameSpace.setName("name");
-        Assert.assertEquals("name", nameSpace.getName());
+    public void testResponseMessage() {
+        authorizationError.setResponseMessage("ResponseMessage");
+        assertEquals("ResponseMessage", authorizationError.getResponseMessage());
     }
 }
diff --git a/src/test/java/org/onap/music/unittests/jsonobjects/AAFResponseTest.java b/src/test/java/org/onap/music/unittests/jsonobjects/AAFResponseTest.java
deleted file mode 100644
index 354668c7..00000000
--- a/src/test/java/org/onap/music/unittests/jsonobjects/AAFResponseTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  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
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
-
-package org.onap.music.unittests.jsonobjects;
-
-import static org.junit.Assert.*;
-import java.util.ArrayList;
-import org.junit.Test;
-import org.onap.music.datastore.jsonobjects.AAFResponse;
-import org.onap.music.datastore.jsonobjects.NameSpace;
-
-public class AAFResponseTest {
-
-    @Test
-    public void testGetNs() {
-        NameSpace ns = new NameSpace();
-        AAFResponse ar = new AAFResponse();
-        ArrayList<NameSpace> nsArray = new ArrayList<>();
-        ns.setName("tom");
-        ArrayList<String> admin = new ArrayList<>();
-        admin.add("admin1");
-        ns.setAdmin(admin);
-        nsArray.add(ns);
-        ar.setNs(nsArray);
-        assertEquals("tom",ar.getNs().get(0).getName());
-        assertEquals("admin1",ar.getNs().get(0).getAdmin().get(0));
-        
-    }
-
-//    @Test
-//    public void testSetNs() {
-//        fail("Not yet implemented");
-//    }
-
-}
diff --git a/src/test/java/org/onap/music/unittests/jsonobjects/JsonInsertTest.java b/src/test/java/org/onap/music/unittests/jsonobjects/JsonInsertTest.java
index 535cdd84..4992af7b 100644
--- a/src/test/java/org/onap/music/unittests/jsonobjects/JsonInsertTest.java
+++ b/src/test/java/org/onap/music/unittests/jsonobjects/JsonInsertTest.java
@@ -4,6 +4,8 @@
  * ===================================================================
  *  Copyright (c) 2017 AT&T Intellectual Property
  * ===================================================================
+ *  Modifications Copyright (c) 2019 IBM.
+ * ===================================================================
  *  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
@@ -22,9 +24,9 @@
 
 package org.onap.music.unittests.jsonobjects;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -98,6 +100,12 @@ public class JsonInsertTest {
         assertArrayEquals(ji1,test1);
     }
 
-
+    @Test
+    public void testObjectMap()
+    {
+        Map<String, byte[]> map = new HashMap<>();
+        ji.setObjectMap(map);
+        assertEquals(map, ji.getObjectMap());
+    }
 
 }
diff --git a/src/test/java/org/onap/music/unittests/jsonobjects/JsonOnboardTest.java b/src/test/java/org/onap/music/unittests/jsonobjects/JsonOnboardTest.java
deleted file mode 100644
index f7a1576a..00000000
--- a/src/test/java/org/onap/music/unittests/jsonobjects/JsonOnboardTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  Modifications Copyright (c) 2019 IBM.
- * ===================================================================
- *  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
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
- 
-package org.onap.music.unittests.jsonobjects;
-
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.music.datastore.jsonobjects.JsonOnboard;
-
-public class JsonOnboardTest {
-
-    JsonOnboard jo = null;
-    
-    @Before
-    public void init() {
-        jo = new JsonOnboard();
-    }
-
-    
-    @Test
-    public void testGetPassword() {
-        String password = "password";
-        jo.setPassword(password);
-        assertEquals(password,jo.getPassword());
-    }
-
-    @Test
-    public void testGetAid() {
-        String aid = "aid";
-        jo.setAid(aid);
-        assertEquals(aid,jo.getAid());
-
-    }
-
-    @Test
-    public void testGetAppname() {
-        String appName = "appName";
-        jo.setAppname(appName);
-        assertEquals(appName,jo.getAppname());
-
-    }
-
-    @Test
-    public void testGetUserId() {
-        String userId = "userId";
-        jo.setUserId(userId);
-        assertEquals(userId,jo.getUserId());
-
-    }
-
-    @Test
-    public void testGetIsAAF() {
-        String aaf = "true";
-        jo.setIsAAF(aaf);
-        assertEquals(aaf,jo.getIsAAF());
-        
-    }
-    
-    @Test
-    public void testKeyspace() {
-        jo.setKeyspace_name("Keyspace");
-        assertEquals("Keyspace",jo.getKeyspace());
-        
-    }
-
-}