Update lock in PushManager and SSEClient. Update rc version

Author: nmayorsplit

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.12.0</version>
+        <version>4.12.1-rc</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>

client/src/main/java/io/split/engine/common/PushManagerImp.java

@@ -44,8 +44,7 @@ public class PushManagerImp implements PushManager {
     private final FeatureFlagsWorker _featureFlagsWorker;
     private final Worker<SegmentQueueDto> _segmentWorker;
     private final PushStatusTracker _pushStatusTracker;
-    private static final Lock startLock = new ReentrantLock();
-    private static final Lock stopLock = new ReentrantLock();
+    private static final Lock lock = new ReentrantLock();
 
     private Future<?> _nextTokenRefreshTask;
     private final ScheduledExecutorService _scheduledExecutorService;
@@ -98,7 +97,7 @@ public static PushManagerImp build(Synchronizer synchronizer,
     @Override
     public void start() {
         try {
-            startLock.lock();
+            lock.lock();
             AuthenticationResponse response = _authApiClient.Authenticate();
             _log.debug(String.format("Auth service response pushEnabled: %s", response.isPushEnabled()));
             if (response.isPushEnabled() && startSse(response.getToken(), response.getChannels())) {
@@ -115,18 +114,18 @@ public void start() {
                 _pushStatusTracker.forcePushDisable();
             }
         } finally {
-            startLock.unlock();
+            lock.unlock();
         }
     }
 
     @Override
     public void stop() {
         try {
-            stopLock.lock();
+            lock.lock();
             _log.debug("Stopping PushManagerImp");
             cleanUpResources();
         } finally {
-            stopLock.unlock();
+            lock.unlock();
         }
     }
 

client/src/main/java/io/split/engine/sse/client/SSEClient.java

@@ -50,8 +50,7 @@ private enum ConnectionState {
     private final static String SOCKET_CLOSED_MESSAGE = "Socket closed";
     private final static String KEEP_ALIVE_PAYLOAD = ":keepalive\n";
     private final static long CONNECT_TIMEOUT = 30000;
-    private static final Lock openLock = new ReentrantLock();
-    private static final Lock closeLock = new ReentrantLock();
+    private static final Lock lock = new ReentrantLock();
     private static final Logger _log = LoggerFactory.getLogger(SSEClient.class);
     private final ExecutorService _connectionExecutor;
     private final CloseableHttpClient _client;
@@ -81,7 +80,7 @@ public SSEClient(Function<RawEvent, Void> eventCallback,
 
     public boolean open(URI uri) {
         try {
-            openLock.lock();
+            lock.lock();
             if (isOpen()) {
                 _log.info("SSEClient already open.");
                 return false;
@@ -106,7 +105,7 @@ public boolean open(URI uri) {
             }
             return isOpen();
         } finally {
-            openLock.unlock();
+            lock.unlock();
         }
     }
 
@@ -116,7 +115,7 @@ public boolean isOpen() {
 
     public void close() {
         try {
-            closeLock.lock();
+            lock.lock();
             _forcedStop.set(true);
             if (_state.compareAndSet(ConnectionState.OPEN, ConnectionState.CLOSED)) {
                 if (_ongoingResponse.get() != null) {
@@ -129,7 +128,7 @@ public void close() {
                 }
             }
         } finally {
-            closeLock.unlock();
+            lock.unlock();
         }
     }
 

pluggable-storage/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.12.0</version>
+        <version>4.12.1-rc</version>
     </parent>
 
     <version>2.1.0</version>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.split.client</groupId>
     <artifactId>java-client-parent</artifactId>
-    <version>4.12.0</version>
+    <version>4.12.1-rc</version>
     <dependencyManagement>
         <dependencies>
             <dependency>

redis-wrapper/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.12.0</version>
+        <version>4.12.1-rc</version>
     </parent>
     <artifactId>redis-wrapper</artifactId>
     <version>3.1.0</version>

testing/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.12.0</version>
+        <version>4.12.1-rc</version>
     </parent>
     <artifactId>java-client-testing</artifactId>
     <packaging>jar</packaging>