Merge in changes from Beta SDK

.github/workflows/lint-test-sdk.yml

@@ -13,15 +13,15 @@ jobs:
         java-version: ['8', '11', '17'] # Define the Java versions to test against
     steps:
       - uses: actions/checkout@v3
-      
+
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java-version }}
           distribution: 'adopt'
-      
+
       - name: 'Set up GCP SDK'
-        uses: 'google-github-actions/setup-gcloud@v0'
-      
+        uses: 'google-github-actions/setup-gcloud@v2'
+
       - name: Run tests
         run: make test

.github/workflows/publish-sdk.yml

@@ -20,7 +20,7 @@ jobs:
           gpg-passphrase: GPG_PASSPHRASE
 
       - name: 'Set up GCP SDK for downloading test data'
-        uses: 'google-github-actions/setup-gcloud@v0'
+        uses: 'google-github-actions/setup-gcloud@v2'
 
       - name: Download test data
         run: make test-data
@@ -31,7 +31,7 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          
+
       - name: Publish package
         run: mvn nexus-staging:release
         env:

.gitignore

@@ -1,6 +1,36 @@
+# Shared test files
+src/test/resources/assignment-v2
+src/test/resources/rac-experiments-v3.json
+
+### IntelliJ IDEA ###
+*.iml
 .idea/
-target/
 out/
-src/test/resources/assignment-v2
-src/test/resources/rac-experiments-v*.json
-.DS_Store
+target/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

Makefile

@@ -29,18 +29,20 @@ build: test-data
 	mvn --batch-mode --update-snapshots package
 
 ## test-data
-testDataDir := src/test/resources/
-tempDir := ${testDataDir}temp/
-gitDataDir := ${tempDir}sdk-test-data/
+testDataDir := src/test/resources
+banditsDataDir := ${testDataDir}/bandits
+tempDir := ${testDataDir}/temp
+tempBanditsDir := ${tempDir}/bandits
+gitDataDir := ${tempDir}/sdk-test-data
 branchName := main
 githubRepoLink := https://github.com/Eppo-exp/sdk-test-data.git
 .PHONY: test-data
-test-data: 
-	rm -rf $(testDataDir)
-	mkdir -p $(tempDir)
+test-data:
+	find ${testDataDir} -mindepth 1 ! -regex '^${banditsDataDir}.*' -delete
+	mkdir -p ${tempDir}
 	git clone -b ${branchName} --depth 1 --single-branch ${githubRepoLink} ${gitDataDir}
-	cp ${gitDataDir}rac-experiments-v3.json ${testDataDir}
-	cp -r ${gitDataDir}assignment-v2 ${testDataDir}
+	cp ${gitDataDir}/rac-experiments-v3.json ${testDataDir}
+	cp -r ${gitDataDir}/assignment-v2 ${testDataDir}
 	rm -rf ${tempDir}
 
 .PHONY: test

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cloud.eppo</groupId>
     <artifactId>eppo-server-sdk</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Eppo Server-Side SDK for Java</description>
@@ -107,6 +107,11 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.13</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.12</version>
+        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
@@ -125,6 +130,18 @@
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
@@ -206,4 +223,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>