APP-3054: new legacy and BDK2.0 release

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.symphony.platformsolutions</groupId>
     <artifactId>symphony-bdk-java</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <name>Symphony Java BDK Project</name>
     <description>Symphony Java BDK Parent</description>
     <url>https://github.com/SymphonyPlatformSolutions/symphony-api-client-java</url>
@@ -185,6 +185,9 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <version>3.0.1</version>
+                        <configuration>
+                            <failOnError>false</failOnError>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -207,6 +210,17 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.7</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
 

symphony-bdk-bom/pom.xml

@@ -6,10 +6,11 @@
     <parent>
         <artifactId>symphony-bdk-java</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>symphony-bdk-bom</artifactId>
+    <version>1.2.1.BETA</version>
     <packaging>pom</packaging>
     <name>Symphony Java BDK BOM</name>
     <description>Symphony Java BDK Bom (Bill Of Materials)</description>

symphony-bdk-core-invokers/pom.xml

@@ -6,10 +6,11 @@
     <parent>
         <artifactId>symphony-bdk-java</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>symphony-bdk-core-invokers</artifactId>
+    <version>1.2.1.BETA</version>
     <name>Symphony Java BDK Core Invokers</name>
     <description>Symphony Java BDK Core Invokers Module</description>
     <packaging>pom</packaging>

symphony-bdk-core-invokers/symphony-bdk-core-invoker-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>symphony-bdk-core-invokers</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1.BETA</version>
     </parent>
 
     <artifactId>symphony-bdk-core-invoker-api</artifactId>

symphony-bdk-core-invokers/symphony-bdk-core-invoker-jersey2/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>symphony-bdk-core-invokers</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1.BETA</version>
     </parent>
 
     <artifactId>symphony-bdk-core-invoker-jersey2</artifactId>

symphony-bdk-core-invokers/symphony-bdk-core-invoker-jersey2/src/main/java/com/symphony/bdk/core/api/invoker/jersey2/ApiClientJersey2.java

@@ -329,7 +329,6 @@ protected boolean isJsonMime(String mime) {
    * @param formParams Form parameters
    * @param contentType Context type
    * @return Entity
-   * @throws ApiException API exception
    */
   protected Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) {
     Entity<?> entity;

symphony-bdk-core/pom.xml

@@ -6,10 +6,11 @@
     <parent>
         <artifactId>symphony-bdk-java</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>symphony-bdk-core</artifactId>
+    <version>1.2.1.BETA</version>
     <name>Symphony Java BDK Core </name>
     <description>Symphony Java BDK Core Module</description>
 

symphony-bdk-core/src/main/java/com/symphony/bdk/core/service/datafeed/impl/AbstractDatafeedService.java

@@ -17,6 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.ws.rs.ProcessingException;
+
 /**
  * Base class for implementing the datafeed services. A datafeed services can help a bot subscribe or unsubscribe
  * a {@link RealTimeEventListener} and handle the received event by the subscribed listeners.
@@ -44,7 +46,7 @@ public AbstractDatafeedService(DatafeedApi datafeedApi, AuthSession authSession,
                         ApiException apiException = (ApiException) e;
                         return apiException.isServerError() || apiException.isUnauthorized();
                     }
-                    return false;
+                    return e instanceof ProcessingException;
                 })
                 .build();
     }
@@ -101,6 +103,9 @@ protected Retry getRetryInstance(String name, RetryConfig... config) {
         retry.getEventPublisher().onRetry(event -> {
             long intervalInMillis = event.getWaitInterval().toMillis();
             double interval = intervalInMillis / 1000.0;
+            if (event.getLastThrowable() != null) {
+              log.debug("Datafeed service failed due to {}", event.getLastThrowable().getMessage());
+            }
             log.info("Retry in {} secs...", interval);
         });
         return retry;

symphony-bdk-core/src/main/java/com/symphony/bdk/core/service/datafeed/impl/DatafeedServiceV1.java

@@ -16,6 +16,8 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.ws.rs.ProcessingException;
+
 /**
  * A class for implementing the datafeed v1 service.
  *
@@ -93,7 +95,7 @@ private void readDatafeed() throws Throwable {
                 ApiException apiException = (ApiException) e;
                 return apiException.isServerError() || apiException.isUnauthorized() || apiException.isClientError();
             }
-            return false;
+            return e instanceof ProcessingException;
         }).build();
         Retry retry = this.getRetryInstance("Read Datafeed", config);
         retry.executeCheckedSupplier(() -> {

symphony-bdk-core/src/main/java/com/symphony/bdk/core/service/datafeed/impl/DatafeedServiceV2.java

@@ -17,6 +17,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.ws.rs.ProcessingException;
+
 /**
  * A class for implementing the datafeed v2 service.
  *
@@ -132,7 +134,7 @@ private void readDatafeed() throws Throwable {
                         ApiException apiException = (ApiException) e;
                         return apiException.isServerError() || apiException.isUnauthorized() || apiException.isClientError();
                     }
-                    return false;
+                    return e instanceof ProcessingException;
                 }).build();
         Retry retry = this.getRetryInstance("Read Datafeed", config);
         retry.executeCheckedSupplier(() -> {

symphony-bdk-core/src/test/java/com/symphony/bdk/core/service/datafeed/impl/DatafeedServiceV1Test.java

@@ -1,6 +1,10 @@
 package com.symphony.bdk.core.service.datafeed.impl;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -52,6 +56,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -60,6 +65,8 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.ws.rs.ProcessingException;
+
 public class DatafeedServiceV1Test {
 
     private DatafeedServiceV1 datafeedService;
@@ -167,6 +174,16 @@ void startTestFailedAuthRead() throws ApiException, AuthUnauthorizedException {
         verify(datafeedApi, times(1)).v4DatafeedIdReadGet("test-id", "1234", "1234", null);
     }
 
+    @Test
+    void startTestFailedSocketTimeoutRead() throws ApiException, AuthUnauthorizedException {
+        when(datafeedApi.v4DatafeedCreatePost("1234", "1234")).thenReturn(new Datafeed().id("test-id"));
+        when(datafeedApi.v4DatafeedIdReadGet("test-id", "1234", "1234", null))
+            .thenThrow(new ProcessingException(new SocketTimeoutException()));
+
+        this.datafeedService.start();
+        verify(datafeedApi, times(2)).v4DatafeedIdReadGet("test-id", "1234", "1234", null);
+    }
+
     @Test
     void startServiceAlreadyStarted() throws ApiException, AuthUnauthorizedException {
         AtomicInteger signal = new AtomicInteger(0);

symphony-bdk-core/src/test/java/com/symphony/bdk/core/service/datafeed/impl/DatafeedServiceV2Test.java

@@ -1,5 +1,13 @@
 package com.symphony.bdk.core.service.datafeed.impl;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.symphony.bdk.core.api.invoker.ApiException;
 import com.symphony.bdk.core.auth.AuthSession;
 import com.symphony.bdk.core.auth.exception.AuthUnauthorizedException;
@@ -11,19 +19,25 @@
 import com.symphony.bdk.core.config.model.BdkRetryConfig;
 import com.symphony.bdk.core.service.datafeed.RealTimeEventListener;
 import com.symphony.bdk.gen.api.DatafeedApi;
-import com.symphony.bdk.gen.api.model.*;
+import com.symphony.bdk.gen.api.model.AckId;
+import com.symphony.bdk.gen.api.model.V4Event;
+import com.symphony.bdk.gen.api.model.V4Initiator;
+import com.symphony.bdk.gen.api.model.V4MessageSent;
+import com.symphony.bdk.gen.api.model.V4Payload;
+import com.symphony.bdk.gen.api.model.V5Datafeed;
+import com.symphony.bdk.gen.api.model.V5EventList;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.*;
+import javax.ws.rs.ProcessingException;
 
 public class DatafeedServiceV2Test {
 
@@ -223,6 +237,17 @@ void testStartClientErrorReadDatafeed() throws ApiException, AuthUnauthorizedExc
         verify(datafeedApi, times(1)).deleteDatafeed("test-id", "1234", "1234");
     }
 
+    @Test
+    void testStartSocketTimeoutReadDatafeed() throws ApiException, AuthUnauthorizedException {
+        AckId ackId = datafeedService.getAckId();
+        when(datafeedApi.listDatafeed("1234", "1234")).thenReturn(Collections.singletonList(new V5Datafeed().id("test-id")));
+        when(datafeedApi.readDatafeed("test-id", "1234", "1234", ackId)).thenThrow(new ProcessingException(new SocketTimeoutException()));
+
+        this.datafeedService.start();
+        verify(datafeedApi, times(1)).listDatafeed("1234", "1234");
+        verify(datafeedApi, times(2)).readDatafeed("test-id", "1234", "1234", ackId);
+    }
+
     @Test
     void testStartAuthErrorReadDatafeed() throws ApiException, AuthUnauthorizedException {
         AckId ackId = datafeedService.getAckId();

symphony-bdk-examples/bdk-core-examples/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>symphony-bdk-examples</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1.BETA</version>
     </parent>
 
     <artifactId>symphony-bdk-core-examples</artifactId>

symphony-bdk-examples/bdk-spring-boot-example/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>symphony-bdk-examples</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1.BETA</version>
     </parent>
 
     <artifactId>symphony-bdk-spring-boot-examples</artifactId>
@@ -33,4 +33,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

symphony-bdk-examples/bdk-template-examples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>symphony-bdk-examples</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1.BETA</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

symphony-bdk-examples/pom.xml

@@ -6,10 +6,11 @@
     <parent>
         <artifactId>symphony-bdk-java</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>symphony-bdk-examples</artifactId>
+    <version>1.2.1.BETA</version>
     <name>Symphony Java BDK Examples Parent</name>
     <description>Symphony Java BDK Parent Module</description>
     <packaging>pom</packaging>

symphony-bdk-legacy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.symphony.platformsolutions</groupId>
         <artifactId>symphony-bdk-java</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>symphony-bdk-legacy</artifactId>

symphony-bdk-legacy/sms-sdk-renderer-java/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.symphony.platformsolutions</groupId>
         <artifactId>symphony-bdk-legacy</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>sms-sdk-renderer-java</artifactId>

symphony-bdk-legacy/symphony-api-client-java/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.symphony.platformsolutions</groupId>
         <artifactId>symphony-bdk-legacy</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>symphony-api-client-java</artifactId>

symphony-bdk-legacy/symphony-bdk-bot-sdk-java/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.symphony.platformsolutions</groupId>
         <artifactId>symphony-bdk-legacy</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>symphony-bdk-bot-sdk-java</artifactId>

symphony-bdk-legacy/symphony-bdk-bot-sdk-java/src/main/java/com/symphony/bdk/bot/sdk/event/InternalEventListener.java

@@ -111,15 +111,15 @@ public interface InternalEventListener {
   /**
    * Connection request received. Pushes event to EventDispatcher.
    *
-   * @param event
+   * @param connectionRequestedEvent
    */
   void onConnectionRequested(ConnectionRequestedEvent connectionRequestedEvent);
 
   /**
    * Accepted connection request event received. Pushes event to EventDispatcher.
    *
-   * @param event
+   * @param connectionAcceptedEvent
    */
-  void onConnectionAccepted(ConnectionAcceptedEvent connectionRequestedEvent);
+  void onConnectionAccepted(ConnectionAcceptedEvent connectionAcceptedEvent);
 
 }

symphony-bdk-spring/bdk-core-starter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>symphony-bdk-spring</artifactId>
         <groupId>com.symphony.platformsolutions</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1.BETA</version>
     </parent>
 
     <artifactId>symphony-bdk-core-spring-boot-starter</artifactId>
@@ -57,4 +57,4 @@
 
     </dependencies>
 
-</project>
+</project>