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

Transform to use JSON-based API #92

Merged
merged 2 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-container-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
java-version: '21'
settings-path: ${{ github.workspace }}
server-id: github

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/perform-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
java-version: '21'
settings-path: ${{ github.workspace }}
server-id: github

Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
java-version: '21'

- name: Determine Home Directory
id: find-home
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
java-version: '21'

- name: Determine Home Directory
id: find-home
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
java-version: '21'

- name: Determine Home Directory
id: find-home
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/render-and-deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
java-version: '21'
settings-path: ${{ github.workspace }}
server-id: github

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/submit-dependency-tree-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
java-version: '21'

- name: Determine Home Directory
id: find-home
Expand Down
2 changes: 2 additions & 0 deletions .run/mvn generate-sources [rest-client].run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="compile" />
<option value="generate-sources" />
<option value="-pl" />
<option value="rest-client" />
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ To use the `3scale-cms` command you need to provide a few parameters:

- An **ACCESS_TOKEN**, which can be used instead of a PROVIDER_KEY. The access
token must be granted permissions to both the Account Management API and the
hidden Content Management API.
Content Management API.
- The **PROVIDER_KEY**, which can be found in the Account tab of your admin
portal (only visible to the users with "admin" role). The PROVIDER_KEY will be
ignored if an ACCESS_TOKEN is specified.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class TopLevelCommand extends CommandBase {
arity = "1",
description = "Use an access token instead of a provider key. The " +
"access token must be granted permissions to both " +
"Account Management API and the hidden Content Management API"
"Account Management API and the Developer Portal API"
)
private String accessToken;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package com.fwmotion.threescale.cms.cli.config;

import com.fwmotion.threescale.cms.mixins.*;
import com.fwmotion.threescale.cms.mixins.EnumHandlerMixIn;
import com.redhat.threescale.rest.cms.model.*;
import io.quarkus.runtime.annotations.RegisterForReflection;

@SuppressWarnings("unused")
@RegisterForReflection(targets = {
EnumHandlerMixIn.class,
FileListMixIn.class,
SectionListMixIn.class,
TemplateListMixIn.class,
TemplateMergingList.class,

BuiltinPage.class,
BuiltinPartial.class,
Expand All @@ -20,23 +17,20 @@
FileList.class,
FileUpdatableFields.class,
Layout.class,
ListPaginationAttributes.class,
ListPaginationMetadata.class,
ModelFile.class,
Page.class,
Partial.class,
ProviderAccount.class,
ProviderPlan.class,
ProviderUser.class,
Section.class,
SectionCreationRequest.class,
SectionList.class,
SectionUpdatableFields.class,
Template.class,
TemplateCommon.class,
TemplateCreationRequest.class,
TemplateList.class,
TemplateList.class,
TemplateUpdatableFields.class,
WrappedProviderAccount.class
})
public class ReflectionConfiguration {
}
Expand Down
34 changes: 34 additions & 0 deletions openapi-generator-template/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd http://www.w3.org/2001/XMLSchema-instance https://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.fwmotion</groupId>
<artifactId>3scale-cms-tools-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

<artifactId>openapi-generator-template</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>3scale CMS Tools (OpenAPI-Generator Template Customizations)</name>
<url>https://fwmotion.github.io/3scale-cms/openapi-generator-template</url>
<description><![CDATA[
Customizations to the OpenAPI-Generator templates for use with generating
code in the 3scale-cms project
]]></description>

<distributionManagement>
<site>
<id>fwmotion.github.io</id>
<url>https://fwmotion.github.io/3scale-cms/cli</url>
</site>
</distributionManagement>

<properties>
<project.build.outputTimestamp>1</project.build.outputTimestamp>
</properties>

</project>
Loading