forked from commercetools/rmf-codegen
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'commercetools:main' into main
- Loading branch information
Showing
49 changed files
with
1,371 additions
and
212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,139 +6,6 @@ on: | |
| name: AutoRelease | ||
|
|
||
| jobs: | ||
| # build-native: | ||
| # name: Build all native images | ||
| # continue-on-error: true | ||
| # strategy: | ||
| # matrix: | ||
| # include: | ||
| # - os: ubuntu-latest | ||
| # name: Linux | ||
| # artifact: rmf-codegen.linux | ||
| # - os: macos-latest | ||
| # name: Mac OS X | ||
| # artifact: rmf-codegen.darwin | ||
| # # TODO windows fails, reason not known yet | ||
| # # - os: windows-latest | ||
| # # name: Windows | ||
| # # artifact: rmf-codegen.win32 | ||
| # runs-on: ${{ matrix.os }} | ||
| # steps: | ||
| # - name: Checkout | ||
| # uses: actions/checkout@v3 | ||
| # | ||
| # - name: Setup Java | ||
| # uses: actions/setup-java@v3 | ||
| # with: | ||
| # distribution: 'temurin' | ||
| # java-version: '11' | ||
| # | ||
| # - name: Build ${{ matrix.name }} native image | ||
| # uses: gradle/gradle-command-action@v1 | ||
| # with: | ||
| # arguments: nativeImage | ||
| # build-root-directory: tools/cli-application | ||
| # gradle-executable: ./gradlew | ||
| # | ||
| # - name: Upload ${{ matrix.name }} native image | ||
| # uses: actions/upload-artifact@v1 | ||
| # with: | ||
| # name: ${{ matrix.artifact }} | ||
| # path: ./tools/cli-application/build/graal/rmf-codegen | ||
| # | ||
| # release: | ||
| # name: Build JAR and Release the artifacts | ||
| # runs-on: ubuntu-latest | ||
| # needs: build-native | ||
| # steps: | ||
| # - name: Checkout | ||
| # uses: actions/checkout@v3 | ||
| # | ||
| # - name: Setup Java | ||
| # uses: actions/setup-java@v3 | ||
| # with: | ||
| # distribution: 'temurin' | ||
| # java-version: '11' | ||
| # | ||
| # - name: Build JAR | ||
| # uses: gradle/gradle-command-action@v1 | ||
| # with: | ||
| # arguments: build | ||
| # build-root-directory: tools/cli-application | ||
| # gradle-executable: ./gradlew | ||
| # | ||
| # - name: Get current date | ||
| # id: date | ||
| # run: echo "::set-output name=date::$(date +'%Y-%m-%d_%H-%M-%S')" | ||
| # | ||
| # - name: Download native build artifacts | ||
| # uses: actions/download-artifact@v2 | ||
| # | ||
| # - name: Commit new version to README and install script | ||
| # uses: stefanzweifel/[email protected] | ||
| # with: | ||
| # commit_message: "TASK: Updating version in README" | ||
| # commit_user_name: Auto Mation | ||
| # commit_user_email: [email protected] | ||
| # commit_author: Auto Mation <[email protected]> | ||
| # | ||
| # - name: Create GitHub Release | ||
| # id: create_github_release | ||
| # uses: actions/create-release@v1 | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # with: | ||
| # tag_name: ${{ github.ref }} | ||
| # release_name: ${{ github.ref }} | ||
| # draft: false | ||
| # prerelease: false | ||
| # | ||
| # - name: Upload JAR | ||
| # id: upload-release-asset | ||
| # uses: actions/upload-release-asset@v1 | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # with: | ||
| # upload_url: ${{ steps.create_github_release.outputs.upload_url }} | ||
| # asset_path: rmf-codegen.jar | ||
| # asset_name: rmf-codegen.jar | ||
| # asset_content_type: application/java-archive | ||
| # | ||
| # - name: Upload Linux Binary | ||
| # id: upload-linux-asset | ||
| # uses: actions/upload-release-asset@v1 | ||
| # continue-on-error: true | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # with: | ||
| # upload_url: ${{ steps.create_github_release.outputs.upload_url }} | ||
| # asset_path: rmf-codegen.linux/rmf-codegen | ||
| # asset_name: rmf-codegen.linux | ||
| # asset_content_type: application/octet-stream | ||
| # | ||
| # - name: Upload Mac OS Binary | ||
| # id: upload-mac-asset | ||
| # continue-on-error: true | ||
| # uses: actions/upload-release-asset@v1 | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # with: | ||
| # upload_url: ${{ steps.create_github_release.outputs.upload_url }} | ||
| # asset_path: rmf-codegen.darwin/rmf-codegen | ||
| # asset_name: rmf-codegen.darwin | ||
| # asset_content_type: application/octet-stream | ||
|
|
||
| # - name: Upload Windows Binary | ||
| # id: upload-windows-asset | ||
| # uses: actions/upload-release-asset@v1 | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # with: | ||
| # upload_url: ${{ steps.create_github_release.outputs.upload_url }} | ||
| # asset_path: rmf-codegen.win32/rmf-codegen | ||
| # asset_name: rmf-codegen.exe | ||
| # asset_content_type: application/octet-stream | ||
|
|
||
| release_maven: | ||
| name: Build and release to Maven | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
ctp-validators/src/main/kotlin/com/commercetools/rmf/validators/PolymorphicSubtypesRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package com.commercetools.rmf.validators | ||
|
|
||
| import io.vrap.rmf.raml.model.modules.Library | ||
| import io.vrap.rmf.raml.model.types.AnyType | ||
| import io.vrap.rmf.raml.model.types.BuiltinType | ||
| import io.vrap.rmf.raml.model.types.ObjectType | ||
| import io.vrap.rmf.raml.model.types.TypeTemplate | ||
| import org.eclipse.emf.common.util.Diagnostic | ||
| import java.util.* | ||
|
|
||
| //@ValidatorSet | ||
| class PolymorphicSubtypesRule(severity: RuleSeverity, options: List<RuleOption>? = null) : TypesRule(severity, options) { | ||
|
|
||
| private val exclude: List<String> = | ||
| (options?.filter { ruleOption -> ruleOption.type.lowercase(Locale.getDefault()) == RuleOptionType.EXCLUDE.toString() }?.map { ruleOption -> ruleOption.value }?.plus("") ?: defaultExcludes) | ||
|
|
||
| override fun caseAnyType(type: AnyType): List<Diagnostic> { | ||
| val validationResults: MutableList<Diagnostic> = ArrayList() | ||
|
|
||
| if (exclude.contains(type.name).not() && type is ObjectType && type.subTypes.filterNot { it.isInlineType }.any() && type.discriminator == null) { | ||
| validationResults.add(create(type, "Type \"{0}\" has subtypes but no discriminator is set", type.name)) | ||
| } | ||
| return validationResults | ||
| } | ||
|
|
||
| companion object : ValidatorFactory<PolymorphicSubtypesRule> { | ||
| private val defaultExcludes by lazy { listOf("") } | ||
|
|
||
| @JvmStatic | ||
| override fun create(options: List<RuleOption>?): PolymorphicSubtypesRule { | ||
| return PolymorphicSubtypesRule(RuleSeverity.ERROR, options) | ||
| } | ||
|
|
||
| @JvmStatic | ||
| override fun create(severity: RuleSeverity, options: List<RuleOption>?): PolymorphicSubtypesRule { | ||
| return PolymorphicSubtypesRule(severity, options) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
ctp-validators/src/test/resources/polymorphic-subtype-rule.raml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #%RAML 1.0 | ||
| title: discriminator subtype rule | ||
|
|
||
| types: | ||
| Foo: | ||
| type: object | ||
| discriminator: type | ||
| properties: | ||
| type: string | ||
| SubFoo: | ||
| discriminatorValue: sub | ||
| type: Foo | ||
| Bar: | ||
| type: object | ||
| description: InvalidBar | ||
| properties: | ||
| name: string | ||
| FooBar: | ||
| description: FooBar | ||
| type: object | ||
| properties: | ||
| bar: Bar | ||
| FooBar2: | ||
| type: object | ||
| properties: | ||
| bar: | ||
| description: Bar | ||
| type: Bar | ||
| InvalidBaz: | ||
| type: object | ||
| description: InvalidBar | ||
| properties: | ||
| name: string | ||
| SubBaz: | ||
| description: SubBaz | ||
| type: InvalidBaz | ||
| SubBaz2: | ||
| type: InvalidBaz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
|
|
||
| dependencies { | ||
| implementation project(':codegen-renderers') | ||
| implementation commons.lang3 | ||
| implementation commons.text | ||
| implementation orgkotlin.reflect | ||
| implementation orgkotlin.stdlib | ||
| } |
Oops, something went wrong.