Skip to content

Commit

Permalink
Excavator: Upgrades Baseline to the latest version (#296)
Browse files Browse the repository at this point in the history
  • Loading branch information
svc-excavator-bot authored and dansanduleac committed Sep 17, 2019
1 parent 3b50b76 commit 2dd54fe
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .baseline/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@
<property name="allowEmptyMethods" value="true"/>
<property name="allowEmptyTypes" value="true"/>
<property name="allowEmptyLoops" value="true"/>
<property name="allowEmptyLambdas" value="true"/>
<property name="ignoreEnhancedForColon" value="false"/>
<message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
<message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
Expand All @@ -435,7 +436,7 @@
</module>
<module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
<module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
<property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
<property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
</module>
<module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
<property name="scope" value="public"/>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
classpath 'com.netflix.nebula:gradle-info-plugin:5.0.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.netflix.nebula:nebula-publishing-plugin:13.5.0'
classpath 'com.palantir.baseline:gradle-baseline-java:0.57.0'
classpath 'com.palantir.baseline:gradle-baseline-java:2.5.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.11.2'
}
}
Expand Down
7 changes: 4 additions & 3 deletions ssl-config/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ apply plugin: 'com.palantir.revapi'

dependencies {
compile "com.fasterxml.jackson.core:jackson-databind"
implementation 'com.palantir.safe-logging:preconditions'

testCompile project(':extras:jackson-support')
testCompile "org.assertj:assertj-core"
testCompile "junit:junit"
testImplementation project(':extras:jackson-support')
testImplementation "org.assertj:assertj-core"
testImplementation "junit:junit"

annotationProcessor "org.immutables:value"
compileOnly 'org.immutables:value::annotations'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
import java.nio.file.Path;
import java.util.Optional;
import org.immutables.value.Value;
Expand Down Expand Up @@ -66,11 +67,11 @@ public StoreType keyStoreType() {
@Value.Check
protected final void check() {
if (keyStorePath().isPresent() != keyStorePassword().isPresent()) {
throw new IllegalArgumentException(
throw new SafeIllegalArgumentException(
"keyStorePath and keyStorePassword must both be present or both be absent");
}
if (keyStoreKeyAlias().isPresent() && !keyStorePath().isPresent()) {
throw new IllegalArgumentException(
throw new SafeIllegalArgumentException(
"keyStorePath must be present if keyStoreKeyAlias is present");
}
}
Expand Down

0 comments on commit 2dd54fe

Please sign in to comment.