diff --git a/pom.xml b/pom.xml
index 6c459e8..458a141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,16 +21,11 @@
-
- UTF-8
-
-
-
Stefan Kalscheuer
stefan@stklcode.de
- +1
+ Europe/Berlin
@@ -45,6 +40,62 @@
https://github.com/stklcode/jvaultconnector/issues
+
+ UTF-8
+
+
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.15.2
+
+
+
+ org.junit.jupiter
+ junit-jupiter
+ 5.9.3
+ test
+
+
+ org.mockito
+ mockito-core
+ 5.3.1
+ test
+
+
+ com.github.stefanbirkner
+ system-lambda
+ 1.2.1
+ test
+
+
+ com.github.tomakehurst
+ wiremock-jre8
+ 2.35.0
+ test
+
+
+ commons-io
+ commons-io
+ 2.13.0
+ test
+
+
+ nl.jqno.equalsverifier
+ equalsverifier
+ 3.14.2
+ test
+
+
+ org.awaitility
+ awaitility
+ 4.2.0
+ test
+
+
+
@@ -136,57 +187,6 @@
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.15.2
-
-
-
- org.junit.jupiter
- junit-jupiter
- 5.9.3
- test
-
-
- org.mockito
- mockito-core
- 5.3.1
- test
-
-
- com.github.stefanbirkner
- system-lambda
- 1.2.1
- test
-
-
- com.github.tomakehurst
- wiremock-jre8
- 2.35.0
- test
-
-
- commons-io
- commons-io
- 2.13.0
- test
-
-
- nl.jqno.equalsverifier
- equalsverifier
- 3.14.2
- test
-
-
- org.awaitility
- awaitility
- 4.2.0
- test
-
-
-
sources
diff --git a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java
index af5a6e7..f597e2d 100644
--- a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java
+++ b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java
@@ -75,6 +75,24 @@ public class HTTPVaultConnector implements VaultConnector {
private String token; // Current token.
private long tokenTTL = 0; // Expiration time for current token.
+ /**
+ * Create connector using a {@link HTTPVaultConnectorBuilder}.
+ *
+ * @param builder The builder.
+ */
+ HTTPVaultConnector(final HTTPVaultConnectorBuilder builder) {
+ this.request = new RequestHelper(
+ ((builder.isWithTLS()) ? "https" : "http") + "://" +
+ builder.getHost() +
+ ((builder.getPort() != null) ? ":" + builder.getPort() : "") +
+ builder.getPrefix(),
+ builder.getNumberOfRetries(),
+ builder.getTimeout(),
+ builder.getTlsVersion(),
+ builder.getTrustedCA()
+ );
+ }
+
/**
* Get a new builder for a connector.
*
@@ -108,24 +126,6 @@ public class HTTPVaultConnector implements VaultConnector {
return new HTTPVaultConnectorBuilder().withBaseURL(baseURL);
}
- /**
- * Create connector using a {@link HTTPVaultConnectorBuilder}.
- *
- * @param builder The builder.
- */
- HTTPVaultConnector(final HTTPVaultConnectorBuilder builder) {
- this.request = new RequestHelper(
- ((builder.isWithTLS()) ? "https" : "http") + "://" +
- builder.getHost() +
- ((builder.getPort() != null) ? ":" + builder.getPort() : "") +
- builder.getPrefix(),
- builder.getNumberOfRetries(),
- builder.getTimeout(),
- builder.getTlsVersion(),
- builder.getTrustedCA()
- );
- }
-
@Override
public final void resetAuth() {
token = null;
diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java
index 95c7004..c643ba9 100644
--- a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java
@@ -34,17 +34,6 @@ import java.util.Objects;
public final class AppRole implements Serializable {
private static final long serialVersionUID = -6248529625864573990L;
- /**
- * Get {@link Builder} instance.
- *
- * @param name Role name.
- * @return AppRole Builder.
- * @since 0.8
- */
- public static Builder builder(final String name) {
- return new Builder(name);
- }
-
@JsonProperty("role_name")
private String name;
@@ -134,6 +123,17 @@ public final class AppRole implements Serializable {
this.tokenType = builder.tokenType != null ? builder.tokenType.value() : null;
}
+ /**
+ * Get {@link Builder} instance.
+ *
+ * @param name Role name.
+ * @return AppRole Builder.
+ * @since 0.8
+ */
+ public static Builder builder(final String name) {
+ return new Builder(name);
+ }
+
/**
* @return the role name
*/
diff --git a/src/main/java/de/stklcode/jvault/connector/model/Token.java b/src/main/java/de/stklcode/jvault/connector/model/Token.java
index e103f41..3193f22 100644
--- a/src/main/java/de/stklcode/jvault/connector/model/Token.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/Token.java
@@ -34,16 +34,6 @@ import java.util.*;
public final class Token implements Serializable {
private static final long serialVersionUID = 5208508683665365287L;
- /**
- * Get {@link Builder} instance.
- *
- * @return Token Builder.
- * @since 0.8
- */
- public static Builder builder() {
- return new Builder();
- }
-
@JsonProperty("id")
@JsonInclude(JsonInclude.Include.NON_NULL)
private String id;
@@ -123,6 +113,16 @@ public final class Token implements Serializable {
this.entityAlias = builder.entityAlias;
}
+ /**
+ * Get {@link Builder} instance.
+ *
+ * @return Token Builder.
+ * @since 0.8
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
/**
* @return Token ID
*/
diff --git a/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java b/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java
index 8c6eff4..5c136f1 100644
--- a/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java
+++ b/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java
@@ -36,15 +36,6 @@ import java.util.Objects;
public final class TokenRole implements Serializable {
private static final long serialVersionUID = -3505215215838576321L;
- /**
- * Get {@link Builder} instance.
- *
- * @return Token Role Builder.
- */
- public static Builder builder() {
- return new Builder();
- }
-
@JsonProperty("name")
@JsonInclude(JsonInclude.Include.NON_NULL)
private String name;
@@ -129,6 +120,15 @@ public final class TokenRole implements Serializable {
this.tokenType = builder.tokenType != null ? builder.tokenType.value() : null;
}
+ /**
+ * Get {@link Builder} instance.
+ *
+ * @return Token Role Builder.
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
/**
* @return Token Role name
*/