diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 95e8ccf8d..7f9632834 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -49,17 +49,17 @@ jobs: strategy: fail-fast: false matrix: - jdk: [8, 9] + jdk: [11, 17] optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] steps: - name: checkout uses: actions/checkout@v4 - name: set up JDK ${{ matrix.jdk }} - uses: AdoptOpenJDK/install-jdk@v1 + uses: actions/setup-java@v4 with: - version: ${{ matrix.jdk }} - architecture: x64 + java-version: ${{ matrix.jdk }} + distribution: 'temurin' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/core-api/src/main/java/com/optimizely/ab/event/internal/serializer/JacksonSerializer.java b/core-api/src/main/java/com/optimizely/ab/event/internal/serializer/JacksonSerializer.java index 6087b4cce..5c1d586fd 100644 --- a/core-api/src/main/java/com/optimizely/ab/event/internal/serializer/JacksonSerializer.java +++ b/core-api/src/main/java/com/optimizely/ab/event/internal/serializer/JacksonSerializer.java @@ -1,6 +1,6 @@ /** * - * Copyright 2016-2017, 2019, Optimizely and contributors + * Copyright 2016-2017, 2019, 2025 Optimizely and contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; class JacksonSerializer implements Serializer { private ObjectMapper mapper = new ObjectMapper().setPropertyNamingStrategy( - PropertyNamingStrategy.SNAKE_CASE); + PropertyNamingStrategies.SNAKE_CASE); public String serialize(T payload) { mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); diff --git a/core-api/src/test/java/com/optimizely/ab/event/internal/serializer/JacksonSerializerTest.java b/core-api/src/test/java/com/optimizely/ab/event/internal/serializer/JacksonSerializerTest.java index fb068e3ab..79974a986 100644 --- a/core-api/src/test/java/com/optimizely/ab/event/internal/serializer/JacksonSerializerTest.java +++ b/core-api/src/test/java/com/optimizely/ab/event/internal/serializer/JacksonSerializerTest.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.optimizely.ab.event.internal.payload.EventBatch; import org.junit.Test; @@ -42,7 +42,7 @@ public class JacksonSerializerTest { private JacksonSerializer serializer = new JacksonSerializer(); private ObjectMapper mapper = new ObjectMapper().setPropertyNamingStrategy( - PropertyNamingStrategy.SNAKE_CASE); + PropertyNamingStrategies.SNAKE_CASE); @Test diff --git a/java-quickstart/build.gradle b/java-quickstart/build.gradle index a58fb090e..ef86b3045 100644 --- a/java-quickstart/build.gradle +++ b/java-quickstart/build.gradle @@ -4,7 +4,11 @@ dependencies { implementation project(':core-api') implementation project(':core-httpclient-impl') - implementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion + // implementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0' + implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion