Skip to content

Commit a684096

Browse files
jetersenjetersen
committed
code style and import order
1 parent 3128912 commit a684096

81 files changed

Lines changed: 386 additions & 278 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.gradle
2-
.idea
2+
.idea/*
3+
!.idea/codeStyles/
34
.testcontainers-tmp*
45

56
vault-java-driver.iml

‎.idea/codeStyles/Project.xml‎

Lines changed: 125 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/codeStyles/codeStyleConfig.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/checkstyle/checkstyle.xml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
2+
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
3+
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
34
<module name="Checker">
4-
<module name="FileTabCharacter" />
5-
<module name="NewlineAtEndOfFile">
6-
<property name="lineSeparator" value="lf" />
7-
</module>
8-
<module name="RegexpSingleline">
9-
<property name="format" value="\s+$"/>
10-
<property name="message" value="Trailing spaces are not allowed."/>
5+
<module name="BeforeExecutionExclusionFileFilter">
6+
<property name="fileNamePattern" value="module\-info\.java$"/>
7+
</module>
8+
<module name="FileTabCharacter"/>
9+
<module name="NewlineAtEndOfFile">
10+
<property name="lineSeparator" value="lf"/>
11+
</module>
12+
<module name="RegexpSingleline">
13+
<property name="format" value="\s+$"/>
14+
<property name="message" value="Trailing spaces are not allowed."/>
15+
</module>
16+
<module name="TreeWalker">
17+
<module name="ImportOrder">
18+
<property name="separatedStaticGroups" value="true"/>
19+
<property name="option" value="bottom"/>
1120
</module>
21+
<module name="UnusedImports"/>
22+
<module name="AvoidStarImport"/>
23+
</module>
1224
</module>

‎src/main/java/com/bettercloud/vault/SslConfig.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
package com.bettercloud.vault;
22

33
import com.bettercloud.vault.api.Auth;
4-
5-
import javax.net.ssl.KeyManager;
6-
import javax.net.ssl.KeyManagerFactory;
7-
import javax.net.ssl.SSLContext;
8-
import javax.net.ssl.TrustManager;
9-
import javax.net.ssl.TrustManagerFactory;
104
import java.io.BufferedReader;
115
import java.io.ByteArrayInputStream;
126
import java.io.File;
@@ -31,6 +25,11 @@
3125
import java.security.spec.InvalidKeySpecException;
3226
import java.security.spec.PKCS8EncodedKeySpec;
3327
import java.util.Base64;
28+
import javax.net.ssl.KeyManager;
29+
import javax.net.ssl.KeyManagerFactory;
30+
import javax.net.ssl.SSLContext;
31+
import javax.net.ssl.TrustManager;
32+
import javax.net.ssl.TrustManagerFactory;
3433

3534
/**
3635
* <p>A container for SSL-related configuration options, meant to be stored within a {@link VaultConfig} instance.</p>

‎src/main/java/com/bettercloud/vault/Vault.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.bettercloud.vault.rest.Rest;
1515
import com.bettercloud.vault.rest.RestException;
1616
import com.bettercloud.vault.rest.RestResponse;
17-
1817
import java.nio.charset.StandardCharsets;
1918
import java.util.HashMap;
2019
import java.util.Map;

‎src/main/java/com/bettercloud/vault/api/Auth.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.bettercloud.vault.response.LookupResponse;
1111
import com.bettercloud.vault.rest.Rest;
1212
import com.bettercloud.vault.rest.RestResponse;
13-
1413
import java.io.Serializable;
1514
import java.nio.charset.StandardCharsets;
1615
import java.util.List;

‎src/main/java/com/bettercloud/vault/api/Debug.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.bettercloud.vault.rest.Rest;
77
import com.bettercloud.vault.rest.RestException;
88
import com.bettercloud.vault.rest.RestResponse;
9-
109
import java.util.HashSet;
1110
import java.util.Set;
1211

‎src/main/java/com/bettercloud/vault/api/Leases.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.bettercloud.vault.response.VaultResponse;
77
import com.bettercloud.vault.rest.Rest;
88
import com.bettercloud.vault.rest.RestResponse;
9-
109
import java.nio.charset.StandardCharsets;
1110

1211

‎src/main/java/com/bettercloud/vault/api/Logical.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package com.bettercloud.vault.api;
22

3-
import java.nio.charset.StandardCharsets;
4-
import java.util.ArrayList;
5-
import java.util.Arrays;
6-
import java.util.List;
7-
import java.util.Map;
8-
93
import com.bettercloud.vault.VaultConfig;
104
import com.bettercloud.vault.VaultException;
115
import com.bettercloud.vault.json.Json;
@@ -15,8 +9,19 @@
159
import com.bettercloud.vault.rest.Rest;
1610
import com.bettercloud.vault.rest.RestException;
1711
import com.bettercloud.vault.rest.RestResponse;
12+
import java.nio.charset.StandardCharsets;
13+
import java.util.ArrayList;
14+
import java.util.Arrays;
15+
import java.util.List;
16+
import java.util.Map;
1817

19-
import static com.bettercloud.vault.api.LogicalUtilities.*;
18+
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForDelete;
19+
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForList;
20+
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForReadOrWrite;
21+
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDelete;
22+
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDestroy;
23+
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionUnDelete;
24+
import static com.bettercloud.vault.api.LogicalUtilities.jsonObjectToWriteFromEngineVersion;
2025

2126

2227
/**

0 commit comments

Comments
 (0)