Skip to content

Commit

Permalink
chore: 🐝 Update SDK - 02 - Generate (#52)
Browse files Browse the repository at this point in the history
Also includes some re-work for the code gen automation. Some custom workarounds have been replaced with new SE features. This also fixes code gen being broken on macOS.

---------

Co-authored-by: speakeasybot <bot@speakeasyapi.dev>
Co-authored-by: Charles Daniels <charles@styra.com>
  • Loading branch information
3 people authored Jun 24, 2024
1 parent 5e1996e commit 93c8a00
Show file tree
Hide file tree
Showing 56 changed files with 3,757 additions and 396 deletions.
41 changes: 33 additions & 8 deletions .speakeasy/gen.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
lockVersion: 2.0.0
id: 47e8e950-a454-4ebb-9f78-86fda7dfa0c2
management:
docChecksum: 11b8c1e1d3f9d5dab18c36b33f81200d
docChecksum: a34bd1c885aa42eb3175940494581f67
docVersion: 0.2.0
speakeasyVersion: 1.300.1
generationVersion: 2.339.1
releaseVersion: 1.0.0
configChecksum: ff63c88af0d20ceaa673f21c65426d38
speakeasyVersion: 1.315.1
generationVersion: 2.352.0
releaseVersion: 1.3.0
configChecksum: 96413e4084b873a18a563f380b248a33
repoURL: https://github.com/StyraInc/opa-java.git
published: true
features:
java:
additionalDependencies: 0.1.0
constsAndDefaults: 0.1.1
core: 3.22.0
core: 3.25.1
examples: 2.81.3
flattening: 2.81.1
globalSecurityCallbacks: 0.1.0
Expand All @@ -27,6 +27,7 @@ generatedFiles:
- src/main/java/com/styra/opa/openapi/models/operations/ExecuteDefaultPolicyWithInputRequestBuilder.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecutePolicyRequestBuilder.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecutePolicyWithInputRequestBuilder.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecuteBatchPolicyWithInputRequestBuilder.java
- src/main/java/com/styra/opa/openapi/models/operations/HealthRequestBuilder.java
- src/main/java/com/styra/opa/openapi/models/operations/SDKMethodInterfaces.java
- src/main/java/com/styra/opa/openapi/OpaApiClient.java
Expand All @@ -49,6 +50,7 @@ generatedFiles:
- src/main/java/com/styra/opa/openapi/utils/HTTPClient.java
- src/main/java/com/styra/opa/openapi/utils/HTTPRequest.java
- src/main/java/com/styra/opa/openapi/utils/HeaderMetadata.java
- src/main/java/com/styra/opa/openapi/utils/Helpers.java
- src/main/java/com/styra/opa/openapi/utils/Hook.java
- src/main/java/com/styra/opa/openapi/utils/Hooks.java
- src/main/java/com/styra/opa/openapi/utils/JSON.java
Expand All @@ -73,6 +75,7 @@ generatedFiles:
- src/main/java/com/styra/opa/openapi/utils/TypedObject.java
- src/main/java/com/styra/opa/openapi/utils/Types.java
- src/main/java/com/styra/opa/openapi/utils/Utils.java
- src/main/java/com/styra/opa/openapi/models/errors/AuthException.java
- src/main/java/com/styra/opa/openapi/models/errors/SDKError.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecuteDefaultPolicyWithInputRequest.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecuteDefaultPolicyWithInputResponse.java
Expand All @@ -81,23 +84,34 @@ generatedFiles:
- src/main/java/com/styra/opa/openapi/models/operations/ExecutePolicyWithInputRequestBody.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecutePolicyWithInputRequest.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecutePolicyWithInputResponse.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecuteBatchPolicyWithInputRequestBody.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecuteBatchPolicyWithInputRequest.java
- src/main/java/com/styra/opa/openapi/models/operations/ExecuteBatchPolicyWithInputResponse.java
- src/main/java/com/styra/opa/openapi/models/operations/HealthRequest.java
- src/main/java/com/styra/opa/openapi/models/operations/HealthResponse.java
- src/main/java/com/styra/opa/openapi/models/shared/Result.java
- src/main/java/com/styra/opa/openapi/models/shared/Input.java
- src/main/java/com/styra/opa/openapi/models/shared/GzipAcceptEncoding.java
- src/main/java/com/styra/opa/openapi/models/shared/SuccessfulPolicyEvaluation.java
- src/main/java/com/styra/opa/openapi/models/shared/SuccessfulPolicyResponse.java
- src/main/java/com/styra/opa/openapi/models/shared/Revision.java
- src/main/java/com/styra/opa/openapi/models/shared/Provenance.java
- src/main/java/com/styra/opa/openapi/models/shared/Explain.java
- src/main/java/com/styra/opa/openapi/models/shared/GzipContentEncoding.java
- src/main/java/com/styra/opa/openapi/models/shared/Location.java
- src/main/java/com/styra/opa/openapi/models/shared/Errors.java
- src/main/java/com/styra/opa/openapi/models/shared/ServerError.java
- src/main/java/com/styra/opa/openapi/models/shared/ResponsesSuccessfulPolicyResponse.java
- src/main/java/com/styra/opa/openapi/models/shared/Responses.java
- src/main/java/com/styra/opa/openapi/models/shared/BatchMixedResults.java
- src/main/java/com/styra/opa/openapi/models/shared/BatchSuccessfulPolicyEvaluation.java
- src/main/java/com/styra/opa/openapi/models/shared/HealthyServer.java
- src/main/java/com/styra/opa/openapi/models/errors/Location.java
- src/main/java/com/styra/opa/openapi/models/errors/Errors.java
- src/main/java/com/styra/opa/openapi/models/errors/ClientError.java
- src/main/java/com/styra/opa/openapi/models/errors/ServerErrorLocation.java
- src/main/java/com/styra/opa/openapi/models/errors/ServerErrorErrors.java
- src/main/java/com/styra/opa/openapi/models/errors/ServerError.java
- src/main/java/com/styra/opa/openapi/models/errors/BatchServerError.java
- src/main/java/com/styra/opa/openapi/models/errors/UnhealthyServer.java
- docs/models/operations/ExecuteDefaultPolicyWithInputRequest.md
- docs/models/operations/ExecuteDefaultPolicyWithInputResponse.md
Expand All @@ -106,23 +120,34 @@ generatedFiles:
- docs/models/operations/ExecutePolicyWithInputRequestBody.md
- docs/models/operations/ExecutePolicyWithInputRequest.md
- docs/models/operations/ExecutePolicyWithInputResponse.md
- docs/models/operations/ExecuteBatchPolicyWithInputRequestBody.md
- docs/models/operations/ExecuteBatchPolicyWithInputRequest.md
- docs/models/operations/ExecuteBatchPolicyWithInputResponse.md
- docs/models/operations/HealthRequest.md
- docs/models/operations/HealthResponse.md
- docs/models/shared/Result.md
- docs/models/shared/Input.md
- docs/models/shared/GzipAcceptEncoding.md
- docs/models/shared/SuccessfulPolicyEvaluation.md
- docs/models/shared/SuccessfulPolicyResponse.md
- docs/models/shared/Revision.md
- docs/models/shared/Provenance.md
- docs/models/shared/Explain.md
- docs/models/shared/GzipContentEncoding.md
- docs/models/shared/Location.md
- docs/models/shared/Errors.md
- docs/models/shared/ServerError.md
- docs/models/shared/ResponsesSuccessfulPolicyResponse.md
- docs/models/shared/Responses.md
- docs/models/shared/BatchMixedResults.md
- docs/models/shared/BatchSuccessfulPolicyEvaluation.md
- docs/models/shared/HealthyServer.md
- docs/models/errors/Location.md
- docs/models/errors/Errors.md
- docs/models/errors/ClientError.md
- docs/models/errors/ServerErrorLocation.md
- docs/models/errors/ServerErrorErrors.md
- docs/models/errors/ServerError.md
- docs/models/errors/BatchServerError.md
- docs/models/errors/UnhealthyServer.md
- docs/sdks/opaapiclient/README.md
- USAGE.md
21 changes: 18 additions & 3 deletions .speakeasy/gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,20 @@ generation:
auth:
oAuth2ClientCredentialsEnabled: false
java:
version: 1.0.0
additionalDependencies: []
additionalPlugins: []
version: 1.3.0
additionalDependencies:
- testImplementation:org.junit.jupiter:junit-jupiter-api:5.8.2
- runtimeOnly:org.junit.jupiter:junit-jupiter-engine:5.8.2
- testImplementation:org.testcontainers:testcontainers-bom:1.19.7
- testImplementation:org.testcontainers:testcontainers:1.19.7
- testImplementation:org.testcontainers:junit-jupiter:1.19.7
- implementation:com.fasterxml.jackson.core:jackson-annotations:2.17.0
- implementation:com.fasterxml.jackson.core:jackson-core:2.17.0
- implementation:org.apache.httpcomponents:httpcore:4.4.16
additionalPlugins:
- id("java")
- id "nebula.lint" version "17.8.0"
- id("checkstyle")
artifactID: openapi
clientServerStatusCodesAsErrors: true
companyEmail: devrel@styra.com
Expand All @@ -32,6 +43,10 @@ java:
shared: models/shared
webhooks: models/webhooks
inputModelSuffix: input
license:
name: The MIT License (MIT)
shortName: MIT
url: https://mit-license.org/
maxMethodParams: 4
ossrhURL: https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
outputModelSuffix: output
Expand Down
13 changes: 6 additions & 7 deletions .speakeasy/workflow.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
speakeasyVersion: 1.300.1
speakeasyVersion: 1.315.1
sources:
openapi:
sourceNamespace: openapi
sourceRevisionDigest: sha256:ff046f99475adef37992086fbd269b75bdc76e54b1b430840cb348635e64bbad
sourceBlobDigest: sha256:82c975a5f4a988e001d69ab5d6b8f82563971f1058d0b18942e95345235276bd
sourceRevisionDigest: sha256:fb5f79d7d512c1930065ffdd3cb92e412164c3d53bc0c936b1c44a6bb4329828
sourceBlobDigest: sha256:7d4ebf8b4a38acf08835ed8fa2e4e4cfd31ba01defc2a2bfd44cec637c87e35e
tags:
- latest
- main
targets:
opa:
source: openapi
sourceNamespace: openapi
sourceRevisionDigest: sha256:ff046f99475adef37992086fbd269b75bdc76e54b1b430840cb348635e64bbad
sourceBlobDigest: sha256:82c975a5f4a988e001d69ab5d6b8f82563971f1058d0b18942e95345235276bd
outLocation: /github/workspace/repo
sourceRevisionDigest: sha256:fb5f79d7d512c1930065ffdd3cb92e412164c3d53bc0c936b1c44a6bb4329828
sourceBlobDigest: sha256:7d4ebf8b4a38acf08835ed8fa2e4e4cfd31ba01defc2a2bfd44cec637c87e35e
outLocation: /Users/cad/f/src/opa-java
workflow:
workflowVersion: 1.0.0
speakeasyVersion: latest
Expand Down
66 changes: 65 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public class Application {
// handle exception
throw e;
}

}
}
```
Expand Down Expand Up @@ -174,7 +175,7 @@ public class Application {
.request(req)
.call();

if (res.successfulPolicyEvaluation().isPresent()) {
if (res.successfulPolicyResponse().isPresent()) {
// handle response
}
} catch (com.styra.opa.openapi.models.errors.ClientError e) {
Expand All @@ -190,6 +191,65 @@ public class Application {
// handle exception
throw e;
}

}
}
```

### Example 3

```java
package hello.world;

import com.styra.opa.openapi.OpaApiClient;
import com.styra.opa.openapi.models.operations.*;
import com.styra.opa.openapi.models.shared.*;
import com.styra.opa.openapi.utils.EventStream;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.Optional;
import org.openapitools.jackson.nullable.JsonNullable;
import static java.util.Map.entry;

public class Application {

public static void main(String[] args) throws Exception {
try {
OpaApiClient sdk = OpaApiClient.builder()
.build();

ExecuteBatchPolicyWithInputRequest req = ExecuteBatchPolicyWithInputRequest.builder()
.path("app/rbac")
.requestBody(ExecuteBatchPolicyWithInputRequestBody.builder()
.inputs(java.util.Map.ofEntries(
entry("key", Input.of("<value>"))))
.build())
.build();

ExecuteBatchPolicyWithInputResponse res = sdk.executeBatchPolicyWithInput()
.request(req)
.call();

if (res.batchSuccessfulPolicyEvaluation().isPresent()) {
// handle response
}
} catch (com.styra.opa.openapi.models.errors.ClientError e) {
// handle exception
throw e;
} catch (com.styra.opa.openapi.models.errors.BatchServerError e) {
// handle exception
throw e;
} catch (com.styra.opa.openapi.models.errors.SDKError e) {
// handle exception
throw e;
} catch (Exception e) {
// handle exception
throw e;
}

}
}
```
Expand All @@ -203,6 +263,7 @@ public class Application {
* [executeDefaultPolicyWithInput](docs/sdks/opaapiclient/README.md#executedefaultpolicywithinput) - Execute the default decision given an input
* [executePolicy](docs/sdks/opaapiclient/README.md#executepolicy) - Execute a policy
* [executePolicyWithInput](docs/sdks/opaapiclient/README.md#executepolicywithinput) - Execute a policy given an input
* [executeBatchPolicyWithInput](docs/sdks/opaapiclient/README.md#executebatchpolicywithinput) - Execute a policy given a batch of inputs
* [health](docs/sdks/opaapiclient/README.md#health) - Verify the server is operational
<!-- End Available Resources and Operations [operations] -->

Expand Down Expand Up @@ -265,6 +326,7 @@ public class Application {
// handle exception
throw e;
}

}
}
```
Expand Down Expand Up @@ -319,6 +381,7 @@ public class Application {
// handle exception
throw e;
}

}
}
```
Expand Down Expand Up @@ -382,6 +445,7 @@ public class Application {
// handle exception
throw e;
}

}
}
```
Expand Down
12 changes: 11 additions & 1 deletion RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,14 @@ Based on:
### Generated
- [java v1.0.0] .
### Releases
- [Maven Central v1.0.0] https://central.sonatype.com/artifact/com.styra.opa/openapi/1.0.0 - .
- [Maven Central v1.0.0] https://central.sonatype.com/artifact/com.styra.opa/openapi/1.0.0 - .

## 2024-06-21 00:19:57
### Changes
Based on:
- OpenAPI Doc
- Speakeasy CLI 1.313.0 (2.347.8) https://github.com/speakeasy-api/speakeasy
### Generated
- [java v1.1.0] .
### Releases
- [Maven Central v1.1.0] https://central.sonatype.com/artifact/com.styra.opa/openapi/1.1.0 - .
60 changes: 59 additions & 1 deletion USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class Application {
// handle exception
throw e;
}

}
}
```
Expand Down Expand Up @@ -82,7 +83,7 @@ public class Application {
.request(req)
.call();

if (res.successfulPolicyEvaluation().isPresent()) {
if (res.successfulPolicyResponse().isPresent()) {
// handle response
}
} catch (com.styra.opa.openapi.models.errors.ClientError e) {
Expand All @@ -98,6 +99,63 @@ public class Application {
// handle exception
throw e;
}

}
}
```

```java
package hello.world;

import com.styra.opa.openapi.OpaApiClient;
import com.styra.opa.openapi.models.operations.*;
import com.styra.opa.openapi.models.shared.*;
import com.styra.opa.openapi.utils.EventStream;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.Optional;
import org.openapitools.jackson.nullable.JsonNullable;
import static java.util.Map.entry;

public class Application {

public static void main(String[] args) throws Exception {
try {
OpaApiClient sdk = OpaApiClient.builder()
.build();

ExecuteBatchPolicyWithInputRequest req = ExecuteBatchPolicyWithInputRequest.builder()
.path("app/rbac")
.requestBody(ExecuteBatchPolicyWithInputRequestBody.builder()
.inputs(java.util.Map.ofEntries(
entry("key", Input.of("<value>"))))
.build())
.build();

ExecuteBatchPolicyWithInputResponse res = sdk.executeBatchPolicyWithInput()
.request(req)
.call();

if (res.batchSuccessfulPolicyEvaluation().isPresent()) {
// handle response
}
} catch (com.styra.opa.openapi.models.errors.ClientError e) {
// handle exception
throw e;
} catch (com.styra.opa.openapi.models.errors.BatchServerError e) {
// handle exception
throw e;
} catch (com.styra.opa.openapi.models.errors.SDKError e) {
// handle exception
throw e;
} catch (Exception e) {
// handle exception
throw e;
}

}
}
```
Expand Down
Loading

0 comments on commit 93c8a00

Please sign in to comment.