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
6 changes: 4 additions & 2 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@ The driver is available from Maven Central, for all modern Java build systems.
Gradle:
```
dependencies {
implementation 'com.bettercloud:vault-java-driver:5.1.0'
implementation 'io.github.jopenlibs:vault-java-driver:6.0.0'
}
```

Maven:
```
<dependency>
<groupId>com.bettercloud</groupId>
<groupId>io.github.jopenlibs</groupId>
<artifactId>vault-java-driver</artifactId>
<version>5.1.0</version>
<version>6.0.0</version>
</dependency>
```

Initializing a Driver Instance
------------------------------
The `com.bettercloud.vault.VaultConfig` class is used to initialize a driver instance with desired settings.
The `io.github.jopenlibs.vault.VaultConfig` class is used to initialize a driver instance with desired settings.
In the most basic use cases, where you are only supplying a Vault server address and perhaps a root token, there
are convenience constructor methods available:
```
Expand Down Expand Up @@ -436,4 +436,3 @@ This client driver adapts JSON parsing code from Ralf Sternberg's excellent
[minimal-json](https://github.com/ralfstx/minimal-json) library, likewise available under the MIT License. Package
names have all been changed, to prevent any conflicts should you happen to be using a different version of that
library elsewhere in your project dependencies.

5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ apply plugin: 'maven'
apply plugin: 'signing'
apply plugin: 'checkstyle'

group 'com.bettercloud'
group 'io.github.jopenlibs'
archivesBaseName = 'vault-java-driver'
version '5.1.0'
version '6.0.0-SNAPSHOT'

ext.isReleaseVersion = !version.endsWith('SNAPSHOT')

// This project is actually limited to Java 8 compatibility. See below.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault;
package io.github.jopenlibs.vault;

import java.io.IOException;
import java.io.Serializable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.bettercloud.vault;
package io.github.jopenlibs.vault;

import com.bettercloud.vault.api.Auth;
import io.github.jopenlibs.vault.api.Auth;
import io.github.jopenlibs.vault.rest.Rest;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
Expand Down Expand Up @@ -479,7 +480,7 @@ protected String getPemUTF8() {
* occur both at build time, and when an <code>SslConfig</code> instance is deserialized (see
* {@link this#readObject(ObjectInputStream)}.</p>
*
* <p>This SSLContext object will be passed to the {@link com.bettercloud.vault.rest.Rest} layer,
* <p>This SSLContext object will be passed to the {@link Rest} layer,
* where it will be used when establishing an HTTPS connection to provide access to trusted server X509
* certificates (as well as client certificates and private keys when TLS client auth is used).</p>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.bettercloud.vault;
package io.github.jopenlibs.vault;

import com.bettercloud.vault.api.Auth;
import com.bettercloud.vault.api.Debug;
import com.bettercloud.vault.api.Leases;
import com.bettercloud.vault.api.Logical;
import com.bettercloud.vault.api.Seal;
import com.bettercloud.vault.api.database.Database;
import com.bettercloud.vault.api.mounts.Mounts;
import com.bettercloud.vault.api.pki.Pki;
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.json.JsonValue;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestException;
import com.bettercloud.vault.rest.RestResponse;
import io.github.jopenlibs.vault.api.Auth;
import io.github.jopenlibs.vault.api.Debug;
import io.github.jopenlibs.vault.api.Leases;
import io.github.jopenlibs.vault.api.Logical;
import io.github.jopenlibs.vault.api.Seal;
import io.github.jopenlibs.vault.api.database.Database;
import io.github.jopenlibs.vault.api.mounts.Mounts;
import io.github.jopenlibs.vault.api.pki.Pki;
import io.github.jopenlibs.vault.json.Json;
import io.github.jopenlibs.vault.json.JsonObject;
import io.github.jopenlibs.vault.json.JsonValue;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestException;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault;
package io.github.jopenlibs.vault;

import java.io.Serializable;
import java.util.Map;
Expand Down Expand Up @@ -389,4 +389,3 @@ public int getPrefixPathDepth() {
return prefixPathDepth;
}
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault;
package io.github.jopenlibs.vault;

public class VaultException extends Exception {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.bettercloud.vault.api;

import com.bettercloud.vault.Vault;
import com.bettercloud.vault.VaultConfig;
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.response.AuthResponse;
import com.bettercloud.vault.response.LogicalResponse;
import com.bettercloud.vault.response.LookupResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestResponse;
package io.github.jopenlibs.vault.api;

import io.github.jopenlibs.vault.Vault;
import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import io.github.jopenlibs.vault.json.Json;
import io.github.jopenlibs.vault.json.JsonObject;
import io.github.jopenlibs.vault.response.AuthResponse;
import io.github.jopenlibs.vault.response.LogicalResponse;
import io.github.jopenlibs.vault.response.LookupResponse;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.bettercloud.vault.api;
package io.github.jopenlibs.vault.api;

import com.bettercloud.vault.VaultConfig;
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.response.HealthResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestException;
import com.bettercloud.vault.rest.RestResponse;
import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import io.github.jopenlibs.vault.response.HealthResponse;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestException;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.util.HashSet;
import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.bettercloud.vault.api;
package io.github.jopenlibs.vault.api;

import com.bettercloud.vault.VaultConfig;
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.response.VaultResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestResponse;
import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import io.github.jopenlibs.vault.json.Json;
import io.github.jopenlibs.vault.response.VaultResponse;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.nio.charset.StandardCharsets;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package com.bettercloud.vault.api;

import com.bettercloud.vault.VaultConfig;
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.json.JsonValue;
import com.bettercloud.vault.response.LogicalResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestException;
import com.bettercloud.vault.rest.RestResponse;
package io.github.jopenlibs.vault.api;

import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import io.github.jopenlibs.vault.json.Json;
import io.github.jopenlibs.vault.json.JsonObject;
import io.github.jopenlibs.vault.json.JsonValue;
import io.github.jopenlibs.vault.response.LogicalResponse;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestException;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Map;

import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForDelete;
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForList;
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForReadOrWrite;
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDelete;
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDestroy;
import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionUnDelete;
import static com.bettercloud.vault.api.LogicalUtilities.jsonObjectToWriteFromEngineVersion;
import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForDelete;
import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForList;
import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForReadOrWrite;
import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForVersionDelete;
import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForVersionDestroy;
import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForVersionUnDelete;
import static io.github.jopenlibs.vault.api.LogicalUtilities.jsonObjectToWriteFromEngineVersion;

/**
* <p>The implementing class for Vault's core/logical operations (e.g. read, write).</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.bettercloud.vault.api;
package io.github.jopenlibs.vault.api;

import com.bettercloud.vault.json.JsonObject;
import io.github.jopenlibs.vault.json.JsonObject;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.bettercloud.vault.api;
package io.github.jopenlibs.vault.api;

import com.bettercloud.vault.VaultConfig;
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.response.SealResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestResponse;
import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import io.github.jopenlibs.vault.json.Json;
import io.github.jopenlibs.vault.response.SealResponse;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.nio.charset.StandardCharsets;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.bettercloud.vault.api.database;
package io.github.jopenlibs.vault.api.database;

import com.bettercloud.vault.VaultConfig;
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.response.DatabaseResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestResponse;
import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import io.github.jopenlibs.vault.json.Json;
import io.github.jopenlibs.vault.json.JsonObject;
import io.github.jopenlibs.vault.response.DatabaseResponse;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.nio.charset.StandardCharsets;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.database;
package io.github.jopenlibs.vault.api.database;

public class DatabaseCredential {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.database;
package io.github.jopenlibs.vault.api.database;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.mounts;
package io.github.jopenlibs.vault.api.mounts;

import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.mounts;
package io.github.jopenlibs.vault.api.mounts;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.bettercloud.vault.api.mounts;
package io.github.jopenlibs.vault.api.mounts;

import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
import io.github.jopenlibs.vault.json.Json;
import io.github.jopenlibs.vault.json.JsonObject;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.mounts;
package io.github.jopenlibs.vault.api.mounts;

import java.util.Arrays;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.bettercloud.vault.api.mounts;
package io.github.jopenlibs.vault.api.mounts;

import com.bettercloud.vault.VaultConfig;
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.response.MountResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestResponse;
import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import io.github.jopenlibs.vault.response.MountResponse;
import io.github.jopenlibs.vault.rest.Rest;
import io.github.jopenlibs.vault.rest.RestResponse;
import java.nio.charset.StandardCharsets;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.mounts;
package io.github.jopenlibs.vault.api.mounts;

import java.util.concurrent.TimeUnit;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* <p>Classes implementing the various endpoints of the Vault HTTP API.</p>
*
* <p>The classes in this package are not meant to be instantiated directly. Rather, they should be used by way
* of the <code>com.bettercloud.vault.Vault</code> driver class, in a DSL-style builder pattern approach.</p>
* of the <code>io.github.jopenlibs.vault.Vault</code> driver class, in a DSL-style builder pattern approach.</p>
*/
package com.bettercloud.vault.api;
package io.github.jopenlibs.vault.api;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.pki;
package io.github.jopenlibs.vault.api.pki;

import java.io.Serializable;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bettercloud.vault.api.pki;
package io.github.jopenlibs.vault.api.pki;

import java.util.List;

Expand Down
Loading