Excavator: Upgrades Baseline to the latest version

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'

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<ArgumentDefinition> {
+    final class ArgumentDefinitionDeserializer extends JsonDeserializer<ArgumentDefinition> {
         @SuppressWarnings("deprecation")
         @Override
         public ArgumentDefinition deserialize(JsonParser parser, DeserializationContext _context)

conjure-core/src/main/java/com/palantir/conjure/parser/types/BaseObjectTypeDefinition.java

@@ -43,7 +43,7 @@ public interface BaseObjectTypeDefinition {
 
     <T> T visit(TypeDefinitionVisitor<T> visitor);
 
-    class BaseObjectTypeDefinitionDeserializer extends JsonDeserializer<BaseObjectTypeDefinition> {
+    final class BaseObjectTypeDefinitionDeserializer extends JsonDeserializer<BaseObjectTypeDefinition> {
         @Override
         public BaseObjectTypeDefinition deserialize(JsonParser parser, DeserializationContext _ctxt)
                 throws IOException {

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<EnumValueDefinition> {
+    final class EnumValueDeserializer extends JsonDeserializer<EnumValueDefinition> {
         @SuppressWarnings("deprecation")
         @Override
         public EnumValueDefinition deserialize(JsonParser parser, DeserializationContext _ctxt) throws IOException {

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<FieldDefinition> {
+    final class FieldDefinitionDeserializer extends JsonDeserializer<FieldDefinition> {
         @SuppressWarnings("deprecation")
         @Override
         public FieldDefinition deserialize(JsonParser parser, DeserializationContext _context) throws IOException {

conjure-generator-common/src/main/java/com/palantir/conjure/either/Either.java

@@ -39,7 +39,7 @@ abstract class Left<L, R> implements Either<L, R> {
         abstract L value();
 
         @Override
-        public <T> T fold(Function<? super L, ? extends T> mapLeft, Function<? super R, ? extends T> _mapRight) {
+        public final <T> T fold(Function<? super L, ? extends T> mapLeft, Function<? super R, ? extends T> _mapRight) {
             return mapLeft.apply(value());
         }
     }
@@ -50,7 +50,7 @@ abstract class Right<L, R> implements Either<L, R> {
         abstract R value();
 
         @Override
-        public <T> T fold(Function<? super L, ? extends T> _mapLeft, Function<? super R, ? extends T> mapRight) {
+        public final <T> T fold(Function<? super L, ? extends T> _mapLeft, Function<? super R, ? extends T> mapRight) {
             return mapRight.apply(value());
         }
     }