Merge pull request #187 from casz/chore/overallCodeHealth

Overall code health improvements

Author: steve-perkins

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/gradle.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [9, 11, 12]
+        os: [ubuntu-latest, windows-latest]
+        include:
+          # TODO(casz) remove once https://github.com/testcontainers/testcontainers-java/pull/1780 is available
+        - os: 'ubuntu-latest'
+          tasks: 'integrationTest'
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build with Gradle
+        run: ./gradlew build ${{ matrix.tasks }} -s --info

.gitignore

@@ -1,5 +1,6 @@
 .gradle
-.idea
+.idea/*
+!.idea/codeStyles/
 .testcontainers-tmp*
 
 vault-java-driver.iml

.idea/codeStyles/Project.xml

@@ -0,0 +1,27 @@
+language: java
+
+dist: xenial
+
+services:
+  - docker
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+matrix:
+  include:
+    - jdk: openjdk12
+    - jdk: openjdk11
+    - jdk: openjdk9
+
+script:
+  - ./gradlew build integrationTest -s --info
+
+notifications:
+  email: false

.idea/codeStyles/codeStyleConfig.xml

@@ -1,6 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'signing'
+apply plugin: 'checkstyle'
 
 group 'com.bettercloud'
 archivesBaseName = 'vault-java-driver'
@@ -18,7 +19,7 @@ repositories {
 dependencies {
     testCompile('junit:junit:4.12')
     testCompile('org.mockito:mockito-core:2.28.2')
-    testCompile('org.testcontainers:testcontainers:1.11.3')
+    testCompile('org.testcontainers:testcontainers:1.12.0')
     testCompile('org.eclipse.jetty:jetty-server:9.4.19.v20190610')
     testCompile('org.slf4j:slf4j-api:1.7.26')
     testCompile('org.bouncycastle:bcprov-jdk15on:1.62')
@@ -46,10 +47,14 @@ compileJava {
     options.compilerArgs = ['--release', '8']
 }
 
+compileJava.options.encoding = 'UTF-8'
+compileTestJava.options.encoding = 'UTF-8'
+
 task compileModuleInfoJava(type: JavaCompile) {
     classpath = files()
     source = 'src/main/java/module-info.java'
     destinationDir = compileJava.destinationDir
+    options.encoding = compileJava.options.encoding
 
     doFirst {
         options.compilerArgs = [
@@ -207,4 +212,3 @@ uploadArchives {
         }
     }
 }
-

.travis.yml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+  <module name="BeforeExecutionExclusionFileFilter">
+    <property name="fileNamePattern" value="module\-info\.java$"/>
+  </module>
+  <module name="FileTabCharacter"/>
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator" value="lf"/>
+  </module>
+  <module name="RegexpSingleline">
+    <property name="format" value="\s+$"/>
+    <property name="message" value="Trailing spaces are not allowed."/>
+  </module>
+  <module name="TreeWalker">
+    <module name="ImportOrder">
+      <property name="separatedStaticGroups" value="true"/>
+      <property name="option" value="bottom"/>
+    </module>
+    <module name="UnusedImports"/>
+    <module name="AvoidStarImport"/>
+  </module>
+</module>

build.gradle

@@ -1,12 +1,6 @@
 package com.bettercloud.vault;
 
 import com.bettercloud.vault.api.Auth;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -31,6 +25,11 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Base64;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
 
 /**
  * <p>A container for SSL-related configuration options, meant to be stored within a {@link VaultConfig} instance.</p>
@@ -444,13 +443,13 @@ public SslConfig build() throws VaultException {
             this.environmentLoader = new EnvironmentLoader();
         }
         if (this.verifyObject == null && environmentLoader.loadVariable(VAULT_SSL_VERIFY) != null) {
-            this.verify = Boolean.valueOf(environmentLoader.loadVariable(VAULT_SSL_VERIFY));
+            this.verify = Boolean.parseBoolean(environmentLoader.loadVariable(VAULT_SSL_VERIFY));
         } else if (this.verifyObject != null) {
             this.verify = verifyObject;
         } else {
             this.verify = true;
         }
-        if (this.verify == true && this.pemUTF8 == null && environmentLoader.loadVariable(VAULT_SSL_CERT) != null) {
+        if (this.verify && this.pemUTF8 == null && environmentLoader.loadVariable(VAULT_SSL_CERT) != null) {
             final File pemFile = new File(environmentLoader.loadVariable(VAULT_SSL_CERT));
             try (final InputStream input = new FileInputStream(pemFile)) {
                 this.pemUTF8 = inputStreamToUTF8(input);
@@ -487,7 +486,7 @@ protected String getPemUTF8() {
      * @throws VaultException
      */
     private void buildSsl() throws VaultException {
-        if (verify == true) {
+        if (verify) {
             if (keyStore != null || trustStore != null) {
                 this.sslContext = buildSslContextFromJks();
             } else if (pemUTF8 != null || clientPemUTF8 != null || clientKeyPemUTF8 != null) {
@@ -625,7 +624,7 @@ private KeyStore inputStreamToKeyStore(final InputStream inputStream, final Stri
      */
     private static String inputStreamToUTF8(final InputStream input) throws IOException {
         final BufferedReader in = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
-        final StringBuilder utf8 = new StringBuilder("");
+        final StringBuilder utf8 = new StringBuilder();
         String str;
         while ((str = in.readLine()) != null) {
             // String concatenation is less efficient, but for some reason the line-breaks (which are necessary

config/checkstyle/checkstyle.xml

@@ -14,7 +14,6 @@
 import com.bettercloud.vault.rest.Rest;
 import com.bettercloud.vault.rest.RestException;
 import com.bettercloud.vault.rest.RestResponse;
-
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;