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
5 changes: 0 additions & 5 deletions .baseline/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
<module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
<module name="EqualsHashCode"/>
<module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
<module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
<module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
<message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
<message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
Expand Down Expand Up @@ -371,10 +370,6 @@
<property name="format" value="\bIOUtils\.toString\("/>
<property name="message" value="Prefer Guava''s [CharStreams,Files,Resources].toString to avoid charset/stream closing issues."/>
</module>
<module name="RegexpSinglelineJava">
<property name="format" value="static enum"/>
<property name="message" value="Redundant ''static'' modifier."/>
</module>
<module name="RegexpSinglelineJava">
<property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
<property name="message" value="TODO format: // TODO(#issue): explanation"/>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {
classpath 'com.netflix.nebula:gradle-info-plugin:5.1.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
classpath 'com.palantir.baseline:gradle-baseline-java:2.27.0'
classpath 'com.palantir.baseline:gradle-baseline-java:2.28.2'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ private MoreVisitors() {}
public static final ExternalType EXTERNAL = new ExternalType();
public static final IsInternalReference IS_INTERNAL_REFERENCE = new IsInternalReference();

private static class IsExternalType extends IsTypeVisitor {
private static final class IsExternalType extends IsTypeVisitor {
@Override
public Boolean visitExternal(ExternalReference _value) {
return true;
}
}

private static class ExternalType extends DefaultTypeVisitor<ExternalReference> {
private static final class ExternalType extends DefaultTypeVisitor<ExternalReference> {
@Override
public ExternalReference visitExternal(ExternalReference value) {
return value;
}
}

private static class IsInternalReference extends IsTypeVisitor {
private static final class IsInternalReference extends IsTypeVisitor {
@Override
public Boolean visitReference(TypeName _value) {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

public abstract class TestBase {

protected static final String readFromFile(Path file) {
protected static String readFromFile(Path file) {
try {
return new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
} catch (IOException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ public void testUuidType_equality() throws Exception {
assertThat(uuidA.hashCode()).isNotEqualTo(uuidB.hashCode());
}

private static class TestVisitor implements UnionTypeExample.Visitor<Integer> {
private static final class TestVisitor implements UnionTypeExample.Visitor<Integer> {
@Override
public Integer visitStringExample(StringExample stringExampleValue) {
return stringExampleValue.getString().length();
Expand Down