8000 Excavator: Upgrades Baseline to the latest version by svc-excavator-bot · Pull Request #1826 · palantir/conjure · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Excavator: Upgrades Baseline to the latest version #1826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2025
Merged

Excavator: Upgrades Baseline to the latest version #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {
classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.18.0'
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'
classpath 'com.palantir.baseline:gradle-baseline-java:6.32.0'
classpath 'com.palantir.baseline:gradle-baseline-java:6.34.0'
classpath 'com.palantir.gradle.conjure:gradle-conjure:5.56.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.3.0'
Expand Down
59 changes: 42 additions & 17 deletions conjure-core/src/main/java/com/palantir/conjure/defs/ConjureParserUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,10 @@ public static String parsePackageOrElseThrow(

public static ErrorDefinition parseErrorType(
TypeName name,
com.palantir.conjure.parser.types.complex.ErrorTypeDefinition def,
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.types.complex.ErrorTypeDefinition def,
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
ErrorDefinition errorType = ErrorDefinition.builder()
.errorName(name)
.namespace(ErrorNamespace.of(def.namespace().name()))
Expand All @@ -136,7 +138,9 @@ public static ErrorDefinition parseErrorType(
}

public static TypeDefinition parseEnumType(
TypeName name, com.palantir.conjure.parser.types.complex.EnumTypeDefinition def) {
TypeName name,
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.types.complex.EnumTypeDefinition def) {

EnumDefinition enumType = EnumDefinition.builder()
.typeName(name)
Expand All @@ -152,8 +156,10 @@ public static TypeDefinition parseEnumType(

public static TypeDefinition parseUnionType(
TypeName name,
com.palantir.conjure.parser.types.complex.UnionTypeDefinition def,
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.types.complex.UnionTypeDefinition def,
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
UnionDefinition unionType = UnionDefinition.builder()
.typeName(name)
.union(parseField(def.union(), typeResolver))
Expand All @@ -166,8 +172,10 @@ public static TypeDefinition parseUnionType(

public static TypeDefinition parseObjectType(
TypeName name,
com.palantir.conjure.parser.types.complex.ObjectTypeDefinition def,
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.types.complex.ObjectTypeDefinition def,
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
ObjectDefinition objectType = ObjectDefinition.builder()
.typeName(name)
.fields(parseField(def.fields(), typeResolver))
Expand All @@ -180,8 +188,10 @@ public static TypeDefinition parseObjectType(

public static TypeDefinition parseAliasType(
TypeName name,
com.palantir.conjure.parser.types.reference.AliasTypeDefinition def,
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.types.reference.AliasTypeDefinition def,
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
return TypeDefinition.alias(AliasDefinition.builder()
.typeName(name)
.alias(def.alias().visit(new ConjureTypeParserVisitor(typeResolver)))
Expand Down Expand Up @@ -215,7 +225,8 @@ private static boolean isBearerToken(ExternalTypeDefinition externalTypeDefiniti

public static TypeName createTypeName(
String name,
com.palantir.conjure.parser.types.BaseObjectTypeDefinition def,
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.types.BaseObjectTypeDefinition def,
Optional<String> defaultPackage) {
TypeName type = TypeName.of(name, parsePackageOrElseThrow(def.conjurePackage(), defaultPackage));
TypeNameValidator.validate(type);
Expand Down Expand Up @@ -244,6 +255,7 @@ static ConjureDefinition parseConjureDef(
ConjureSourceFile parsed = annotatedParsed.conjureSourceFile();

try {
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver =
new ConjureTypeParserVisitor.ByParsedRepresentationTypeNameResolver(
parsed.types(), annotatedParsed.importProviders(), annotatedParsedDefs);
Expand Down Expand Up @@ -363,8 +375,10 @@ static ServiceDefinition parseService(
}

static Map<TypeName, TypeDefinition> parseObjects(
com.palantir.conjure.parser.types.TypesDefinition parsed,
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.types.TypesDefinition parsed,
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
Optional<String> defaultPackage =
parsed.definitions().defaultConjurePackage().map(ConjurePackage::name);

Expand All @@ -376,8 +390,11 @@ static Map<TypeName, TypeDefinition> parseObjects(
.collect(Collectors.toMap(td -> td.accept(TypeDefinitionVisitor.TYPE_NAME), td -> td));
}

@SuppressWarnings("for-rollout:PreferredInterfaceType")
static List<ErrorDefinition> parseErrors(
NamedTypesDefinition defs, ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
NamedTypesDefinition defs,
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
Optional<String> defaultPackage = defs.defaultConjurePackage().map(ConjurePackage::name);
ImmutableList.Builder<ErrorDefinition> errorsBuidler = ImmutableList.builder();
errorsBuidler.addAll(defs.errors().entrySet().stream()
Expand Down Expand Up @@ -408,7 +425,8 @@ static List<FieldDefinition> parseField(
com.palantir.conjure.parser.types.names.FieldName,
com.palantir.conjure.parser.types.complex.FieldDefinition>
def,
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
return def.entrySet().stream()
.map(entry -> {
FieldDefinition fieldDefinition = FieldDefinition.builder()
Expand All @@ -424,6 +442,7 @@ static List<FieldDefinition> parseField(
.collect(Collectors.toList());
}

@SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
private static LogSafety parseLogSafety(LogSafetyDefinition def) {
switch (def) {
case SAFE:
Expand Down Expand Up @@ -484,8 +503,10 @@ private static HttpPath parseHttpPath(
return httpPath;
}

@SuppressWarnings({"for-rollout:StatementSwitchToExpressionSwitch", "for-rollout:UnnecessaryDefaultInEnumSwitch"})
private static Optional<AuthType> parseAuthType(
com.palantir.conjure.parser.services.AuthDefinition authDefinition) {
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
com.palantir.conjure.parser.services.AuthDefinition authDefinition) {

switch (authDefinition.type()) {
case HEADER:
Expand All @@ -499,6 +520,7 @@ private static Optional<AuthType> parseAuthType(
}
}

@SuppressWarnings("for-rollout:PreferredInterfaceType")
private static List<ArgumentDefinition> parseArgs(
Map<ParameterName, com.palantir.conjure.parser.services.ArgumentDefinition> args,
HttpPath httpPath,
Expand All @@ -524,6 +546,7 @@ private static List<ArgumentDefinition> parseArgs(
return resultBuilder.build();
}

@SuppressWarnings({"for-rol 10000 lout:StatementSwitchToExpressionSwitch", "for-rollout:UnnecessaryDefaultInEnumSwitch"})
private static ParameterType parseParameterType(
com.palantir.conjure.parser.services.ArgumentDefinition argumentDef,
ArgumentName argName,
Expand Down Expand Up @@ -558,8 +581,10 @@ private static ParameterType parseParameterType(
}

private static Set<Type> parseMarkers(
Set<com.palantir.conjure.parser.types.ConjureType> markers,
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
Set<com.palantir.conjure.parser.types.ConjureType> markers,
@SuppressWarnings("for-rollout:DifferentNameButSame")
ConjureTypeParserVisitor.ReferenceTypeResolver typeResolver) {
return markers.stream()
.map(m -> m.visit(new ConjureTypeParserVisitor(typeResolver)))
.collect(Collectors.toSet());
Expand Down
1 change: 1 addition & 0 deletions conjure-core/src/main/java/com/palantir/conjure/defs/EndpointErrorResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ private ErrorTypeName resolveReferenceType(ForeignReferenceType foreignReference
externalFile.conjureSourceFile().types().definitions().defaultConjurePackage());
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
private static ErrorTypeName resolveInternal(
TypeName name,
Map<TypeName, ErrorTypeDefinition> parsedErrorDefinitions,
Expand Down
1 change: 1 addition & 0 deletions ...re-core/src/main/java/com/palantir/conjure/defs/validator/ConjureContextualValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.palantir.conjure.visitor.DealiasingTypeVisitor;

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
public interface ConjureContextualValidator<T> {
/**
Expand Down
10 changes: 10 additions & 0 deletions ...re-core/src/main/java/com/palantir/conjure/defs/validator/ConjureDefinitionValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
public enum ConjureDefinitionValidator implements ConjureValidator<ConjureDefinition> {
UNIQUE_SERVICE_NAMES(new UniqueServiceNamesValidator()),
Expand Down Expand Up @@ -80,6 +81,7 @@ public void validate(ConjureDefinition definition) {
validator.validate(definition);
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class UniqueServiceNamesValidator implements ConjureValidator<ConjureDefinition> {
@Override
Expand All @@ -95,6 +97,7 @@ public void validate(ConjureDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class IllegalVersionValidator implements ConjureValidator<ConjureDefinition> {
@Override
Expand All @@ -107,6 +110,7 @@ public void validate(ConjureDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class UniqueNamesValidator implements ConjureValidator<ConjureDefinition> {
@Override
Expand Down Expand Up @@ -136,11 +140,13 @@ private static String typeNameToString(TypeName typeName) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoRecursiveTypesValidator implements ConjureValidator<ConjureDefinition> {
@Override
public void validate(ConjureDefinition definition) {
// create mapping from object type name -> names of reference types that are fields of that type
@SuppressWarnings("for-rollout:PreferredInterfaceType")
Multimap<TypeName, TypeName> typeToRefFields = HashMultimap.create();

definition.getTypes().forEach(type -> getReferenceType(type)
Expand Down Expand Up @@ -193,6 +199,7 @@ private void verifyTypeHasNoRecursiveDefinitions(
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
public static final class NoNestedOptionalValidator implements ConjureValidator<ConjureDefinition> {
@Override
Expand Down Expand Up @@ -312,6 +319,7 @@ private static boolean recursivelyFindNestedOptionals(
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class IllegalMapKeyValidator implements ConjureValidator<ConjureDefinition> {

Expand Down Expand Up @@ -441,6 +449,7 @@ private static boolean recursivelyFindIllegalKeys(
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class LogSafetyConjureDefinitionValidator implements ConjureValidator<ConjureDefinition> {

Expand Down Expand Up @@ -512,6 +521,7 @@ private static boolean isSafetyMarker(Type type) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private enum UniqueErrorNameValidator implements ConjureValidator<ConjureDefinition> {
INSTANCE;
Expand Down
1 change: 1 addition & 0 deletions conjure-core/src/main/java/com/palantir/conjure/defs/validator/ConjureValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.palantir.conjure.defs.validator;

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
public interface ConjureValidator<T> {
/**
Expand Down
14 changes: 14 additions & 0 deletions ...e-core/src/main/java/com/palantir/conjure/defs/validator/EndpointDefinitionValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
public enum EndpointDefinitionValidator implements ConjureContextualValidator<EndpointDefinition> {
ARGUMENT_TYPE(new NonBodyArgumentTypeValidator()),
Expand Down Expand Up @@ -98,6 +99,7 @@ public void validate(EndpointDefinition definition, DealiasingTypeVisitor dealia
validator.validate(definition, dealiasingTypeVisitor);
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NonBodyArgumentTypeValidator implements ConjureContextualValidator<EndpointDefinition> {
@Override
Expand Down Expand Up @@ -133,6 +135,7 @@ private static boolean validateType(Type input, DealiasingTypeVisitor dealiasing
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class SingleBodyParamValidator implements ConjureValidator<EndpointDefinition> {
@Override
Expand All @@ -149,6 +152,7 @@ public void validate(EndpointDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoGetBodyParamValidator implements ConjureValidator<EndpointDefinition> {
@Override
Expand All @@ -164,6 +168,7 @@ public void validate(EndpointDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoOptionalBinaryBodyParamValidator
implements ConjureContextualValidator<EndpointDefinition> {
Expand Down Expand Up @@ -191,6 +196,7 @@ private static boolean isOptionalBinary(Type type) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class PathParamValidator implements ConjureValidator<EndpointDefinition> {
@Override
Expand Down Expand Up @@ -228,6 +234,7 @@ public void validate(EndpointDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoComplexPathParamValidator implements ConjureContextualValidator<EndpointDefinition> {
@Override
Expand All @@ -249,6 +256,7 @@ public void validate(EndpointDefinition definition, DealiasingTypeVisitor dealia
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoComplexHeaderParamValidator implements ConjureContextualValidator<EndpointDefinition> {

Expand Down Expand Up @@ -281,6 +289,7 @@ && recursivelyValidate(
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoComplexQueryParamValidator implements ConjureContextualValidator<EndpointDefinition> {
@Override
Expand Down Expand Up @@ -351,6 +360,7 @@ public Boolean visitUnknown(String _unknownType) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoBearerTokenPathOrQueryParams
implements ConjureContextualValidator<EndpointDefinition> {
Expand Down Expand Up @@ -389,6 +399,7 @@ private static boolean validateType(Type input, DealiasingTypeVisitor dealiasing
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class ParameterNameValidator implements ConjureValidator<EndpointDefinition> {
@Override
Expand All @@ -407,6 +418,7 @@ public void validate(EndpointDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class ParamIdValidator implements ConjureValidator<EndpointDefinition> {
@Override
Expand Down Expand Up @@ -461,6 +473,7 @@ public void validate(EndpointDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoUnsupportedHttpMethodValidator implements ConjureValidator<EndpointDefinition> {
@Override
Expand All @@ -474,6 +487,7 @@ public void validate(EndpointDefinition definition) {
}
}

@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
@com.google.errorprone.annotations.Immutable
private static final class NoDuplicateEndpointErrorsValidation implements ConjureValidator<EndpointDefinition> {
@Override
Expand Down
Loading
0