diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7763305..91508ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,6 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3 + uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v4 with: - java-version: "17" + java-version: "25" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5fd804e..2421526 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,9 +8,9 @@ on: jobs: deploy: - uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v3 + uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v4 with: - java-version: "17" + java-version: "25" secrets: server-username: ${{ secrets.OSSRH_USERNAME }} server-password: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index cba24cb..e8d22ba 100644 --- a/pom.xml +++ b/pom.xml @@ -7,11 +7,11 @@ dev.vality library-parent-pom - 3.1.0 + 4.0.0 error-mapping-java-v2 - 0.0.4 + 1.0.0 jar error-mapping-java-v2 @@ -40,25 +40,38 @@ - 17 - 17 - 2.17.1 - 1.18.32 + 3.2.0 + 1.18.46 1.0.2 - 2.1.0 - 1.668-8cab698 + 3.0.0 + 1.698-99c91c9 + 6.1.0 + 3.15.0 + 3.5.6 + + + + tools.jackson + jackson-bom + ${jackson.version} + pom + import + + + + dev.vality.woody - woody-thrift + woody-api ${woody.version} provided dev.vality.woody - woody-api + libthrift ${woody.version} provided @@ -81,29 +94,56 @@ provided - com.fasterxml.jackson.core + tools.jackson.core jackson-databind - ${jackson.version} provided - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} + tools.jackson.core + jackson-core provided com.fasterxml.jackson.core - jackson-core - ${jackson.version} + jackson-annotations provided org.junit.jupiter - junit-jupiter-engine - 5.10.3 + junit-jupiter + ${junit.version} test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + full + + + org.projectlombok + lombok + ${lombok.version} + + + + + + diff --git a/src/main/java/dev/vality/adapter/common/v2/mapper/ErrorMapping.java b/src/main/java/dev/vality/adapter/common/v2/mapper/ErrorMapping.java index e4e844b..47bc012 100644 --- a/src/main/java/dev/vality/adapter/common/v2/mapper/ErrorMapping.java +++ b/src/main/java/dev/vality/adapter/common/v2/mapper/ErrorMapping.java @@ -1,17 +1,17 @@ package dev.vality.adapter.common.v2.mapper; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.adapter.common.v2.exception.ErrorMappingException; import dev.vality.adapter.common.v2.mapper.model.Error; import dev.vality.adapter.common.v2.mapper.model.MappingExceptions; import dev.vality.damsel.domain.Failure; import dev.vality.geck.serializer.kit.tbase.TErrorUtil; import dev.vality.woody.api.flow.error.*; +import tools.jackson.core.JacksonException; +import tools.jackson.core.exc.StreamReadException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.DatabindException; +import tools.jackson.databind.ObjectMapper; -import java.io.IOException; import java.io.InputStream; import java.nio.charset.CharsetEncoder; import java.nio.charset.StandardCharsets; @@ -69,11 +69,11 @@ private static List initErrorList(InputStream inputStream, ObjectMapper o inputStream, new TypeReference<>() { }); - } catch (JsonParseException e) { + } catch (StreamReadException e) { throw new ErrorMappingException("Json can't parse data from file", e); - } catch (JsonMappingException e) { + } catch (DatabindException e) { throw new ErrorMappingException("Json can't mapping data from file", e); - } catch (IOException e) { + } catch (JacksonException e) { throw new ErrorMappingException("Failed to initErrorList", e); } }