nextBackoff() {
+ retryNumber += 1;
+ if (retryNumber > maxNumRetries) {
+ return Optional.empty();
+ }
+
+ int upperBound = (int) Math.pow(2, retryNumber);
+ return Optional.of(ONE_SECOND.multipliedBy(random.nextInt(upperBound)));
+ }
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/core/Stream.java b/common/src/main/java/com/skyflow/generated/auth/rest/core/Stream.java
new file mode 100644
index 00000000..4a984faa
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/core/Stream.java
@@ -0,0 +1,97 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.core;
+
+import java.io.Reader;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Scanner;
+
+/**
+ * The {@code Stream} class implements {@link Iterable} to provide a simple mechanism for reading and parsing
+ * objects of a given type from data streamed via a {@link Reader} using a specified delimiter.
+ *
+ * {@code Stream} assumes that data is being pushed to the provided {@link Reader} asynchronously and utilizes a
+ * {@code Scanner} to block during iteration if the next object is not available.
+ *
+ * @param The type of objects in the stream.
+ */
+public final class Stream implements Iterable {
+ /**
+ * The {@link Class} of the objects in the stream.
+ */
+ private final Class valueType;
+ /**
+ * The {@link Scanner} used for reading from the input stream and blocking when needed during iteration.
+ */
+ private final Scanner scanner;
+
+ /**
+ * Constructs a new {@code Stream} with the specified value type, reader, and delimiter.
+ *
+ * @param valueType The class of the objects in the stream.
+ * @param reader The reader that provides the streamed data.
+ * @param delimiter The delimiter used to separate elements in the stream.
+ */
+ public Stream(Class valueType, Reader reader, String delimiter) {
+ this.scanner = new Scanner(reader).useDelimiter(delimiter);
+ this.valueType = valueType;
+ }
+
+ /**
+ * Returns an iterator over the elements in this stream that blocks during iteration when the next object is
+ * not yet available.
+ *
+ * @return An iterator that can be used to traverse the elements in the stream.
+ */
+ @Override
+ public Iterator iterator() {
+ return new Iterator() {
+ /**
+ * Returns {@code true} if there are more elements in the stream.
+ *
+ * Will block and wait for input if the stream has not ended and the next object is not yet available.
+ *
+ * @return {@code true} if there are more elements, {@code false} otherwise.
+ */
+ @Override
+ public boolean hasNext() {
+ return scanner.hasNext();
+ }
+
+ /**
+ * Returns the next element in the stream.
+ *
+ * Will block and wait for input if the stream has not ended and the next object is not yet available.
+ *
+ * @return The next element in the stream.
+ * @throws NoSuchElementException If there are no more elements in the stream.
+ */
+ @Override
+ public T next() {
+ if (!scanner.hasNext()) {
+ throw new NoSuchElementException();
+ } else {
+ try {
+ T parsedResponse = ObjectMappers.JSON_MAPPER.readValue(
+ scanner.next().trim(), valueType);
+ return parsedResponse;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ /**
+ * Removing elements from {@code Stream} is not supported.
+ *
+ * @throws UnsupportedOperationException Always, as removal is not supported.
+ */
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/core/Suppliers.java b/common/src/main/java/com/skyflow/generated/auth/rest/core/Suppliers.java
new file mode 100644
index 00000000..d3ab5e53
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/core/Suppliers.java
@@ -0,0 +1,23 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.core;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+public final class Suppliers {
+ private Suppliers() {}
+
+ public static Supplier memoize(Supplier delegate) {
+ AtomicReference value = new AtomicReference<>();
+ return () -> {
+ T val = value.get();
+ if (val == null) {
+ val = value.updateAndGet(cur -> cur == null ? Objects.requireNonNull(delegate.get()) : cur);
+ }
+ return val;
+ };
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/errors/BadRequestError.java b/common/src/main/java/com/skyflow/generated/auth/rest/errors/BadRequestError.java
new file mode 100644
index 00000000..ec08ddf2
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/errors/BadRequestError.java
@@ -0,0 +1,33 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.errors;
+
+import com.skyflow.generated.auth.rest.core.ApiClientApiException;
+import java.util.Map;
+import okhttp3.Response;
+
+public final class BadRequestError extends ApiClientApiException {
+ /**
+ * The body of the response that triggered the exception.
+ */
+ private final Map body;
+
+ public BadRequestError(Map body) {
+ super("BadRequestError", 400, body);
+ this.body = body;
+ }
+
+ public BadRequestError(Map body, Response rawResponse) {
+ super("BadRequestError", 400, body, rawResponse);
+ this.body = body;
+ }
+
+ /**
+ * @return the body
+ */
+ @java.lang.Override
+ public Map body() {
+ return this.body;
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/errors/HttpStatus.java b/common/src/main/java/com/skyflow/generated/auth/rest/errors/HttpStatus.java
new file mode 100644
index 00000000..2e1c45d2
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/errors/HttpStatus.java
@@ -0,0 +1,15 @@
+package com.skyflow.generated.auth.rest.errors;
+
+public enum HttpStatus {
+ BAD_REQUEST("Bad Request");
+
+ private final String httpStatus;
+
+ HttpStatus(String httpStatus) {
+ this.httpStatus = httpStatus;
+ }
+
+ public String getHttpStatus() {
+ return httpStatus;
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/errors/NotFoundError.java b/common/src/main/java/com/skyflow/generated/auth/rest/errors/NotFoundError.java
new file mode 100644
index 00000000..b889e1b0
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/errors/NotFoundError.java
@@ -0,0 +1,33 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.errors;
+
+import com.skyflow.generated.auth.rest.core.ApiClientApiException;
+import java.util.Map;
+import okhttp3.Response;
+
+public final class NotFoundError extends ApiClientApiException {
+ /**
+ * The body of the response that triggered the exception.
+ */
+ private final Map body;
+
+ public NotFoundError(Map body) {
+ super("NotFoundError", 404, body);
+ this.body = body;
+ }
+
+ public NotFoundError(Map body, Response rawResponse) {
+ super("NotFoundError", 404, body, rawResponse);
+ this.body = body;
+ }
+
+ /**
+ * @return the body
+ */
+ @java.lang.Override
+ public Map body() {
+ return this.body;
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/errors/UnauthorizedError.java b/common/src/main/java/com/skyflow/generated/auth/rest/errors/UnauthorizedError.java
new file mode 100644
index 00000000..40ea9c25
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/errors/UnauthorizedError.java
@@ -0,0 +1,33 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.errors;
+
+import com.skyflow.generated.auth.rest.core.ApiClientApiException;
+import java.util.Map;
+import okhttp3.Response;
+
+public final class UnauthorizedError extends ApiClientApiException {
+ /**
+ * The body of the response that triggered the exception.
+ */
+ private final Map body;
+
+ public UnauthorizedError(Map body) {
+ super("UnauthorizedError", 401, body);
+ this.body = body;
+ }
+
+ public UnauthorizedError(Map body, Response rawResponse) {
+ super("UnauthorizedError", 401, body, rawResponse);
+ this.body = body;
+ }
+
+ /**
+ * @return the body
+ */
+ @java.lang.Override
+ public Map body() {
+ return this.body;
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AsyncAuthenticationClient.java b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AsyncAuthenticationClient.java
new file mode 100644
index 00000000..e75fad24
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AsyncAuthenticationClient.java
@@ -0,0 +1,46 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.resources.authentication;
+
+import com.skyflow.generated.auth.rest.core.ClientOptions;
+import com.skyflow.generated.auth.rest.core.RequestOptions;
+import com.skyflow.generated.auth.rest.types.V1GetAuthTokenResponse;
+import com.skyflow.generated.auth.rest.resources.authentication.requests.V1GetAuthTokenRequest;
+
+import java.util.concurrent.CompletableFuture;
+
+public class AsyncAuthenticationClient {
+ protected final ClientOptions clientOptions;
+
+ private final AsyncRawAuthenticationClient rawClient;
+
+ public AsyncAuthenticationClient(ClientOptions clientOptions) {
+ this.clientOptions = clientOptions;
+ this.rawClient = new AsyncRawAuthenticationClient(clientOptions);
+ }
+
+ /**
+ * Get responses with HTTP metadata like headers
+ */
+ public AsyncRawAuthenticationClient withRawResponse() {
+ return this.rawClient;
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public CompletableFuture authenticationServiceGetAuthToken(V1GetAuthTokenRequest request) {
+ return this.rawClient.authenticationServiceGetAuthToken(request).thenApply(response -> response.body());
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public CompletableFuture authenticationServiceGetAuthToken(
+ V1GetAuthTokenRequest request, RequestOptions requestOptions) {
+ return this.rawClient
+ .authenticationServiceGetAuthToken(request, requestOptions)
+ .thenApply(response -> response.body());
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AsyncRawAuthenticationClient.java b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AsyncRawAuthenticationClient.java
new file mode 100644
index 00000000..61ff4335
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AsyncRawAuthenticationClient.java
@@ -0,0 +1,132 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.resources.authentication;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.skyflow.generated.auth.rest.errors.BadRequestError;
+import com.skyflow.generated.auth.rest.errors.NotFoundError;
+import com.skyflow.generated.auth.rest.errors.UnauthorizedError;
+import com.skyflow.generated.auth.rest.resources.authentication.requests.V1GetAuthTokenRequest;
+import com.skyflow.generated.auth.rest.types.V1GetAuthTokenResponse;
+import com.skyflow.generated.auth.rest.core.ApiClientApiException;
+import com.skyflow.generated.auth.rest.core.ApiClientException;
+import com.skyflow.generated.auth.rest.core.ApiClientHttpResponse;
+import com.skyflow.generated.auth.rest.core.ClientOptions;
+import com.skyflow.generated.auth.rest.core.MediaTypes;
+import com.skyflow.generated.auth.rest.core.ObjectMappers;
+import com.skyflow.generated.auth.rest.core.RequestOptions;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Headers;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import org.jetbrains.annotations.NotNull;
+
+public class AsyncRawAuthenticationClient {
+ protected final ClientOptions clientOptions;
+
+ public AsyncRawAuthenticationClient(ClientOptions clientOptions) {
+ this.clientOptions = clientOptions;
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public CompletableFuture> authenticationServiceGetAuthToken(
+ V1GetAuthTokenRequest request) {
+ return authenticationServiceGetAuthToken(request, null);
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public CompletableFuture> authenticationServiceGetAuthToken(
+ V1GetAuthTokenRequest request, RequestOptions requestOptions) {
+ HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ .newBuilder()
+ .addPathSegments("v1/auth/sa/oauth/token")
+ .build();
+ RequestBody body;
+ try {
+ body = RequestBody.create(
+ ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON);
+ } catch (JsonProcessingException e) {
+ throw new ApiClientException("Failed to serialize request", e);
+ }
+ Request okhttpRequest = new Request.Builder()
+ .url(httpUrl)
+ .method("POST", body)
+ .headers(Headers.of(clientOptions.headers(requestOptions)))
+ .addHeader("Content-Type", "application/json")
+ .addHeader("Accept", "application/json")
+ .build();
+ OkHttpClient client = clientOptions.httpClient();
+ if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
+ client = clientOptions.httpClientWithTimeout(requestOptions);
+ }
+ CompletableFuture> future = new CompletableFuture<>();
+ client.newCall(okhttpRequest).enqueue(new Callback() {
+ @Override
+ public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
+ try (ResponseBody responseBody = response.body()) {
+ if (response.isSuccessful()) {
+ future.complete(new ApiClientHttpResponse<>(
+ ObjectMappers.JSON_MAPPER.readValue(
+ responseBody.string(), V1GetAuthTokenResponse.class),
+ response));
+ return;
+ }
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
+ try {
+ switch (response.code()) {
+ case 400:
+ future.completeExceptionally(new BadRequestError(
+ ObjectMappers.JSON_MAPPER.readValue(
+ responseBodyString, new TypeReference>() {}),
+ response));
+ return;
+ case 401:
+ future.completeExceptionally(new UnauthorizedError(
+ ObjectMappers.JSON_MAPPER.readValue(
+ responseBodyString, new TypeReference>() {}),
+ response));
+ return;
+ case 404:
+ future.completeExceptionally(new NotFoundError(
+ ObjectMappers.JSON_MAPPER.readValue(
+ responseBodyString, new TypeReference>() {}),
+ response));
+ return;
+ }
+ } catch (JsonProcessingException ignored) {
+ // unable to map error response, throwing generic error
+ }
+ future.completeExceptionally(new ApiClientApiException(
+ "Error with status code " + response.code(),
+ response.code(),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
+ response));
+ return;
+ } catch (IOException e) {
+ future.completeExceptionally(new ApiClientException("Network error executing HTTP request", e));
+ }
+ }
+
+ @Override
+ public void onFailure(@NotNull Call call, @NotNull IOException e) {
+ future.completeExceptionally(new ApiClientException("Network error executing HTTP request", e));
+ }
+ });
+ return future;
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AuthenticationClient.java b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AuthenticationClient.java
new file mode 100644
index 00000000..a0ba860a
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/AuthenticationClient.java
@@ -0,0 +1,44 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.resources.authentication;
+
+import com.skyflow.generated.auth.rest.core.ClientOptions;
+import com.skyflow.generated.auth.rest.core.RequestOptions;
+import com.skyflow.generated.auth.rest.resources.authentication.requests.V1GetAuthTokenRequest;
+import com.skyflow.generated.auth.rest.types.V1GetAuthTokenResponse;
+
+public class AuthenticationClient {
+ protected final ClientOptions clientOptions;
+
+ private final RawAuthenticationClient rawClient;
+
+ public AuthenticationClient(ClientOptions clientOptions) {
+ this.clientOptions = clientOptions;
+ this.rawClient = new RawAuthenticationClient(clientOptions);
+ }
+
+ /**
+ * Get responses with HTTP metadata like headers
+ */
+ public RawAuthenticationClient withRawResponse() {
+ return this.rawClient;
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public V1GetAuthTokenResponse authenticationServiceGetAuthToken(V1GetAuthTokenRequest request) {
+ return this.rawClient.authenticationServiceGetAuthToken(request).body();
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public V1GetAuthTokenResponse authenticationServiceGetAuthToken(
+ V1GetAuthTokenRequest request, RequestOptions requestOptions) {
+ return this.rawClient
+ .authenticationServiceGetAuthToken(request, requestOptions)
+ .body();
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/RawAuthenticationClient.java b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/RawAuthenticationClient.java
new file mode 100644
index 00000000..f3211ad1
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/RawAuthenticationClient.java
@@ -0,0 +1,111 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.resources.authentication;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.skyflow.generated.auth.rest.errors.BadRequestError;
+import com.skyflow.generated.auth.rest.errors.NotFoundError;
+import com.skyflow.generated.auth.rest.errors.UnauthorizedError;
+import com.skyflow.generated.auth.rest.types.V1GetAuthTokenResponse;
+import com.skyflow.generated.auth.rest.core.ApiClientApiException;
+import com.skyflow.generated.auth.rest.core.ApiClientException;
+import com.skyflow.generated.auth.rest.core.ApiClientHttpResponse;
+import com.skyflow.generated.auth.rest.core.ClientOptions;
+import com.skyflow.generated.auth.rest.core.MediaTypes;
+import com.skyflow.generated.auth.rest.core.ObjectMappers;
+import com.skyflow.generated.auth.rest.core.RequestOptions;
+import com.skyflow.generated.auth.rest.resources.authentication.requests.V1GetAuthTokenRequest;
+
+import java.io.IOException;
+import java.util.Map;
+import okhttp3.Headers;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+public class RawAuthenticationClient {
+ protected final ClientOptions clientOptions;
+
+ public RawAuthenticationClient(ClientOptions clientOptions) {
+ this.clientOptions = clientOptions;
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public ApiClientHttpResponse authenticationServiceGetAuthToken(
+ V1GetAuthTokenRequest request) {
+ return authenticationServiceGetAuthToken(request, null);
+ }
+
+ /**
+ * <p>Generates a Bearer Token to authenticate with Skyflow. This method doesn't require the <code>Authorization</code> header.</p><p><b>Note:</b> For recommended ways to authenticate, see <a href='/api-authentication/'>API authentication</a>.</p>
+ */
+ public ApiClientHttpResponse authenticationServiceGetAuthToken(
+ V1GetAuthTokenRequest request, RequestOptions requestOptions) {
+ HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ .newBuilder()
+ .addPathSegments("v1/auth/sa/oauth/token")
+ .build();
+ RequestBody body;
+ try {
+ body = RequestBody.create(
+ ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON);
+ } catch (JsonProcessingException e) {
+ throw new ApiClientException("Failed to serialize request", e);
+ }
+ Request okhttpRequest = new Request.Builder()
+ .url(httpUrl)
+ .method("POST", body)
+ .headers(Headers.of(clientOptions.headers(requestOptions)))
+ .addHeader("Content-Type", "application/json")
+ .addHeader("Accept", "application/json")
+ .build();
+ OkHttpClient client = clientOptions.httpClient();
+ if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
+ client = clientOptions.httpClientWithTimeout(requestOptions);
+ }
+ try (Response response = client.newCall(okhttpRequest).execute()) {
+ ResponseBody responseBody = response.body();
+ if (response.isSuccessful()) {
+ return new ApiClientHttpResponse<>(
+ ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), V1GetAuthTokenResponse.class),
+ response);
+ }
+ String responseBodyString = responseBody != null ? responseBody.string() : "{}";
+ try {
+ switch (response.code()) {
+ case 400:
+ throw new BadRequestError(
+ ObjectMappers.JSON_MAPPER.readValue(
+ responseBodyString, new TypeReference>() {}),
+ response);
+ case 401:
+ throw new UnauthorizedError(
+ ObjectMappers.JSON_MAPPER.readValue(
+ responseBodyString, new TypeReference>() {}),
+ response);
+ case 404:
+ throw new NotFoundError(
+ ObjectMappers.JSON_MAPPER.readValue(
+ responseBodyString, new TypeReference>() {}),
+ response);
+ }
+ } catch (JsonProcessingException ignored) {
+ // unable to map error response, throwing generic error
+ }
+ throw new ApiClientApiException(
+ "Error with status code " + response.code(),
+ response.code(),
+ ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
+ response);
+ } catch (IOException e) {
+ throw new ApiClientException("Network error executing HTTP request", e);
+ }
+ }
+}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/requests/V1GetAuthTokenRequest.java
similarity index 98%
rename from src/main/java/com/skyflow/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java
rename to common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/requests/V1GetAuthTokenRequest.java
index 8c4961b1..cd1d22c1 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/resources/authentication/requests/V1GetAuthTokenRequest.java
@@ -1,7 +1,7 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
-package com.skyflow.generated.rest.resources.authentication.requests;
+package com.skyflow.generated.auth.rest.resources.authentication.requests;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
@@ -11,7 +11,8 @@
import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.skyflow.generated.rest.core.ObjectMappers;
+import com.skyflow.generated.auth.rest.core.ObjectMappers;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/types/GooglerpcStatus.java b/common/src/main/java/com/skyflow/generated/auth/rest/types/GooglerpcStatus.java
new file mode 100644
index 00000000..06a9373c
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/types/GooglerpcStatus.java
@@ -0,0 +1,144 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.types;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.skyflow.generated.auth.rest.core.ObjectMappers;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+@JsonInclude(JsonInclude.Include.NON_ABSENT)
+@JsonDeserialize(builder = GooglerpcStatus.Builder.class)
+public final class GooglerpcStatus {
+ private final Optional code;
+
+ private final Optional message;
+
+ private final Optional> details;
+
+ private final Map additionalProperties;
+
+ private GooglerpcStatus(
+ Optional code,
+ Optional message,
+ Optional> details,
+ Map additionalProperties) {
+ this.code = code;
+ this.message = message;
+ this.details = details;
+ this.additionalProperties = additionalProperties;
+ }
+
+ @JsonProperty("code")
+ public Optional getCode() {
+ return code;
+ }
+
+ @JsonProperty("message")
+ public Optional getMessage() {
+ return message;
+ }
+
+ @JsonProperty("details")
+ public Optional> getDetails() {
+ return details;
+ }
+
+ @java.lang.Override
+ public boolean equals(Object other) {
+ if (this == other) return true;
+ return other instanceof GooglerpcStatus && equalTo((GooglerpcStatus) other);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ private boolean equalTo(GooglerpcStatus other) {
+ return code.equals(other.code) && message.equals(other.message) && details.equals(other.details);
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ return Objects.hash(this.code, this.message, this.details);
+ }
+
+ @java.lang.Override
+ public String toString() {
+ return ObjectMappers.stringify(this);
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static final class Builder {
+ private Optional code = Optional.empty();
+
+ private Optional message = Optional.empty();
+
+ private Optional> details = Optional.empty();
+
+ @JsonAnySetter
+ private Map additionalProperties = new HashMap<>();
+
+ private Builder() {}
+
+ public Builder from(GooglerpcStatus other) {
+ code(other.getCode());
+ message(other.getMessage());
+ details(other.getDetails());
+ return this;
+ }
+
+ @JsonSetter(value = "code", nulls = Nulls.SKIP)
+ public Builder code(Optional code) {
+ this.code = code;
+ return this;
+ }
+
+ public Builder code(Integer code) {
+ this.code = Optional.ofNullable(code);
+ return this;
+ }
+
+ @JsonSetter(value = "message", nulls = Nulls.SKIP)
+ public Builder message(Optional message) {
+ this.message = message;
+ return this;
+ }
+
+ public Builder message(String message) {
+ this.message = Optional.ofNullable(message);
+ return this;
+ }
+
+ @JsonSetter(value = "details", nulls = Nulls.SKIP)
+ public Builder details(Optional> details) {
+ this.details = details;
+ return this;
+ }
+
+ public Builder details(List details) {
+ this.details = Optional.ofNullable(details);
+ return this;
+ }
+
+ public GooglerpcStatus build() {
+ return new GooglerpcStatus(code, message, details, additionalProperties);
+ }
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/types/ProtobufAny.java b/common/src/main/java/com/skyflow/generated/auth/rest/types/ProtobufAny.java
new file mode 100644
index 00000000..6f5df772
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/types/ProtobufAny.java
@@ -0,0 +1,95 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.types;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.skyflow.generated.auth.rest.core.ObjectMappers;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+@JsonInclude(JsonInclude.Include.NON_ABSENT)
+@JsonDeserialize(builder = ProtobufAny.Builder.class)
+public final class ProtobufAny {
+ private final Optional type;
+
+ private final Map additionalProperties;
+
+ private ProtobufAny(Optional type, Map additionalProperties) {
+ this.type = type;
+ this.additionalProperties = additionalProperties;
+ }
+
+ @JsonProperty("@type")
+ public Optional getType() {
+ return type;
+ }
+
+ @java.lang.Override
+ public boolean equals(Object other) {
+ if (this == other) return true;
+ return other instanceof ProtobufAny && equalTo((ProtobufAny) other);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ private boolean equalTo(ProtobufAny other) {
+ return type.equals(other.type);
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ return Objects.hash(this.type);
+ }
+
+ @java.lang.Override
+ public String toString() {
+ return ObjectMappers.stringify(this);
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static final class Builder {
+ private Optional type = Optional.empty();
+
+ @JsonAnySetter
+ private Map additionalProperties = new HashMap<>();
+
+ private Builder() {}
+
+ public Builder from(ProtobufAny other) {
+ type(other.getType());
+ return this;
+ }
+
+ @JsonSetter(value = "@type", nulls = Nulls.SKIP)
+ public Builder type(Optional type) {
+ this.type = type;
+ return this;
+ }
+
+ public Builder type(String type) {
+ this.type = Optional.ofNullable(type);
+ return this;
+ }
+
+ public ProtobufAny build() {
+ return new ProtobufAny(type, additionalProperties);
+ }
+ }
+}
diff --git a/common/src/main/java/com/skyflow/generated/auth/rest/types/V1GetAuthTokenResponse.java b/common/src/main/java/com/skyflow/generated/auth/rest/types/V1GetAuthTokenResponse.java
new file mode 100644
index 00000000..3c10fbd3
--- /dev/null
+++ b/common/src/main/java/com/skyflow/generated/auth/rest/types/V1GetAuthTokenResponse.java
@@ -0,0 +1,130 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest.types;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.skyflow.generated.auth.rest.core.ObjectMappers;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+@JsonInclude(JsonInclude.Include.NON_ABSENT)
+@JsonDeserialize(builder = V1GetAuthTokenResponse.Builder.class)
+public final class V1GetAuthTokenResponse {
+ private final Optional accessToken;
+
+ private final Optional tokenType;
+
+ private final Map additionalProperties;
+
+ private V1GetAuthTokenResponse(
+ Optional accessToken, Optional tokenType, Map additionalProperties) {
+ this.accessToken = accessToken;
+ this.tokenType = tokenType;
+ this.additionalProperties = additionalProperties;
+ }
+
+ /**
+ * @return AccessToken.
+ */
+ @JsonProperty("accessToken")
+ public Optional getAccessToken() {
+ return accessToken;
+ }
+
+ /**
+ * @return TokenType : Bearer.
+ */
+ @JsonProperty("tokenType")
+ public Optional getTokenType() {
+ return tokenType;
+ }
+
+ @java.lang.Override
+ public boolean equals(Object other) {
+ if (this == other) return true;
+ return other instanceof V1GetAuthTokenResponse && equalTo((V1GetAuthTokenResponse) other);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ private boolean equalTo(V1GetAuthTokenResponse other) {
+ return accessToken.equals(other.accessToken) && tokenType.equals(other.tokenType);
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ return Objects.hash(this.accessToken, this.tokenType);
+ }
+
+ @java.lang.Override
+ public String toString() {
+ return ObjectMappers.stringify(this);
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static final class Builder {
+ private Optional accessToken = Optional.empty();
+
+ private Optional tokenType = Optional.empty();
+
+ @JsonAnySetter
+ private Map additionalProperties = new HashMap<>();
+
+ private Builder() {}
+
+ public Builder from(V1GetAuthTokenResponse other) {
+ accessToken(other.getAccessToken());
+ tokenType(other.getTokenType());
+ return this;
+ }
+
+ /**
+ * AccessToken.
+ */
+ @JsonSetter(value = "accessToken", nulls = Nulls.SKIP)
+ public Builder accessToken(Optional accessToken) {
+ this.accessToken = accessToken;
+ return this;
+ }
+
+ public Builder accessToken(String accessToken) {
+ this.accessToken = Optional.ofNullable(accessToken);
+ return this;
+ }
+
+ /**
+ * TokenType : Bearer.
+ */
+ @JsonSetter(value = "tokenType", nulls = Nulls.SKIP)
+ public Builder tokenType(Optional tokenType) {
+ this.tokenType = tokenType;
+ return this;
+ }
+
+ public Builder tokenType(String tokenType) {
+ this.tokenType = Optional.ofNullable(tokenType);
+ return this;
+ }
+
+ public V1GetAuthTokenResponse build() {
+ return new V1GetAuthTokenResponse(accessToken, tokenType, additionalProperties);
+ }
+ }
+}
diff --git a/src/main/java/com/skyflow/logs/ErrorLogs.java b/common/src/main/java/com/skyflow/logs/ErrorLogs.java
similarity index 93%
rename from src/main/java/com/skyflow/logs/ErrorLogs.java
rename to common/src/main/java/com/skyflow/logs/ErrorLogs.java
index 3415860c..8f1156fd 100644
--- a/src/main/java/com/skyflow/logs/ErrorLogs.java
+++ b/common/src/main/java/com/skyflow/logs/ErrorLogs.java
@@ -66,6 +66,15 @@ public enum ErrorLogs {
EMPTY_OR_NULL_TOKEN_IN_DETOKENIZE_DATA("Invalid %s1 request. Token can not be null or empty in detokenize data at index %s2."),
REDACTION_IS_REQUIRED("Invalid %s1 request. Redaction is required."),
DETOKENIZE_REQUEST_REJECTED("Detokenize request resulted in failure."),
+ DETOKENIZE_REQUEST_NULL("Invalid %s1 request. Detokenize request can not be null."),
+
+ NULL_TOKEN_REDACTION_GROUP_OBJECT("Invalid %s1 request. Token Redaction group object can not be null or empty."),
+
+ NULL_REDACTION_IN_TOKEN_GROUP("Invalid %s1 request. Redaction can not be null in token redaction group"),
+
+ NULL_TOKEN_GROUP_NAME_IN_TOKEN_GROUP("Invalid %s1 request. Token group name can not be null in token redaction group"),
+
+ EMPTY_OR_NULL_REDACTION_IN_TOKEN_GROUP("Invalid %s1 request. Redaction can not be null or empty in token redaction group"),
IDS_IS_REQUIRED("Invalid %s1 request. Ids are required."),
EMPTY_IDS("Invalid %s1 request. Ids can not be empty."),
EMPTY_OR_NULL_ID_IN_IDS("Invalid %s1 request. Id can not be null or empty in ids at index %s2."),
@@ -126,7 +135,10 @@ public enum ErrorLogs {
OUTPUT_DIRECTORY_NOT_FOUND("Invalid %s1 request. The output directory does not exist. Please specify a valid output directory."),
INVALID_PERMISSIONS_FOR_OUTPUT_DIRECTORY("Invalid %s1 request. The output directory is not writable. Please check the permissions or specify a valid output directory."),
EMPTY_FILE_AND_FILE_PATH_IN_DEIDENTIFY_FILE("Invalid %s1 request. The file and file path fields are both empty. Specify a valid file object or file path."),
- ;
+
+ UNEXPECTED_ERROR_DURING_BATCH_PROCESSING("Unexpected error occurred during batch processing. Error: %s1"),
+
+ PROCESSING_ERROR_RESPONSE("Processing error response.");
private final String log;
diff --git a/src/main/java/com/skyflow/logs/InfoLogs.java b/common/src/main/java/com/skyflow/logs/InfoLogs.java
similarity index 96%
rename from src/main/java/com/skyflow/logs/InfoLogs.java
rename to common/src/main/java/com/skyflow/logs/InfoLogs.java
index efd81a49..03f80ac7 100644
--- a/src/main/java/com/skyflow/logs/InfoLogs.java
+++ b/common/src/main/java/com/skyflow/logs/InfoLogs.java
@@ -20,7 +20,8 @@ public enum InfoLogs {
GET_SIGNED_DATA_TOKENS_TRIGGERED("getSignedDataTokens method triggered."),
GET_SIGNED_DATA_TOKEN_SUCCESS("Signed data tokens generated."),
REUSE_BEARER_TOKEN("Reusing bearer token."),
- REUSE_API_KEY("Reusing api key."),
+ USE_CLIENT_PROVIDED_BEARER_TOKEN("Using bearer token provided by client."),
+ USE_API_KEY("Using api key."),
GENERATE_BEARER_TOKEN_FROM_CREDENTIALS_TRIGGERED("generateBearerTokenFromCredentials method triggered."),
GENERATE_BEARER_TOKEN_FROM_CREDENTIALS_STRING_TRIGGERED("generateBearerTokenFromCredentialString method triggered."),
GENERATE_SIGNED_TOKENS_FROM_CREDENTIALS_FILE_TRIGGERED("generateSignedTokensFromCredentialsFile method triggered."),
@@ -90,6 +91,8 @@ public enum InfoLogs {
GET_DETECT_RUN_TRIGGERED("Get detect run method triggered."),
VALIDATE_GET_DETECT_RUN_REQUEST("Validating get detect run request."),
REIDENTIFY_TEXT_SUCCESS("Text data re-identified."),
+
+ PROCESSING_BATCHES("Processing batch")
;
diff --git a/common/src/main/java/com/skyflow/logs/WarningLogs.java b/common/src/main/java/com/skyflow/logs/WarningLogs.java
new file mode 100644
index 00000000..8905ad12
--- /dev/null
+++ b/common/src/main/java/com/skyflow/logs/WarningLogs.java
@@ -0,0 +1,17 @@
+package com.skyflow.logs;
+
+public enum WarningLogs {
+ INVALID_BATCH_SIZE_PROVIDED("Invalid value for batch size provided, switching to default value."),
+ INVALID_CONCURRENCY_LIMIT_PROVIDED("Invalid value for concurrency limit provided, switching to default value."),
+ ;
+
+ private final String log;
+
+ WarningLogs(String log) {
+ this.log = log;
+ }
+
+ public final String getLog() {
+ return log;
+ }
+}
diff --git a/src/main/java/com/skyflow/serviceaccount/util/BearerToken.java b/common/src/main/java/com/skyflow/serviceaccount/util/BearerToken.java
similarity index 90%
rename from src/main/java/com/skyflow/serviceaccount/util/BearerToken.java
rename to common/src/main/java/com/skyflow/serviceaccount/util/BearerToken.java
index 23d09ab8..9f0fc0e3 100644
--- a/src/main/java/com/skyflow/serviceaccount/util/BearerToken.java
+++ b/common/src/main/java/com/skyflow/serviceaccount/util/BearerToken.java
@@ -4,19 +4,18 @@
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
-import com.skyflow.generated.rest.ApiClient;
-import com.skyflow.generated.rest.ApiClientBuilder;
-import com.skyflow.generated.rest.core.ApiClientApiException;
-import com.skyflow.generated.rest.resources.authentication.AuthenticationClient;
-import com.skyflow.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest;
-import com.skyflow.generated.rest.types.V1GetAuthTokenResponse;
+import com.skyflow.generated.auth.rest.ApiClient;
+import com.skyflow.generated.auth.rest.ApiClientBuilder;
+import com.skyflow.generated.auth.rest.core.ApiClientApiException;
+import com.skyflow.generated.auth.rest.resources.authentication.AuthenticationClient;
+import com.skyflow.generated.auth.rest.resources.authentication.requests.V1GetAuthTokenRequest;
+import com.skyflow.generated.auth.rest.types.V1GetAuthTokenResponse;
import com.skyflow.logs.ErrorLogs;
import com.skyflow.logs.InfoLogs;
-import com.skyflow.utils.Constants;
-import com.skyflow.utils.Utils;
+import com.skyflow.utils.BaseConstants;
+import com.skyflow.utils.BaseUtils;
import com.skyflow.utils.logger.LogUtil;
import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
import java.io.File;
import java.io.FileNotFoundException;
@@ -62,11 +61,11 @@ private static V1GetAuthTokenResponse generateBearerTokenFromCredentials(
return getBearerTokenFromCredentials(serviceAccountCredentials, context, roles);
} catch (JsonSyntaxException e) {
LogUtil.printErrorLog(ErrorLogs.INVALID_CREDENTIALS_FILE_FORMAT.getLog());
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), BaseUtils.parameterizedString(
ErrorMessage.FileInvalidJson.getMessage(), credentialsFile.getPath()));
} catch (FileNotFoundException e) {
LogUtil.printErrorLog(ErrorLogs.CREDENTIALS_FILE_NOT_FOUND.getLog());
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), BaseUtils.parameterizedString(
ErrorMessage.FileNotFound.getMessage(), credentialsFile.getPath()));
}
}
@@ -117,17 +116,17 @@ private static V1GetAuthTokenResponse getBearerTokenFromCredentials(
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MissingTokenUri.getMessage());
}
- PrivateKey pvtKey = Utils.getPrivateKeyFromPem(privateKey.getAsString());
+ PrivateKey pvtKey = BaseUtils.getPrivateKeyFromPem(privateKey.getAsString());
String signedUserJWT = getSignedToken(
clientID.getAsString(), keyID.getAsString(), tokenURI.getAsString(), pvtKey, context
);
- String basePath = Utils.getBaseURL(tokenURI.getAsString());
+ String basePath = BaseUtils.getBaseURL(tokenURI.getAsString());
apiClientBuilder.url(basePath);
ApiClient apiClient = apiClientBuilder.token("token").build();
AuthenticationClient authenticationApi = apiClient.authentication();
- V1GetAuthTokenRequest._FinalStage authTokenBuilder = V1GetAuthTokenRequest.builder().grantType(Constants.GRANT_TYPE).assertion(signedUserJWT);
+ V1GetAuthTokenRequest._FinalStage authTokenBuilder = V1GetAuthTokenRequest.builder().grantType(BaseConstants.GRANT_TYPE).assertion(signedUserJWT);
if (roles != null) {
String scopedRoles = getScopeUsingRoles(roles);
@@ -155,8 +154,8 @@ private static String getSignedToken(
.claim("aud", tokenURI)
.claim("sub", clientID)
.claim("ctx", context)
- .setExpiration(expirationDate)
- .signWith(SignatureAlgorithm.RS256, pvtKey)
+ .expiration(expirationDate)
+ .signWith(pvtKey, Jwts.SIG.RS256)
.compact();
}
diff --git a/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokenResponse.java b/common/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokenResponse.java
similarity index 83%
rename from src/main/java/com/skyflow/serviceaccount/util/SignedDataTokenResponse.java
rename to common/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokenResponse.java
index 7c9f4674..874b47c5 100644
--- a/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokenResponse.java
+++ b/common/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokenResponse.java
@@ -1,10 +1,10 @@
package com.skyflow.serviceaccount.util;
import com.google.gson.Gson;
-import com.skyflow.utils.Constants;
+import com.skyflow.utils.BaseConstants;
public class SignedDataTokenResponse {
- private static final String prefix = Constants.SIGNED_DATA_TOKEN_PREFIX;
+ private static final String prefix = BaseConstants.SIGNED_DATA_TOKEN_PREFIX;
private final String token;
private final String signedToken;
diff --git a/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokens.java b/common/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokens.java
similarity index 96%
rename from src/main/java/com/skyflow/serviceaccount/util/SignedDataTokens.java
rename to common/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokens.java
index ecdfa89f..ed0026ef 100644
--- a/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokens.java
+++ b/common/src/main/java/com/skyflow/serviceaccount/util/SignedDataTokens.java
@@ -9,10 +9,9 @@
import com.skyflow.errors.SkyflowException;
import com.skyflow.logs.ErrorLogs;
import com.skyflow.logs.InfoLogs;
-import com.skyflow.utils.Utils;
+import com.skyflow.utils.BaseUtils;
import com.skyflow.utils.logger.LogUtil;
import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
import java.io.File;
import java.io.FileNotFoundException;
@@ -59,11 +58,11 @@ private static List generateSignedTokenFromCredentialsF
responseToken = generateSignedTokensFromCredentials(serviceAccountCredentials, dataTokens, timeToLive, context);
} catch (JsonSyntaxException e) {
LogUtil.printErrorLog(ErrorLogs.INVALID_CREDENTIALS_FILE_FORMAT.getLog());
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), BaseUtils.parameterizedString(
ErrorMessage.FileInvalidJson.getMessage(), credentialsFile.getPath()));
} catch (FileNotFoundException e) {
LogUtil.printErrorLog(ErrorLogs.CREDENTIALS_FILE_NOT_FOUND.getLog());
- throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), BaseUtils.parameterizedString(
ErrorMessage.FileNotFound.getMessage(), credentialsFile.getPath()));
}
return responseToken;
@@ -111,7 +110,7 @@ private static List generateSignedTokensFromCredentials
LogUtil.printErrorLog(ErrorLogs.KEY_ID_IS_REQUIRED.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MissingKeyId.getMessage());
}
- PrivateKey pvtKey = Utils.getPrivateKeyFromPem(privateKey.getAsString());
+ PrivateKey pvtKey = BaseUtils.getPrivateKeyFromPem(privateKey.getAsString());
signedDataTokens = getSignedToken(
clientID.getAsString(), keyID.getAsString(), pvtKey, dataTokens, timeToLive, context);
} catch (RuntimeException e) {
@@ -143,8 +142,8 @@ private static List getSignedToken(
.claim("sub", clientID)
.claim("ctx", context)
.claim("tok", dataToken)
- .setExpiration(expirationDate)
- .signWith(SignatureAlgorithm.RS256, pvtKey)
+ .expiration(expirationDate)
+ .signWith(pvtKey, Jwts.SIG.RS256)
.compact();
SignedDataTokenResponse responseObject = new SignedDataTokenResponse(dataToken, eachSignedDataToken);
list.add(responseObject);
diff --git a/src/main/java/com/skyflow/serviceaccount/util/Token.java b/common/src/main/java/com/skyflow/serviceaccount/util/Token.java
similarity index 100%
rename from src/main/java/com/skyflow/serviceaccount/util/Token.java
rename to common/src/main/java/com/skyflow/serviceaccount/util/Token.java
diff --git a/src/main/java/com/skyflow/utils/Constants.java b/common/src/main/java/com/skyflow/utils/BaseConstants.java
similarity index 71%
rename from src/main/java/com/skyflow/utils/Constants.java
rename to common/src/main/java/com/skyflow/utils/BaseConstants.java
index b9264a22..0880034f 100644
--- a/src/main/java/com/skyflow/utils/Constants.java
+++ b/common/src/main/java/com/skyflow/utils/BaseConstants.java
@@ -1,21 +1,24 @@
package com.skyflow.utils;
-public final class Constants {
+public class BaseConstants {
+ public static final String SDK_NAME= "Skyflow Java SDK ";
+ public static final String SDK_VERSION = "1.0.0";
+ public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION;
+ public static final String ORDER_ASCENDING = "ASCENDING";
+ public static final String ENV_CREDENTIALS_KEY_NAME = "SKYFLOW_CREDENTIALS";
public static final String SECURE_PROTOCOL = "https://";
- public static final String DEV_DOMAIN = ".vault.skyflowapis.dev";
- public static final String STAGE_DOMAIN = ".vault.skyflowapis.tech";
- public static final String SANDBOX_DOMAIN = ".vault.skyflowapis-preview.com";
- public static final String PROD_DOMAIN = ".vault.skyflowapis.com";
+
+ public static final String V2_VAULT_DOMAIN = ".vault.";
+ public static final String V3_VAULT_DOMAIN = ".skyvault.";
+ public static final String DEV_DOMAIN = "skyflowapis.dev";
+ public static final String STAGE_DOMAIN = "skyflowapis.tech";
+ public static final String SANDBOX_DOMAIN = "skyflowapis-preview.com";
+ public static final String PROD_DOMAIN = "skyflowapis.com";
public static final String PKCS8_PRIVATE_HEADER = "-----BEGIN PRIVATE KEY-----";
public static final String PKCS8_PRIVATE_FOOTER = "-----END PRIVATE KEY-----";
public static final String GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer";
public static final String SIGNED_DATA_TOKEN_PREFIX = "signed_token_";
- public static final String ORDER_ASCENDING = "ASCENDING";
public static final String API_KEY_REGEX = "^sky-[a-zA-Z0-9]{5}-[a-fA-F0-9]{32}$";
- public static final String ENV_CREDENTIALS_KEY_NAME = "SKYFLOW_CREDENTIALS";
- public static final String SDK_NAME = "Skyflow Java SDK ";
- public static final String SDK_VERSION = "v2";
- public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION;
public static final String SDK_METRIC_NAME_VERSION = "sdk_name_version";
public static final String SDK_METRIC_NAME_VERSION_PREFIX = "skyflow-java@";
public static final String SDK_METRIC_CLIENT_DEVICE_MODEL = "sdk_client_device_model";
@@ -25,7 +28,6 @@ public final class Constants {
public static final String SDK_AUTH_HEADER_KEY = "x-skyflow-authorization";
public static final String SDK_METRICS_HEADER_KEY = "sky-metadata";
public static final String REQUEST_ID_HEADER_KEY = "x-request-id";
- public static final String PROCESSED_FILE_NAME_PREFIX = "processed-";
- public static final String ERROR_FROM_CLIENT_HEADER_KEY = "eror-from-client";
- public static final String DEIDENTIFIED_FILE_PREFIX = "deidentified";;
+ public static final String ERROR_FROM_CLIENT_HEADER_KEY = "error-from-client";
+
}
diff --git a/src/main/java/com/skyflow/utils/Utils.java b/common/src/main/java/com/skyflow/utils/BaseUtils.java
similarity index 63%
rename from src/main/java/com/skyflow/utils/Utils.java
rename to common/src/main/java/com/skyflow/utils/BaseUtils.java
index cc8d572a..b7cf6bb0 100644
--- a/src/main/java/com/skyflow/utils/Utils.java
+++ b/common/src/main/java/com/skyflow/utils/BaseUtils.java
@@ -1,7 +1,6 @@
package com.skyflow.utils;
import com.google.gson.JsonObject;
-import com.skyflow.config.ConnectionConfig;
import com.skyflow.config.Credentials;
import com.skyflow.enums.Env;
import com.skyflow.errors.ErrorCode;
@@ -10,8 +9,8 @@
import com.skyflow.logs.ErrorLogs;
import com.skyflow.logs.InfoLogs;
import com.skyflow.serviceaccount.util.BearerToken;
+import com.skyflow.serviceaccount.util.Token;
import com.skyflow.utils.logger.LogUtil;
-import com.skyflow.vault.connection.InvokeConnectionRequest;
import org.apache.commons.codec.binary.Base64;
import java.io.File;
@@ -22,54 +21,59 @@
import java.security.PrivateKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.HashMap;
-import java.util.Map;
-public final class Utils {
- public static String getVaultURL(String clusterId, Env env) {
- StringBuilder sb = new StringBuilder(Constants.SECURE_PROTOCOL);
- sb.append(clusterId);
+public class BaseUtils {
+ public static String getVaultURL(String clusterId, Env env, String vaultDomain) {
+ StringBuilder sb = buildBaseUrl(clusterId, vaultDomain);
switch (env) {
case DEV:
- sb.append(Constants.DEV_DOMAIN);
+ sb.append(BaseConstants.DEV_DOMAIN);
break;
case STAGE:
- sb.append(Constants.STAGE_DOMAIN);
+ sb.append(BaseConstants.STAGE_DOMAIN);
break;
case SANDBOX:
- sb.append(Constants.SANDBOX_DOMAIN);
+ sb.append(BaseConstants.SANDBOX_DOMAIN);
break;
case PROD:
default:
- sb.append(Constants.PROD_DOMAIN);
+ sb.append(BaseConstants.PROD_DOMAIN);
break;
}
return sb.toString();
}
public static String generateBearerToken(Credentials credentials) throws SkyflowException {
+ String bearerToken;
if (credentials.getPath() != null) {
- return BearerToken.builder()
+ bearerToken = BearerToken.builder()
.setCredentials(new File(credentials.getPath()))
.setRoles(credentials.getRoles())
.setCtx(credentials.getContext())
.build()
.getBearerToken();
} else if (credentials.getCredentialsString() != null) {
- return BearerToken.builder()
+ bearerToken = BearerToken.builder()
.setCredentials(credentials.getCredentialsString())
.setRoles(credentials.getRoles())
.setCtx(credentials.getContext())
.build()
.getBearerToken();
} else {
- return credentials.getToken();
+ LogUtil.printInfoLog(InfoLogs.USE_CLIENT_PROVIDED_BEARER_TOKEN.getLog());
+ bearerToken = credentials.getToken();
+ }
+ // check expiry for generated token
+ if (Token.isExpired(bearerToken)) {
+ LogUtil.printErrorLog(ErrorLogs.INVALID_BEARER_TOKEN.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.BearerTokenExpired.getMessage());
}
+ return bearerToken;
}
public static PrivateKey getPrivateKeyFromPem(String pemKey) throws SkyflowException {
- String PKCS8PrivateHeader = Constants.PKCS8_PRIVATE_HEADER;
- String PKCS8PrivateFooter = Constants.PKCS8_PRIVATE_FOOTER;
+ String PKCS8PrivateHeader = BaseConstants.PKCS8_PRIVATE_HEADER;
+ String PKCS8PrivateFooter = BaseConstants.PKCS8_PRIVATE_FOOTER;
String privateKeyContent = pemKey;
PrivateKey privateKey = null;
@@ -101,43 +105,8 @@ public static String parameterizedString(String base, String... args) {
return base;
}
- public static String constructConnectionURL(ConnectionConfig config, InvokeConnectionRequest invokeConnectionRequest) {
- StringBuilder filledURL = new StringBuilder(config.getConnectionUrl());
-
- if (invokeConnectionRequest.getPathParams() != null && !invokeConnectionRequest.getPathParams().isEmpty()) {
- for (Map.Entry entry : invokeConnectionRequest.getPathParams().entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- filledURL = new StringBuilder(filledURL.toString().replace(String.format("{%s}", key), value));
- }
- }
-
- if (invokeConnectionRequest.getQueryParams() != null && !invokeConnectionRequest.getQueryParams().isEmpty()) {
- filledURL.append("?");
- for (Map.Entry entry : invokeConnectionRequest.getQueryParams().entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- filledURL.append(key).append("=").append(value).append("&");
- }
- filledURL = new StringBuilder(filledURL.substring(0, filledURL.length() - 1));
- }
-
- return filledURL.toString();
- }
-
- public static Map constructConnectionHeadersMap(Map requestHeaders) {
- Map headersMap = new HashMap<>();
- for (Map.Entry entry : requestHeaders.entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- headersMap.put(key.toLowerCase(), value);
- }
- return headersMap;
- }
-
- public static JsonObject getMetrics() {
+ protected static JsonObject getCommonMetrics() {
JsonObject details = new JsonObject();
- String sdkVersion = Constants.SDK_VERSION;
String deviceModel;
String osDetails;
String javaVersion;
@@ -148,7 +117,7 @@ public static JsonObject getMetrics() {
} catch (Exception e) {
LogUtil.printInfoLog(parameterizedString(
InfoLogs.UNABLE_TO_GENERATE_SDK_METRIC.getLog(),
- Constants.SDK_METRIC_CLIENT_DEVICE_MODEL
+ BaseConstants.SDK_METRIC_CLIENT_DEVICE_MODEL
));
deviceModel = "";
}
@@ -160,7 +129,7 @@ public static JsonObject getMetrics() {
} catch (Exception e) {
LogUtil.printInfoLog(parameterizedString(
InfoLogs.UNABLE_TO_GENERATE_SDK_METRIC.getLog(),
- Constants.SDK_METRIC_CLIENT_OS_DETAILS
+ BaseConstants.SDK_METRIC_CLIENT_OS_DETAILS
));
osDetails = "";
}
@@ -172,14 +141,13 @@ public static JsonObject getMetrics() {
} catch (Exception e) {
LogUtil.printInfoLog(parameterizedString(
InfoLogs.UNABLE_TO_GENERATE_SDK_METRIC.getLog(),
- Constants.SDK_METRIC_RUNTIME_DETAILS
+ BaseConstants.SDK_METRIC_RUNTIME_DETAILS
));
javaVersion = "";
}
- details.addProperty(Constants.SDK_METRIC_NAME_VERSION, Constants.SDK_METRIC_NAME_VERSION_PREFIX + sdkVersion);
- details.addProperty(Constants.SDK_METRIC_CLIENT_DEVICE_MODEL, deviceModel);
- details.addProperty(Constants.SDK_METRIC_RUNTIME_DETAILS, Constants.SDK_METRIC_RUNTIME_DETAILS_PREFIX + javaVersion);
- details.addProperty(Constants.SDK_METRIC_CLIENT_OS_DETAILS, osDetails);
+ details.addProperty(BaseConstants.SDK_METRIC_CLIENT_DEVICE_MODEL, deviceModel);
+ details.addProperty(BaseConstants.SDK_METRIC_RUNTIME_DETAILS, BaseConstants.SDK_METRIC_RUNTIME_DETAILS_PREFIX + javaVersion);
+ details.addProperty(BaseConstants.SDK_METRIC_CLIENT_OS_DETAILS, osDetails);
return details;
}
@@ -199,4 +167,11 @@ private static PrivateKey parsePkcs8PrivateKey(byte[] pkcs8Bytes) throws Skyflow
}
return privateKey;
}
+
+ private static StringBuilder buildBaseUrl(String clusterId, String vaultDomain) {
+ StringBuilder sb = new StringBuilder(BaseConstants.SECURE_PROTOCOL);
+ sb.append(clusterId);
+ sb.append(vaultDomain);
+ return sb;
+ }
}
diff --git a/common/src/main/java/com/skyflow/utils/SdkVersion.java b/common/src/main/java/com/skyflow/utils/SdkVersion.java
new file mode 100644
index 00000000..8136d8c9
--- /dev/null
+++ b/common/src/main/java/com/skyflow/utils/SdkVersion.java
@@ -0,0 +1,13 @@
+package com.skyflow.utils;
+
+public class SdkVersion {
+ private static String sdkPrefix = BaseConstants.SDK_PREFIX;
+
+ public static String getSdkPrefix() {
+ return sdkPrefix;
+ }
+
+ public static void setSdkPrefix(String sdkPrefix) {
+ SdkVersion.sdkPrefix = sdkPrefix;
+ }
+}
diff --git a/src/main/java/com/skyflow/utils/logger/LogUtil.java b/common/src/main/java/com/skyflow/utils/logger/LogUtil.java
similarity index 96%
rename from src/main/java/com/skyflow/utils/logger/LogUtil.java
rename to common/src/main/java/com/skyflow/utils/logger/LogUtil.java
index 78cfa038..54fc7d47 100644
--- a/src/main/java/com/skyflow/utils/logger/LogUtil.java
+++ b/common/src/main/java/com/skyflow/utils/logger/LogUtil.java
@@ -2,13 +2,13 @@
import com.skyflow.enums.LogLevel;
import com.skyflow.logs.InfoLogs;
-import com.skyflow.utils.Constants;
+import com.skyflow.utils.SdkVersion;
import java.util.logging.*;
public final class LogUtil {
private static final Logger LOGGER = Logger.getLogger(LogUtil.class.getName());
- private static final String SDK_LOG_PREFIX = "[" + Constants.SDK_PREFIX + "] ";
+ private static final String SDK_LOG_PREFIX = "[" + SdkVersion.getSdkPrefix() + "] ";
private static boolean IS_LOGGER_SETUP_DONE = false;
synchronized public static void setupLogger(LogLevel logLevel) {
diff --git a/common/src/main/java/com/skyflow/utils/validations/BaseValidations.java b/common/src/main/java/com/skyflow/utils/validations/BaseValidations.java
new file mode 100644
index 00000000..8460ec1d
--- /dev/null
+++ b/common/src/main/java/com/skyflow/utils/validations/BaseValidations.java
@@ -0,0 +1,108 @@
+package com.skyflow.utils.validations;
+
+import com.skyflow.config.Credentials;
+import com.skyflow.config.VaultConfig;
+import com.skyflow.errors.ErrorCode;
+import com.skyflow.errors.ErrorMessage;
+import com.skyflow.errors.SkyflowException;
+import com.skyflow.logs.ErrorLogs;
+import com.skyflow.utils.BaseConstants;
+import com.skyflow.utils.BaseUtils;
+import com.skyflow.utils.logger.LogUtil;
+
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class BaseValidations {
+ BaseValidations() {
+ }
+
+ public static void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
+ String vaultId = vaultConfig.getVaultId();
+ String clusterId = vaultConfig.getClusterId();
+ Credentials credentials = vaultConfig.getCredentials();
+ if (vaultId == null) {
+ LogUtil.printErrorLog(ErrorLogs.VAULT_ID_IS_REQUIRED.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultId.getMessage());
+ } else if (vaultId.trim().isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_ID.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultId.getMessage());
+ } else if (clusterId == null) {
+ LogUtil.printErrorLog(ErrorLogs.CLUSTER_ID_IS_REQUIRED.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidClusterId.getMessage());
+ } else if (clusterId.trim().isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_CLUSTER_ID.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyClusterId.getMessage());
+ } else if (credentials != null) {
+ validateCredentials(credentials);
+ }
+ }
+
+ public static void validateCredentials(Credentials credentials) throws SkyflowException {
+ int nonNullMembers = 0;
+ String path = credentials.getPath();
+ String credentialsString = credentials.getCredentialsString();
+ String token = credentials.getToken();
+ String apiKey = credentials.getApiKey();
+ String context = credentials.getContext();
+ ArrayList roles = credentials.getRoles();
+
+ if (path != null) nonNullMembers++;
+ if (credentialsString != null) nonNullMembers++;
+ if (token != null) nonNullMembers++;
+ if (apiKey != null) nonNullMembers++;
+
+ if (nonNullMembers > 1) {
+ LogUtil.printErrorLog(ErrorLogs.MULTIPLE_TOKEN_GENERATION_MEANS_PASSED.getLog());
+ throw new SkyflowException(
+ ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MultipleTokenGenerationMeansPassed.getMessage()
+ );
+ } else if (nonNullMembers < 1) {
+ LogUtil.printErrorLog(ErrorLogs.NO_TOKEN_GENERATION_MEANS_PASSED.getLog());
+ throw new SkyflowException(
+ ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.NoTokenGenerationMeansPassed.getMessage()
+ );
+ } else if (path != null && path.trim().isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_CREDENTIALS_PATH.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyCredentialFilePath.getMessage());
+ } else if (credentialsString != null && credentialsString.trim().isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_CREDENTIALS_STRING.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyCredentialsString.getMessage());
+ } else if (token != null && token.trim().isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_TOKEN_VALUE.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyToken.getMessage());
+ } else if (apiKey != null) {
+ if (apiKey.trim().isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_API_KEY_VALUE.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyApikey.getMessage());
+ } else {
+ Pattern pattern = Pattern.compile(BaseConstants.API_KEY_REGEX);
+ Matcher matcher = pattern.matcher(apiKey);
+ if (!matcher.matches()) {
+ LogUtil.printErrorLog(ErrorLogs.INVALID_API_KEY.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidApikey.getMessage());
+ }
+ }
+ } else if (roles != null) {
+ if (roles.isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_ROLES.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRoles.getMessage());
+ } else {
+ for (int index = 0; index < roles.size(); index++) {
+ String role = roles.get(index);
+ if (role == null || role.trim().isEmpty()) {
+ LogUtil.printErrorLog(BaseUtils.parameterizedString(
+ ErrorLogs.EMPTY_OR_NULL_ROLE_IN_ROLES.getLog(), Integer.toString(index)
+ ));
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyRoleInRoles.getMessage());
+ }
+ }
+ }
+ }
+ if (context != null && context.trim().isEmpty()) {
+ LogUtil.printErrorLog(ErrorLogs.EMPTY_OR_NULL_CONTEXT.getLog());
+ throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyContext.getMessage());
+ }
+ }
+}
diff --git a/common/src/main/java/com/skyflow/vault/data/BaseInsertRequest.java b/common/src/main/java/com/skyflow/vault/data/BaseInsertRequest.java
new file mode 100644
index 00000000..b856492d
--- /dev/null
+++ b/common/src/main/java/com/skyflow/vault/data/BaseInsertRequest.java
@@ -0,0 +1,41 @@
+package com.skyflow.vault.data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+class BaseInsertRequest {
+ private final BaseInsertRequestBuilder builder;
+
+ protected BaseInsertRequest(BaseInsertRequestBuilder builder) {
+ this.builder = builder;
+ }
+
+ public String getTable() {
+ return this.builder.table;
+ }
+
+ public ArrayList> getValues() {
+ return this.builder.values;
+ }
+
+ static class BaseInsertRequestBuilder {
+ protected String table;
+ protected ArrayList> values;
+ protected String upsert;
+
+ protected BaseInsertRequestBuilder() {
+ }
+
+ public BaseInsertRequestBuilder table(String table) {
+ this.table = table;
+ return this;
+ }
+
+ public BaseInsertRequestBuilder values(ArrayList> values) {
+ this.values = values;
+ return this;
+ }
+
+ }
+}
+
diff --git a/src/test/java/com/skyflow/config/CredentialsTests.java b/common/test/java/com/skyflow/config/CredentialsTests.java
similarity index 89%
rename from src/test/java/com/skyflow/config/CredentialsTests.java
rename to common/test/java/com/skyflow/config/CredentialsTests.java
index ff9fcfda..13cd0644 100644
--- a/src/test/java/com/skyflow/config/CredentialsTests.java
+++ b/common/test/java/com/skyflow/config/CredentialsTests.java
@@ -3,7 +3,7 @@
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
-import com.skyflow.utils.validations.Validations;
+import com.skyflow.utils.validations.BaseValidations;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -45,7 +45,7 @@ public void testValidCredentialsWithPath() {
try {
Credentials credentials = new Credentials();
credentials.setPath(path);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.assertNull(credentials.getCredentialsString());
Assert.assertNull(credentials.getToken());
Assert.assertNull(credentials.getApiKey());
@@ -59,7 +59,7 @@ public void testValidCredentialsWithCredentialsString() {
try {
Credentials credentials = new Credentials();
credentials.setCredentialsString(credentialsString);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.assertNull(credentials.getPath());
Assert.assertNull(credentials.getToken());
Assert.assertNull(credentials.getApiKey());
@@ -73,7 +73,7 @@ public void testValidCredentialsWithToken() {
try {
Credentials credentials = new Credentials();
credentials.setToken(token);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.assertNull(credentials.getPath());
Assert.assertNull(credentials.getCredentialsString());
Assert.assertNull(credentials.getApiKey());
@@ -87,7 +87,7 @@ public void testValidCredentialsWithApikey() {
try {
Credentials credentials = new Credentials();
credentials.setApiKey(validApiKey);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.assertNull(credentials.getPath());
Assert.assertNull(credentials.getCredentialsString());
Assert.assertNull(credentials.getToken());
@@ -104,7 +104,7 @@ public void testValidCredentialsWithRolesAndContext() {
credentials.setApiKey(validApiKey);
credentials.setRoles(roles);
credentials.setContext(context);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.assertNull(credentials.getPath());
Assert.assertNull(credentials.getCredentialsString());
Assert.assertNull(credentials.getToken());
@@ -120,7 +120,7 @@ public void testEmptyPathInCredentials() {
try {
Credentials credentials = new Credentials();
credentials.setPath("");
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -133,7 +133,7 @@ public void testEmptyCredentialsStringInCredentials() {
try {
Credentials credentials = new Credentials();
credentials.setCredentialsString("");
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -146,7 +146,7 @@ public void testEmptyTokenInCredentials() {
try {
Credentials credentials = new Credentials();
credentials.setToken("");
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -159,7 +159,7 @@ public void testEmptyApikeyInCredentials() {
try {
Credentials credentials = new Credentials();
credentials.setApiKey("");
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -172,7 +172,7 @@ public void testInvalidApikeyInCredentials() {
try {
Credentials credentials = new Credentials();
credentials.setApiKey(invalidApiKey);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -186,7 +186,7 @@ public void testBothTokenAndPathInCredentials() {
Credentials credentials = new Credentials();
credentials.setPath(path);
credentials.setToken(token);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -198,7 +198,7 @@ public void testBothTokenAndPathInCredentials() {
public void testNothingPassedInCredentials() {
try {
Credentials credentials = new Credentials();
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -212,7 +212,7 @@ public void testEmptyRolesInCredentials() {
Credentials credentials = new Credentials();
credentials.setPath(path);
credentials.setRoles(roles);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -228,7 +228,7 @@ public void testNullRoleInRolesInCredentials() {
roles.add(role);
roles.add(null);
credentials.setRoles(roles);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -244,7 +244,7 @@ public void testEmptyRoleInRolesInCredentials() {
roles.add(role);
roles.add("");
credentials.setRoles(roles);
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -258,7 +258,7 @@ public void testEmptyContextInCredentials() {
Credentials credentials = new Credentials();
credentials.setPath(path);
credentials.setContext("");
- Validations.validateCredentials(credentials);
+ BaseValidations.validateCredentials(credentials);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
diff --git a/src/test/java/com/skyflow/config/VaultConfigTests.java b/common/test/java/com/skyflow/config/VaultConfigTests.java
similarity index 91%
rename from src/test/java/com/skyflow/config/VaultConfigTests.java
rename to common/test/java/com/skyflow/config/VaultConfigTests.java
index b99f6c9b..2c3cb77d 100644
--- a/src/test/java/com/skyflow/config/VaultConfigTests.java
+++ b/common/test/java/com/skyflow/config/VaultConfigTests.java
@@ -4,7 +4,7 @@
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
-import com.skyflow.utils.validations.Validations;
+import com.skyflow.utils.validations.BaseValidations;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -35,7 +35,7 @@ public void testValidVaultConfigWithCredentialsInValidations() {
vaultConfig.setClusterId(clusterID);
vaultConfig.setEnv(Env.SANDBOX);
vaultConfig.setCredentials(credentials);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -53,7 +53,7 @@ public void testValidVaultConfigWithoutCredentialsInValidations() {
vaultConfig.setVaultId(vaultID);
vaultConfig.setClusterId(clusterID);
vaultConfig.setEnv(Env.SANDBOX);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -71,7 +71,7 @@ public void testDefaultEnvInVaultConfigWithCredentialsInValidations() {
vaultConfig.setVaultId(vaultID);
vaultConfig.setClusterId(clusterID);
vaultConfig.setCredentials(credentials);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -89,7 +89,7 @@ public void testDefaultEnvInVaultConfigWithoutCredentialsInValidations() {
vaultConfig.setVaultId(vaultID);
vaultConfig.setClusterId(clusterID);
vaultConfig.setEnv(null);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -106,7 +106,7 @@ public void testNoVaultIdInVaultConfigInValidations() {
try {
vaultConfig.setClusterId(clusterID);
vaultConfig.setEnv(Env.SANDBOX);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -121,7 +121,7 @@ public void testEmptyVaultIdInVaultConfigInValidations() {
vaultConfig.setVaultId("");
vaultConfig.setClusterId(clusterID);
vaultConfig.setEnv(Env.SANDBOX);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -135,7 +135,7 @@ public void testNoClusterIdInVaultConfigInValidations() {
VaultConfig vaultConfig = new VaultConfig();
vaultConfig.setVaultId(vaultID);
vaultConfig.setEnv(Env.SANDBOX);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -150,7 +150,7 @@ public void testEmptyClusterIdInVaultConfigInValidations() {
vaultConfig.setVaultId(vaultID);
vaultConfig.setClusterId("");
vaultConfig.setEnv(Env.SANDBOX);
- Validations.validateVaultConfig(vaultConfig);
+ BaseValidations.validateVaultConfig(vaultConfig);
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
diff --git a/src/test/java/com/skyflow/errors/SkyflowExceptionTest.java b/common/test/java/com/skyflow/errors/SkyflowExceptionTest.java
similarity index 91%
rename from src/test/java/com/skyflow/errors/SkyflowExceptionTest.java
rename to common/test/java/com/skyflow/errors/SkyflowExceptionTest.java
index 89e0643b..cf35f548 100644
--- a/src/test/java/com/skyflow/errors/SkyflowExceptionTest.java
+++ b/common/test/java/com/skyflow/errors/SkyflowExceptionTest.java
@@ -59,7 +59,7 @@ public void testConstructorWithJsonErrorBody() {
Assert.assertEquals("NOT_FOUND", ex.getHttpStatus());
Assert.assertEquals("req-123", ex.getRequestId());
Assert.assertNotNull(ex.getDetails());
- Assert.assertTrue(ex.getDetails().size() > 0);
+ Assert.assertFalse(ex.getDetails().isEmpty());
}
@@ -67,9 +67,9 @@ public void testConstructorWithJsonErrorBody() {
public void testConstructorWithNullErrorBody() {
Map> headers = new HashMap<>();
SkyflowException ex = new SkyflowException(500, new RuntimeException("fail"), headers, null);
- Assert.assertNull(ex.getMessage());
+ Assert.assertEquals(ex.getMessage(), "fail");
+ Assert.assertEquals(ex.getHttpStatus(), HttpStatus.BAD_REQUEST.getHttpStatus());
Assert.assertNull(ex.getGrpcCode());
- Assert.assertNull(ex.getHttpStatus());
}
@Test
@@ -85,11 +85,11 @@ public void testGettersAndSetters() {
@Test
public void testSetDetailsWithErrorFromClientHeader() {
- String json = "{\"error\":{\"message\":\"test error\",\"grpc_code\":13,\"details\":[]}}";
+ String jsonString = "{\"error\":{\"message\":\"test error\",\"grpc_code\":13,\"details\":[]}}";
Map> headers = new HashMap<>();
headers.put("error-from-client", Collections.singletonList("client error"));
- SkyflowException ex = new SkyflowException(500, new RuntimeException("fail"), headers, json);
+ SkyflowException ex = new SkyflowException(500, new RuntimeException("fail"), headers, jsonString);
Assert.assertNotNull(ex.getDetails());
Assert.assertEquals(1, ex.getDetails().size());
diff --git a/src/test/java/com/skyflow/serviceaccount/util/BearerTokenTests.java b/common/test/java/com/skyflow/serviceaccount/util/BearerTokenTests.java
similarity index 90%
rename from src/test/java/com/skyflow/serviceaccount/util/BearerTokenTests.java
rename to common/test/java/com/skyflow/serviceaccount/util/BearerTokenTests.java
index 4bfb697c..cf5bbcd5 100644
--- a/src/test/java/com/skyflow/serviceaccount/util/BearerTokenTests.java
+++ b/common/test/java/com/skyflow/serviceaccount/util/BearerTokenTests.java
@@ -3,7 +3,7 @@
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
-import com.skyflow.utils.Utils;
+import com.skyflow.utils.BaseUtils;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -25,7 +25,7 @@ public class BearerTokenTests {
@BeforeClass
public static void setup() {
credentialsFilePath = "./credentials.json";
- invalidJsonFilePath = "./src/test/resources/notJson.txt";
+ invalidJsonFilePath = "./test/resources/notJson.txt";
invalidFilePath = "./src/test/credentials.json";
credentialsString = "{\"key\":\"value\"}";
context = "test_context";
@@ -64,7 +64,7 @@ public void testEmptyCredentialsFilePath() {
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
- Utils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), ""), e.getMessage()
+ BaseUtils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), ""), e.getMessage()
);
}
}
@@ -79,7 +79,7 @@ public void testInvalidFilePath() {
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
- Utils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), invalidFilePath),
+ BaseUtils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), invalidFilePath),
e.getMessage()
);
}
@@ -95,7 +95,7 @@ public void testInvalidCredentialsFile() {
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
- Utils.parameterizedString(ErrorMessage.FileInvalidJson.getMessage(), invalidJsonFilePath),
+ BaseUtils.parameterizedString(ErrorMessage.FileInvalidJson.getMessage(), invalidJsonFilePath),
e.getMessage()
);
}
@@ -128,7 +128,7 @@ public void testInvalidCredentialsString() {
@Test
public void testNoPrivateKeyInCredentialsForCredentials() {
- String filePath = "./src/test/resources/noPrivateKeyCredentials.json";
+ String filePath = "./test/resources/noPrivateKeyCredentials.json";
File file = new File(filePath);
try {
BearerToken bearerToken = BearerToken.builder().setCredentials(file).build();
@@ -142,7 +142,7 @@ public void testNoPrivateKeyInCredentialsForCredentials() {
@Test
public void testNoClientIDInCredentialsForCredentials() {
- String filePath = "./src/test/resources/noClientIDCredentials.json";
+ String filePath = "./test/resources/noClientIDCredentials.json";
File file = new File(filePath);
try {
BearerToken bearerToken = BearerToken.builder().setCredentials(file).build();
@@ -156,7 +156,7 @@ public void testNoClientIDInCredentialsForCredentials() {
@Test
public void testNoKeyIDInCredentialsForCredentials() {
- String filePath = "./src/test/resources/noKeyIDCredentials.json";
+ String filePath = "./test/resources/noKeyIDCredentials.json";
File file = new File(filePath);
try {
BearerToken bearerToken = BearerToken.builder().setCredentials(file).build();
@@ -170,7 +170,7 @@ public void testNoKeyIDInCredentialsForCredentials() {
@Test
public void testNoTokenURIInCredentialsForCredentials() {
- String filePath = "./src/test/resources/noTokenURICredentials.json";
+ String filePath = "./test/resources/noTokenURICredentials.json";
File file = new File(filePath);
try {
BearerToken bearerToken = BearerToken.builder().setCredentials(file).build();
@@ -184,7 +184,7 @@ public void testNoTokenURIInCredentialsForCredentials() {
@Test
public void testInvalidPrivateKeyInCredentialsForCredentials() {
- String filePath = "./src/test/resources/invalidPrivateKeyCredentials.json";
+ String filePath = "./test/resources/invalidPrivateKeyCredentials.json";
File file = new File(filePath);
try {
BearerToken bearerToken = BearerToken.builder().setCredentials(file).build();
@@ -211,7 +211,7 @@ public void testInvalidKeySpecInCredentialsForCredentials() {
@Test
public void testInvalidTokenURIInCredentialsForCredentials() throws SkyflowException {
- String filePath = "./src/test/resources/invalidTokenURICredentials.json";
+ String filePath = "./test/resources/invalidTokenURICredentials.json";
File file = new File(filePath);
try {
BearerToken bearerToken = BearerToken.builder().setCredentials(file).build();
diff --git a/src/test/java/com/skyflow/serviceaccount/util/SignedDataTokensTests.java b/common/test/java/com/skyflow/serviceaccount/util/SignedDataTokensTests.java
similarity index 87%
rename from src/test/java/com/skyflow/serviceaccount/util/SignedDataTokensTests.java
rename to common/test/java/com/skyflow/serviceaccount/util/SignedDataTokensTests.java
index 42ad9bc7..dcda716e 100644
--- a/src/test/java/com/skyflow/serviceaccount/util/SignedDataTokensTests.java
+++ b/common/test/java/com/skyflow/serviceaccount/util/SignedDataTokensTests.java
@@ -3,7 +3,7 @@
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
-import com.skyflow.utils.Utils;
+import com.skyflow.utils.BaseUtils;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -26,7 +26,7 @@ public class SignedDataTokensTests {
@BeforeClass
public static void setup() {
credentialsFilePath = "./credentials.json";
- invalidJsonFilePath = "./src/test/resources/notJson.txt";
+ invalidJsonFilePath = "./test/resources/notJson.txt";
invalidFilePath = "./src/test/credentials.json";
credentialsString = "{\"key\":\"value\"}";
context = "test_context";
@@ -69,7 +69,7 @@ public void testEmptyCredentialsFilePath() {
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
- Assert.assertEquals(Utils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), ""), e.getMessage());
+ Assert.assertEquals(BaseUtils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), ""), e.getMessage());
}
}
@@ -83,7 +83,7 @@ public void testInvalidFilePath() {
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
- Utils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), invalidFilePath),
+ BaseUtils.parameterizedString(ErrorMessage.FileNotFound.getMessage(), invalidFilePath),
e.getMessage());
}
}
@@ -98,7 +98,7 @@ public void testInvalidCredentialsFile() {
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
- Utils.parameterizedString(ErrorMessage.FileInvalidJson.getMessage(), invalidJsonFilePath),
+ BaseUtils.parameterizedString(ErrorMessage.FileInvalidJson.getMessage(), invalidJsonFilePath),
e.getMessage()
);
}
@@ -109,19 +109,15 @@ public void testEmptyCredentialsString() {
try {
SignedDataTokens signedTokens = SignedDataTokens.builder().setCredentials("").build();
signedTokens.getSignedDataTokens();
- System.out.println("in try block");
Assert.fail(EXCEPTION_NOT_THROWN);
} catch (SkyflowException e) {
- System.out.println("caught skyflow exception");
- System.out.println(e);
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
- Utils.parameterizedString(ErrorMessage.InvalidCredentials.getMessage(), invalidJsonFilePath),
+ BaseUtils.parameterizedString(ErrorMessage.InvalidCredentials.getMessage(), invalidJsonFilePath),
e.getMessage()
);
} catch (Exception e) {
- System.out.println("catching exception");
- System.out.println(e);
+ Assert.fail(e.getMessage());
}
}
@@ -134,7 +130,7 @@ public void testInvalidCredentialsString() {
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
- Utils.parameterizedString(ErrorMessage.CredentialsStringInvalidJson.getMessage(), invalidJsonFilePath),
+ BaseUtils.parameterizedString(ErrorMessage.CredentialsStringInvalidJson.getMessage(), invalidJsonFilePath),
e.getMessage()
);
}
@@ -142,7 +138,7 @@ public void testInvalidCredentialsString() {
@Test
public void testNoPrivateKeyInCredentials() {
- String filePath = "./src/test/resources/noPrivateKeyCredentials.json";
+ String filePath = "./test/resources/noPrivateKeyCredentials.json";
File file = new File(filePath);
try {
SignedDataTokens signedTokens = SignedDataTokens.builder().setCredentials(file).build();
@@ -156,7 +152,7 @@ public void testNoPrivateKeyInCredentials() {
@Test
public void testNoClientIDInCredentials() {
- String filePath = "./src/test/resources/noClientIDCredentials.json";
+ String filePath = "./test/resources/noClientIDCredentials.json";
File file = new File(filePath);
try {
SignedDataTokens signedTokens = SignedDataTokens.builder().setCredentials(file).build();
@@ -170,7 +166,7 @@ public void testNoClientIDInCredentials() {
@Test
public void testNoKeyIDInCredentials() {
- String filePath = "./src/test/resources/noKeyIDCredentials.json";
+ String filePath = "./test/resources/noKeyIDCredentials.json";
File file = new File(filePath);
try {
SignedDataTokens signedTokens = SignedDataTokens.builder().setCredentials(file).build();
@@ -184,7 +180,7 @@ public void testNoKeyIDInCredentials() {
@Test
public void testInvalidPrivateKeyInCredentials() {
- String filePath = "./src/test/resources/invalidPrivateKeyCredentials.json";
+ String filePath = "./test/resources/invalidPrivateKeyCredentials.json";
File file = new File(filePath);
try {
SignedDataTokens signedTokens = SignedDataTokens.builder().setCredentials(file).build();
diff --git a/src/test/java/com/skyflow/serviceaccount/util/TokenTests.java b/common/test/java/com/skyflow/serviceaccount/util/TokenTests.java
similarity index 87%
rename from src/test/java/com/skyflow/serviceaccount/util/TokenTests.java
rename to common/test/java/com/skyflow/serviceaccount/util/TokenTests.java
index ed5c72b2..587527cf 100644
--- a/src/test/java/com/skyflow/serviceaccount/util/TokenTests.java
+++ b/common/test/java/com/skyflow/serviceaccount/util/TokenTests.java
@@ -1,6 +1,6 @@
package com.skyflow.serviceaccount.util;
-import com.skyflow.Skyflow;
+// import com.skyflow.Skyflow;
import com.skyflow.enums.LogLevel;
import io.github.cdimascio.dotenv.Dotenv;
import org.junit.Assert;
@@ -10,10 +10,10 @@
public class TokenTests {
private static final String INVALID_EXCEPTION_THROWN = "Should not have thrown any exception";
- @BeforeClass
- public static void setup() {
- Skyflow skyflowClient = Skyflow.builder().setLogLevel(LogLevel.DEBUG).build();
- }
+ // @BeforeClass
+ // public static void setup() {
+ // Skyflow skyflowClient = Skyflow.builder().setLogLevel(LogLevel.DEBUG).build();
+ // }
@Test
public void testNoTokenForIsExpiredToken() {
diff --git a/common/test/java/com/skyflow/utils/BaseUtilsTests.java b/common/test/java/com/skyflow/utils/BaseUtilsTests.java
new file mode 100644
index 00000000..60958841
--- /dev/null
+++ b/common/test/java/com/skyflow/utils/BaseUtilsTests.java
@@ -0,0 +1,22 @@
+package com.skyflow.utils;
+
+import com.google.gson.JsonObject;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BaseUtilsTests {
+ private static final String INVALID_EXCEPTION_THROWN = "Should not have thrown any exception";
+ private static final String EXCEPTION_NOT_THROWN = "Should have thrown an exception";
+
+ @Test
+ public void testGetBaseMetrics() {
+ try {
+ JsonObject metrics = BaseUtils.getCommonMetrics();
+ Assert.assertNotNull(metrics.get(BaseConstants.SDK_METRIC_RUNTIME_DETAILS).getAsString());
+ Assert.assertNotNull(metrics.get(BaseConstants.SDK_METRIC_CLIENT_DEVICE_MODEL).getAsString());
+ Assert.assertNotNull(metrics.get(BaseConstants.SDK_METRIC_CLIENT_OS_DETAILS).getAsString());
+ } catch (Exception e) {
+ Assert.fail(INVALID_EXCEPTION_THROWN);
+ }
+ }
+}
diff --git a/src/test/resources/invalidPrivateKeyCredentials.json b/common/test/resources/invalidPrivateKeyCredentials.json
similarity index 100%
rename from src/test/resources/invalidPrivateKeyCredentials.json
rename to common/test/resources/invalidPrivateKeyCredentials.json
diff --git a/src/test/resources/invalidTokenURICredentials.json b/common/test/resources/invalidTokenURICredentials.json
similarity index 100%
rename from src/test/resources/invalidTokenURICredentials.json
rename to common/test/resources/invalidTokenURICredentials.json
diff --git a/src/test/resources/noClientIDCredentials.json b/common/test/resources/noClientIDCredentials.json
similarity index 100%
rename from src/test/resources/noClientIDCredentials.json
rename to common/test/resources/noClientIDCredentials.json
diff --git a/src/test/resources/noKeyIDCredentials.json b/common/test/resources/noKeyIDCredentials.json
similarity index 100%
rename from src/test/resources/noKeyIDCredentials.json
rename to common/test/resources/noKeyIDCredentials.json
diff --git a/src/test/resources/noPrivateKeyCredentials.json b/common/test/resources/noPrivateKeyCredentials.json
similarity index 100%
rename from src/test/resources/noPrivateKeyCredentials.json
rename to common/test/resources/noPrivateKeyCredentials.json
diff --git a/src/test/resources/noTokenURICredentials.json b/common/test/resources/noTokenURICredentials.json
similarity index 100%
rename from src/test/resources/noTokenURICredentials.json
rename to common/test/resources/noTokenURICredentials.json
diff --git a/src/test/resources/notJson.txt b/common/test/resources/notJson.txt
similarity index 100%
rename from src/test/resources/notJson.txt
rename to common/test/resources/notJson.txt
diff --git a/pom.xml b/pom.xml
index df054845..1c115553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
4.0.0
com.skyflow
- skyflow-java
- 2.0.0-beta.2
- jar
+ skyflow
+ 1.0.0
+ pom
${project.groupId}:${project.artifactId}
Skyflow SDK for the Java programming language
@@ -25,6 +25,11 @@
skyflow
+
+ common
+ v2
+ v3
+
scm:git:git://github.com:skyflowapi/skyflow-java.git
scm:git:ssh://github.com:skyflowapi/skyflow-java.git
@@ -32,6 +37,7 @@
+ true
8
8
4.12.0
@@ -45,12 +51,6 @@
-
- com.squareup.okhttp3
- okhttp
- 4.12.0
- compile
-
com.fasterxml.jackson.core
jackson-databind
@@ -170,7 +170,8 @@
3.2.0
- com.skyflow.generated.rest.*
+ com.skyflow.generated.rest.*:
+ com.skyflow.generated.auth.*:
@@ -179,6 +180,7 @@
jar
+
@@ -257,8 +259,22 @@
https://repo.maven.apache.org/maven2/
-
+
+ jfrog
+
+
+ central
+ prekarilabs.jfrog.io-releases
+ https://prekarilabs.jfrog.io/artifactory/skyflow-java
+
+
+ snapshots
+ prekarilabs.jfrog.io-snapshots
+ https://prekarilabs.jfrog.io/artifactory/skyflow-java
+
+
+
maven-central
@@ -287,20 +303,5 @@
-
- jfrog
-
-
- central
- prekarilabs.jfrog.io-releases
- https://prekarilabs.jfrog.io/artifactory/skyflow-java
-
-
- snapshots
- prekarilabs.jfrog.io-snapshots
- https://prekarilabs.jfrog.io/artifactory/skyflow-java
-
-
-
-
+
\ No newline at end of file
diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh
index d729ea63..fcc1fd3f 100755
--- a/scripts/bump_version.sh
+++ b/scripts/bump_version.sh
@@ -1,7 +1,8 @@
# Input Arguments
Version=$1
CommitHash=$2
-PomFile="$GITHUB_WORKSPACE/pom.xml"
+Module=$3
+PomFile="$GITHUB_WORKSPACE/v3/pom.xml"
if [ -z "$Version" ]; then
echo "Error: Version argument is required."
@@ -26,15 +27,16 @@ if [ -z "$CommitHash" ]; then
else
echo "Bumping main project version to $Version-dev-$CommitHash"
- awk -v version="$Version-dev.$CommitHash" '
- BEGIN { updated = 0 }
- // && updated == 0 {
- sub(/.*<\/version>/, "" version "")
- updated = 1
- }
- { print }
- ' "$PomFile" > tempfile && cat tempfile > "$PomFile" && rm -f tempfile
+ awk -v version="$Version${CommitHash:+-dev.$CommitHash}" '
+ BEGIN { updated = 0 }
+ //,/<\/parent>/ { print; next }
+ // && updated == 0 {
+ sub(/.*<\/version>/, "" version "")
+ updated = 1
+ }
+ { print }
+ ' "$PomFile" > tempfile && cat tempfile > "$PomFile" && rm -f tempfile
- echo "--------------------------"
- echo "Done. Main project version now at $Version-dev.$CommitHash"
+echo "--------------------------"
+echo "Done. v3 module version now at $Version${CommitHash:+-dev.$CommitHash}"
fi
diff --git a/src/main/java/com/skyflow/config/ManagementConfig.java b/src/main/java/com/skyflow/config/ManagementConfig.java
deleted file mode 100644
index a054c8ea..00000000
--- a/src/main/java/com/skyflow/config/ManagementConfig.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.skyflow.config;
-
-public class ManagementConfig {
- // members
-
- // constructor
- ManagementConfig() {
- }
-
- // getters and setters
-}
diff --git a/src/main/java/com/skyflow/vault/audit/ListEventRequest.java b/src/main/java/com/skyflow/vault/audit/ListEventRequest.java
deleted file mode 100644
index b6c26b6d..00000000
--- a/src/main/java/com/skyflow/vault/audit/ListEventRequest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.skyflow.vault.audit;
-
-public class ListEventRequest {
- // members
-
- // constructor
- public ListEventRequest() {
- }
-
- // getters ans setters
-}
diff --git a/src/main/java/com/skyflow/vault/audit/ListEventResponse.java b/src/main/java/com/skyflow/vault/audit/ListEventResponse.java
deleted file mode 100644
index 2647e617..00000000
--- a/src/main/java/com/skyflow/vault/audit/ListEventResponse.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.skyflow.vault.audit;
-
-public class ListEventResponse {
- // members
-
- public ListEventResponse() {
- }
-
- // getters ans setters
-}
diff --git a/src/main/java/com/skyflow/vault/bin/GetBinRequest.java b/src/main/java/com/skyflow/vault/bin/GetBinRequest.java
deleted file mode 100644
index d059245f..00000000
--- a/src/main/java/com/skyflow/vault/bin/GetBinRequest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.skyflow.vault.bin;
-
-public class GetBinRequest {
- // members
-
- public GetBinRequest() {
- }
-
- // getters ans setters
-}
diff --git a/src/main/java/com/skyflow/vault/bin/GetBinResponse.java b/src/main/java/com/skyflow/vault/bin/GetBinResponse.java
deleted file mode 100644
index 86210031..00000000
--- a/src/main/java/com/skyflow/vault/bin/GetBinResponse.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.skyflow.vault.bin;
-
-public class GetBinResponse {
- // members
-
- public GetBinResponse() {
- }
-
- // getters ans setters
-}
diff --git a/src/main/java/com/skyflow/vault/controller/AuditController.java b/src/main/java/com/skyflow/vault/controller/AuditController.java
deleted file mode 100644
index 2faa04a6..00000000
--- a/src/main/java/com/skyflow/vault/controller/AuditController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.skyflow.vault.controller;
-
-import com.skyflow.generated.rest.ApiClient;
-import com.skyflow.vault.audit.ListEventRequest;
-import com.skyflow.vault.audit.ListEventResponse;
-
-public class AuditController {
-
- public AuditController(ApiClient apiClient) {
-
- }
-
- // Check for correct return type in python interfaces
- public ListEventResponse list(ListEventRequest listEventRequest) {
- // return audit events
- return null;
- }
-}
diff --git a/src/main/java/com/skyflow/vault/controller/BinLookupController.java b/src/main/java/com/skyflow/vault/controller/BinLookupController.java
deleted file mode 100644
index 4eb7a1c8..00000000
--- a/src/main/java/com/skyflow/vault/controller/BinLookupController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.skyflow.vault.controller;
-
-import com.skyflow.generated.rest.ApiClient;
-import com.skyflow.vault.bin.GetBinRequest;
-import com.skyflow.vault.bin.GetBinResponse;
-
-public class BinLookupController {
-
- public BinLookupController(ApiClient apiClient) {
- }
-
- public GetBinResponse get(GetBinRequest getBinRequest) {
- // return bin lookup response (card metadata associated with BIN)
- return null;
- }
-}
diff --git a/v2/pom.xml b/v2/pom.xml
new file mode 100644
index 00000000..e239bc85
--- /dev/null
+++ b/v2/pom.xml
@@ -0,0 +1,31 @@
+
+
+ 4.0.0
+
+ com.skyflow
+ skyflow
+ 1.0.0
+ ../pom.xml
+
+
+ skyflow-java
+ 2.0.0-beta.3
+ com.skyflow
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ com.skyflow
+ common
+ 1.0.0
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/skyflow/ConnectionClient.java b/v2/src/main/java/com/skyflow/ConnectionClient.java
similarity index 95%
rename from src/main/java/com/skyflow/ConnectionClient.java
rename to v2/src/main/java/com/skyflow/ConnectionClient.java
index 7cb10713..79541add 100644
--- a/src/main/java/com/skyflow/ConnectionClient.java
+++ b/v2/src/main/java/com/skyflow/ConnectionClient.java
@@ -1,12 +1,12 @@
package com.skyflow;
+import com.skyflow.serviceaccount.util.Token;
import com.skyflow.config.ConnectionConfig;
import com.skyflow.config.Credentials;
import com.skyflow.errors.ErrorCode;
import com.skyflow.errors.ErrorMessage;
import com.skyflow.errors.SkyflowException;
import com.skyflow.logs.InfoLogs;
-import com.skyflow.serviceaccount.util.Token;
import com.skyflow.utils.Constants;
import com.skyflow.utils.Utils;
import com.skyflow.utils.logger.LogUtil;
@@ -40,7 +40,7 @@ protected void updateConnectionConfig(ConnectionConfig connectionConfig) throws
prioritiseCredentials();
}
- protected void setBearerToken() throws SkyflowException {
+ protected void setBearerToken() throws SkyflowException, com.skyflow.errors.SkyflowException {
prioritiseCredentials();
Validations.validateCredentials(this.finalCredentials);
if (this.finalCredentials.getApiKey() != null) {
@@ -57,7 +57,7 @@ private void setApiKey() {
if (apiKey == null) {
apiKey = this.finalCredentials.getApiKey();
} else {
- LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
+ LogUtil.printInfoLog(InfoLogs.USE_API_KEY.getLog());
}
}
diff --git a/src/main/java/com/skyflow/Skyflow.java b/v2/src/main/java/com/skyflow/Skyflow.java
similarity index 95%
rename from src/main/java/com/skyflow/Skyflow.java
rename to v2/src/main/java/com/skyflow/Skyflow.java
index 8e51da57..03e38c3a 100644
--- a/src/main/java/com/skyflow/Skyflow.java
+++ b/v2/src/main/java/com/skyflow/Skyflow.java
@@ -10,6 +10,8 @@
import com.skyflow.errors.SkyflowException;
import com.skyflow.logs.ErrorLogs;
import com.skyflow.logs.InfoLogs;
+import com.skyflow.utils.Constants;
+import com.skyflow.utils.SdkVersion;
import com.skyflow.utils.Utils;
import com.skyflow.utils.logger.LogUtil;
import com.skyflow.utils.validations.Validations;
@@ -19,15 +21,17 @@
import java.util.LinkedHashMap;
-public final class Skyflow {
+public final class Skyflow extends BaseSkyflow {
private final SkyflowClientBuilder builder;
private Skyflow(SkyflowClientBuilder builder) {
+ super(builder);
this.builder = builder;
LogUtil.printInfoLog(InfoLogs.CLIENT_INITIALIZED.getLog());
}
public static SkyflowClientBuilder builder() {
+ SdkVersion.setSdkPrefix(Constants.SDK_PREFIX);
return new SkyflowClientBuilder();
}
@@ -79,10 +83,6 @@ public Skyflow updateLogLevel(LogLevel logLevel) {
return this;
}
- public LogLevel getLogLevel() {
- return this.builder.logLevel;
- }
-
public VaultController vault() throws SkyflowException {
Object[] array = this.builder.vaultClientsMap.keySet().toArray();
if (array.length < 1) {
@@ -102,7 +102,6 @@ public VaultController vault(String vaultId) throws SkyflowException {
return controller;
}
-
public ConnectionController connection() throws SkyflowException {
Object[] array = this.builder.connectionsMap.keySet().toArray();
if (array.length < 1) {
@@ -141,23 +140,18 @@ public DetectController detect(String vaultId) throws SkyflowException {
return controller;
}
- public static final class SkyflowClientBuilder {
+ public static final class SkyflowClientBuilder extends BaseSkyflowClientBuilder {
private final LinkedHashMap connectionsMap;
private final LinkedHashMap vaultClientsMap;
private final LinkedHashMap detectClientsMap;
- private final LinkedHashMap vaultConfigMap;
private final LinkedHashMap connectionConfigMap;
- private Credentials skyflowCredentials;
- private LogLevel logLevel;
public SkyflowClientBuilder() {
+ super();
this.vaultClientsMap = new LinkedHashMap<>();
this.detectClientsMap = new LinkedHashMap<>();
- this.vaultConfigMap = new LinkedHashMap<>();
this.connectionsMap = new LinkedHashMap<>();
this.connectionConfigMap = new LinkedHashMap<>();
- this.skyflowCredentials = null;
- this.logLevel = LogLevel.ERROR;
}
public SkyflowClientBuilder addVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
@@ -271,12 +265,9 @@ public SkyflowClientBuilder addSkyflowCredentials(Credentials credentials) throw
return this;
}
+ @Override
public SkyflowClientBuilder setLogLevel(LogLevel logLevel) {
- this.logLevel = logLevel == null ? LogLevel.ERROR : logLevel;
- LogUtil.setupLogger(this.logLevel);
- LogUtil.printInfoLog(Utils.parameterizedString(
- InfoLogs.CURRENT_LOG_LEVEL.getLog(), String.valueOf(logLevel)
- ));
+ super.setLogLevel(logLevel);
return this;
}
diff --git a/src/main/java/com/skyflow/VaultClient.java b/v2/src/main/java/com/skyflow/VaultClient.java
similarity index 99%
rename from src/main/java/com/skyflow/VaultClient.java
rename to v2/src/main/java/com/skyflow/VaultClient.java
index 7536a2c1..e9981523 100644
--- a/src/main/java/com/skyflow/VaultClient.java
+++ b/v2/src/main/java/com/skyflow/VaultClient.java
@@ -24,8 +24,8 @@
import com.skyflow.generated.rest.resources.tokens.TokensClient;
import com.skyflow.generated.rest.resources.tokens.requests.V1DetokenizePayload;
import com.skyflow.generated.rest.resources.tokens.requests.V1TokenizePayload;
-import com.skyflow.generated.rest.types.*;
import com.skyflow.generated.rest.types.Transformations;
+import com.skyflow.generated.rest.types.*;
import com.skyflow.logs.InfoLogs;
import com.skyflow.serviceaccount.util.Token;
import com.skyflow.utils.Constants;
@@ -34,9 +34,9 @@
import com.skyflow.utils.validations.Validations;
import com.skyflow.vault.data.InsertRequest;
import com.skyflow.vault.data.UpdateRequest;
-import com.skyflow.vault.detect.*;
import com.skyflow.vault.detect.DeidentifyFileRequest;
import com.skyflow.vault.detect.DeidentifyTextRequest;
+import com.skyflow.vault.detect.*;
import com.skyflow.vault.tokens.ColumnValue;
import com.skyflow.vault.tokens.DetokenizeData;
import com.skyflow.vault.tokens.DetokenizeRequest;
@@ -78,7 +78,7 @@ protected StringsClient getDetectTextApi() {
return this.apiClient.strings();
}
- protected FilesClient getDetectFileAPi(){
+ protected FilesClient getDetectFileAPi() {
return this.apiClient.files();
}
@@ -213,8 +213,8 @@ protected void setBearerToken() throws SkyflowException {
prioritiseCredentials();
Validations.validateCredentials(this.finalCredentials);
if (this.finalCredentials.getApiKey() != null) {
- LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
- token=this.finalCredentials.getApiKey();
+ LogUtil.printInfoLog(InfoLogs.USE_API_KEY.getLog());
+ token = this.finalCredentials.getApiKey();
} else if (Token.isExpired(token)) {
LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog());
token = Utils.generateBearerToken(this.finalCredentials);
@@ -387,7 +387,7 @@ private Transformations getTransformations(com.skyflow.vault.detect.Transformati
.build();
}
- private List getEntityTypes(List entities){
+ private List getEntityTypes(List entities) {
List mappedEntityTypes = null;
if (entities != null) {
mappedEntityTypes = entities.stream()
@@ -398,7 +398,7 @@ private List getEntityTypes(List entities){
return mappedEntityTypes;
}
- protected com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest getDeidentifyTextFileRequest(DeidentifyFileRequest request, String vaultId, String base64Content){
+ protected com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest getDeidentifyTextFileRequest(DeidentifyFileRequest request, String vaultId, String base64Content) {
List mappedEntityTypes = getEntityTypes(request.getEntities());
TokenFormat tokenFormat = request.getTokenFormat();
diff --git a/src/main/java/com/skyflow/config/ConnectionConfig.java b/v2/src/main/java/com/skyflow/config/ConnectionConfig.java
similarity index 100%
rename from src/main/java/com/skyflow/config/ConnectionConfig.java
rename to v2/src/main/java/com/skyflow/config/ConnectionConfig.java
diff --git a/src/main/java/com/skyflow/enums/DeidentifyFileStatus.java b/v2/src/main/java/com/skyflow/enums/DeidentifyFileStatus.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/DeidentifyFileStatus.java
rename to v2/src/main/java/com/skyflow/enums/DeidentifyFileStatus.java
diff --git a/src/main/java/com/skyflow/enums/DetectEntities.java b/v2/src/main/java/com/skyflow/enums/DetectEntities.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/DetectEntities.java
rename to v2/src/main/java/com/skyflow/enums/DetectEntities.java
diff --git a/src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java b/v2/src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java
rename to v2/src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java
diff --git a/src/main/java/com/skyflow/enums/MaskingMethod.java b/v2/src/main/java/com/skyflow/enums/MaskingMethod.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/MaskingMethod.java
rename to v2/src/main/java/com/skyflow/enums/MaskingMethod.java
diff --git a/src/main/java/com/skyflow/enums/RedactionType.java b/v2/src/main/java/com/skyflow/enums/RedactionType.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/RedactionType.java
rename to v2/src/main/java/com/skyflow/enums/RedactionType.java
diff --git a/src/main/java/com/skyflow/enums/RequestMethod.java b/v2/src/main/java/com/skyflow/enums/RequestMethod.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/RequestMethod.java
rename to v2/src/main/java/com/skyflow/enums/RequestMethod.java
diff --git a/src/main/java/com/skyflow/enums/TokenMode.java b/v2/src/main/java/com/skyflow/enums/TokenMode.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/TokenMode.java
rename to v2/src/main/java/com/skyflow/enums/TokenMode.java
diff --git a/src/main/java/com/skyflow/enums/TokenType.java b/v2/src/main/java/com/skyflow/enums/TokenType.java
similarity index 100%
rename from src/main/java/com/skyflow/enums/TokenType.java
rename to v2/src/main/java/com/skyflow/enums/TokenType.java
diff --git a/src/main/java/com/skyflow/generated/rest/ApiClient.java b/v2/src/main/java/com/skyflow/generated/rest/ApiClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/ApiClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/ApiClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java b/v2/src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java
rename to v2/src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java
diff --git a/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java b/v2/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/AsyncApiClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java b/v2/src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java
rename to v2/src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/ApiClientApiException.java b/v2/src/main/java/com/skyflow/generated/rest/core/ApiClientApiException.java
similarity index 98%
rename from src/main/java/com/skyflow/generated/rest/core/ApiClientApiException.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/ApiClientApiException.java
index a4487b1e..4fab1d41 100644
--- a/src/main/java/com/skyflow/generated/rest/core/ApiClientApiException.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/core/ApiClientApiException.java
@@ -65,7 +65,7 @@ public Map> headers() {
return this.headers;
}
- @java.lang.Override
+ @Override
public String toString() {
return "ApiClientApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + ", body: " + body
+ "}";
diff --git a/src/main/java/com/skyflow/generated/rest/core/ApiClientException.java b/v2/src/main/java/com/skyflow/generated/rest/core/ApiClientException.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/ApiClientException.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/ApiClientException.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/ApiClientHttpResponse.java b/v2/src/main/java/com/skyflow/generated/rest/core/ApiClientHttpResponse.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/ApiClientHttpResponse.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/ApiClientHttpResponse.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java b/v2/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/ClientOptions.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/DateTimeDeserializer.java b/v2/src/main/java/com/skyflow/generated/rest/core/DateTimeDeserializer.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/DateTimeDeserializer.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/DateTimeDeserializer.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/Environment.java b/v2/src/main/java/com/skyflow/generated/rest/core/Environment.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/Environment.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/Environment.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/FileStream.java b/v2/src/main/java/com/skyflow/generated/rest/core/FileStream.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/FileStream.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/FileStream.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/InputStreamRequestBody.java b/v2/src/main/java/com/skyflow/generated/rest/core/InputStreamRequestBody.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/InputStreamRequestBody.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/InputStreamRequestBody.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/MediaTypes.java b/v2/src/main/java/com/skyflow/generated/rest/core/MediaTypes.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/MediaTypes.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/MediaTypes.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/Nullable.java b/v2/src/main/java/com/skyflow/generated/rest/core/Nullable.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/Nullable.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/Nullable.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/NullableNonemptyFilter.java b/v2/src/main/java/com/skyflow/generated/rest/core/NullableNonemptyFilter.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/NullableNonemptyFilter.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/NullableNonemptyFilter.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/ObjectMappers.java b/v2/src/main/java/com/skyflow/generated/rest/core/ObjectMappers.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/ObjectMappers.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/ObjectMappers.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/QueryStringMapper.java b/v2/src/main/java/com/skyflow/generated/rest/core/QueryStringMapper.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/QueryStringMapper.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/QueryStringMapper.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/QueryStringMapperTest.java b/v2/src/main/java/com/skyflow/generated/rest/core/QueryStringMapperTest.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/QueryStringMapperTest.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/QueryStringMapperTest.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/RequestOptions.java b/v2/src/main/java/com/skyflow/generated/rest/core/RequestOptions.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/RequestOptions.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/RequestOptions.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/ResponseBodyInputStream.java b/v2/src/main/java/com/skyflow/generated/rest/core/ResponseBodyInputStream.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/ResponseBodyInputStream.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/ResponseBodyInputStream.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/ResponseBodyReader.java b/v2/src/main/java/com/skyflow/generated/rest/core/ResponseBodyReader.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/ResponseBodyReader.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/ResponseBodyReader.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/RetryInterceptor.java b/v2/src/main/java/com/skyflow/generated/rest/core/RetryInterceptor.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/RetryInterceptor.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/RetryInterceptor.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/Stream.java b/v2/src/main/java/com/skyflow/generated/rest/core/Stream.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/Stream.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/Stream.java
diff --git a/src/main/java/com/skyflow/generated/rest/core/Suppliers.java b/v2/src/main/java/com/skyflow/generated/rest/core/Suppliers.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/core/Suppliers.java
rename to v2/src/main/java/com/skyflow/generated/rest/core/Suppliers.java
diff --git a/src/main/java/com/skyflow/generated/rest/errors/BadRequestError.java b/v2/src/main/java/com/skyflow/generated/rest/errors/BadRequestError.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/errors/BadRequestError.java
rename to v2/src/main/java/com/skyflow/generated/rest/errors/BadRequestError.java
index c8d4bb99..80ae5e7c 100644
--- a/src/main/java/com/skyflow/generated/rest/errors/BadRequestError.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/errors/BadRequestError.java
@@ -25,7 +25,7 @@ public BadRequestError(Object body, Response rawResponse) {
/**
* @return the body
*/
- @java.lang.Override
+ @Override
public Object body() {
return this.body;
}
diff --git a/src/main/java/com/skyflow/generated/rest/errors/InternalServerError.java b/v2/src/main/java/com/skyflow/generated/rest/errors/InternalServerError.java
similarity index 97%
rename from src/main/java/com/skyflow/generated/rest/errors/InternalServerError.java
rename to v2/src/main/java/com/skyflow/generated/rest/errors/InternalServerError.java
index d29f2b82..ffeed9d7 100644
--- a/src/main/java/com/skyflow/generated/rest/errors/InternalServerError.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/errors/InternalServerError.java
@@ -26,7 +26,7 @@ public InternalServerError(ErrorResponse body, Response rawResponse) {
/**
* @return the body
*/
- @java.lang.Override
+ @Override
public ErrorResponse body() {
return this.body;
}
diff --git a/src/main/java/com/skyflow/generated/rest/errors/NotFoundError.java b/v2/src/main/java/com/skyflow/generated/rest/errors/NotFoundError.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/errors/NotFoundError.java
rename to v2/src/main/java/com/skyflow/generated/rest/errors/NotFoundError.java
index efa94aad..1d0a6ad0 100644
--- a/src/main/java/com/skyflow/generated/rest/errors/NotFoundError.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/errors/NotFoundError.java
@@ -25,7 +25,7 @@ public NotFoundError(Object body, Response rawResponse) {
/**
* @return the body
*/
- @java.lang.Override
+ @Override
public Object body() {
return this.body;
}
diff --git a/src/main/java/com/skyflow/generated/rest/errors/UnauthorizedError.java b/v2/src/main/java/com/skyflow/generated/rest/errors/UnauthorizedError.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/errors/UnauthorizedError.java
rename to v2/src/main/java/com/skyflow/generated/rest/errors/UnauthorizedError.java
index 3b6d6ae1..3bc254bc 100644
--- a/src/main/java/com/skyflow/generated/rest/errors/UnauthorizedError.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/errors/UnauthorizedError.java
@@ -25,7 +25,7 @@ public UnauthorizedError(Object body, Response rawResponse) {
/**
* @return the body
*/
- @java.lang.Override
+ @Override
public Object body() {
return this.body;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncAuditClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncAuditClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/AsyncAuditClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncAuditClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncRawAuditClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncRawAuditClient.java
similarity index 95%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/AsyncRawAuditClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncRawAuditClient.java
index 875ca259..e1516eaf 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncRawAuditClient.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/AsyncRawAuditClient.java
@@ -4,27 +4,15 @@
package com.skyflow.generated.rest.resources.audit;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.skyflow.generated.rest.core.ApiClientApiException;
-import com.skyflow.generated.rest.core.ApiClientException;
-import com.skyflow.generated.rest.core.ApiClientHttpResponse;
-import com.skyflow.generated.rest.core.ClientOptions;
-import com.skyflow.generated.rest.core.ObjectMappers;
-import com.skyflow.generated.rest.core.QueryStringMapper;
-import com.skyflow.generated.rest.core.RequestOptions;
+import com.skyflow.generated.rest.core.*;
import com.skyflow.generated.rest.errors.NotFoundError;
import com.skyflow.generated.rest.resources.audit.requests.AuditServiceListAuditEventsRequest;
import com.skyflow.generated.rest.types.V1AuditResponse;
+import okhttp3.*;
+import org.jetbrains.annotations.NotNull;
+
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Headers;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import org.jetbrains.annotations.NotNull;
public class AsyncRawAuditClient {
protected final ClientOptions clientOptions;
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/AuditClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/AuditClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/AuditClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/AuditClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/RawAuditClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/RawAuditClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/RawAuditClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/RawAuditClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/requests/AuditServiceListAuditEventsRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/requests/AuditServiceListAuditEventsRequest.java
similarity index 97%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/requests/AuditServiceListAuditEventsRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/requests/AuditServiceListAuditEventsRequest.java
index 3da04589..8b6686e4 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/requests/AuditServiceListAuditEventsRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/requests/AuditServiceListAuditEventsRequest.java
@@ -430,7 +430,7 @@ public Optional getOffset() {
return offset;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof AuditServiceListAuditEventsRequest
@@ -478,7 +478,7 @@ private boolean equalTo(AuditServiceListAuditEventsRequest other) {
&& offset.equals(other.offset);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(
this.filterOpsContextChangeId,
@@ -516,7 +516,7 @@ public int hashCode() {
this.offset);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
@@ -848,7 +848,7 @@ public static final class Builder implements FilterOpsAccountIdStage, _FinalStag
private Builder() {}
- @java.lang.Override
+ @Override
public Builder from(AuditServiceListAuditEventsRequest other) {
filterOpsContextChangeId(other.getFilterOpsContextChangeId());
filterOpsContextRequestId(other.getFilterOpsContextRequestId());
@@ -890,7 +890,7 @@ public Builder from(AuditServiceListAuditEventsRequest other) {
* Resources with the specified account ID.Resources with the specified account ID.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("filterOps.accountID")
public _FinalStage filterOpsAccountId(@NotNull String filterOpsAccountId) {
this.filterOpsAccountId = Objects.requireNonNull(filterOpsAccountId, "filterOpsAccountId must not be null");
@@ -901,7 +901,7 @@ public _FinalStage filterOpsAccountId(@NotNull String filterOpsAccountId) {
* Record position at which to start returning results.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage offset(Long offset) {
this.offset = Optional.ofNullable(offset);
return this;
@@ -910,7 +910,7 @@ public _FinalStage offset(Long offset) {
/**
* Record position at which to start returning results.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "offset", nulls = Nulls.SKIP)
public _FinalStage offset(Optional offset) {
this.offset = offset;
@@ -921,7 +921,7 @@ public _FinalStage offset(Optional offset) {
* Number of results to return.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage limit(Long limit) {
this.limit = Optional.ofNullable(limit);
return this;
@@ -930,7 +930,7 @@ public _FinalStage limit(Long limit) {
/**
* Number of results to return.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "limit", nulls = Nulls.SKIP)
public _FinalStage limit(Optional limit) {
this.limit = limit;
@@ -941,7 +941,7 @@ public _FinalStage limit(Optional limit) {
* Change ID provided in the previous audit response's nextOps attribute. An alternate way to manage response pagination. Can't be used with sortOps or offset. For the first request in a series of audit requests, leave blank.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage afterOpsChangeId(String afterOpsChangeId) {
this.afterOpsChangeId = Optional.ofNullable(afterOpsChangeId);
return this;
@@ -950,7 +950,7 @@ public _FinalStage afterOpsChangeId(String afterOpsChangeId) {
/**
* Change ID provided in the previous audit response's nextOps attribute. An alternate way to manage response pagination. Can't be used with sortOps or offset. For the first request in a series of audit requests, leave blank.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "afterOps.changeID", nulls = Nulls.SKIP)
public _FinalStage afterOpsChangeId(Optional afterOpsChangeId) {
this.afterOpsChangeId = afterOpsChangeId;
@@ -961,7 +961,7 @@ public _FinalStage afterOpsChangeId(Optional afterOpsChangeId) {
* Timestamp provided in the previous audit response's nextOps attribute. An alternate way to manage response pagination. Can't be used with sortOps or offset. For the first request in a series of audit requests, leave blank.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage afterOpsTimestamp(String afterOpsTimestamp) {
this.afterOpsTimestamp = Optional.ofNullable(afterOpsTimestamp);
return this;
@@ -970,7 +970,7 @@ public _FinalStage afterOpsTimestamp(String afterOpsTimestamp) {
/**
* Timestamp provided in the previous audit response's nextOps attribute. An alternate way to manage response pagination. Can't be used with sortOps or offset. For the first request in a series of audit requests, leave blank.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "afterOps.timestamp", nulls = Nulls.SKIP)
public _FinalStage afterOpsTimestamp(Optional afterOpsTimestamp) {
this.afterOpsTimestamp = afterOpsTimestamp;
@@ -981,7 +981,7 @@ public _FinalStage afterOpsTimestamp(Optional afterOpsTimestamp) {
* Ascending or descending ordering of results.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage sortOpsOrderBy(AuditServiceListAuditEventsRequestSortOpsOrderBy sortOpsOrderBy) {
this.sortOpsOrderBy = Optional.ofNullable(sortOpsOrderBy);
return this;
@@ -990,7 +990,7 @@ public _FinalStage sortOpsOrderBy(AuditServiceListAuditEventsRequestSortOpsOrder
/**
* Ascending or descending ordering of results.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "sortOps.orderBy", nulls = Nulls.SKIP)
public _FinalStage sortOpsOrderBy(Optional sortOpsOrderBy) {
this.sortOpsOrderBy = sortOpsOrderBy;
@@ -1001,7 +1001,7 @@ public _FinalStage sortOpsOrderBy(OptionalFully-qualified field by which to sort results. Field names should be in camel case (for example, "capitalization.camelCase").
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage sortOpsSortBy(String sortOpsSortBy) {
this.sortOpsSortBy = Optional.ofNullable(sortOpsSortBy);
return this;
@@ -1010,7 +1010,7 @@ public _FinalStage sortOpsSortBy(String sortOpsSortBy) {
/**
* Fully-qualified field by which to sort results. Field names should be in camel case (for example, "capitalization.camelCase").
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "sortOps.sortBy", nulls = Nulls.SKIP)
public _FinalStage sortOpsSortBy(Optional sortOpsSortBy) {
this.sortOpsSortBy = sortOpsSortBy;
@@ -1021,7 +1021,7 @@ public _FinalStage sortOpsSortBy(Optional sortOpsSortBy) {
* HTTP URI of the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsHttpUri(String filterOpsHttpUri) {
this.filterOpsHttpUri = Optional.ofNullable(filterOpsHttpUri);
return this;
@@ -1030,7 +1030,7 @@ public _FinalStage filterOpsHttpUri(String filterOpsHttpUri) {
/**
* HTTP URI of the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.httpURI", nulls = Nulls.SKIP)
public _FinalStage filterOpsHttpUri(Optional filterOpsHttpUri) {
this.filterOpsHttpUri = filterOpsHttpUri;
@@ -1041,7 +1041,7 @@ public _FinalStage filterOpsHttpUri(Optional filterOpsHttpUri) {
* HTTP method of the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsHttpMethod(String filterOpsHttpMethod) {
this.filterOpsHttpMethod = Optional.ofNullable(filterOpsHttpMethod);
return this;
@@ -1050,7 +1050,7 @@ public _FinalStage filterOpsHttpMethod(String filterOpsHttpMethod) {
/**
* HTTP method of the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.httpMethod", nulls = Nulls.SKIP)
public _FinalStage filterOpsHttpMethod(Optional filterOpsHttpMethod) {
this.filterOpsHttpMethod = filterOpsHttpMethod;
@@ -1061,7 +1061,7 @@ public _FinalStage filterOpsHttpMethod(Optional filterOpsHttpMethod) {
* Response message of the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsResponseMessage(String filterOpsResponseMessage) {
this.filterOpsResponseMessage = Optional.ofNullable(filterOpsResponseMessage);
return this;
@@ -1070,7 +1070,7 @@ public _FinalStage filterOpsResponseMessage(String filterOpsResponseMessage) {
/**
* Response message of the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.responseMessage", nulls = Nulls.SKIP)
public _FinalStage filterOpsResponseMessage(Optional filterOpsResponseMessage) {
this.filterOpsResponseMessage = filterOpsResponseMessage;
@@ -1081,7 +1081,7 @@ public _FinalStage filterOpsResponseMessage(Optional filterOpsResponseMe
* Name of the API called in the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsApiName(String filterOpsApiName) {
this.filterOpsApiName = Optional.ofNullable(filterOpsApiName);
return this;
@@ -1090,7 +1090,7 @@ public _FinalStage filterOpsApiName(String filterOpsApiName) {
/**
* Name of the API called in the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.apiName", nulls = Nulls.SKIP)
public _FinalStage filterOpsApiName(Optional filterOpsApiName) {
this.filterOpsApiName = filterOpsApiName;
@@ -1101,7 +1101,7 @@ public _FinalStage filterOpsApiName(Optional filterOpsApiName) {
* End timestamp for the query, in SQL format.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsEndTime(String filterOpsEndTime) {
this.filterOpsEndTime = Optional.ofNullable(filterOpsEndTime);
return this;
@@ -1110,7 +1110,7 @@ public _FinalStage filterOpsEndTime(String filterOpsEndTime) {
/**
* End timestamp for the query, in SQL format.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.endTime", nulls = Nulls.SKIP)
public _FinalStage filterOpsEndTime(Optional filterOpsEndTime) {
this.filterOpsEndTime = filterOpsEndTime;
@@ -1121,7 +1121,7 @@ public _FinalStage filterOpsEndTime(Optional filterOpsEndTime) {
* Start timestamp for the query, in SQL format.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsStartTime(String filterOpsStartTime) {
this.filterOpsStartTime = Optional.ofNullable(filterOpsStartTime);
return this;
@@ -1130,7 +1130,7 @@ public _FinalStage filterOpsStartTime(String filterOpsStartTime) {
/**
* Start timestamp for the query, in SQL format.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.startTime", nulls = Nulls.SKIP)
public _FinalStage filterOpsStartTime(Optional filterOpsStartTime) {
this.filterOpsStartTime = filterOpsStartTime;
@@ -1141,7 +1141,7 @@ public _FinalStage filterOpsStartTime(Optional filterOpsStartTime) {
* HTTP response code of the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsResponseCode(Integer filterOpsResponseCode) {
this.filterOpsResponseCode = Optional.ofNullable(filterOpsResponseCode);
return this;
@@ -1150,7 +1150,7 @@ public _FinalStage filterOpsResponseCode(Integer filterOpsResponseCode) {
/**
* HTTP response code of the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.responseCode", nulls = Nulls.SKIP)
public _FinalStage filterOpsResponseCode(Optional filterOpsResponseCode) {
this.filterOpsResponseCode = filterOpsResponseCode;
@@ -1161,7 +1161,7 @@ public _FinalStage filterOpsResponseCode(Optional filterOpsResponseCode
* Events with associated tags. If an event matches at least one tag, the event is returned. Comma-separated list. For example, "login, get".
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsTags(String filterOpsTags) {
this.filterOpsTags = Optional.ofNullable(filterOpsTags);
return this;
@@ -1170,7 +1170,7 @@ public _FinalStage filterOpsTags(String filterOpsTags) {
/**
* Events with associated tags. If an event matches at least one tag, the event is returned. Comma-separated list. For example, "login, get".
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.tags", nulls = Nulls.SKIP)
public _FinalStage filterOpsTags(Optional filterOpsTags) {
this.filterOpsTags = filterOpsTags;
@@ -1181,7 +1181,7 @@ public _FinalStage filterOpsTags(Optional filterOpsTags) {
* Resources with the specified type.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsResourceType(
AuditServiceListAuditEventsRequestFilterOpsResourceType filterOpsResourceType) {
this.filterOpsResourceType = Optional.ofNullable(filterOpsResourceType);
@@ -1191,7 +1191,7 @@ public _FinalStage filterOpsResourceType(
/**
* Resources with the specified type.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.resourceType", nulls = Nulls.SKIP)
public _FinalStage filterOpsResourceType(
Optional filterOpsResourceType) {
@@ -1203,7 +1203,7 @@ public _FinalStage filterOpsResourceType(
* Events with the specified action type.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsActionType(
AuditServiceListAuditEventsRequestFilterOpsActionType filterOpsActionType) {
this.filterOpsActionType = Optional.ofNullable(filterOpsActionType);
@@ -1213,7 +1213,7 @@ public _FinalStage filterOpsActionType(
/**
* Events with the specified action type.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.actionType", nulls = Nulls.SKIP)
public _FinalStage filterOpsActionType(
Optional filterOpsActionType) {
@@ -1225,7 +1225,7 @@ public _FinalStage filterOpsActionType(
* Resources with a specified ID. If a resource matches at least one ID, the associated event is returned. Format is a comma-separated list of "<resourceType>/<resourceID>". For example, "VAULT/12345, USER/67890".
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsResourceIDs(String filterOpsResourceIDs) {
this.filterOpsResourceIDs = Optional.ofNullable(filterOpsResourceIDs);
return this;
@@ -1234,7 +1234,7 @@ public _FinalStage filterOpsResourceIDs(String filterOpsResourceIDs) {
/**
* Resources with a specified ID. If a resource matches at least one ID, the associated event is returned. Format is a comma-separated list of "<resourceType>/<resourceID>". For example, "VAULT/12345, USER/67890".
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.resourceIDs", nulls = Nulls.SKIP)
public _FinalStage filterOpsResourceIDs(Optional filterOpsResourceIDs) {
this.filterOpsResourceIDs = filterOpsResourceIDs;
@@ -1245,7 +1245,7 @@ public _FinalStage filterOpsResourceIDs(Optional filterOpsResourceIDs) {
* Resources with the specified vault ID.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsVaultId(String filterOpsVaultId) {
this.filterOpsVaultId = Optional.ofNullable(filterOpsVaultId);
return this;
@@ -1254,7 +1254,7 @@ public _FinalStage filterOpsVaultId(String filterOpsVaultId) {
/**
* Resources with the specified vault ID.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.vaultID", nulls = Nulls.SKIP)
public _FinalStage filterOpsVaultId(Optional filterOpsVaultId) {
this.filterOpsVaultId = filterOpsVaultId;
@@ -1265,7 +1265,7 @@ public _FinalStage filterOpsVaultId(Optional filterOpsVaultId) {
* Resources with the specified workspace ID.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsWorkspaceId(String filterOpsWorkspaceId) {
this.filterOpsWorkspaceId = Optional.ofNullable(filterOpsWorkspaceId);
return this;
@@ -1274,7 +1274,7 @@ public _FinalStage filterOpsWorkspaceId(String filterOpsWorkspaceId) {
/**
* Resources with the specified workspace ID.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.workspaceID", nulls = Nulls.SKIP)
public _FinalStage filterOpsWorkspaceId(Optional filterOpsWorkspaceId) {
this.filterOpsWorkspaceId = filterOpsWorkspaceId;
@@ -1285,7 +1285,7 @@ public _FinalStage filterOpsWorkspaceId(Optional filterOpsWorkspaceId) {
* Resources with the specified parent account ID.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsParentAccountId(String filterOpsParentAccountId) {
this.filterOpsParentAccountId = Optional.ofNullable(filterOpsParentAccountId);
return this;
@@ -1294,7 +1294,7 @@ public _FinalStage filterOpsParentAccountId(String filterOpsParentAccountId) {
/**
* Resources with the specified parent account ID.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.parentAccountID", nulls = Nulls.SKIP)
public _FinalStage filterOpsParentAccountId(Optional filterOpsParentAccountId) {
this.filterOpsParentAccountId = filterOpsParentAccountId;
@@ -1305,7 +1305,7 @@ public _FinalStage filterOpsParentAccountId(Optional filterOpsParentAcco
* Embedded User Context.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextBearerTokenContextId(String filterOpsContextBearerTokenContextId) {
this.filterOpsContextBearerTokenContextId = Optional.ofNullable(filterOpsContextBearerTokenContextId);
return this;
@@ -1314,7 +1314,7 @@ public _FinalStage filterOpsContextBearerTokenContextId(String filterOpsContextB
/**
* Embedded User Context.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.bearerTokenContextID", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextBearerTokenContextId(Optional filterOpsContextBearerTokenContextId) {
this.filterOpsContextBearerTokenContextId = filterOpsContextBearerTokenContextId;
@@ -1325,7 +1325,7 @@ public _FinalStage filterOpsContextBearerTokenContextId(Optional filterO
* ID of the JWT token.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextJwtId(String filterOpsContextJwtId) {
this.filterOpsContextJwtId = Optional.ofNullable(filterOpsContextJwtId);
return this;
@@ -1334,7 +1334,7 @@ public _FinalStage filterOpsContextJwtId(String filterOpsContextJwtId) {
/**
* ID of the JWT token.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.jwtID", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextJwtId(Optional filterOpsContextJwtId) {
this.filterOpsContextJwtId = filterOpsContextJwtId;
@@ -1345,7 +1345,7 @@ public _FinalStage filterOpsContextJwtId(Optional filterOpsContextJwtId)
* Authentication mode the actor used.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextAuthMode(
AuditServiceListAuditEventsRequestFilterOpsContextAuthMode filterOpsContextAuthMode) {
this.filterOpsContextAuthMode = Optional.ofNullable(filterOpsContextAuthMode);
@@ -1355,7 +1355,7 @@ public _FinalStage filterOpsContextAuthMode(
/**
* Authentication mode the actor used.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.authMode", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextAuthMode(
Optional filterOpsContextAuthMode) {
@@ -1367,7 +1367,7 @@ public _FinalStage filterOpsContextAuthMode(
* HTTP Origin request header (including scheme, hostname, and port) of the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextOrigin(String filterOpsContextOrigin) {
this.filterOpsContextOrigin = Optional.ofNullable(filterOpsContextOrigin);
return this;
@@ -1376,7 +1376,7 @@ public _FinalStage filterOpsContextOrigin(String filterOpsContextOrigin) {
/**
* HTTP Origin request header (including scheme, hostname, and port) of the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.origin", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextOrigin(Optional filterOpsContextOrigin) {
this.filterOpsContextOrigin = filterOpsContextOrigin;
@@ -1387,7 +1387,7 @@ public _FinalStage filterOpsContextOrigin(Optional filterOpsContextOrigi
* IP Address of the client that made the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextIpAddress(String filterOpsContextIpAddress) {
this.filterOpsContextIpAddress = Optional.ofNullable(filterOpsContextIpAddress);
return this;
@@ -1396,7 +1396,7 @@ public _FinalStage filterOpsContextIpAddress(String filterOpsContextIpAddress) {
/**
* IP Address of the client that made the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.ipAddress", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextIpAddress(Optional filterOpsContextIpAddress) {
this.filterOpsContextIpAddress = filterOpsContextIpAddress;
@@ -1407,7 +1407,7 @@ public _FinalStage filterOpsContextIpAddress(Optional filterOpsContextIp
* Type of access for the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextAccessType(
AuditServiceListAuditEventsRequestFilterOpsContextAccessType filterOpsContextAccessType) {
this.filterOpsContextAccessType = Optional.ofNullable(filterOpsContextAccessType);
@@ -1417,7 +1417,7 @@ public _FinalStage filterOpsContextAccessType(
/**
* Type of access for the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.accessType", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextAccessType(
Optional filterOpsContextAccessType) {
@@ -1429,7 +1429,7 @@ public _FinalStage filterOpsContextAccessType(
* Type of member who sent the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextActorType(
AuditServiceListAuditEventsRequestFilterOpsContextActorType filterOpsContextActorType) {
this.filterOpsContextActorType = Optional.ofNullable(filterOpsContextActorType);
@@ -1439,7 +1439,7 @@ public _FinalStage filterOpsContextActorType(
/**
* Type of member who sent the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.actorType", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextActorType(
Optional filterOpsContextActorType) {
@@ -1451,7 +1451,7 @@ public _FinalStage filterOpsContextActorType(
* Member who sent the request. Depending on actorType, this may be a user ID or a service account ID.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextActor(String filterOpsContextActor) {
this.filterOpsContextActor = Optional.ofNullable(filterOpsContextActor);
return this;
@@ -1460,7 +1460,7 @@ public _FinalStage filterOpsContextActor(String filterOpsContextActor) {
/**
* Member who sent the request. Depending on actorType, this may be a user ID or a service account ID.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.actor", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextActor(Optional filterOpsContextActor) {
this.filterOpsContextActor = filterOpsContextActor;
@@ -1471,7 +1471,7 @@ public _FinalStage filterOpsContextActor(Optional filterOpsContextActor)
* ID for the session in which the request was sent.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextSessionId(String filterOpsContextSessionId) {
this.filterOpsContextSessionId = Optional.ofNullable(filterOpsContextSessionId);
return this;
@@ -1480,7 +1480,7 @@ public _FinalStage filterOpsContextSessionId(String filterOpsContextSessionId) {
/**
* ID for the session in which the request was sent.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.sessionID", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextSessionId(Optional filterOpsContextSessionId) {
this.filterOpsContextSessionId = filterOpsContextSessionId;
@@ -1491,7 +1491,7 @@ public _FinalStage filterOpsContextSessionId(Optional filterOpsContextSe
* ID for the request set by the service that received the request.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextTraceId(String filterOpsContextTraceId) {
this.filterOpsContextTraceId = Optional.ofNullable(filterOpsContextTraceId);
return this;
@@ -1500,7 +1500,7 @@ public _FinalStage filterOpsContextTraceId(String filterOpsContextTraceId) {
/**
* ID for the request set by the service that received the request.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.traceID", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextTraceId(Optional filterOpsContextTraceId) {
this.filterOpsContextTraceId = filterOpsContextTraceId;
@@ -1511,7 +1511,7 @@ public _FinalStage filterOpsContextTraceId(Optional filterOpsContextTrac
* ID for the request that caused the event.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextRequestId(String filterOpsContextRequestId) {
this.filterOpsContextRequestId = Optional.ofNullable(filterOpsContextRequestId);
return this;
@@ -1520,7 +1520,7 @@ public _FinalStage filterOpsContextRequestId(String filterOpsContextRequestId) {
/**
* ID for the request that caused the event.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.requestID", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextRequestId(Optional filterOpsContextRequestId) {
this.filterOpsContextRequestId = filterOpsContextRequestId;
@@ -1531,7 +1531,7 @@ public _FinalStage filterOpsContextRequestId(Optional filterOpsContextRe
* ID for the audit event.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage filterOpsContextChangeId(String filterOpsContextChangeId) {
this.filterOpsContextChangeId = Optional.ofNullable(filterOpsContextChangeId);
return this;
@@ -1540,14 +1540,14 @@ public _FinalStage filterOpsContextChangeId(String filterOpsContextChangeId) {
/**
* ID for the audit event.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "filterOps.context.changeID", nulls = Nulls.SKIP)
public _FinalStage filterOpsContextChangeId(Optional filterOpsContextChangeId) {
this.filterOpsContextChangeId = filterOpsContextChangeId;
return this;
}
- @java.lang.Override
+ @Override
public AuditServiceListAuditEventsRequest build() {
return new AuditServiceListAuditEventsRequest(
filterOpsContextChangeId,
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsActionType.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsActionType.java
similarity index 97%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsActionType.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsActionType.java
index a9fb6d44..9611f8ab 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsActionType.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsActionType.java
@@ -49,7 +49,7 @@ public enum AuditServiceListAuditEventsRequestFilterOpsActionType {
}
@JsonValue
- @java.lang.Override
+ @Override
public String toString() {
return this.value;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAccessType.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAccessType.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAccessType.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAccessType.java
index 0b082305..44ac80d9 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAccessType.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAccessType.java
@@ -21,7 +21,7 @@ public enum AuditServiceListAuditEventsRequestFilterOpsContextAccessType {
}
@JsonValue
- @java.lang.Override
+ @Override
public String toString() {
return this.value;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextActorType.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextActorType.java
similarity index 95%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextActorType.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextActorType.java
index 76a357f4..1948ea9c 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextActorType.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextActorType.java
@@ -19,7 +19,7 @@ public enum AuditServiceListAuditEventsRequestFilterOpsContextActorType {
}
@JsonValue
- @java.lang.Override
+ @Override
public String toString() {
return this.value;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAuthMode.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAuthMode.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAuthMode.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAuthMode.java
index cfca2e35..82c375aa 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAuthMode.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsContextAuthMode.java
@@ -21,7 +21,7 @@ public enum AuditServiceListAuditEventsRequestFilterOpsContextAuthMode {
}
@JsonValue
- @java.lang.Override
+ @Override
public String toString() {
return this.value;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsResourceType.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsResourceType.java
similarity index 98%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsResourceType.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsResourceType.java
index f5d2eafe..864213ec 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsResourceType.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestFilterOpsResourceType.java
@@ -73,7 +73,7 @@ public enum AuditServiceListAuditEventsRequestFilterOpsResourceType {
}
@JsonValue
- @java.lang.Override
+ @Override
public String toString() {
return this.value;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestSortOpsOrderBy.java b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestSortOpsOrderBy.java
similarity index 95%
rename from src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestSortOpsOrderBy.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestSortOpsOrderBy.java
index 51fc2715..fe3f928e 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestSortOpsOrderBy.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/audit/types/AuditServiceListAuditEventsRequestSortOpsOrderBy.java
@@ -17,7 +17,7 @@ public enum AuditServiceListAuditEventsRequestSortOpsOrderBy {
}
@JsonValue
- @java.lang.Override
+ @Override
public String toString() {
return this.value;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncAuthenticationClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncAuthenticationClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncAuthenticationClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncAuthenticationClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncRawAuthenticationClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncRawAuthenticationClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncRawAuthenticationClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/authentication/AsyncRawAuthenticationClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/authentication/AuthenticationClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/authentication/AuthenticationClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/authentication/AuthenticationClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/authentication/AuthenticationClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/authentication/RawAuthenticationClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/authentication/RawAuthenticationClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/authentication/RawAuthenticationClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/authentication/RawAuthenticationClient.java
diff --git a/v2/src/main/java/com/skyflow/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java
new file mode 100644
index 00000000..182952bc
--- /dev/null
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/authentication/requests/V1GetAuthTokenRequest.java
@@ -0,0 +1,335 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.rest.resources.authentication.requests;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.skyflow.generated.rest.core.ObjectMappers;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
+
+@JsonInclude(JsonInclude.Include.NON_ABSENT)
+@JsonDeserialize(builder = V1GetAuthTokenRequest.Builder.class)
+public final class V1GetAuthTokenRequest {
+ private final String grantType;
+
+ private final String assertion;
+
+ private final Optional subjectToken;
+
+ private final Optional subjectTokenType;
+
+ private final Optional requestedTokenUse;
+
+ private final Optional scope;
+
+ private final Map additionalProperties;
+
+ private V1GetAuthTokenRequest(
+ String grantType,
+ String assertion,
+ Optional subjectToken,
+ Optional subjectTokenType,
+ Optional requestedTokenUse,
+ Optional scope,
+ Map additionalProperties) {
+ this.grantType = grantType;
+ this.assertion = assertion;
+ this.subjectToken = subjectToken;
+ this.subjectTokenType = subjectTokenType;
+ this.requestedTokenUse = requestedTokenUse;
+ this.scope = scope;
+ this.additionalProperties = additionalProperties;
+ }
+
+ /**
+ * @return Grant type of the request. Set this to urn:ietf:params:oauth:grant-type:jwt-bearer.
+ */
+ @JsonProperty("grant_type")
+ public String getGrantType() {
+ return grantType;
+ }
+
+ /**
+ * @return User-signed JWT token that contains the following fields: <br/> <ul><li><code>iss</code>: Issuer of the JWT.</li><li><code>key</code>: Unique identifier for the key.</li><li><code>aud</code>: Recipient the JWT is intended for.</li><li><code>exp</code>: Time the JWT expires.</li><li><code>sub</code>: Subject of the JWT.</li><li><code>ctx</code>: (Optional) Value for <a href='/context-aware-overview/'>Context-aware authorization</a>.</li></ul>
+ */
+ @JsonProperty("assertion")
+ public String getAssertion() {
+ return assertion;
+ }
+
+ /**
+ * @return Subject token.
+ */
+ @JsonProperty("subject_token")
+ public Optional getSubjectToken() {
+ return subjectToken;
+ }
+
+ /**
+ * @return Subject token type.
+ */
+ @JsonProperty("subject_token_type")
+ public Optional getSubjectTokenType() {
+ return subjectTokenType;
+ }
+
+ /**
+ * @return Token use type. Either delegation or impersonation.
+ */
+ @JsonProperty("requested_token_use")
+ public Optional getRequestedTokenUse() {
+ return requestedTokenUse;
+ }
+
+ /**
+ * @return Subset of available <a href='#Roles'>roles</a> to associate with the requested token. Uses the format "role:<roleID1> role:<roleID2>".
+ */
+ @JsonProperty("scope")
+ public Optional getScope() {
+ return scope;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) return true;
+ return other instanceof V1GetAuthTokenRequest && equalTo((V1GetAuthTokenRequest) other);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ private boolean equalTo(V1GetAuthTokenRequest other) {
+ return grantType.equals(other.grantType)
+ && assertion.equals(other.assertion)
+ && subjectToken.equals(other.subjectToken)
+ && subjectTokenType.equals(other.subjectTokenType)
+ && requestedTokenUse.equals(other.requestedTokenUse)
+ && scope.equals(other.scope);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(
+ this.grantType,
+ this.assertion,
+ this.subjectToken,
+ this.subjectTokenType,
+ this.requestedTokenUse,
+ this.scope);
+ }
+
+ @Override
+ public String toString() {
+ return ObjectMappers.stringify(this);
+ }
+
+ public static GrantTypeStage builder() {
+ return new Builder();
+ }
+
+ public interface GrantTypeStage {
+ /**
+ * Grant type of the request. Set this to `urn:ietf:params:oauth:grant-type:jwt-bearer`.
+ */
+ AssertionStage grantType(@NotNull String grantType);
+
+ Builder from(V1GetAuthTokenRequest other);
+ }
+
+ public interface AssertionStage {
+ /**
+ * User-signed JWT token that contains the following fields:
iss: Issuer of the JWT.key: Unique identifier for the key.aud: Recipient the JWT is intended for.exp: Time the JWT expires.sub: Subject of the JWT.ctx: (Optional) Value for Context-aware authorization.
+ */
+ _FinalStage assertion(@NotNull String assertion);
+ }
+
+ public interface _FinalStage {
+ V1GetAuthTokenRequest build();
+
+ /**
+ * Subject token.
+ */
+ _FinalStage subjectToken(Optional subjectToken);
+
+ _FinalStage subjectToken(String subjectToken);
+
+ /**
+ * Subject token type.
+ */
+ _FinalStage subjectTokenType(Optional subjectTokenType);
+
+ _FinalStage subjectTokenType(String subjectTokenType);
+
+ /**
+ * Token use type. Either delegation or impersonation.
+ */
+ _FinalStage requestedTokenUse(Optional requestedTokenUse);
+
+ _FinalStage requestedTokenUse(String requestedTokenUse);
+
+ /**
+ * Subset of available <a href='#Roles'>roles</a> to associate with the requested token. Uses the format "role:<roleID1> role:<roleID2>".
+ */
+ _FinalStage scope(Optional scope);
+
+ _FinalStage scope(String scope);
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static final class Builder implements GrantTypeStage, AssertionStage, _FinalStage {
+ private String grantType;
+
+ private String assertion;
+
+ private Optional scope = Optional.empty();
+
+ private Optional requestedTokenUse = Optional.empty();
+
+ private Optional subjectTokenType = Optional.empty();
+
+ private Optional subjectToken = Optional.empty();
+
+ @JsonAnySetter
+ private Map additionalProperties = new HashMap<>();
+
+ private Builder() {}
+
+ @Override
+ public Builder from(V1GetAuthTokenRequest other) {
+ grantType(other.getGrantType());
+ assertion(other.getAssertion());
+ subjectToken(other.getSubjectToken());
+ subjectTokenType(other.getSubjectTokenType());
+ requestedTokenUse(other.getRequestedTokenUse());
+ scope(other.getScope());
+ return this;
+ }
+
+ /**
+ * Grant type of the request. Set this to `urn:ietf:params:oauth:grant-type:jwt-bearer`.Grant type of the request. Set this to urn:ietf:params:oauth:grant-type:jwt-bearer.
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @Override
+ @JsonSetter("grant_type")
+ public AssertionStage grantType(@NotNull String grantType) {
+ this.grantType = Objects.requireNonNull(grantType, "grantType must not be null");
+ return this;
+ }
+
+ /**
+ * User-signed JWT token that contains the following fields:
iss: Issuer of the JWT.key: Unique identifier for the key.aud: Recipient the JWT is intended for.exp: Time the JWT expires.sub: Subject of the JWT.ctx: (Optional) Value for Context-aware authorization.
User-signed JWT token that contains the following fields: <br/> <ul><li><code>iss</code>: Issuer of the JWT.</li><li><code>key</code>: Unique identifier for the key.</li><li><code>aud</code>: Recipient the JWT is intended for.</li><li><code>exp</code>: Time the JWT expires.</li><li><code>sub</code>: Subject of the JWT.</li><li><code>ctx</code>: (Optional) Value for <a href='/context-aware-overview/'>Context-aware authorization</a>.</li></ul>
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @Override
+ @JsonSetter("assertion")
+ public _FinalStage assertion(@NotNull String assertion) {
+ this.assertion = Objects.requireNonNull(assertion, "assertion must not be null");
+ return this;
+ }
+
+ /**
+ * Subset of available <a href='#Roles'>roles</a> to associate with the requested token. Uses the format "role:<roleID1> role:<roleID2>".
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @Override
+ public _FinalStage scope(String scope) {
+ this.scope = Optional.ofNullable(scope);
+ return this;
+ }
+
+ /**
+ * Subset of available <a href='#Roles'>roles</a> to associate with the requested token. Uses the format "role:<roleID1> role:<roleID2>".
+ */
+ @Override
+ @JsonSetter(value = "scope", nulls = Nulls.SKIP)
+ public _FinalStage scope(Optional scope) {
+ this.scope = scope;
+ return this;
+ }
+
+ /**
+ * Token use type. Either delegation or impersonation.
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @Override
+ public _FinalStage requestedTokenUse(String requestedTokenUse) {
+ this.requestedTokenUse = Optional.ofNullable(requestedTokenUse);
+ return this;
+ }
+
+ /**
+ * Token use type. Either delegation or impersonation.
+ */
+ @Override
+ @JsonSetter(value = "requested_token_use", nulls = Nulls.SKIP)
+ public _FinalStage requestedTokenUse(Optional requestedTokenUse) {
+ this.requestedTokenUse = requestedTokenUse;
+ return this;
+ }
+
+ /**
+ * Subject token type.
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @Override
+ public _FinalStage subjectTokenType(String subjectTokenType) {
+ this.subjectTokenType = Optional.ofNullable(subjectTokenType);
+ return this;
+ }
+
+ /**
+ * Subject token type.
+ */
+ @Override
+ @JsonSetter(value = "subject_token_type", nulls = Nulls.SKIP)
+ public _FinalStage subjectTokenType(Optional subjectTokenType) {
+ this.subjectTokenType = subjectTokenType;
+ return this;
+ }
+
+ /**
+ * Subject token.
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @Override
+ public _FinalStage subjectToken(String subjectToken) {
+ this.subjectToken = Optional.ofNullable(subjectToken);
+ return this;
+ }
+
+ /**
+ * Subject token.
+ */
+ @Override
+ @JsonSetter(value = "subject_token", nulls = Nulls.SKIP)
+ public _FinalStage subjectToken(Optional subjectToken) {
+ this.subjectToken = subjectToken;
+ return this;
+ }
+
+ @Override
+ public V1GetAuthTokenRequest build() {
+ return new V1GetAuthTokenRequest(
+ grantType,
+ assertion,
+ subjectToken,
+ subjectTokenType,
+ requestedTokenUse,
+ scope,
+ additionalProperties);
+ }
+ }
+}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncBinLookupClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncBinLookupClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncBinLookupClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncBinLookupClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/AsyncRawBinLookupClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/binlookup/BinLookupClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/BinLookupClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/binlookup/BinLookupClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/BinLookupClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/binlookup/RawBinLookupClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/RawBinLookupClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/binlookup/RawBinLookupClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/RawBinLookupClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/binlookup/requests/V1BinListRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/requests/V1BinListRequest.java
similarity index 98%
rename from src/main/java/com/skyflow/generated/rest/resources/binlookup/requests/V1BinListRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/requests/V1BinListRequest.java
index d4a1c21b..af827e01 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/binlookup/requests/V1BinListRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/binlookup/requests/V1BinListRequest.java
@@ -74,7 +74,7 @@ public Optional getSkyflowId() {
return skyflowId;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof V1BinListRequest && equalTo((V1BinListRequest) other);
@@ -92,12 +92,12 @@ private boolean equalTo(V1BinListRequest other) {
&& skyflowId.equals(other.skyflowId);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(this.fields, this.bin, this.vaultSchemaConfig, this.skyflowId);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncDeprecatedClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncDeprecatedClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncDeprecatedClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncDeprecatedClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/AsyncRawDeprecatedClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/deprecated/DeprecatedClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/DeprecatedClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/deprecated/DeprecatedClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/DeprecatedClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/deprecated/RawDeprecatedClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/RawDeprecatedClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/deprecated/RawDeprecatedClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/RawDeprecatedClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectStatusRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectStatusRequest.java
similarity index 97%
rename from src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectStatusRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectStatusRequest.java
index 45997db3..b94cb3d3 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectStatusRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectStatusRequest.java
@@ -37,7 +37,7 @@ public Optional getVaultId() {
return vaultId;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof DetectServiceDetectStatusRequest && equalTo((DetectServiceDetectStatusRequest) other);
@@ -52,12 +52,12 @@ private boolean equalTo(DetectServiceDetectStatusRequest other) {
return vaultId.equals(other.vaultId);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(this.vaultId);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectTextRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectTextRequest.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectTextRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectTextRequest.java
index 3c4b4ea2..a8263338 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectTextRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/DetectServiceDetectTextRequest.java
@@ -156,7 +156,7 @@ public Optional getStoreEntities() {
return storeEntities;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof DetectServiceDetectTextRequest && equalTo((DetectServiceDetectTextRequest) other);
@@ -181,7 +181,7 @@ private boolean equalTo(DetectServiceDetectTextRequest other) {
&& storeEntities.equals(other.storeEntities);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(
this.text,
@@ -197,7 +197,7 @@ public int hashCode() {
this.storeEntities);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
@@ -309,7 +309,7 @@ public static final class Builder implements TextStage, VaultIdStage, _FinalStag
private Builder() {}
- @java.lang.Override
+ @Override
public Builder from(DetectServiceDetectTextRequest other) {
text(other.getText());
vaultId(other.getVaultId());
@@ -329,7 +329,7 @@ public Builder from(DetectServiceDetectTextRequest other) {
* Data to deidentify.Data to deidentify.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("text")
public VaultIdStage text(@NotNull String text) {
this.text = Objects.requireNonNull(text, "text must not be null");
@@ -340,7 +340,7 @@ public VaultIdStage text(@NotNull String text) {
* ID of the vault.ID of the vault.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("vault_id")
public _FinalStage vaultId(@NotNull String vaultId) {
this.vaultId = Objects.requireNonNull(vaultId, "vaultId must not be null");
@@ -351,7 +351,7 @@ public _FinalStage vaultId(@NotNull String vaultId) {
* Indicates whether entities should be stored in the vault.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage storeEntities(Boolean storeEntities) {
this.storeEntities = Optional.ofNullable(storeEntities);
return this;
@@ -360,33 +360,33 @@ public _FinalStage storeEntities(Boolean storeEntities) {
/**
* Indicates whether entities should be stored in the vault.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "store_entities", nulls = Nulls.SKIP)
public _FinalStage storeEntities(Optional storeEntities) {
this.storeEntities = storeEntities;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage advancedOptions(V1AdvancedOptions advancedOptions) {
this.advancedOptions = Optional.ofNullable(advancedOptions);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "advanced_options", nulls = Nulls.SKIP)
public _FinalStage advancedOptions(Optional advancedOptions) {
this.advancedOptions = advancedOptions;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage accuracy(DetectDataAccuracy accuracy) {
this.accuracy = Optional.ofNullable(accuracy);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "accuracy", nulls = Nulls.SKIP)
public _FinalStage accuracy(Optional accuracy) {
this.accuracy = accuracy;
@@ -397,7 +397,7 @@ public _FinalStage accuracy(Optional accuracy) {
* If true, returns the details for the detected entities.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage returnEntities(Boolean returnEntities) {
this.returnEntities = Optional.ofNullable(returnEntities);
return this;
@@ -406,7 +406,7 @@ public _FinalStage returnEntities(Boolean returnEntities) {
/**
* If true, returns the details for the detected entities.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "return_entities", nulls = Nulls.SKIP)
public _FinalStage returnEntities(Optional returnEntities) {
this.returnEntities = returnEntities;
@@ -417,7 +417,7 @@ public _FinalStage returnEntities(Optional returnEntities) {
* Regular expressions to always restrict. Strings matching these regular expressions are replaced with 'RESTRICTED'.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage restrictRegex(List restrictRegex) {
this.restrictRegex = Optional.ofNullable(restrictRegex);
return this;
@@ -426,7 +426,7 @@ public _FinalStage restrictRegex(List restrictRegex) {
/**
* Regular expressions to always restrict. Strings matching these regular expressions are replaced with 'RESTRICTED'.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_regex", nulls = Nulls.SKIP)
public _FinalStage restrictRegex(Optional> restrictRegex) {
this.restrictRegex = restrictRegex;
@@ -437,7 +437,7 @@ public _FinalStage restrictRegex(Optional> restrictRegex) {
* Regular expressions to ignore when detecting entities.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage allowRegex(List allowRegex) {
this.allowRegex = Optional.ofNullable(allowRegex);
return this;
@@ -446,20 +446,20 @@ public _FinalStage allowRegex(List allowRegex) {
/**
* Regular expressions to ignore when detecting entities.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "allow_regex", nulls = Nulls.SKIP)
public _FinalStage allowRegex(Optional> allowRegex) {
this.allowRegex = allowRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage deidentifyTokenFormat(DetectRequestDeidentifyOption deidentifyTokenFormat) {
this.deidentifyTokenFormat = Optional.ofNullable(deidentifyTokenFormat);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "deidentify_token_format", nulls = Nulls.SKIP)
public _FinalStage deidentifyTokenFormat(Optional deidentifyTokenFormat) {
this.deidentifyTokenFormat = deidentifyTokenFormat;
@@ -470,7 +470,7 @@ public _FinalStage deidentifyTokenFormat(Optional
* Entities to detect and deidentify.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage restrictEntityTypes(List restrictEntityTypes) {
this.restrictEntityTypes = Optional.ofNullable(restrictEntityTypes);
return this;
@@ -479,7 +479,7 @@ public _FinalStage restrictEntityTypes(List restrictEntityTy
/**
* Entities to detect and deidentify.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_entity_types", nulls = Nulls.SKIP)
public _FinalStage restrictEntityTypes(Optional> restrictEntityTypes) {
this.restrictEntityTypes = restrictEntityTypes;
@@ -490,7 +490,7 @@ public _FinalStage restrictEntityTypes(Optional> restri
* Will give a handle to delete the tokens generated during a specific interaction.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage sessionId(String sessionId) {
this.sessionId = Optional.ofNullable(sessionId);
return this;
@@ -499,14 +499,14 @@ public _FinalStage sessionId(String sessionId) {
/**
* Will give a handle to delete the tokens generated during a specific interaction.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "session_id", nulls = Nulls.SKIP)
public _FinalStage sessionId(Optional sessionId) {
this.sessionId = sessionId;
return this;
}
- @java.lang.Override
+ @Override
public DetectServiceDetectTextRequest build() {
return new DetectServiceDetectTextRequest(
text,
diff --git a/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/V1DetectFileRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/V1DetectFileRequest.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/V1DetectFileRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/V1DetectFileRequest.java
index 8bdee935..a460f3a1 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/V1DetectFileRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/deprecated/requests/V1DetectFileRequest.java
@@ -194,7 +194,7 @@ public Optional getDeidentifyTokenFormat() {
return deidentifyTokenFormat;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof V1DetectFileRequest && equalTo((V1DetectFileRequest) other);
@@ -223,7 +223,7 @@ private boolean equalTo(V1DetectFileRequest other) {
&& deidentifyTokenFormat.equals(other.deidentifyTokenFormat);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(
this.file,
@@ -243,7 +243,7 @@ public int hashCode() {
this.deidentifyTokenFormat);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
@@ -376,7 +376,7 @@ public static final class Builder implements FileStage, DataFormatStage, InputTy
private Builder() {}
- @java.lang.Override
+ @Override
public Builder from(V1DetectFileRequest other) {
file(other.getFile());
dataFormat(other.getDataFormat());
@@ -400,21 +400,21 @@ public Builder from(V1DetectFileRequest other) {
* Path of the file or base64-encoded data that has to be processed.Path of the file or base64-encoded data that has to be processed.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("file")
public DataFormatStage file(@NotNull String file) {
this.file = Objects.requireNonNull(file, "file must not be null");
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter("data_format")
public InputTypeStage dataFormat(@NotNull V1FileDataFormat dataFormat) {
this.dataFormat = Objects.requireNonNull(dataFormat, "dataFormat must not be null");
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter("input_type")
public VaultIdStage inputType(@NotNull DetectFileRequestDataType inputType) {
this.inputType = Objects.requireNonNull(inputType, "inputType must not be null");
@@ -425,85 +425,85 @@ public VaultIdStage inputType(@NotNull DetectFileRequestDataType inputType) {
* ID of the vault.ID of the vault.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("vault_id")
public _FinalStage vaultId(@NotNull String vaultId) {
this.vaultId = Objects.requireNonNull(vaultId, "vaultId must not be null");
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage deidentifyTokenFormat(DetectRequestDeidentifyOption deidentifyTokenFormat) {
this.deidentifyTokenFormat = Optional.ofNullable(deidentifyTokenFormat);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "deidentify_token_format", nulls = Nulls.SKIP)
public _FinalStage deidentifyTokenFormat(Optional deidentifyTokenFormat) {
this.deidentifyTokenFormat = deidentifyTokenFormat;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage advancedOptions(V1AdvancedOptions advancedOptions) {
this.advancedOptions = Optional.ofNullable(advancedOptions);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "advanced_options", nulls = Nulls.SKIP)
public _FinalStage advancedOptions(Optional advancedOptions) {
this.advancedOptions = advancedOptions;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage pdf(V1PdfConfig pdf) {
this.pdf = Optional.ofNullable(pdf);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "pdf", nulls = Nulls.SKIP)
public _FinalStage pdf(Optional pdf) {
this.pdf = pdf;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage image(V1ImageOptions image) {
this.image = Optional.ofNullable(image);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "image", nulls = Nulls.SKIP)
public _FinalStage image(Optional image) {
this.image = image;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage audio(V1AudioConfig audio) {
this.audio = Optional.ofNullable(audio);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "audio", nulls = Nulls.SKIP)
public _FinalStage audio(Optional audio) {
this.audio = audio;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage accuracy(DetectDataAccuracy accuracy) {
this.accuracy = Optional.ofNullable(accuracy);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "accuracy", nulls = Nulls.SKIP)
public _FinalStage accuracy(Optional accuracy) {
this.accuracy = accuracy;
@@ -514,7 +514,7 @@ public _FinalStage accuracy(Optional accuracy) {
* If true, returns the details for the detected entities.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage returnEntities(Boolean returnEntities) {
this.returnEntities = Optional.ofNullable(returnEntities);
return this;
@@ -523,7 +523,7 @@ public _FinalStage returnEntities(Boolean returnEntities) {
/**
* If true, returns the details for the detected entities.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "return_entities", nulls = Nulls.SKIP)
public _FinalStage returnEntities(Optional returnEntities) {
this.returnEntities = returnEntities;
@@ -534,7 +534,7 @@ public _FinalStage returnEntities(Optional returnEntities) {
* Regular expressions to always restrict. Strings matching these regular expressions are replaced with 'RESTRICTED'.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage restrictRegex(List restrictRegex) {
this.restrictRegex = Optional.ofNullable(restrictRegex);
return this;
@@ -543,7 +543,7 @@ public _FinalStage restrictRegex(List restrictRegex) {
/**
* Regular expressions to always restrict. Strings matching these regular expressions are replaced with 'RESTRICTED'.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_regex", nulls = Nulls.SKIP)
public _FinalStage restrictRegex(Optional> restrictRegex) {
this.restrictRegex = restrictRegex;
@@ -554,7 +554,7 @@ public _FinalStage restrictRegex(Optional> restrictRegex) {
* Regular expressions to ignore when detecting entities.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage allowRegex(List allowRegex) {
this.allowRegex = Optional.ofNullable(allowRegex);
return this;
@@ -563,7 +563,7 @@ public _FinalStage allowRegex(List allowRegex) {
/**
* Regular expressions to ignore when detecting entities.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "allow_regex", nulls = Nulls.SKIP)
public _FinalStage allowRegex(Optional> allowRegex) {
this.allowRegex = allowRegex;
@@ -574,7 +574,7 @@ public _FinalStage allowRegex(Optional> allowRegex) {
* Entities to detect and deidentify.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage restrictEntityTypes(List restrictEntityTypes) {
this.restrictEntityTypes = Optional.ofNullable(restrictEntityTypes);
return this;
@@ -583,7 +583,7 @@ public _FinalStage restrictEntityTypes(List restrictEntityTy
/**
* Entities to detect and deidentify.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_entity_types", nulls = Nulls.SKIP)
public _FinalStage restrictEntityTypes(Optional> restrictEntityTypes) {
this.restrictEntityTypes = restrictEntityTypes;
@@ -594,7 +594,7 @@ public _FinalStage restrictEntityTypes(Optional> restri
* Will give a handle to delete the tokens generated during a specific interaction.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage sessionId(String sessionId) {
this.sessionId = Optional.ofNullable(sessionId);
return this;
@@ -603,14 +603,14 @@ public _FinalStage sessionId(String sessionId) {
/**
* Will give a handle to delete the tokens generated during a specific interaction.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "session_id", nulls = Nulls.SKIP)
public _FinalStage sessionId(Optional sessionId) {
this.sessionId = sessionId;
return this;
}
- @java.lang.Override
+ @Override
public V1DetectFileRequest build() {
return new V1DetectFileRequest(
file,
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java
similarity index 100%
rename from src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyAudioRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyAudioRequest.java
similarity index 96%
rename from src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyAudioRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyAudioRequest.java
index 5f4929aa..181693c6 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyAudioRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyAudioRequest.java
@@ -172,7 +172,7 @@ public Optional getTransformations() {
return transformations;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof DeidentifyAudioRequest && equalTo((DeidentifyAudioRequest) other);
@@ -199,7 +199,7 @@ private boolean equalTo(DeidentifyAudioRequest other) {
&& transformations.equals(other.transformations);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(
this.vaultId,
@@ -217,7 +217,7 @@ public int hashCode() {
this.transformations);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
@@ -338,7 +338,7 @@ public static final class Builder implements VaultIdStage, FileStage, _FinalStag
private Builder() {}
- @java.lang.Override
+ @Override
public Builder from(DeidentifyAudioRequest other) {
vaultId(other.getVaultId());
file(other.getFile());
@@ -356,7 +356,7 @@ public Builder from(DeidentifyAudioRequest other) {
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter("vault_id")
public FileStage vaultId(@NotNull String vaultId) {
this.vaultId = Objects.requireNonNull(vaultId, "vaultId must not be null");
@@ -367,72 +367,72 @@ public FileStage vaultId(@NotNull String vaultId) {
* File to de-identify. Files are specified as Base64-encoded data.File to de-identify. Files are specified as Base64-encoded data.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("file")
public _FinalStage file(@NotNull DeidentifyAudioRequestFile file) {
this.file = Objects.requireNonNull(file, "file must not be null");
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage transformations(Transformations transformations) {
this.transformations = Optional.ofNullable(transformations);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "transformations", nulls = Nulls.SKIP)
public _FinalStage transformations(Optional transformations) {
this.transformations = transformations;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage restrictRegex(List restrictRegex) {
this.restrictRegex = Optional.ofNullable(restrictRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_regex", nulls = Nulls.SKIP)
public _FinalStage restrictRegex(Optional> restrictRegex) {
this.restrictRegex = restrictRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage allowRegex(List allowRegex) {
this.allowRegex = Optional.ofNullable(allowRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "allow_regex", nulls = Nulls.SKIP)
public _FinalStage allowRegex(Optional> allowRegex) {
this.allowRegex = allowRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage tokenType(TokenTypeWithoutVault tokenType) {
this.tokenType = Optional.ofNullable(tokenType);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "token_type", nulls = Nulls.SKIP)
public _FinalStage tokenType(Optional tokenType) {
this.tokenType = tokenType;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage entityTypes(List entityTypes) {
this.entityTypes = Optional.ofNullable(entityTypes);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "entity_types", nulls = Nulls.SKIP)
public _FinalStage entityTypes(Optional> entityTypes) {
this.entityTypes = entityTypes;
@@ -443,7 +443,7 @@ public _FinalStage entityTypes(Optional> entityTypes) {
* Padding added to the end of a bleep, in seconds.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage bleepStopPadding(Double bleepStopPadding) {
this.bleepStopPadding = Optional.ofNullable(bleepStopPadding);
return this;
@@ -452,7 +452,7 @@ public _FinalStage bleepStopPadding(Double bleepStopPadding) {
/**
* Padding added to the end of a bleep, in seconds.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "bleep_stop_padding", nulls = Nulls.SKIP)
public _FinalStage bleepStopPadding(Optional bleepStopPadding) {
this.bleepStopPadding = bleepStopPadding;
@@ -463,7 +463,7 @@ public _FinalStage bleepStopPadding(Optional bleepStopPadding) {
* Padding added to the beginning of a bleep, in seconds.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage bleepStartPadding(Double bleepStartPadding) {
this.bleepStartPadding = Optional.ofNullable(bleepStartPadding);
return this;
@@ -472,7 +472,7 @@ public _FinalStage bleepStartPadding(Double bleepStartPadding) {
/**
* Padding added to the beginning of a bleep, in seconds.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "bleep_start_padding", nulls = Nulls.SKIP)
public _FinalStage bleepStartPadding(Optional bleepStartPadding) {
this.bleepStartPadding = bleepStartPadding;
@@ -483,7 +483,7 @@ public _FinalStage bleepStartPadding(Optional bleepStartPadding) {
* The pitch of the bleep sound, in Hz. The higher the number, the higher the pitch.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage bleepFrequency(Double bleepFrequency) {
this.bleepFrequency = Optional.ofNullable(bleepFrequency);
return this;
@@ -492,7 +492,7 @@ public _FinalStage bleepFrequency(Double bleepFrequency) {
/**
* The pitch of the bleep sound, in Hz. The higher the number, the higher the pitch.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "bleep_frequency", nulls = Nulls.SKIP)
public _FinalStage bleepFrequency(Optional bleepFrequency) {
this.bleepFrequency = bleepFrequency;
@@ -503,7 +503,7 @@ public _FinalStage bleepFrequency(Optional bleepFrequency) {
* Relative loudness of the bleep in dB. Positive values increase its loudness, and negative values decrease it.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage bleepGain(Double bleepGain) {
this.bleepGain = Optional.ofNullable(bleepGain);
return this;
@@ -512,7 +512,7 @@ public _FinalStage bleepGain(Double bleepGain) {
/**
* Relative loudness of the bleep in dB. Positive values increase its loudness, and negative values decrease it.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "bleep_gain", nulls = Nulls.SKIP)
public _FinalStage bleepGain(Optional bleepGain) {
this.bleepGain = bleepGain;
@@ -523,7 +523,7 @@ public _FinalStage bleepGain(Optional bleepGain) {
* Type of transcription to output.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage outputTranscription(DeidentifyAudioRequestOutputTranscription outputTranscription) {
this.outputTranscription = Optional.ofNullable(outputTranscription);
return this;
@@ -532,7 +532,7 @@ public _FinalStage outputTranscription(DeidentifyAudioRequestOutputTranscription
/**
* Type of transcription to output.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "output_transcription", nulls = Nulls.SKIP)
public _FinalStage outputTranscription(
Optional outputTranscription) {
@@ -544,7 +544,7 @@ public _FinalStage outputTranscription(
* If true, includes processed audio file in the response.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
public _FinalStage outputProcessedAudio(Boolean outputProcessedAudio) {
this.outputProcessedAudio = Optional.ofNullable(outputProcessedAudio);
return this;
@@ -553,14 +553,14 @@ public _FinalStage outputProcessedAudio(Boolean outputProcessedAudio) {
/**
* If true, includes processed audio file in the response.
*/
- @java.lang.Override
+ @Override
@JsonSetter(value = "output_processed_audio", nulls = Nulls.SKIP)
public _FinalStage outputProcessedAudio(Optional outputProcessedAudio) {
this.outputProcessedAudio = outputProcessedAudio;
return this;
}
- @java.lang.Override
+ @Override
public DeidentifyAudioRequest build() {
return new DeidentifyAudioRequest(
vaultId,
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyDocumentRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyDocumentRequest.java
similarity index 95%
rename from src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyDocumentRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyDocumentRequest.java
index bf6f307e..80e8fff1 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyDocumentRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyDocumentRequest.java
@@ -99,7 +99,7 @@ public Optional getTransformations() {
return transformations;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof DeidentifyDocumentRequest && equalTo((DeidentifyDocumentRequest) other);
@@ -120,7 +120,7 @@ private boolean equalTo(DeidentifyDocumentRequest other) {
&& transformations.equals(other.transformations);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(
this.vaultId,
@@ -132,7 +132,7 @@ public int hashCode() {
this.transformations);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
@@ -199,7 +199,7 @@ public static final class Builder implements VaultIdStage, FileStage, _FinalStag
private Builder() {}
- @java.lang.Override
+ @Override
public Builder from(DeidentifyDocumentRequest other) {
vaultId(other.getVaultId());
file(other.getFile());
@@ -211,7 +211,7 @@ public Builder from(DeidentifyDocumentRequest other) {
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter("vault_id")
public FileStage vaultId(@NotNull String vaultId) {
this.vaultId = Objects.requireNonNull(vaultId, "vaultId must not be null");
@@ -222,79 +222,79 @@ public FileStage vaultId(@NotNull String vaultId) {
* File to de-identify. Files are specified as Base64-encoded data.File to de-identify. Files are specified as Base64-encoded data.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("file")
public _FinalStage file(@NotNull DeidentifyDocumentRequestFile file) {
this.file = Objects.requireNonNull(file, "file must not be null");
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage transformations(Transformations transformations) {
this.transformations = Optional.ofNullable(transformations);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "transformations", nulls = Nulls.SKIP)
public _FinalStage transformations(Optional transformations) {
this.transformations = transformations;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage restrictRegex(List restrictRegex) {
this.restrictRegex = Optional.ofNullable(restrictRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_regex", nulls = Nulls.SKIP)
public _FinalStage restrictRegex(Optional> restrictRegex) {
this.restrictRegex = restrictRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage allowRegex(List allowRegex) {
this.allowRegex = Optional.ofNullable(allowRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "allow_regex", nulls = Nulls.SKIP)
public _FinalStage allowRegex(Optional> allowRegex) {
this.allowRegex = allowRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage tokenType(TokenTypeWithoutVault tokenType) {
this.tokenType = Optional.ofNullable(tokenType);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "token_type", nulls = Nulls.SKIP)
public _FinalStage tokenType(Optional tokenType) {
this.tokenType = tokenType;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage entityTypes(List entityTypes) {
this.entityTypes = Optional.ofNullable(entityTypes);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "entity_types", nulls = Nulls.SKIP)
public _FinalStage entityTypes(Optional> entityTypes) {
this.entityTypes = entityTypes;
return this;
}
- @java.lang.Override
+ @Override
public DeidentifyDocumentRequest build() {
return new DeidentifyDocumentRequest(
vaultId,
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyFileRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyFileRequest.java
similarity index 95%
rename from src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyFileRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyFileRequest.java
index 1cbcd8f1..bd8ec3a7 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyFileRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyFileRequest.java
@@ -99,7 +99,7 @@ public Optional getTransformations() {
return transformations;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof DeidentifyFileRequest && equalTo((DeidentifyFileRequest) other);
@@ -120,7 +120,7 @@ private boolean equalTo(DeidentifyFileRequest other) {
&& transformations.equals(other.transformations);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(
this.vaultId,
@@ -132,7 +132,7 @@ public int hashCode() {
this.transformations);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
@@ -199,7 +199,7 @@ public static final class Builder implements VaultIdStage, FileStage, _FinalStag
private Builder() {}
- @java.lang.Override
+ @Override
public Builder from(DeidentifyFileRequest other) {
vaultId(other.getVaultId());
file(other.getFile());
@@ -211,7 +211,7 @@ public Builder from(DeidentifyFileRequest other) {
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter("vault_id")
public FileStage vaultId(@NotNull String vaultId) {
this.vaultId = Objects.requireNonNull(vaultId, "vaultId must not be null");
@@ -222,79 +222,79 @@ public FileStage vaultId(@NotNull String vaultId) {
* File to de-identify. Files are specified as Base64-encoded data.File to de-identify. Files are specified as Base64-encoded data.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("file")
public _FinalStage file(@NotNull DeidentifyFileRequestFile file) {
this.file = Objects.requireNonNull(file, "file must not be null");
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage transformations(Transformations transformations) {
this.transformations = Optional.ofNullable(transformations);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "transformations", nulls = Nulls.SKIP)
public _FinalStage transformations(Optional transformations) {
this.transformations = transformations;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage restrictRegex(List restrictRegex) {
this.restrictRegex = Optional.ofNullable(restrictRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_regex", nulls = Nulls.SKIP)
public _FinalStage restrictRegex(Optional> restrictRegex) {
this.restrictRegex = restrictRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage allowRegex(List allowRegex) {
this.allowRegex = Optional.ofNullable(allowRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "allow_regex", nulls = Nulls.SKIP)
public _FinalStage allowRegex(Optional> allowRegex) {
this.allowRegex = allowRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage tokenType(TokenTypeWithoutVault tokenType) {
this.tokenType = Optional.ofNullable(tokenType);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "token_type", nulls = Nulls.SKIP)
public _FinalStage tokenType(Optional tokenType) {
this.tokenType = tokenType;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage entityTypes(List entityTypes) {
this.entityTypes = Optional.ofNullable(entityTypes);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "entity_types", nulls = Nulls.SKIP)
public _FinalStage entityTypes(Optional> entityTypes) {
this.entityTypes = entityTypes;
return this;
}
- @java.lang.Override
+ @Override
public DeidentifyFileRequest build() {
return new DeidentifyFileRequest(
vaultId,
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyImageRequest.java b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyImageRequest.java
similarity index 95%
rename from src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyImageRequest.java
rename to v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyImageRequest.java
index 41de24b2..94159f02 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyImageRequest.java
+++ b/v2/src/main/java/com/skyflow/generated/rest/resources/files/requests/DeidentifyImageRequest.java
@@ -136,7 +136,7 @@ public Optional getTransformations() {
return transformations;
}
- @java.lang.Override
+ @Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof DeidentifyImageRequest && equalTo((DeidentifyImageRequest) other);
@@ -160,7 +160,7 @@ private boolean equalTo(DeidentifyImageRequest other) {
&& transformations.equals(other.transformations);
}
- @java.lang.Override
+ @Override
public int hashCode() {
return Objects.hash(
this.vaultId,
@@ -175,7 +175,7 @@ public int hashCode() {
this.transformations);
}
- @java.lang.Override
+ @Override
public String toString() {
return ObjectMappers.stringify(this);
}
@@ -269,7 +269,7 @@ public static final class Builder implements VaultIdStage, FileStage, _FinalStag
private Builder() {}
- @java.lang.Override
+ @Override
public Builder from(DeidentifyImageRequest other) {
vaultId(other.getVaultId());
file(other.getFile());
@@ -284,7 +284,7 @@ public Builder from(DeidentifyImageRequest other) {
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter("vault_id")
public FileStage vaultId(@NotNull String vaultId) {
this.vaultId = Objects.requireNonNull(vaultId, "vaultId must not be null");
@@ -295,72 +295,72 @@ public FileStage vaultId(@NotNull String vaultId) {
* File to de-identify. Files are specified as Base64-encoded data.File to de-identify. Files are specified as Base64-encoded data.
* @return Reference to {@code this} so that method calls can be chained together.
*/
- @java.lang.Override
+ @Override
@JsonSetter("file")
public _FinalStage file(@NotNull DeidentifyImageRequestFile file) {
this.file = Objects.requireNonNull(file, "file must not be null");
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage transformations(Transformations transformations) {
this.transformations = Optional.ofNullable(transformations);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "transformations", nulls = Nulls.SKIP)
public _FinalStage transformations(Optional transformations) {
this.transformations = transformations;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage restrictRegex(List restrictRegex) {
this.restrictRegex = Optional.ofNullable(restrictRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "restrict_regex", nulls = Nulls.SKIP)
public _FinalStage restrictRegex(Optional> restrictRegex) {
this.restrictRegex = restrictRegex;
return this;
}
- @java.lang.Override
+ @Override
public _FinalStage allowRegex(List allowRegex) {
this.allowRegex = Optional.ofNullable(allowRegex);
return this;
}
- @java.lang.Override
+ @Override
@JsonSetter(value = "allow_regex", nulls = Nulls.SKIP)
public _FinalStage allowRegex(Optional