Skip to content
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

Excavator: Upgrades Baseline to the latest version #238

Merged
merged 2 commits into from
Aug 17, 2021
Merged

Excavator: Upgrades Baseline to the latest version #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a69839
Excavator: Upgrades Baseline to the latest version
svc-excavator-bot Aug 16, 2021
8806b80
Replace asserts
fawind Aug 17, 2021
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 @@ -23,7 +23,7 @@ buildscript {
dependencies {
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.2.1'
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.2.0'
classpath 'com.palantir.baseline:gradle-baseline-java:3.93.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.17.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.0.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
Expand Down
6 changes: 4 additions & 2 deletions ...-postman-core/src/main/java/com/palantir/conjure/postman/visitor/TemplateTypeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.google.common.base.Preconditions;
import com.palantir.conjure.spec.AliasDefinition;
import com.palantir.conjure.spec.EnumDefinition;
import com.palantir.conjure.spec.EnumValueDefinition;
Expand Down Expand Up @@ -102,6 +103,7 @@ public JsonNode visitMap(MapType value) {
return objectMapper.createObjectNode().set(key, value.getValueType().accept(this));
}

@SuppressWarnings("PreferSafeLoggingPreconditions")
@Override
public JsonNode visitReference(TypeName value) {
TypeDefinition definition = types.get(value);
Expand Down Expand Up @@ -138,7 +140,7 @@ public JsonNode visitObject(ObjectDefinition value) {
.forEach(fieldDefinition -> node.set(
fieldDefinition.getFieldName().get(),
fieldDefinition.getType().accept(visitor)));
assert seenTypeStack.pop().equals(value.getTypeName());
Preconditions.checkState(seenTypeStack.pop().equals(value.getTypeName()));
return node;
}

Expand All @@ -164,7 +166,7 @@ public JsonNode visitUnion(UnionDefinition value) {
.createObjectNode()
.put("type", unionTypes)
.set("oneOf", templates);
assert seenTypeStack.pop().equals(value.getTypeName());
Preconditions.checkState(seenTypeStack.pop().equals(value.getTypeName()));
return union;
}
}
Expand Down