Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .baseline/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</module>
<module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
<property name="max" value="120"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
</module>
<module name="TreeWalker">
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.27.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.178.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.180.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
classpath 'com.palantir.metricschema:gradle-metric-schema:0.16.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public final class ArgumentTypesResolver {
.put(SafeLong.class, "SafeLong")
.put(String.class, "String")
.put(UUID.class, "Uuid")
.build())
.buildOrThrow())
.mapKeys((Function<Class<?>, ClassName>) ClassName::get)
.map(value -> "serialize" + value)
.collectToMap());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void testConsistency() {
builder.put(parameterType, method.getName());
}

assertThat(builder.build())
assertThat(builder.buildOrThrow())
.as("the map in %s is missing some values", ArgumentTypesResolver.class)
.containsAllEntriesOf(ArgumentTypesResolver.PARAMETER_SERIALIZER_TYPES);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private MultipartBody createOkhttpMultipartBody(List<KeyValue> keyValues) {
.put("bucket", bucket)
.put("key", key)
.putAll(entry.keyValues())
.build());
.buildOrThrow());

okhttp3.MediaType contentType = okhttp3.MediaType.parse(entry.contentType());
RequestBody body = unknownLengthRequestBody(value.getBytes(CHARSET), contentType);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private static ImmutableMap<String, String> tracingTags(Config cf, Endpoint endp
return ImmutableMap.<String, String>builderWithExpectedSize(endpointTags.size() + configTags.size())
.putAll(endpointTags)
.putAll(configTags)
.build();
.buildOrThrow();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we may want this to be buildKeepingLast()

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think failure indicates a bug in DialogueTracing factory methods, throw is probably reasonable (less confusion if we clobber tags, anyhow)

}

@Override
Expand Down