From df49d3053ff360b83fc8a3a2bc6b44fb1595df95 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Sun, 15 Aug 2021 22:10:17 +0000 Subject: [PATCH 1/2] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dd546f8d5..a1da92885 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.2.1' - classpath 'com.palantir.baseline:gradle-baseline-java:4.9.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.16.0' classpath 'com.palantir.gradle.conjure:gradle-conjure:5.10.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.0.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' From 90637fed7b08d1f1764495eac608c47ff0c0699b Mon Sep 17 00:00:00 2001 From: Fabian Windheuser Date: Mon, 16 Aug 2021 16:52:43 +0200 Subject: [PATCH 2/2] Checkstyle --- .../palantir/conjure/parser/services/ArgumentDefinition.java | 2 +- .../conjure/parser/types/BaseObjectTypeDefinition.java | 2 +- .../conjure/parser/types/complex/EnumValueDefinition.java | 2 +- .../conjure/parser/types/complex/FieldDefinition.java | 2 +- .../src/main/java/com/palantir/conjure/either/Either.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conjure-core/src/main/java/com/palantir/conjure/parser/services/ArgumentDefinition.java b/conjure-core/src/main/java/com/palantir/conjure/parser/services/ArgumentDefinition.java index 6f9521d1c..0ec1923b2 100644 --- a/conjure-core/src/main/java/com/palantir/conjure/parser/services/ArgumentDefinition.java +++ b/conjure-core/src/main/java/com/palantir/conjure/parser/services/ArgumentDefinition.java @@ -98,7 +98,7 @@ static Builder builder() { class Builder extends ImmutableArgumentDefinition.Builder {} // solve Jackson sad-times for multiple parser - class ArgumentDefinitionDeserializer extends JsonDeserializer { + final class ArgumentDefinitionDeserializer extends JsonDeserializer { @SuppressWarnings("deprecation") @Override public ArgumentDefinition deserialize(JsonParser parser, DeserializationContext _context) diff --git a/conjure-core/src/main/java/com/palantir/conjure/parser/types/BaseObjectTypeDefinition.java b/conjure-core/src/main/java/com/palantir/conjure/parser/types/BaseObjectTypeDefinition.java index 6865ba665..ac678478a 100644 --- a/conjure-core/src/main/java/com/palantir/conjure/parser/types/BaseObjectTypeDefinition.java +++ b/conjure-core/src/main/java/com/palantir/conjure/parser/types/BaseObjectTypeDefinition.java @@ -43,7 +43,7 @@ public interface BaseObjectTypeDefinition { T visit(TypeDefinitionVisitor visitor); - class BaseObjectTypeDefinitionDeserializer extends JsonDeserializer { + final class BaseObjectTypeDefinitionDeserializer extends JsonDeserializer { @Override public BaseObjectTypeDefinition deserialize(JsonParser parser, DeserializationContext _ctxt) throws IOException { diff --git a/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/EnumValueDefinition.java b/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/EnumValueDefinition.java index 35ccc7427..9a5718ef8 100644 --- a/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/EnumValueDefinition.java +++ b/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/EnumValueDefinition.java @@ -43,7 +43,7 @@ static EnumValueDefinition.Builder builder() { class Builder extends ImmutableEnumValueDefinition.Builder {} - class EnumValueDeserializer extends JsonDeserializer { + final class EnumValueDeserializer extends JsonDeserializer { @SuppressWarnings("deprecation") @Override public EnumValueDefinition deserialize(JsonParser parser, DeserializationContext _ctxt) throws IOException { diff --git a/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/FieldDefinition.java b/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/FieldDefinition.java index ff4a95a54..de2cc7cc6 100644 --- a/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/FieldDefinition.java +++ b/conjure-core/src/main/java/com/palantir/conjure/parser/types/complex/FieldDefinition.java @@ -44,7 +44,7 @@ static FieldDefinition of(ConjureType type) { } // solve Jackson sad-times for multiple parser - class FieldDefinitionDeserializer extends JsonDeserializer { + final class FieldDefinitionDeserializer extends JsonDeserializer { @SuppressWarnings("deprecation") @Override public FieldDefinition deserialize(JsonParser parser, DeserializationContext _context) throws IOException { diff --git a/conjure-generator-common/src/main/java/com/palantir/conjure/either/Either.java b/conjure-generator-common/src/main/java/com/palantir/conjure/either/Either.java index e37234127..769c27a0f 100644 --- a/conjure-generator-common/src/main/java/com/palantir/conjure/either/Either.java +++ b/conjure-generator-common/src/main/java/com/palantir/conjure/either/Either.java @@ -39,7 +39,7 @@ abstract class Left implements Either { abstract L value(); @Override - public T fold(Function mapLeft, Function _mapRight) { + public final T fold(Function mapLeft, Function _mapRight) { return mapLeft.apply(value()); } } @@ -50,7 +50,7 @@ abstract class Right implements Either { abstract R value(); @Override - public T fold(Function _mapLeft, Function mapRight) { + public final T fold(Function _mapLeft, Function mapRight) { return mapRight.apply(value()); } }