Skip to content

Commit

Permalink
chore: updates based on PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@booniepepper
booniepepper committed Dec 13, 2023
1 parent cc3df4b commit 2360394
Show file tree
Hide file tree
Showing 5 changed files with 216 additions and 72 deletions.
126 changes: 93 additions & 33 deletions src/main/java/dev/openfga/sdk/api/OpenFgaApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public OpenFgaApi(Configuration configuration, ApiClient apiClient) throws FgaIn
this.oAuth2Client = null;
}

var additionalHeaders = configuration.getAdditionalHeaders();
if (additionalHeaders != null) {
apiClient.addRequestInterceptor(httpRequest -> additionalHeaders.forEach(httpRequest::setHeader));
var defaultHeaders = configuration.getDefaultHeaders();
if (defaultHeaders != null) {
apiClient.addRequestInterceptor(httpRequest -> defaultHeaders.forEach(httpRequest::setHeader));
}
}

Expand Down Expand Up @@ -146,8 +146,12 @@ private HttpRequest.Builder checkRequestBuilder(String storeId, CheckRequest bod
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down Expand Up @@ -227,8 +231,12 @@ private HttpRequest.Builder createStoreRequestBuilder(CreateStoreRequest body, C
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down Expand Up @@ -307,8 +315,12 @@ private HttpRequest.Builder deleteStoreRequestBuilder(String storeId, Configurat
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
Expand Down Expand Up @@ -392,8 +404,12 @@ private HttpRequest.Builder expandRequestBuilder(String storeId, ExpandRequest b
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down Expand Up @@ -472,8 +488,12 @@ private HttpRequest.Builder getStoreRequestBuilder(String storeId, Configuration
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
Expand Down Expand Up @@ -558,8 +578,12 @@ private HttpRequest.Builder listObjectsRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down Expand Up @@ -657,8 +681,12 @@ private HttpRequest.Builder listStoresRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
Expand Down Expand Up @@ -741,8 +769,12 @@ private HttpRequest.Builder readRequestBuilder(String storeId, ReadRequest body,
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down Expand Up @@ -834,8 +866,12 @@ private HttpRequest.Builder readAssertionsRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
Expand Down Expand Up @@ -923,8 +959,12 @@ private HttpRequest.Builder readAuthorizationModelRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
Expand Down Expand Up @@ -1033,8 +1073,12 @@ private HttpRequest.Builder readAuthorizationModelsRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
Expand Down Expand Up @@ -1144,8 +1188,12 @@ private HttpRequest.Builder readChangesRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
Expand Down Expand Up @@ -1227,8 +1275,12 @@ private HttpRequest.Builder writeRequestBuilder(String storeId, WriteRequest bod
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down Expand Up @@ -1330,8 +1382,12 @@ private HttpRequest.Builder writeAssertionsRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down Expand Up @@ -1427,8 +1483,12 @@ private HttpRequest.Builder writeAuthorizationModelRequestBuilder(
localVarRequestBuilder.header("Authorization", "Bearer " + accessToken);
}

if (configuration.getAdditionalHeaders() != null) {
configuration.getAdditionalHeaders().forEach(localVarRequestBuilder::header);
if (configuration.getUserAgent() != null) {
localVarRequestBuilder.header("User-Agent", configuration.getUserAgent());
}

if (configuration.getDefaultHeaders() != null) {
configuration.getDefaultHeaders().forEach(localVarRequestBuilder::header);
}

try {
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/dev/openfga/sdk/api/configuration/ClientConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,6 @@ public String getAuthorizationModelIdChecked() throws FgaInvalidParameterExcepti

/* Overrides beyond this point required for typing. */

@Override
public ClientConfiguration override(ConfigurationOverride configurationOverride) {
super.override(configurationOverride);
return this;
}

@Override
public ClientConfiguration apiUrl(String apiUrl) {
super.apiUrl(apiUrl);
Expand Down
39 changes: 27 additions & 12 deletions src/main/java/dev/openfga/sdk/api/configuration/Configuration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.net.http.HttpConnectTimeoutException;
import java.net.http.HttpRequest;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;

/**
Expand All @@ -42,7 +43,7 @@ public class Configuration implements BaseConfiguration {
private Duration connectTimeout;
private int maxRetries;
private Duration minimumRetryDelay;
private Map<String, String> additionalHeaders;
private Map<String, String> defaultHeaders;

public Configuration() {
this.apiUrl = DEFAULT_API_URL;
Expand Down Expand Up @@ -111,14 +112,21 @@ public Configuration override(ConfigurationOverride configurationOverride) {
Duration overrideMinimumRetryDelay = configurationOverride.getMinimumRetryDelay();
result.minimumRetryDelay(overrideMinimumRetryDelay != null ? overrideMinimumRetryDelay : minimumRetryDelay);

Map<String, String> overrideAdditionalHeaders = configurationOverride.getAdditionalHeaders();
if (overrideAdditionalHeaders != null) {
if (this.additionalHeaders == null) {
this.additionalHeaders = overrideAdditionalHeaders;
} else {
this.additionalHeaders.putAll(overrideAdditionalHeaders);
}
Map<String, String> headers = new HashMap<>();
if (defaultHeaders != null) {
headers.putAll(defaultHeaders);
}
Map<String, String> additionalHeaders = configurationOverride.getAdditionalHeaders();
if (additionalHeaders != null) {
additionalHeaders.forEach((header, value) -> {
if (value == null) {
headers.remove(header);
} else {
headers.put(header, value);
}
});
}
result.defaultHeaders(headers);

return result;
}
Expand Down Expand Up @@ -151,6 +159,10 @@ public String getApiUrl() {
/**
* Set the user agent.
*
* <p>Within the context of a single request, a "User-Agent" header from either
* {@link Configuration#defaultHeaders(Map)} or {@link ConfigurationOverride#additionalHeaders(Map)}
* will take precedence over this value.</p>
*
* @param userAgent The user agent.
* @return This object.
*/
Expand Down Expand Up @@ -271,12 +283,15 @@ public Duration getMinimumRetryDelay() {
return minimumRetryDelay;
}

public Configuration additionalHeaders(Map<String, String> additionalHeaders) {
this.additionalHeaders = additionalHeaders;
public Configuration defaultHeaders(Map<String, String> defaultHeaders) {
this.defaultHeaders = defaultHeaders;
return this;
}

public Map<String, String> getAdditionalHeaders() {
return this.additionalHeaders;
public Map<String, String> getDefaultHeaders() {
if (this.defaultHeaders == null) {
this.defaultHeaders = Map.of();
}
return this.defaultHeaders;
}
}
Loading

0 comments on commit 2360394

Please sign in to comment.