Merge pull request #101 from rudderlabs/master

chore: back-merge master to develop-release 3.1.0

Author: ChryssaAliferi

.github/workflows/build-and-quality-checks.yml

@@ -14,10 +14,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: '21'
+          java-version: '20'
           distribution: 'temurin'
 
       - name: Set up Maven

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 3.1.0 (December 14, 2023)
+- [New](https://github.com/rudderlabs/rudder-sdk-java/pull/86) Update Java to the latest version
+- [New](https://github.com/rudderlabs/rudder-sdk-java/pull/83) Improve links in Rudderstack documentation
+
 # Version 3.0.0 (January 9, 2023)
 - [New](https://github.com/rudderlabs/rudder-sdk-java/pull/43) Add CI feature
 - [New](https://github.com/rudderlabs/rudder-sdk-java/pull/41) Add support for channel object in individual payload

README.md

@@ -2,56 +2,62 @@
 
 # What is RudderStack?
 
-[RudderStack](https://rudderstack.com/) is a **customer data pipeline** tool for collecting, routing and processing data from your websites, apps, cloud tools, and data warehouse.
+[RudderStack](https://rudderstack.com/) is a **customer data pipeline** tool for collecting, routing and processing data from
+your websites, apps, cloud tools, and data warehouse.
 
 ## RudderStack's Java SDK
 
-RudderStack’s Java SDK allows you to track your customer event data from your Java code. Once enabled, the event requests hit the RudderStack servers. RudderStack then routes the events to the specified destination platforms as configured by you.
+RudderStack’s Java SDK allows you to track your customer event data from your Java code. Once enabled, the event requests hit
+the RudderStack servers. RudderStack then routes the events to the specified destination platforms as configured by you.
 
-For detailed documentation on the Java SDK, click [here](https://www.rudderstack.com/docs/sources/event-streams/sdks/rudderstack-java-sdk/).
+For detailed documentation on the Java SDK,
+click [here](https://www.rudderstack.com/docs/sources/event-streams/sdks/rudderstack-java-sdk/).
 
 ## Getting Started with the RudderStack Java SDK
 
 *Add to `pom.xml`:*
 
 ```xml
+
 <dependency>
     <groupId>com.rudderstack.sdk.java.analytics</groupId>
     <artifactId>analytics</artifactId>
-    <version>3.0.1</version>
+    <version>3.1.0</version>
 </dependency>
 
 ```
 
 *or if you're using Gradle:*
 
 ```bash
-implementation 'com.rudderstack.sdk.java.analytics:analytics:3.0.0'
+implementation 'com.rudderstack.sdk.java.analytics:analytics:3.1.0'
 ```
 
 ## Initializing ```RudderClient```
 
 ```java 
-RudderAnalytics analytics = RudderAnalytics
-         .builder("<WRITE_KEY>")
-         .setDataPlaneUrl("<DATA_PLANE_URL>")
-         .build();
+RudderAnalytics analytics=RudderAnalytics
+        .builder("<WRITE_KEY>")
+        .setDataPlaneUrl("<DATA_PLANE_URL>")
+        .build();
 ```
 
 ## Sending events
 
 ```java
-Map<String, Object> map = new HashMap<>();
-map.put("name", "John Marshal");
-map.put("email", "john@example.com");
-analytics.enqueue(IdentifyMessage.builder()
+Map<String, Object> map=new HashMap<>();
+        map.put("name","John Marshal");
+        map.put("email","john@example.com");
+        analytics.enqueue(IdentifyMessage.builder()
         .userId("6754ds7d9")
         .traits(map)
-);
+        );
 ```
 
-For more information on the different types of events supported by the Java SDK, refer to our [docs](https://www.rudderstack.com/docs/sources/event-streams/sdks/rudderstack-java-sdk/).
+For more information on the different types of events supported by the Java SDK, refer to
+our [docs](https://www.rudderstack.com/docs/sources/event-streams/sdks/rudderstack-java-sdk/).
 
 ## Contact Us
 
-If you come across any issues while configuring or using this SDK, feel free to start a conversation on our [Slack](https://resources.rudderstack.com/join-rudderstack-slack) channel. We will be happy to help you.
+If you come across any issues while configuring or using this SDK, feel free to start a conversation on
+our [Slack](https://resources.rudderstack.com/join-rudderstack-slack) channel. We will be happy to help you.

analytics-cli/pom.xml

@@ -88,7 +88,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.8</version>
+        <version>0.8.11</version>
         <executions>
           <execution>
             <id>generate-aggregate-report</id>
@@ -99,6 +99,14 @@
           </execution>
         </executions>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>19</source>
+                <target>19</target>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 </project>

analytics-core/pom.xml

@@ -72,4 +72,16 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>19</source>
+                    <target>19</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

analytics-sample/pom.xml

@@ -54,6 +54,14 @@
           </execution>
         </executions>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>19</source>
+                <target>19</target>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 </project>

analytics/pom.xml

@@ -77,7 +77,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>templating-maven-plugin</artifactId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <goals>
@@ -89,6 +89,14 @@
           </execution>
         </executions>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>19</source>
+                <target>19</target>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 </project>

analytics/src/main/java/com/rudderstack/sdk/java/analytics/MessageInterceptor.java

@@ -27,22 +27,15 @@ abstract class Typed implements MessageInterceptor {
         public final Message intercept(Message message) {
             // todo: non final so messages can be filtered without duplicating logic?
             Message.Type type = message.type();
-            switch (type) {
-                case alias:
-                    return alias((AliasMessage) message);
-                case group:
-                    return group((GroupMessage) message);
-                case identify:
-                    return identify((IdentifyMessage) message);
-                case screen:
-                    return screen((ScreenMessage) message);
-                case page:
-                    return page((PageMessage) message);
-                case track:
-                    return track((TrackMessage) message);
-                default:
-                    throw new IllegalArgumentException("Unknown payload type: " + type);
-            }
+            return switch (type) {
+                case alias -> alias((AliasMessage) message);
+                case group -> group((GroupMessage) message);
+                case identify -> identify((IdentifyMessage) message);
+                case screen -> screen((ScreenMessage) message);
+                case page -> page((PageMessage) message);
+                case track -> track((TrackMessage) message);
+                default -> throw new IllegalArgumentException("Unknown payload type: " + type);
+            };
         }
 
         /** Called for every {@link AliasMessage}. */

analytics/src/test/java/com/rudderstack/sdk/java/analytics/TypedInterceptorTest.java

@@ -2,14 +2,15 @@
 
 import com.rudderstack.sdk.java.analytics.messages.*;
 import org.junit.Test;
+import org.mockito.Answers;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 public class TypedInterceptorTest {
   @Test
   public void messagesFanOutCorrectly() {
-    MessageInterceptor.Typed interceptor = mock(MessageInterceptor.Typed.class);
+    MessageInterceptor.Typed interceptor = mock(MessageInterceptor.Typed.class, Answers.CALLS_REAL_METHODS);
 
     AliasMessage alias = AliasMessage.builder("foo").userId("bar").build();
     interceptor.intercept(alias);

analytics/src/test/java/com/rudderstack/sdk/java/analytics/TypedTransformerTest.java

@@ -2,18 +2,20 @@
 
 import com.rudderstack.sdk.java.analytics.messages.*;
 import org.junit.Test;
+import org.mockito.Answers;
 
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 public class TypedTransformerTest {
   @Test
   public void messagesFanOutCorrectly() {
-    MessageTransformer.Typed transformer = mock(MessageTransformer.Typed.class);
+    MessageTransformer.Typed transformer = mock(MessageTransformer.Typed.class, Answers.CALLS_REAL_METHODS);
 
     AliasMessage.Builder alias = AliasMessage.builder("foo").userId("bar");
     transformer.transform(alias);
-    verify(transformer).alias(alias);
+    verify(transformer).alias(eq(alias));
 
     GroupMessage.Builder group = GroupMessage.builder("foo").userId("bar");
     transformer.transform(group);