WIFI-7556 updated spring-boot version to 2.5.12 (spring 5.3.18) to cover for Springshell vulnerability (#26 )

Merge pull request #25 from Telecominfraproject/WIFI-4732
Wifi 4732 EquipmentPortalController resets to defaults channels for e…
2026-03-20 20:39:05 +00:00 · 2022-04-05 13:55:13 -04:00 · 2021-10-20 16:17:30 -04:00 · 2021-10-20 15:28:33 -04:00 · 2021-09-27 16:12:30 -04:00 · 2021-09-27 13:25:06 -04:00
49 changed files with 492 additions and 332 deletions
--- a/base-build/pom.xml
+++ b/base-build/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>com.telecominfraproject.wlan</groupId>
                <artifactId>tip-wlan-cloud-root-pom</artifactId>
-                <version>1.1.0-SNAPSHOT</version>
+                <version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
        </parent>

--- a/base-cassandra-tests/pom.xml
+++ b/base-cassandra-tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-cassandra-tests</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-cassandra</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
--- a/base-cassandra/pom.xml
+++ b/base-cassandra/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
  <artifactId>base-cassandra</artifactId>
@@ -14,7 +14,7 @@
 	<dependency>
 	    <groupId>com.telecominfraproject.wlan</groupId>
 	    <artifactId>cloud-metrics</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 	</dependency>
  
    <dependency>
--- a/base-client/pom.xml
+++ b/base-client/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-client</artifactId>
@@ -14,25 +14,25 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-container</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-exceptions</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>cloud-metrics</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
--- a/base-client/src/main/java/com/telecominfraproject/wlan/core/client/BaseRemoteClient.java
+++ b/base-client/src/main/java/com/telecominfraproject/wlan/core/client/BaseRemoteClient.java
@@ -1,7 +1,5 @@
 package com.telecominfraproject.wlan.core.client;

-import java.nio.charset.StandardCharsets;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpHeaders;
@@ -22,7 +20,8 @@ public abstract class BaseRemoteClient {
    protected HttpHeaders headers = new HttpHeaders();

    {
-        headers.setContentType(new MediaType("application", "json", StandardCharsets.UTF_8));
+        // Note: APPLICATION_JSON_UTF8 is deprecated
+        headers.setContentType(MediaType.APPLICATION_JSON);
        //Accept-Encoding: gzip,deflate
        headers.set("Accept-Encoding", "gzip,deflate");
    }
--- a/base-client/src/main/java/com/telecominfraproject/wlan/core/client/ExceptionPropagatingErrorHandler.java
+++ b/base-client/src/main/java/com/telecominfraproject/wlan/core/client/ExceptionPropagatingErrorHandler.java
@@ -8,6 +8,7 @@ import org.springframework.core.task.TaskRejectedException;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.ResponseErrorHandler;

@@ -38,7 +39,7 @@ public class ExceptionPropagatingErrorHandler extends DefaultResponseErrorHandle
    public void handleError(ClientHttpResponse response) throws IOException {
        try {
            super.handleError(response);
-        } catch (HttpServerErrorException e) {
+        } catch (HttpServerErrorException | HttpClientErrorException e) {
            // look in the response object, and if it contains any of the
            // exceptions we recognize - throw that exception instead of the
            // HttpServerErrorException
--- a/base-container/pom.xml
+++ b/base-container/pom.xml
@@ -3,7 +3,7 @@
  <parent>
    <groupId>com.telecominfraproject.wlan</groupId>
    <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
    <relativePath>../../wlan-cloud-root</relativePath>
  </parent>
  <artifactId>base-container</artifactId>
@@ -18,7 +18,7 @@
    <dependency>
        <groupId>com.telecominfraproject.wlan</groupId>
        <artifactId>base-models</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
    </dependency>
    <dependency>
        <groupId>org.springframework</groupId>
@@ -32,7 +32,7 @@
 	<dependency>
 	    <groupId>com.telecominfraproject.wlan</groupId>
 	    <artifactId>cloud-metrics</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 	</dependency>

    <!-- Auth0 dependencies -->
--- a/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/CommonControllerAdvice.java
+++ b/base-container/src/main/java/com/telecominfraproject/wlan/core/server/webconfig/CommonControllerAdvice.java
@@ -20,7 +20,7 @@ import com.telecominfraproject.wlan.core.model.json.JsonSerializedException;
 /**
 * @author dtoptygin
 */
-@ControllerAdvice
+@ControllerAdvice(basePackages = "com.telecominfraproject")
 public class CommonControllerAdvice {

    private static final Logger LOG = LoggerFactory.getLogger(CommonControllerAdvice.class);
--- a/base-datastore-inmemory/pom.xml
+++ b/base-datastore-inmemory/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-datastore-inmemory</artifactId>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-exceptions</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
--- a/base-elasticsearch/pom.xml
+++ b/base-elasticsearch/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>base-elasticsearch</artifactId>
@@ -14,12 +14,12 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-exceptions</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<!-- ElasticSearch dependencies -->
 		<dependency>
--- a/base-exceptions/pom.xml
+++ b/base-exceptions/pom.xml
@@ -3,7 +3,7 @@
  <parent>
    <groupId>com.telecominfraproject.wlan</groupId>
    <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
    <relativePath>../../wlan-cloud-root</relativePath>
  </parent>
  <artifactId>base-exceptions</artifactId>
--- a/base-hazelcast-client/pom.xml
+++ b/base-hazelcast-client/pom.xml
@@ -3,30 +3,22 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-hazelcast-client</artifactId>
 	<name>base-hazelcast-client</name>
 	<description>Common classes for accessing Hazelcast in-memory grid data store.</description>
 	<dependencies>
-		<dependency>
-			<groupId>com.hazelcast</groupId>
-			<artifactId>hazelcast</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.hazelcast</groupId>
-			<artifactId>hazelcast-client</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>common-hazelcast</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 	</dependencies>
--- a/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/HazelcastForUnitTest.java
+++ b/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/HazelcastForUnitTest.java
@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;

 import com.hazelcast.config.Config;
-import com.hazelcast.config.GroupConfig;
 import com.hazelcast.config.InterfacesConfig;
 import com.hazelcast.config.JoinConfig;
 import com.hazelcast.config.MapConfig;
@@ -19,7 +18,6 @@ import com.hazelcast.config.QueueConfig;
 import com.hazelcast.config.TcpIpConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.spi.properties.GroupProperty;

@Configuration
@Profile("HazelcastForUnitTest")
@@ -69,12 +67,14 @@ public class HazelcastForUnitTest {
    public HazelcastInstance hazelcastInstanceTest() {
        // this is used for experiments and unit tests
        Config config = new Config();
-        config.setProperty(GroupProperty.LOGGING_TYPE.getName(), "slf4j");
-        config.setProperty(GroupProperty.PHONE_HOME_ENABLED.getName(), "false");
+//        config.setProperty(GroupProperty.LOGGING_TYPE.getName(), "slf4j");
+//        config.setProperty(GroupProperty.PHONE_HOME_ENABLED.getName(), "false");
        
-        GroupConfig groupConfig = new GroupConfig(System.getProperty("tip.wlan.hazelcast.groupName", "wc-dev"));
-        groupConfig.setPassword(System.getProperty("tip.wlan.hazelcast.groupPassword", "wc-dev-pass"));
-        config.setGroupConfig(groupConfig);
+//        GroupConfig groupConfig = new GroupConfig(System.getProperty("tip.wlan.hazelcast.groupName", "wc-dev"));
+//        groupConfig.setPassword(System.getProperty("tip.wlan.hazelcast.groupPassword", "wc-dev-pass"));
+//        config.setGroupConfig(groupConfig);
+        config.setClusterName(System.getProperty("tip.wlan.hazelcast.clusterName", "wc-dev"));
+
        config.getNetworkConfig().setPublicAddress("127.0.0.1").setPort(5900).setPortAutoIncrement(true)
                .setInterfaces(new InterfacesConfig().addInterface("127.0.0.1"));

--- a/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/HazelcastClientConfiguration.java
+++ b/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/HazelcastClientConfiguration.java
@@ -14,8 +14,8 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;

 import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.config.security.UsernamePasswordIdentityConfig;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.spi.properties.GroupProperty;
 import com.telecominfraproject.wlan.core.model.utils.SystemAndEnvPropertyResolver;

 /**
@@ -142,10 +142,11 @@ public class HazelcastClientConfiguration {
    @Bean
    public HazelcastInstance hazelcastClientUnicast() {
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.setProperty(GroupProperty.LOGGING_TYPE.getName(), "slf4j");
-        clientConfig.setProperty(GroupProperty.PHONE_HOME_ENABLED.getName(), "false");
+//        clientConfig.setProperty(GroupProperty.LOGGING_TYPE.getName(), "slf4j");
+//        clientConfig.setProperty(GroupProperty.PHONE_HOME_ENABLED.getName(), "false");

-        clientConfig.getGroupConfig().setName(groupName).setPassword(groupPassword);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(groupName, groupPassword));
+        
        for (String addrStr : nodeAddressesStr.split(",")) {
            clientConfig.getNetworkConfig().addAddress(addrStr);
        }
@@ -156,7 +157,7 @@ public class HazelcastClientConfiguration {
        clientConfig.getNetworkConfig().setSmartRouting(false);
        // the client will attempt to re-connect to the cluster forever if
        // cluster is not available
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance client = new ReConnectingHazelcastClient(clientConfig, reconnectTimeSec);

--- a/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/ReConnectingHazelcastClient.java
+++ b/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/ReConnectingHazelcastClient.java
@@ -1,47 +1,42 @@
 package com.telecominfraproject.wlan.hazelcast.client;

 import java.util.Collection;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import com.hazelcast.cardinality.CardinalityEstimator;
+import com.hazelcast.client.ClientService;
 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.cluster.Cluster;
+import com.hazelcast.cluster.Endpoint;
+import com.hazelcast.collection.IList;
+import com.hazelcast.collection.IQueue;
+import com.hazelcast.collection.ISet;
 import com.hazelcast.config.Config;
-import com.hazelcast.core.ClientService;
-import com.hazelcast.core.Cluster;
 import com.hazelcast.core.DistributedObject;
 import com.hazelcast.core.DistributedObjectListener;
-import com.hazelcast.core.Endpoint;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
-import com.hazelcast.core.IAtomicReference;
 import com.hazelcast.core.ICacheManager;
-import com.hazelcast.core.ICountDownLatch;
 import com.hazelcast.core.IExecutorService;
-import com.hazelcast.core.IList;
-import com.hazelcast.core.ILock;
-import com.hazelcast.core.IMap;
-import com.hazelcast.core.IQueue;
-import com.hazelcast.core.ISemaphore;
-import com.hazelcast.core.ISet;
-import com.hazelcast.core.ITopic;
-import com.hazelcast.core.IdGenerator;
 import com.hazelcast.core.LifecycleService;
-import com.hazelcast.core.MultiMap;
-import com.hazelcast.core.PartitionService;
-import com.hazelcast.core.ReplicatedMap;
 import com.hazelcast.cp.CPSubsystem;
 import com.hazelcast.crdt.pncounter.PNCounter;
 import com.hazelcast.durableexecutor.DurableExecutorService;
 import com.hazelcast.flakeidgen.FlakeIdGenerator;
 import com.hazelcast.logging.LoggingService;
-import com.hazelcast.mapreduce.JobTracker;
-import com.hazelcast.quorum.QuorumService;
+import com.hazelcast.map.IMap;
+import com.hazelcast.multimap.MultiMap;
+import com.hazelcast.partition.PartitionService;
+import com.hazelcast.replicatedmap.ReplicatedMap;
 import com.hazelcast.ringbuffer.Ringbuffer;
 import com.hazelcast.scheduledexecutor.IScheduledExecutorService;
+import com.hazelcast.splitbrainprotection.SplitBrainProtectionService;
+import com.hazelcast.sql.SqlService;
+import com.hazelcast.topic.ITopic;
 import com.hazelcast.transaction.HazelcastXAResource;
 import com.hazelcast.transaction.TransactionContext;
 import com.hazelcast.transaction.TransactionException;
@@ -150,224 +145,157 @@ public class ReConnectingHazelcastClient implements HazelcastInstance {
        }
        return this.client;
    }
-    
-    @Override
+
    public String getName() {
        return getClient().getName();
    }

-    @Override
    public <E> IQueue<E> getQueue(String name) {
        return getClient().getQueue(name);
    }

-    @Override
    public <E> ITopic<E> getTopic(String name) {
        return getClient().getTopic(name);
    }

-    @Override
    public <E> ISet<E> getSet(String name) {
        return getClient().getSet(name);
    }

-    @Override
    public <E> IList<E> getList(String name) {
        return getClient().getList(name);
    }

-    @Override
    public <K, V> IMap<K, V> getMap(String name) {
        return getClient().getMap(name);
    }

-    @Override
    public <K, V> ReplicatedMap<K, V> getReplicatedMap(String name) {
        return getClient().getReplicatedMap(name);
    }

-    @Override
-    public JobTracker getJobTracker(String name) {
-        return getClient().getJobTracker(name);
-    }
-
-    @Override
    public <K, V> MultiMap<K, V> getMultiMap(String name) {
        return getClient().getMultiMap(name);
    }

-    @Override
-    public ILock getLock(String key) {
-        return getClient().getLock(key);
-    }
-
-    @Override
    public <E> Ringbuffer<E> getRingbuffer(String name) {
        return getClient().getRingbuffer(name);
    }

-    @Override
    public <E> ITopic<E> getReliableTopic(String name) {
        return getClient().getReliableTopic(name);
    }

-    @Override
    public Cluster getCluster() {
        return getClient().getCluster();
    }

-    @Override
    public Endpoint getLocalEndpoint() {
        return getClient().getLocalEndpoint();
    }

-    @Override
    public IExecutorService getExecutorService(String name) {
        return getClient().getExecutorService(name);
    }

-    @Override
-    public <T> T executeTransaction(TransactionalTask<T> task) throws TransactionException {
-        return getClient().executeTransaction(task);
-    }
-
-    @Override
-    public <T> T executeTransaction(TransactionOptions options, TransactionalTask<T> task) throws TransactionException {
-        return getClient().executeTransaction(options, task);
-    }
-
-    @Override
-    public TransactionContext newTransactionContext() {
-        return getClient().newTransactionContext();
-    }
-
-    @Override
-    public TransactionContext newTransactionContext(TransactionOptions options) {
-        return getClient().newTransactionContext(options);
-    }
-
-    @Override
-    public IdGenerator getIdGenerator(String name) {
-        return getClient().getIdGenerator(name);
-    }
-
-    @Override
-    public IAtomicLong getAtomicLong(String name) {
-        return getClient().getAtomicLong(name);
-    }
-
-    @Override
-    public <E> IAtomicReference<E> getAtomicReference(String name) {
-        return getClient().getAtomicReference(name);
-    }
-
-    @Override
-    public ICountDownLatch getCountDownLatch(String name) {
-        return getClient().getCountDownLatch(name);
-    }
-
-    @Override
-    public ISemaphore getSemaphore(String name) {
-        return getClient().getSemaphore(name);
-    }
-
-    @Override
-    public Collection<DistributedObject> getDistributedObjects() {
-        return getClient().getDistributedObjects();
-    }
-
-    @Override
-    public String addDistributedObjectListener(DistributedObjectListener distributedObjectListener) {
-        return getClient().addDistributedObjectListener(distributedObjectListener);
-    }
-
-    @Override
-    public boolean removeDistributedObjectListener(String registrationId) {
-        return getClient().removeDistributedObjectListener(registrationId);
-    }
-
-    @Override
-    public Config getConfig() {
-        return getClient().getConfig();
-    }
-
-    @Override
-    public PartitionService getPartitionService() {
-        return getClient().getPartitionService();
-    }
-
-    @Override
-    public QuorumService getQuorumService() {
-        return getClient().getQuorumService();
-    }
-
-    @Override
-    public ClientService getClientService() {
-        return getClient().getClientService();
-    }
-
-    @Override
-    public LoggingService getLoggingService() {
-        return getClient().getLoggingService();
-    }
-
-    @Override
-    public LifecycleService getLifecycleService() {
-        return getClient().getLifecycleService();
-    }
-
-    @Override
-    public <T extends DistributedObject> T getDistributedObject(String serviceName, String name) {
-        return getClient().getDistributedObject(serviceName, name);
-    }
-
-    @Override
-    public ConcurrentMap<String, Object> getUserContext() {
-        return getClient().getUserContext();
-    }
-
-    @Override
-    public HazelcastXAResource getXAResource() {
-        return getClient().getXAResource();
-    }
-
-    @Override
-    public void shutdown() {
-        getClient().shutdown();
-    }
-
-    @Override
    public DurableExecutorService getDurableExecutorService(String name) {
        return getClient().getDurableExecutorService(name);
    }

-    @Override
+    public <T> T executeTransaction(TransactionalTask<T> task) throws TransactionException {
+        return getClient().executeTransaction(task);
+    }
+
+    public <T> T executeTransaction(TransactionOptions options, TransactionalTask<T> task) throws TransactionException {
+        return getClient().executeTransaction(options, task);
+    }
+
+    public TransactionContext newTransactionContext() {
+        return getClient().newTransactionContext();
+    }
+
+    public TransactionContext newTransactionContext(TransactionOptions options) {
+        return getClient().newTransactionContext(options);
+    }
+
+    public FlakeIdGenerator getFlakeIdGenerator(String name) {
+        return getClient().getFlakeIdGenerator(name);
+    }
+
+    public Collection<DistributedObject> getDistributedObjects() {
+        return getClient().getDistributedObjects();
+    }
+
+    public UUID addDistributedObjectListener(DistributedObjectListener distributedObjectListener) {
+        return getClient().addDistributedObjectListener(distributedObjectListener);
+    }
+
+    public boolean removeDistributedObjectListener(UUID registrationId) {
+        return getClient().removeDistributedObjectListener(registrationId);
+    }
+
+    public Config getConfig() {
+        return getClient().getConfig();
+    }
+
+    public PartitionService getPartitionService() {
+        return getClient().getPartitionService();
+    }
+
+    public SplitBrainProtectionService getSplitBrainProtectionService() {
+        return getClient().getSplitBrainProtectionService();
+    }
+
+    public ClientService getClientService() {
+        return getClient().getClientService();
+    }
+
+    public LoggingService getLoggingService() {
+        return getClient().getLoggingService();
+    }
+
+    public LifecycleService getLifecycleService() {
+        return getClient().getLifecycleService();
+    }
+
+    public <T extends DistributedObject> T getDistributedObject(String serviceName, String name) {
+        return getClient().getDistributedObject(serviceName, name);
+    }
+
+    public ConcurrentMap<String, Object> getUserContext() {
+        return getClient().getUserContext();
+    }
+
+    public HazelcastXAResource getXAResource() {
+        return getClient().getXAResource();
+    }
+
    public ICacheManager getCacheManager() {
        return getClient().getCacheManager();
    }

-    @Override
    public CardinalityEstimator getCardinalityEstimator(String name) {
        return getClient().getCardinalityEstimator(name);
    }

-    @Override
+    public PNCounter getPNCounter(String name) {
+        return getClient().getPNCounter(name);
+    }
+
    public IScheduledExecutorService getScheduledExecutorService(String name) {
        return getClient().getScheduledExecutorService(name);
    }

-    @Override
-    public PNCounter getPNCounter(String name) {    	
-    	return getClient().getPNCounter(name);
-    }
-    
-    @Override
    public CPSubsystem getCPSubsystem() {
-    	return getClient().getCPSubsystem();
+        return getClient().getCPSubsystem();
+    }
+
+    public SqlService getSql() {
+        return getClient().getSql();
+    }
+
+    public void shutdown() {
+        getClient().shutdown();
    }
    
-    @Override
-    public FlakeIdGenerator getFlakeIdGenerator(String name) {
-    	return getClient().getFlakeIdGenerator(name);
-    }
 }
--- a/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/TestClient.java
+++ b/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/TestClient.java
@@ -6,8 +6,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;

@@ -16,15 +16,16 @@ import org.slf4j.LoggerFactory;

 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.collection.impl.queue.QueueService;
+import com.hazelcast.config.security.UsernamePasswordIdentityConfig;
 import com.hazelcast.core.DistributedObject;
 import com.hazelcast.core.DistributedObjectEvent;
 import com.hazelcast.core.DistributedObjectListener;
 import com.hazelcast.core.EntryEvent;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.core.IQueue;
-import com.hazelcast.core.IdGenerator;
+import com.hazelcast.flakeidgen.FlakeIdGenerator;
+import com.hazelcast.map.IMap;
 import com.hazelcast.map.listener.EntryAddedListener;
 import com.hazelcast.map.listener.EntryEvictedListener;
 import com.hazelcast.map.listener.EntryRemovedListener;
@@ -35,7 +36,8 @@ public class TestClient {

    public static void main_1(String[] args) throws IOException {
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName("wc-dev").setPassword("wc-dev-pass");
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig("wc-dev", "wc-dev-pass"));
+
        clientConfig.getNetworkConfig().addAddress("127.0.0.1:5900");
        clientConfig.getNetworkConfig().addAddress("127.0.0.1:5901");
        clientConfig.getNetworkConfig().addAddress("127.0.0.1:5902");
@@ -53,7 +55,7 @@ public class TestClient {
            System.out.println("metricsMap["+ entry.getKey() +"]: " +entry.getValue());
        }

-        IdGenerator testIdGenerator = client.getIdGenerator("id_generator_created_from_client");
+        FlakeIdGenerator testIdGenerator = client.getFlakeIdGenerator("id_generator_created_from_client");
        
        Map<Long, String> mapCreatedFromClient = client.getMap( "map_created_from_client" );
        System.out.println("mapCreatedFromClient: " + mapCreatedFromClient);
@@ -120,7 +122,8 @@ public class TestClient {
    
    public static void main_2(String[] args) throws InterruptedException {
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
+
        clientConfig.getNetworkConfig().addAddress(addr);
        clientConfig.getNetworkConfig().addAddress("127.0.0.1:5901");
        clientConfig.getNetworkConfig().addAddress("127.0.0.1:5902");
@@ -239,7 +242,7 @@ public class TestClient {

    public static void main_3(String[] args) throws InterruptedException, ExecutionException {
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);
 //        clientConfig.getNetworkConfig().addAddress("127.0.0.1:5901");
 //        clientConfig.getNetworkConfig().addAddress("127.0.0.1:5902");
@@ -247,7 +250,7 @@ public class TestClient {
        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        //HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
        HazelcastInstance client = new ReConnectingHazelcastClient(clientConfig, 20);
@@ -259,7 +262,7 @@ public class TestClient {
        
        if(Boolean.getBoolean("populateMapBeforeTest")){
            @SuppressWarnings("rawtypes")
-			List<Future> futures = new ArrayList<>(1000);
+			List<CompletionStage<String>> futures = new ArrayList<>(1000);

            //populate map with entries        
            for(int i=0; i<1000000; i++){
@@ -280,12 +283,12 @@ public class TestClient {
 //                    }
 //                }

-                futures.add(client.getMap("testMap").putAsync("t_" + Integer.toString(fI), Integer.toString(fI)));
+                futures.add(client.<String, String>getMap("testMap").putAsync("t_" + Integer.toString(fI), Integer.toString(fI)));

                //wait for a batch of futures to complete
                if(futures.size()>=990){
-                    for(Future<?> f: futures){
-                        f.get();
+                    for(CompletionStage<String> f: futures){
+                        f.toCompletableFuture().get();
                    }
                    
                    futures.clear();
@@ -293,8 +296,8 @@ public class TestClient {
                
            }

-            for(Future<?> f: futures){
-                f.get();
+            for(CompletionStage<String> f: futures){
+                f.toCompletableFuture().get();
            }

            end = System.currentTimeMillis();
@@ -323,7 +326,7 @@ public class TestClient {
            evenCount = 0;
            Predicate<String, String> predicate = new SamplePredicate();
            
-            for(Map.Entry<?, ?> entry: client.getMap( "testMap" ).entrySet(predicate )){
+            for(Map.Entry<String, String> entry: client.<String, String>getMap( "testMap" ).entrySet(predicate )){
                evenCount++;
            }
            
@@ -355,13 +358,13 @@ public class TestClient {

        
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
                
@@ -386,13 +389,13 @@ public class TestClient {
    public static void main_5(String[] args) {
                
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
                
@@ -426,13 +429,13 @@ public class TestClient {
    public static void main_6(String[] args) {
        
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
                
@@ -464,13 +467,13 @@ public class TestClient {
    public static void main_7(String[] args) {
        
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
                
@@ -523,13 +526,13 @@ public class TestClient {
    public static void main(String[] args) {
        
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance hazelcastClient = HazelcastClient.newHazelcastClient(clientConfig);

@@ -598,13 +601,13 @@ public class TestClient {
    public static void main_9(String[] args) throws InterruptedException {
        
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance hazelcastClient = HazelcastClient.newHazelcastClient(clientConfig);
        DistributedObjectListener distributedObjectListener = new DistributedObjectListener() {
--- a/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/clu/GetValues.java
+++ b/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/clu/GetValues.java
@@ -5,9 +5,9 @@ import java.util.Set;

 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.config.security.UsernamePasswordIdentityConfig;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.spi.properties.GroupProperty;
+import com.hazelcast.map.IMap;
 import com.telecominfraproject.wlan.hazelcast.common.HazelcastObjectsConfiguration;

 public class GetValues 
@@ -25,10 +25,10 @@ public class GetValues
 //        }

        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.setProperty(GroupProperty.LOGGING_TYPE.getName(), "slf4j");
-        clientConfig.setProperty(GroupProperty.PHONE_HOME_ENABLED.getName(), "false");
+//        clientConfig.setProperty(GroupProperty.LOGGING_TYPE.getName(), "slf4j");
+//        clientConfig.setProperty(GroupProperty.PHONE_HOME_ENABLED.getName(), "false");
        
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
--- a/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/clu/SetProvisionedCapacity.java
+++ b/base-hazelcast-client/src/main/java/com/telecominfraproject/wlan/hazelcast/client/clu/SetProvisionedCapacity.java
@@ -2,9 +2,9 @@ package com.telecominfraproject.wlan.hazelcast.client.clu;

 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.config.security.UsernamePasswordIdentityConfig;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.spi.properties.GroupProperty;
+import com.hazelcast.map.IMap;

 public class SetProvisionedCapacity {  
    
@@ -21,16 +21,14 @@ public class SetProvisionedCapacity {

        
        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.setProperty(GroupProperty.LOGGING_TYPE.getName(), "slf4j");
-        clientConfig.setProperty(GroupProperty.PHONE_HOME_ENABLED.getName(), "false");
        
-        clientConfig.getGroupConfig().setName(clusterName).setPassword(password);
+        clientConfig.getSecurityConfig().setUsernamePasswordIdentityConfig(new UsernamePasswordIdentityConfig(clusterName, password));
        clientConfig.getNetworkConfig().addAddress(addr);

        //see http://docs.hazelcast.org/docs/3.6/manual/html-single/index.html#java-client-operation-modes
        // here we're using "dumb" client that connects only to a single node of the cluster
        clientConfig.getNetworkConfig().setSmartRouting(false);
-        clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);
+        //clientConfig.getNetworkConfig().setConnectionAttemptLimit(0);

        HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
                
--- a/base-hierarchical-datastore/pom.xml
+++ b/base-hierarchical-datastore/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
  <artifactId>base-hierarchical-datastore</artifactId>
@@ -13,17 +13,17 @@
    <dependency>
        <groupId>com.telecominfraproject.wlan</groupId>
        <artifactId>base-models</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
    </dependency>
    <dependency>
        <groupId>com.telecominfraproject.wlan</groupId>
        <artifactId>base-hazelcast-client</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
    </dependency>
    <dependency>
        <groupId>com.telecominfraproject.wlan</groupId>
        <artifactId>cloud-metrics</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
    </dependency>
    
  </dependencies>
--- a/base-hierarchical-datastore/src/main/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastore.java
+++ b/base-hierarchical-datastore/src/main/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastore.java
@@ -27,6 +27,7 @@ import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
@@ -41,9 +42,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StreamUtils;

+import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.core.IQueue;
+import com.hazelcast.map.IMap;
 import com.netflix.servo.monitor.Counter;
 import com.netflix.servo.monitor.Timer;
 import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsUtils;
@@ -495,7 +496,8 @@ public class HierarchicalDatastore{
        try {
            LOG.trace("submitting append request to hazelcast");
            //submit operation and wait for its completion
-            dirListMap.submitToKey(dirKey, new AppendStringToSetEntryProcessor(shortFileName) ).get();
+            CompletionStage<Set<String>> cs = dirListMap.submitToKey(dirKey, new AppendStringToSetEntryProcessor(shortFileName) );
+            cs.toCompletableFuture().get();
            LOG.trace("append request is processed in hazelcast");
        } catch (InterruptedException e) {
            Thread.currentThread().interrupt();
--- a/base-hierarchical-datastore/src/test/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastoreHourlyIndexTests.java
+++ b/base-hierarchical-datastore/src/test/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastoreHourlyIndexTests.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.PostConstruct;

 import org.junit.AfterClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import com.telecominfraproject.wlan.core.model.filter.EntryFilter;
 import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
 import com.telecominfraproject.wlan.hazelcast.HazelcastForUnitTest;
@@ -59,6 +60,7 @@ import com.telecominfraproject.wlan.hierarchical.datastore.writer.StreamHolder;
        PropertySourcesPlaceholderConfigurer.class, //must have this to resolve non-string @Value annotations, i.e. int properties, etc.
        })
@ActiveProfiles({"HazelcastForUnitTest"})
+@Ignore("DT: these compoinents are not used for now, re-enable the tests if and when they are back in the system")
 public class HierarchicalDatastoreHourlyIndexTests {
    
    static{
--- a/base-hierarchical-datastore/src/test/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastoreRecordIndexTests.java
+++ b/base-hierarchical-datastore/src/test/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastoreRecordIndexTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import com.telecominfraproject.wlan.core.model.filter.EntryFilter;
 import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
 import com.telecominfraproject.wlan.hazelcast.HazelcastForUnitTest;
@@ -53,6 +53,7 @@ import com.telecominfraproject.wlan.hierarchical.datastore.writer.StreamHolder;
        PropertySourcesPlaceholderConfigurer.class, //must have this to resolve non-string @Value annotations, i.e. int properties, etc.
        })
@ActiveProfiles({"HazelcastForUnitTest"})
+@Ignore("DT: these compoinents are not used for now, re-enable the tests if and when they are back in the system")
 public class HierarchicalDatastoreRecordIndexTests {
    
    static{
--- a/base-hierarchical-datastore/src/test/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastoreTests.java
+++ b/base-hierarchical-datastore/src/test/java/com/telecominfraproject/wlan/hierarchical/datastore/HierarchicalDatastoreTests.java
@@ -26,6 +26,7 @@ import java.util.zip.ZipOutputStream;
 import javax.annotation.PostConstruct;

 import org.junit.AfterClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,7 @@ import com.telecominfraproject.wlan.hierarchical.datastore.index.registry.Record
        HazelcastObjectsConfiguration.class,
        })
@ActiveProfiles({"HazelcastForUnitTest"})
+@Ignore("DT: these compoinents are not used for now, re-enable the tests if and when they are back in the system")
 public class HierarchicalDatastoreTests {
    
    static{
--- a/base-jdbc-tests/pom.xml
+++ b/base-jdbc-tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-jdbc-tests</artifactId>
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-jdbc</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
--- a/base-jdbc/pom.xml
+++ b/base-jdbc/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
  <artifactId>base-jdbc</artifactId>
@@ -41,7 +41,7 @@
 	<dependency>
 	    <groupId>com.telecominfraproject.wlan</groupId>
 	    <artifactId>cloud-metrics</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 	</dependency>
  
  </dependencies>
--- a/base-jdbc/src/main/java/com/telecominfraproject/wlan/core/server/jdbc/JdbcOperationsWithMetrics.java
+++ b/base-jdbc/src/main/java/com/telecominfraproject/wlan/core/server/jdbc/JdbcOperationsWithMetrics.java
@@ -3,6 +3,7 @@ package com.telecominfraproject.wlan.core.server.jdbc;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;

 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
@@ -1092,7 +1093,80 @@ class JdbcOperationsWithMetrics implements JdbcOperations{
        }
    }

-    
+ 
+    @Override
+    public <T> Stream<T> queryForStream(String sql, RowMapper<T> rowMapper) throws DataAccessException {
+        queriesExecuted.increment();
+        Stopwatch s = queriesTimer.start();
+        boolean success = false;
+
+        try{
+            Stream<T> ret = delegate.queryForStream(sql, rowMapper);
+            success = true;
+            return ret;
+        }finally{
+            s.stop();
+            if(!success){
+                queriesErrors.increment();
+            }
+        }
+
+    }
+
+    @Override
+    public <T> Stream<T> queryForStream(PreparedStatementCreator psc, RowMapper<T> rowMapper) throws DataAccessException {
+        queriesExecuted.increment();
+        Stopwatch s = queriesTimer.start();
+        boolean success = false;
+
+        try{
+            Stream<T> ret = delegate.queryForStream(psc, rowMapper);
+            success = true;
+            return ret;
+        }finally{
+            s.stop();
+            if(!success){
+                queriesErrors.increment();
+            }
+        }
+    }
+
+    @Override
+    public <T> Stream<T> queryForStream(String sql, PreparedStatementSetter pss, RowMapper<T> rowMapper) throws DataAccessException {
+        queriesExecuted.increment();
+        Stopwatch s = queriesTimer.start();
+        boolean success = false;
+
+        try{
+            Stream<T> ret = delegate.queryForStream(sql, pss, rowMapper);
+            success = true;
+            return ret;
+        }finally{
+            s.stop();
+            if(!success){
+                queriesErrors.increment();
+            }
+        }
+    }
+
+    @Override
+    public <T> Stream<T> queryForStream(String sql, RowMapper<T> rowMapper, Object... args) throws DataAccessException {
+        queriesExecuted.increment();
+        Stopwatch s = queriesTimer.start();
+        boolean success = false;
+
+        try{
+            Stream<T> ret = delegate.queryForStream(sql, rowMapper, args);
+            success = true;
+            return ret;
+        }finally{
+            s.stop();
+            if(!success){
+                queriesErrors.increment();
+            }
+        }
+    }
+
    @Override
    public String toString() {
        return "JOWM-"+delegate.toString();
--- a/base-job/pom.xml
+++ b/base-job/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>

@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
--- a/base-models/pom.xml
+++ b/base-models/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>base-models</artifactId>
@@ -14,20 +14,20 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-exceptions</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>json-patch-tip</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<!-- this is used to register all subclasses of BaseJsonModel for deserialization -->
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>reflections-tip</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
--- a/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/LedStatus.java
+++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/LedStatus.java
@@ -0,0 +1,9 @@
+
+package com.telecominfraproject.wlan.core.model.equipment;
+
+public enum LedStatus {
+    led_on, 
+    led_off, 
+    led_blink, 
+    UNKNOWN;
+}
--- a/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacAddress.java
+++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/MacAddress.java
@@ -58,7 +58,7 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>
        if(address.length >= 6)
        {
            long mac = 0;
-            for (int i = 0; i < 6; i++) {
+            for (var i = 0; i < 6; i++) {
                long t = (address[i] & 0xffL) << ((5 - i) * 8);
                mac |= t;
            }
@@ -73,7 +73,7 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>
    }
    
    public String getAddressAsString() {
-        StringBuilder sb = new StringBuilder(124);
+        var sb = new StringBuilder(124);
        
        if(address != null)
        {
@@ -82,14 +82,15 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>
            }

            sb.setLength(sb.length() - 1);
+            return sb.toString();
        }
        
-        return sb.toString();
+        return null;
    }

    @JsonIgnore
    public String getAsLowerCaseString() {
-        StringBuilder sb = new StringBuilder(124);
+        var sb = new StringBuilder(124);
        for (byte single : address) {
            sb.append(String.format("%02x", single));
        }
@@ -131,8 +132,8 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>

    @Override
   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
+      final var prime = 31;
+      var result = 1;
      result = prime * result + Arrays.hashCode(address);
      return result;
   }
@@ -163,12 +164,16 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>

    
    private static byte[] stringToByteArray(String str) {
-        byte[] ret = new byte[6];
+        if (str == null || str.equals(""))
+        {
+            return null;
+        }
+        var ret = new byte[6];

        String octets[] = str.split(":");
        if(octets.length == 1 && octets[0].length() == str.length() && str.length()<=12) {
            // hex string without colon
-            for(int i = 0; i< str.length(); i+=2) {
+            for(var i = 0; i< str.length(); i+=2) {
                Integer hex = Integer.parseInt(str.substring(i, i==str.length()-1?i+1:i+2), 16);               
                ret[i/2] = hex.byteValue();
            }
@@ -178,7 +183,7 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>
        }
        else {
            try {
-                for (int i = 0; i < octets.length; i++) {
+                for (var i = 0; i < octets.length; i++) {
                    Integer hex = Integer.parseInt(octets[i], 16);
                    ret[i] = hex.byteValue();
                }
@@ -210,8 +215,8 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>
        else
        {
            String[] value = lowercaseValue.split(":");
-            StringBuilder sb = new StringBuilder(6);
-            for(int i=0; i<3; i++)
+            var sb = new StringBuilder(6);
+            for(var i=0; i<3; i++)
            {
                sb.append(value[i].toLowerCase());
            }
@@ -221,11 +226,11 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>
    }
    
    public String toOuiString() {
-        if(address == null) {
+        if(address == null || address.length == 0) {
            return null;
        }
-        StringBuilder sb = new StringBuilder(6);
-        for (int i = 0; i< 3; i++) {
+        var sb = new StringBuilder(6);
+        for (var i = 0; i< 3; i++) {
            sb.append(String.format("%02x", address[i]));
        }
        return sb.toString();
@@ -288,11 +293,17 @@ public class MacAddress extends BaseJsonModel implements Comparable<MacAddress>
     * @return
     */
    public static Long convertMacStringToLongValue(String macStr) {
+        
+        if (macStr == null)
+        {
+            return null;
+        }
+        
        byte[] bval = stringToByteArray(macStr);

-        if (bval.length >= 6) {
+        if (bval != null && bval.length >= 6) {
            long mac = 0;
-            for (int i = 0; i < 6; i++) {
+            for (var i = 0; i < 6; i++) {
                long t = (bval[i] & 0xffL) << ((5 - i) * 8);
                mac |= t;
            }
--- a/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioType.java
+++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/RadioType.java
@@ -73,5 +73,19 @@ public enum RadioType {
        return false;
    }

-    
+    public static String getRadioDisplayString(RadioType radioType) {
+        // This display format matches UI
+        switch (radioType) {
+            case is2dot4GHz:
+                return "2.4GHz";
+            case is5GHz:
+                return "5GHz";
+            case is5GHzU:
+                return "5GHz (U)";
+            case is5GHzL:
+                return "5GHz (L)";
+            default:
+                return radioType.name();
+        }
+    }
 }
--- a/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonTypeResolverBuilder.java
+++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/BaseJsonTypeResolverBuilder.java
@@ -45,11 +45,11 @@ public class BaseJsonTypeResolverBuilder extends StdTypeResolverBuilder {

        @Override
        protected Object _deserializeTypedUsingDefaultImpl(final JsonParser jp, DeserializationContext ctxt,
-                TokenBuffer tb) throws IOException {
+                TokenBuffer tb, String priorFailureMsg) throws IOException {
            Object obj = null;
            JsonParser parser = jp;
            try{
-                obj = super._deserializeTypedUsingDefaultImpl(parser, ctxt, tb);
+                obj = super._deserializeTypedUsingDefaultImpl(parser, ctxt, tb, priorFailureMsg);
            }catch(Exception e){
                JsonDeserializer<Object> deser = ctxt.findContextualValueDeserializer(this._baseType, null);
                if (deser != null) {
@@ -109,7 +109,7 @@ public class BaseJsonTypeResolverBuilder extends StdTypeResolverBuilder {
        return ret;
    }
    
-    public void setPropertName(String property) {
+    public void setPropertyName(String property) {
        super._typeProperty = property;
    }
 }
--- a/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasSourceTimestamp.java
+++ b/base-models/src/main/java/com/telecominfraproject/wlan/core/model/json/interfaces/HasSourceTimestamp.java
@@ -0,0 +1,13 @@
+package com.telecominfraproject.wlan.core.model.json.interfaces;
+/**
+ * Marker interface that tells if current object can provide a timestamp from its source data (i.e. timestamp for stats report used to generate a ServiceMetric)
+ * @author mikehansen1970
+ *
+ */
+public interface HasSourceTimestamp {
+
+    /**
+     * @return the timestamp of the source data for this object (i.e. for the stats that were used for a ServiceMetric)
+     */
+    public long getSourceTimestampMs();
+}
--- a/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/MacAddressTest.java
+++ b/base-models/src/test/java/com/telecominfraproject/wlan/core/model/equipment/MacAddressTest.java
@@ -5,6 +5,8 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;

 import java.math.BigInteger;
 import java.util.HashMap;
@@ -14,8 +16,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
-
 public class MacAddressTest {
    private static final Logger LOG = LoggerFactory.getLogger(MacAddressTest.class);

@@ -145,5 +145,97 @@ public class MacAddressTest {
        assertEquals(first, equalToFirst);
        assertNotEquals(first, notEqualToFirst);
    }
+    
+    @Test
+    public void testSetAddress() {
+        MacAddress nullCheck = new MacAddress();
+        nullCheck.setAddress(null);
+        assertNull(nullCheck.getAddress());
+        
+        MacAddress realValue = new MacAddress();
+        realValue.setAddress(new byte[] { 1, 2, 3, 4, 5, 6 });
+        assertNotNull(realValue.getAddress());
+    }
+    
+    @Test
+    public void testGetAddressAsLong()
+    {
+        MacAddress macAddress = new MacAddress("00:2a:f7:7a:1e:a0");
+        assertNotNull(macAddress.getAddressAsLong());
+        
+        MacAddress otherMacAddress = new MacAddress(new byte[] { 1, 2, 3, 4, 5});
+        assertNull(otherMacAddress.getAddressAsLong());
+    }
+    
+    @Test
+    public void testGetAddressAsString() {
+        MacAddress macAddress = new MacAddress("00:2a:f7:7a:1e:a0");
+        assertNotNull(macAddress.getAddressAsString());
+    }
+    
+    @Test
+    public void testGetAsLowerCaseString() {
+        MacAddress macAddress = new MacAddress("00:2a:f7:7a:1e:a0");
+        assertNotNull(macAddress.getAsLowerCaseString().toCharArray());
+    }
+    
+    @Test
+    public void testHashCode()
+    {
+        MacAddress macAddress = new MacAddress("00:2a:f7:7a:1e:a0");
+        
+        assertNotEquals(macAddress.hashCode(), 0);
+    }
+    
+    @Test
+    public void testStringToByteArray()
+    {
+        MacAddress macAddress = new MacAddress();
+        macAddress.setAddressAsString(null);
+        assertNull(macAddress.getAddress());
+        
+        macAddress.setAddressAsString("00:2a:f7:7a:1e:a0");
+        assertNotNull(macAddress.getAddress());
+        
+        try {
+            macAddress.setAddressAsString("00:2a:f7:7a:1e:a0:b0:f1");
+            fail("expected exception.");
+        } catch (IllegalArgumentException e)
+        {
+            //expected it
+        }
+        try {
+            macAddress.setAddressAsString("00:2a:f7:7a:1esdafsat:a0");
+            fail("expected exception.");
+        } catch (IllegalArgumentException e)
+        {
+            //expected it
+        }
+    }
+    
+    @Test
+    public void testOuiFromLowerCaseString()
+    {
+        assertNotNull(MacAddress.ouiFromLowerCaseString("00:2a:f7:7a:1e:a0", true));
+        assertNotNull(MacAddress.ouiFromLowerCaseString("00:2a:f7:7a:1e:a0", false));
+    }
+    
+    @Test
+    public void testToOuiString()
+    {
+        MacAddress macAddress = new MacAddress("00:2a:f7:7a:1e:a0");
+        assertNotNull(macAddress.toOuiString());
+        
+        MacAddress nullCheck = new MacAddress();
+        nullCheck.setAddressAsString(null);
+        assertNull(nullCheck.toOuiString());
+    }
+    
+    @Test
+    public void testConvertMacStringToLongValue()
+    {
+        assertNotNull(MacAddress.convertMacStringToLongValue("00:2a:f7:7a:1e:a0"));
+        assertNull(MacAddress.convertMacStringToLongValue(null));
+    }

 }
--- a/base-partitioner/pom.xml
+++ b/base-partitioner/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
  <artifactId>base-partitioner</artifactId>
@@ -13,7 +13,7 @@
    <dependency>
 		<groupId>com.telecominfraproject.wlan</groupId>
        <artifactId>base-hazelcast-client</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
    </dependency>
  </dependencies>
  
--- a/base-partitioner/src/main/java/com/telecominfraproject/wlan/partitioner/DynamicServicePartitioner.java
+++ b/base-partitioner/src/main/java/com/telecominfraproject/wlan/partitioner/DynamicServicePartitioner.java
@@ -9,8 +9,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;

 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ILock;
-import com.hazelcast.core.IMap;
+import com.hazelcast.cp.CPSubsystem;
+import com.hazelcast.cp.lock.FencedLock;
+import com.hazelcast.map.IMap;
 import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;

 /**
@@ -65,7 +66,9 @@ public class DynamicServicePartitioner implements ServicePartitionerInterface {
        IMap<String, byte[]> partitionerMap = hazelcastInstance.getMap(mapName);

        // lock the whole partitionerMap while refresh is happening
-        ILock mapLock = hazelcastInstance.getLock("lock_" + mapName);
+        // see https://docs.hazelcast.com/imdg/4.2/migration-guides
+        CPSubsystem cpSubsystem = hazelcastInstance.getCPSubsystem();
+        FencedLock mapLock = cpSubsystem.getLock("lock_" + mapName);
        mapLock.lock();

        try {
--- a/base-partitioner/src/main/java/com/telecominfraproject/wlan/partitioner/DynamicServiceServerPartitioner.java
+++ b/base-partitioner/src/main/java/com/telecominfraproject/wlan/partitioner/DynamicServiceServerPartitioner.java
@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;

 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;

 /**
 * @author yongli
--- a/base-remote-tests/pom.xml
+++ b/base-remote-tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-remote-tests</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-tx-tests</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
 		</dependency>
        
 		<dependency>
--- a/base-scheduler/pom.xml
+++ b/base-scheduler/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-scheduler</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>

--- a/base-stream-consumer/pom.xml
+++ b/base-stream-consumer/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
  <artifactId>base-stream-consumer</artifactId>
@@ -14,13 +14,13 @@
        <dependency>
        <artifactId>base-models</artifactId>
        <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
      </dependency>

    <dependency>
        <groupId>com.telecominfraproject.wlan</groupId>
        <artifactId>cloud-metrics</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
    </dependency>
      
  </dependencies>
--- a/base-stream-interface/pom.xml
+++ b/base-stream-interface/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
  <artifactId>base-stream-interface</artifactId>
--- a/base-tx-tests/pom.xml
+++ b/base-tx-tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>base-tx-tests</artifactId>
--- a/cloud-metrics/pom.xml
+++ b/cloud-metrics/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>cloud-metrics</artifactId>
@@ -13,18 +13,18 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-exceptions</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-elasticsearch</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
--- a/common-hazelcast/pom.xml
+++ b/common-hazelcast/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>com.telecominfraproject.wlan</groupId>
      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
      <relativePath>../../wlan-cloud-root</relativePath>
    </parent>
 	<artifactId>common-hazelcast</artifactId>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 	</dependencies>
--- a/common-hazelcast/src/main/java/com/telecominfraproject/wlan/hazelcast/common/AppendLongToListEntryProcessor.java
+++ b/common-hazelcast/src/main/java/com/telecominfraproject/wlan/hazelcast/common/AppendLongToListEntryProcessor.java
@@ -4,8 +4,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.function.BiFunction;
+
+import com.hazelcast.map.impl.ComputeEntryProcessor;

-import com.hazelcast.map.AbstractEntryProcessor;

 /**
 * This class appends an item to a List<Long> stored in a hazelcast map.
@@ -17,11 +19,24 @@ import com.hazelcast.map.AbstractEntryProcessor;
 * <b>Very important</b>: this class must implement Serializable interface because it is submitted to Hazelcast Cluster
 * @author dtop
 */
-public class AppendLongToListEntryProcessor extends AbstractEntryProcessor<String, List<Long>> implements Serializable {
+public class AppendLongToListEntryProcessor extends ComputeEntryProcessor<String, List<Long>> implements Serializable {
    private static final long serialVersionUID = -6960225265547599510L;
-    
+
    private long tsToAppend; 
-    
+
+//    private BiFunction<String, List<Long>, List<Long>> biFunction =  (key, value) -> {
+//        if(value==null){
+//            value = new ArrayList<>();
+//        }
+//        
+//        // process and modify value
+//        if(!value.contains(tsToAppend)){ 
+//            value.add(tsToAppend); 
+//        } 
+//        
+//        return value;
+//    };
+        
    public AppendLongToListEntryProcessor() {
        // for serialization
    }
@@ -31,7 +46,7 @@ public class AppendLongToListEntryProcessor extends AbstractEntryProcessor<Strin
    }

    @Override
-    public Object process(Entry<String, List<Long>> entry) {
+    public List<Long> process(Entry<String, List<Long>> entry) {
        List<Long> value = entry.getValue();
        
        if(value==null){
@@ -44,6 +59,6 @@ public class AppendLongToListEntryProcessor extends AbstractEntryProcessor<Strin
        } 
        entry.setValue(value);

-        return true;
+        return value;
    }
 }
--- a/common-hazelcast/src/main/java/com/telecominfraproject/wlan/hazelcast/common/AppendStringToSetEntryProcessor.java
+++ b/common-hazelcast/src/main/java/com/telecominfraproject/wlan/hazelcast/common/AppendStringToSetEntryProcessor.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Set;

-import com.hazelcast.map.AbstractEntryProcessor;
+import com.hazelcast.map.impl.ComputeEntryProcessor;

 /**
 * This class appends an item to a Set<String> stored in a hazelcast map.
@@ -17,7 +17,7 @@ import com.hazelcast.map.AbstractEntryProcessor;
 * <b>Very important</b>: this class must implement Serializable interface because it is submitted to Hazelcast Cluster
 * @author dtop
 */
-public class AppendStringToSetEntryProcessor extends AbstractEntryProcessor<String, Set<String>> implements Serializable {
+public class AppendStringToSetEntryProcessor extends ComputeEntryProcessor<String, Set<String>> implements Serializable {
    private static final long serialVersionUID = -6960225265547599510L;
    
    private String stringToAppend; 
@@ -31,7 +31,7 @@ public class AppendStringToSetEntryProcessor extends AbstractEntryProcessor<Stri
    }

    @Override
-    public Object process(Entry<String, Set<String>> entry) {
+    public Set<String> process(Entry<String, Set<String>> entry) {
        Set<String> value = entry.getValue();
        
        if(value==null){
@@ -43,6 +43,6 @@ public class AppendStringToSetEntryProcessor extends AbstractEntryProcessor<Stri
        
        entry.setValue(value);

-        return true;
+        return value;
    }
 }
--- a/json-patch-tip/pom.xml
+++ b/json-patch-tip/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>

--- a/reflections-tip/pom.xml
+++ b/reflections-tip/pom.xml
@@ -3,7 +3,7 @@
  <parent>
    <groupId>com.telecominfraproject.wlan</groupId>
    <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
    <relativePath>../../wlan-cloud-root</relativePath>
  </parent>
  <artifactId>reflections-tip</artifactId>
--- a/webtoken-auth-service/pom.xml
+++ b/webtoken-auth-service/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>webtoken-auth-service</artifactId>
@@ -14,13 +14,13 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-container</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-client</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>

 	</dependencies>
Author	SHA1	Message	Date
Dmitry Toptygin	d64e6dc092	WIFI-7556 updated spring-boot version to 2.5.12 (spring 5.3.18) to cover for Springshell vulnerability (#26 )	2022-04-05 13:55:13 -04:00
norm-traxler	7897ccdf21	Merge pull request #25 from Telecominfraproject/WIFI-4732 Wifi 4732 EquipmentPortalController resets to defaults channels for e…	2021-10-20 16:17:30 -04:00
Lynn Shi	cd60273495	Wifi 4732 EquipmentPortalController resets to defaults channels for equipment country change	2021-10-20 15:28:33 -04:00
norm-traxler	704f5c6047	Merge pull request #24 from Telecominfraproject/WIFI-4415 [WIFI 4415] update LedStatus to pass tests	2021-09-27 16:12:30 -04:00
Thomas-Leung2021	b7d396c6ce	[WIFI-4415] remove unnecessary code	2021-09-27 13:25:06 -04:00
Thomas Leung	e8dd8724fb	Merged in NETEXP-2959 (pull request #3 ) [NETEXP-2959] update LedStatus to pass tests Approved-by: mike.hansen	2021-09-24 16:53:44 -04:00
norm-traxler	267fb477a3	Merge pull request #19 from Telecominfraproject/WIFI-3224-Remote-client-mediatype [WIFI-3224] change BaseRemoteClient from json contentType from UTF-8 …	2021-07-23 11:54:14 -04:00
Norm Traxler	04c844c2e2	[WIFI-3224] change BaseRemoteClient from json contentType from UTF-8 to UTF-16 (default)	2021-07-23 11:42:19 -04:00
Mike Hansen	72da490a3b	Merge pull request #18 from Telecominfraproject/WIFI-3022 [WIFI-3022] fix for getting 00:00:00:00:00:00 mac address	2021-07-14 14:21:48 -04:00
Thomas-Leung2021	bb9c3ba1eb	[WIFI-3022] add null checks convertMacStringToLongValue()	2021-07-14 13:53:49 -04:00
Thomas-Leung2021	7dd594644e	[WIFI-3022] fix for getting 00:00:00:00:00:00 mac address	2021-07-13 17:33:46 -04:00
Mike Hansen	4c15a9650b	Merge pull request #17 from Telecominfraproject/add-http-client-exception-to-tip-error-handler add basePackes property back to CommonControllerAdvice. Add HttpClien…	2021-06-15 10:22:20 -04:00
Thomas Currie	5c3bf48780	add basePackes property back to CommonControllerAdvice. Add HttpClientErrorException to ExceptionPropogatingErrorHandler.	2021-06-14 18:16:21 -04:00
Mike Hansen	be09681087	Merge pull request #16 from Telecominfraproject/revert-15-WIFI-2633-Change-scope-of-CommonControllerAdvice Revert "WIFI-2633 Change scope of CommonControllerAdvice"	2021-06-14 17:08:32 -04:00
Mike Hansen	a7076e523b	Revert "WIFI-2633 Change scope of CommonControllerAdvice"	2021-06-14 17:04:37 -04:00
norm-traxler	6232b8db7b	Merge pull request #15 from Telecominfraproject/WIFI-2633-Change-scope-of-CommonControllerAdvice WIFI-2633 Change scope of CommonControllerAdvice	2021-06-14 11:06:46 -04:00
Thomas Currie	2bfab69a3a	add 'basePackage' attribute to @ControllerAdvice	2021-06-11 09:59:39 -04:00
Mike Hansen	fef03f4bbe	AP: ON_CHANNEL survey report sometimes has no information Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-02 09:07:24 -04:00
norm-traxler	b6a02439b8	Merge pull request #14 from Telecominfraproject/WIFI-2434 WIFI 2434: Update SDK master to use image tag 1.2.0-SNAPSHOT	2021-05-26 21:04:06 -04:00
Akshay Jagadish	789e153519	Update SDK master to use image tag 1.2.0-SNAPSHOT	2021-05-26 18:00:32 -04:00
norm-traxler	c2c67e188c	Merge pull request #13 from Telecominfraproject/WIFI-2150-json--parsing-error-message-on-ap-details-save add null safety check to setAddressAsString in MacAddress.	2021-05-11 10:33:47 -04:00
Thomas Currie	9f5e093ea5	revert to setting address field as null when null is provided to construct / setter.	2021-05-11 09:51:03 -04:00
Thomas Currie	d1bc55745e	add assertions to 2 unit tests to appease sonar	2021-05-10 16:13:41 -04:00
Thomas Currie	e185ccaef6	add test coverage MacAddress of old codeand new null check in order to appease sonar	2021-05-10 16:06:08 -04:00
Thomas Currie	92fcaaa0bb	Sonar changes based on 'code smell'	2021-05-10 14:40:47 -04:00
Thomas Currie	1bcf2860df	add null check to convertMacStringToLongValue to prevent NPE	2021-05-10 14:29:48 -04:00
Thomas Currie	e005180f9f	add null safety check to setAddressAsString in MacAdress.	2021-05-10 14:15:35 -04:00
norm-traxler	b1cc93b9df	Merge pull request #12 from Telecominfraproject/WIFI-2026 WIFI-2026 Changed pom versions from 0.0.1-SNAPSHOT to 1.1.0-SNAPSHOT	2021-04-16 17:08:38 -04:00