Remove duplicate table creation

Remove code to create table as it is already done by the MusicMixin
constructor.

Added java8 syntax enhancement.

Change-Id: Ic04987d701e969466f40fbe255576b85206032f9
Signed-off-by: subhash.kumar.singh <subhash.kumar.singh@huawei.com>
Issue-ID: MUSIC-412

diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java b/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java
index f7dd8ee..26256eb 100644 (file)
--- a/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java
+++ b/mdbc-server/src/test/java/org/onap/music/mdbc/MdbcTestUtils.java
@@ -249,7 +249,6 @@ public class MdbcTestUtils {
 
     public static MusicMixin getMusicMixin() throws MDBCServiceException {
         initNamespaces();
-        initTables();
         MusicMixin mixin=null;
         try {
             Properties properties = new Properties();
@@ -268,13 +267,4 @@ public class MdbcTestUtils {
         MusicMixin.createKeyspace("music_internal",1);
         MusicMixin.createKeyspace(keyspace,1);
     }
-
-    public static void initTables() throws MDBCServiceException{
-        MusicMixin.createMusicRangeInformationTable(keyspace, mriTableName);
-        MusicMixin.createMusicTxDigest(mtdTableName,keyspace, -1);
-        MusicMixin.createMusicEventualTxDigest(eventualMtxdTableName,keyspace, -1);
-        MusicMixin.createMusicNodeInfoTable(nodeInfoTableName,keyspace,-1);
-        MusicMixin.createMusicRangeDependencyTable(keyspace,rangeDependencyTableName);
-    }
-
 }

diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java
index ef26cb6..9800126 100644 (file)
--- a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java
+++ b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java
@@ -107,7 +107,7 @@ public class MusicMixinTest {
     public void initTest() throws MDBCServiceException {
         session = MdbcTestUtils.getSession();
         session.execute("DROP KEYSPACE IF EXISTS "+ MdbcTestUtils.getKeyspace());
-        mixin=MdbcTestUtils.getMusicMixin();
+        mixin = MdbcTestUtils.getMusicMixin();
     }
 
     //@Test(timeout=10000)
@@ -253,21 +253,7 @@ public class MusicMixinTest {
         mixin.addEventualTxDigest(digestId, compressed);
         
         LinkedHashMap<UUID, StagingTable> digest =  mixin.getEveTxDigest("n1");
-        
-        Consumer<Map.Entry<UUID,StagingTable>> consumer = new Consumer<Map.Entry<UUID,StagingTable>>() {
-
-            @Override
-            public void accept(Entry<UUID, StagingTable> mapEntry) {
-                assertNotNull(mapEntry.getValue());
-            }
-            
-        };
-       
-        digest.entrySet().forEach(consumer);
-        
-        
-        
-        
+        digest.entrySet().forEach(e -> assertNotNull(e.getValue()));
     }
 
     protected ByteBuffer mockCompressedProtoByteBuff() throws MDBCServiceException, InvalidProtocolBufferException {