Update documentation related to hazelcast

- removed old entries of data structures which are removed now.
- updated the documentation to correctly reflect our infrastructure
  startegy related to hazelcast.
- fixed few NB comments on the merged patch.

Issue-ID: CPS-2408
Change-Id: Id7ce4ac695ad94742490ac5d2be89cd23ffda3e5
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

2 files changed, 4 insertions, 4 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfig.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfig.java
index ad8025b5dc..109a541cb3 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfig.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfig.java
@@ -57,13 +57,13 @@ public class HazelcastCacheConfig {
         final Config config = getHazelcastInstanceConfig(instanceConfigName);
         config.setClusterName(clusterName);
         config.setClassLoader(org.onap.cps.spi.model.Dataspace.class.getClassLoader());
-        dataStructuresConfig(namedConfig, config);
+        configureDataStructures(namedConfig, config);
         exposeClusterInformation(config);
         updateDiscoveryMode(config);
         return config;
     }
 
-    private static void dataStructuresConfig(final NamedConfig namedConfig, final Config config) {
+    private static void configureDataStructures(final NamedConfig namedConfig, final Config config) {
         if (namedConfig instanceof MapConfig) {
             config.addMapConfig((MapConfig) namedConfig);
         }
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfigSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfigSpec.groovy
index dc38e0fc9b..0bd838437d 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfigSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/cache/HazelcastCacheConfigSpec.groovy
@@ -29,10 +29,10 @@ class HazelcastCacheConfigSpec extends Specification {
     def objectUnderTest = new HazelcastCacheConfig()
 
     def 'Create Hazelcast instance with a #scenario'() {
-        given: 'a cluster name and instance name'
+        given: 'a cluster name and instance config name'
             objectUnderTest.clusterName = 'my cluster'
             objectUnderTest.instanceConfigName = 'my instance config'
-        when: 'an hazelcast instance is created (name has to be unique)'
+        when: 'a hazelcast instance is created (name has to be unique)'
             def result = objectUnderTest.getOrCreateHazelcastInstance(config)
         then: 'the instance is created and has the correct name'
             assert result.name == 'my instance config'