diff options
4 files changed, 55 insertions, 23 deletions
diff --git a/jar/pom.xml b/jar/pom.xml index c4e4294f..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</version> + <version>2.5.10-SNAPSHOT</version> <description> This is the MUSIC REST interface, packaged as a war file. </description> @@ -334,10 +334,15 @@ <version>19.0</version> </dependency> <dependency> + <groupId>de.svenkubiak</groupId> + <artifactId>jBCrypt</artifactId> + <version>0.4.1</version> + </dependency> + <!-- <dependency> <groupId>org.mindrot</groupId> <artifactId>jbcrypt</artifactId> <version>0.4</version> - </dependency> + </dependency>--> <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec --> <dependency> <groupId>commons-codec</groupId> 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/test/java/org/onap/music/unittests/JsonResponseTest.java b/src/test/java/org/onap/music/unittests/JsonResponseTest.java index 20ac1562..6af8c0d9 100644 --- a/src/test/java/org/onap/music/unittests/JsonResponseTest.java +++ b/src/test/java/org/onap/music/unittests/JsonResponseTest.java @@ -113,6 +113,28 @@ public class JsonResponseTest { } @Test + public void testLockLease() { + result = new JsonResponse(ResultType.SUCCESS); + result.setLockLease("lockLease"); + assertEquals("lockLease", result.getLockLease()); + } + + @Test + public void testMusicBuild() { + result = new JsonResponse(ResultType.SUCCESS); + result.setMusicBuild("Build"); + assertEquals("Build", result.getMusicBuild()); + } + + @Test + public void testLockHolder() { + result = new JsonResponse(ResultType.SUCCESS); + List<String> lockHolders = new ArrayList<>(); + result.setLockHolder(lockHolders); + assertEquals(lockHolders, result.getLockHolder()); + } + + @Test public void testLockStatus() { result = new JsonResponse(ResultType.SUCCESS); LockStatus status = LockStatus.LOCKED; diff --git a/src/test/java/org/onap/music/unittests/jsonobjects/JsonOnboardTest.java b/src/test/java/org/onap/music/unittests/jsonobjects/JsonOnboardTest.java index 1e66ed58..f7a1576a 100644 --- a/src/test/java/org/onap/music/unittests/jsonobjects/JsonOnboardTest.java +++ b/src/test/java/org/onap/music/unittests/jsonobjects/JsonOnboardTest.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 @@ -19,7 +21,7 @@ * ============LICENSE_END============================================= * ==================================================================== */ - + package org.onap.music.unittests.jsonobjects; import static org.junit.Assert.*; @@ -75,5 +77,12 @@ public class JsonOnboardTest { assertEquals(aaf,jo.getIsAAF()); } + + @Test + public void testKeyspace() { + jo.setKeyspace_name("Keyspace"); + assertEquals("Keyspace",jo.getKeyspace()); + + } } |