Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test/java unit tests #167

Closed
wants to merge 9 commits into from
53 changes: 53 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,56 @@ jobs:
GITHUB_ORG_ID: ${{ secrets.PYTHON_SDK_GITHUB_ORG_ID }}
GITHUB_REPO_ID: ${{ secrets.PYTHON_SDK_GITHUB_REPO_ID }}
SSH_KEY: ${{ secrets.PYTHON_SDK_SSH_KEY }}

build-and-test-java-sdk:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 11
distribution: 'temurin'
cache: 'gradle'

- name: Setup git
run: ./scripts/setup_git.sh
env:
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}

# - name: Clone the existing SDK
# run: ./scripts/clone_sdk.sh
# env:
# GITHUB_ORG_ID: ${{ secrets.JAVA_SDK_GITHUB_ORG_ID }}
# GITHUB_REPO_ID: ${{ secrets.JAVA_SDK_GITHUB_REPO_ID }}
# SSH_KEY: ${{ secrets.JAVA_SDK_SSH_KEY }}
# SDK_PATH: clients/fga-java-sdk
# KNOWN_HOSTS: ${{secrets.KNOWN_HOSTS}}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

# TODO: Don't run this twice. For some reason, the initial run of
# `make build-client-java` doesn't work, but subsequent runs do.
- name: Build Java SDK
continue-on-error: true
run: |-
mkdir -p clients/fga-java-sdk
make build-client-java

- name: Run All Tests
run: |-
make test-integration-client-java

# - name: Check for SDK changes
# run: ./scripts/commit_push_changes.sh
# env:
# SDK_PATH: clients/fga-java-sdk
# DRY_RUN: 1
# TAGGING_DISABLE: 1
# GITHUB_ORG_ID: ${{ secrets.JAVA_SDK_GITHUB_ORG_ID }}
# GITHUB_REPO_ID: ${{ secrets.JAVA_SDK_GITHUB_REPO_ID }}
# SSH_KEY: ${{ secrets.JAVA_SDK_SSH_KEY }}
23 changes: 21 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ GO_DOCKER_TAG = 1
DOTNET_DOCKER_TAG = 6.0
GOLINT_DOCKER_TAG = v1.51-alpine
BUSYBOX_DOCKER_TAG = 1
GRADLE_DOCKER_TAG = 8.2
PYTHON_DOCKER_TAG = 3.10
# Other config
CONFIG_DIR = ${PWD}/config
Expand All @@ -28,6 +29,7 @@ pull-docker-images:
docker pull golangci/golangci-lint:${GOLINT_DOCKER_TAG}
docker pull mcr.microsoft.com/dotnet/sdk:${DOTNET_DOCKER_TAG}
docker pull busybox:${BUSYBOX_DOCKER_TAG}
docker pull gradle:${GRADLE_DOCKER_TAG}

## Publishing
publish-client-dotnet: build-client-dotnet
Expand All @@ -42,10 +44,10 @@ test: test-all-clients
build: build-all-clients

.PHONY: test-all-clients
test-all-clients: test-client-js test-client-go test-client-dotnet test-client-python
test-all-clients: test-client-js test-client-go test-client-dotnet test-client-python test-client-java

.PHONY: build-all-clients
build-all-clients: build-client-js build-client-go build-client-dotnet build-client-python
build-all-clients: build-client-js build-client-go build-client-dotnet build-client-python build-client-java

### JavaScript
.PHONY: tag-client-js
Expand Down Expand Up @@ -129,6 +131,7 @@ run-in-docker:
-v "${CLIENTS_OUTPUT_DIR}/fga-${sdk_language}-sdk":/module \
-v ${CONFIG_DIR}:/config \
-w /module \
--net="host" \
${image} \
${command}

Expand Down Expand Up @@ -202,3 +205,19 @@ shellcheck:
.PHONY: setup-new-sdk
setup-new-sdk:
./scripts/setup_new_sdk.sh

.PHONY: build-client-java
build-client-java:
make build-client sdk_language=java tmpdir=${TMP_DIR}
make run-in-docker sdk_language=java image=gradle:${GRADLE_DOCKER_TAG} command="/bin/sh -c 'chmod +x ./gradlew && gradle fmt build'"

.PHONY: test-integration-client-java
test-integration-client-java: build-client-java
docker container rm --force openfga-for-java-client || true
docker run --detach --name openfga-for-java-client -p 8080:8080 openfga/openfga run
make run-in-docker sdk_language=java image=gradle:${GRADLE_DOCKER_TAG} command="/bin/sh -c './gradlew test-integration'"
docker container rm --force openfga-for-java-client

.PHONY: test-client-java
test-client-java: build-client-java
# ... any custom test code ...
7 changes: 7 additions & 0 deletions config/clients/java/.openapi-generator-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
**/ServerConfiguration.java
**/ServerVariable.java
src/main/AndroidManifest.xml
build.sbt
pom.xml
git_push.sh
.travis.yml
Empty file.
47 changes: 47 additions & 0 deletions config/clients/java/config.overrides.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"sdkId": "java",
"gitRepoId": "java-sdk",
"packageName": "dev.openfga:openfga-sdk",
"artifactId": "openfga-sdk",
"groupId": "dev.openfga",
"apiPackage": "dev.openfga.api",
"invokerPackage": "dev.openfga.api.invoker",
"modelPackage": "dev.openfga.api.model",
"packageVersion": "0.0.1",
"snapshotVersion": false,
"packageDescription": "Java SDK for OpenFGA",
"artifactDescription": "Java SDK for OpenFGA",
"packageDetailedDescription": "This is an autogenerated java SDK for OpenFGA. It provides a wrapper around the [OpenFGA API definition](https://openfga.dev/api).",
"developerEmail": "community@openfga.dev",
"developerName": "OpenFGA Contributors",
"developerOrganization": "OpenFGA",
"developerOrganizationUrl": "https://openfga.dev",
"licenseName": "Apache-2.0",
"licenseUrl": "https://github.com/openfga/java-sdk/blob/main/LICENSE",
"scmConnection": "scm:git:git@github.com:openfga/java-sdk.git",
"scmDeveloperConnection": "scm:git:git@github.com:openfga/java-sdk.git",
"scmUrl": "https://github.com/openfga/java-sdk",
"library": "native",
"disallowAdditionalPropertiesIfNotPresent": false,
"enumUnknownDefaultCase": true,
"allowUnicodeIdentifiers": true,
"caseInsensitiveResponseHeaders": true,
"files": {
"build.gradle.mustache" : {
"destinationFilename": "build.gradle",
"templateType": "SupportingFiles"
},
"OpenFgaApiTest.java.mustache" : {
"destinationFilename": "src/test/java/dev/openfga/api/OpenFgaApiTest.java",
"templateType": "SupportingFiles"
},
"OpenFgaApiIntegrationTest.java.mustache" : {
"destinationFilename": "src/test-integration/java/dev/openfga/api/OpenFgaApiIntegrationTest.java",
"templateType": "SupportingFiles"
},
"gradle-wrapper.properties.mustache" : {
"destinationFilename": "gradle/wrapper/gradle-wrapper.properties",
"templateType": "SupportingFiles"
}
}
}
1 change: 1 addition & 0 deletions config/clients/java/generator.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java
7 changes: 7 additions & 0 deletions config/clients/java/template-source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"repo": "https://github.com/OpenAPITools/openapi-generator",
"branch": "master",
"commit": "90eacb685c57308e67c65e436b19d160091f91e1",
"url": "https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources/Java",
"docs": "https://github.com/OpenAPITools/openapi-generator/blob/master/docs/generators/java.md"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Java CI with Gradle

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:
name: Build {{{appName}}}
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17' ]
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v2
with:
{{=< >=}}
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: gradle
- name: Build with Gradle
run: |
./gradlew build
30 changes: 30 additions & 0 deletions config/clients/java/template/Configuration.mustache
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{{>licenseInfo}}

package {{invokerPackage}};

{{>generatedAnnotation}}
public class Configuration {
public static final String VERSION = "{{{artifactVersion}}}";

private static ApiClient defaultApiClient = new ApiClient();

/**
* Get the default API client, which would be used when creating API
* instances without providing an API client.
*
* @return Default API client
*/
public static ApiClient getDefaultApiClient() {
return defaultApiClient;
}

/**
* Set the default API client, which would be used when creating API
* instances without providing an API client.
*
* @param apiClient API client
*/
public static void setDefaultApiClient(ApiClient apiClient) {
defaultApiClient = apiClient;
}
}
Loading
Loading