From 998e8fa7f918ab17cdc270afdceed7d426617920 Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Sat, 2 Dec 2023 13:21:59 -0500 Subject: [PATCH 01/14] Initial Equisoft fork configuration --- .circleci/config.yml | 217 - .devcontainer/devcontainer.json | 47 - .github/.test/auto-labeler.js | 117 - .github/.test/js-yaml.js | 3917 ----------------- .github/.test/samples.json | 1344 ------ .github/CODEOWNERS | 36 +- .github/FUNDING.yml | 1 - .github/ISSUE_TEMPLATE.md | 46 - .github/ISSUE_TEMPLATE/announcement.md | 10 - .github/ISSUE_TEMPLATE/bug_report.md | 67 - .github/ISSUE_TEMPLATE/feature_request.md | 24 - .github/PULL_REQUEST_TEMPLATE.md | 21 - .github/actions/run-samples/action.yaml | 19 - .github/auto-labeler.yml | 286 -- .github/dependabot.yml | 12 - .github/workflows/docker.yaml | 39 - .github/workflows/gradle-plugin-tests.yaml | 45 - .github/workflows/gradle-test.yaml | 54 - .github/workflows/linux.yaml | 108 - .github/workflows/maven-plugin-tests.yaml | 44 - .github/workflows/misc-test.yaml | 32 - .../openapi-generator-test-results.yaml | 19 - .github/workflows/openapi-generator.yaml | 121 +- .../workflows/samples-c-libcurl-client.yaml | 27 - .github/workflows/samples-cpp-qt-client.yaml | 38 - .github/workflows/samples-dart.yaml | 39 - .../workflows/samples-dotnet-standard.yaml | 30 - .github/workflows/samples-dotnet.yaml | 54 - .../samples-dotnet6-client-echo-api.yaml | 33 - .github/workflows/samples-dotnet6-client.yaml | 81 - .github/workflows/samples-dotnet6-server.yaml | 41 - .github/workflows/samples-elm.yaml | 35 - .github/workflows/samples-erlang.yaml | 35 - .../workflows/samples-go-client-echo-api.yaml | 32 - .github/workflows/samples-go.yaml | 34 - .github/workflows/samples-groovy.yaml | 45 - .github/workflows/samples-haskell.yaml | 36 - .../samples-java-client-echo-api-jdk11.yaml | 44 - .../samples-java-client-echo-api-jdk8.yaml | 48 - .../workflows/samples-java-client-jdk11.yaml | 89 - .../workflows/samples-java-client-jdk17.yaml | 42 - .github/workflows/samples-java-helidon.yaml | 41 - .../samples-java-play-framework.yaml | 47 - .../workflows/samples-java-server-jdk8.yaml | 50 - .github/workflows/samples-jaxrs-jdk11.yaml | 36 - .github/workflows/samples-jaxrs.yaml | 56 - .github/workflows/samples-jdk17.yaml | 63 - .github/workflows/samples-julia.yaml | 41 - .github/workflows/samples-kotlin-client.yaml | 89 - .../samples-kotlin-server-jdk17.yaml | 52 - .github/workflows/samples-kotlin-server.yaml | 67 - .github/workflows/samples-php7.yaml | 32 - .github/workflows/samples-php8.yaml | 32 - .../samples-python-client-echo-api.yaml | 44 - .../workflows/samples-python-petstore.yaml | 59 - ...es-python-pydantic-v1-client-echo-api.yaml | 44 - .../samples-python-pydantic-v1-petstore.yaml | 59 - .github/workflows/samples-python-server.yaml | 27 - .github/workflows/samples-rust.yaml | 34 - .github/workflows/samples-scala.yaml | 49 - .github/workflows/samples-spring-jdk17.yaml | 36 - .github/workflows/samples-spring.yaml | 75 - .github/workflows/samples-swift.yaml | 50 - .../samples-typescript-axios-echo-api.yaml | 42 - .github/workflows/samples-zapier.yaml | 30 - .github/workflows/sonar.yml | 26 - .github/workflows/windows.yaml | 59 - README.Equisoft.md | 42 + README.md | 3 +- modules/openapi-generator-cli/pom.xml | 6 +- modules/openapi-generator-core/pom.xml | 4 +- .../build.gradle | 8 +- .../gradle.properties | 2 +- .../openapi-generator-gradle-plugin/pom.xml | 6 +- .../openapi-generator-maven-plugin/pom.xml | 6 +- modules/openapi-generator-online/pom.xml | 6 +- modules/openapi-generator/pom.xml | 67 +- pom.xml | 102 +- 78 files changed, 108 insertions(+), 8793 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .github/.test/auto-labeler.js delete mode 100644 .github/.test/js-yaml.js delete mode 100644 .github/.test/samples.json delete mode 100644 .github/FUNDING.yml delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/ISSUE_TEMPLATE/announcement.md delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .github/actions/run-samples/action.yaml delete mode 100644 .github/auto-labeler.yml delete mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/docker.yaml delete mode 100644 .github/workflows/gradle-plugin-tests.yaml delete mode 100644 .github/workflows/gradle-test.yaml delete mode 100644 .github/workflows/linux.yaml delete mode 100644 .github/workflows/maven-plugin-tests.yaml delete mode 100644 .github/workflows/misc-test.yaml delete mode 100644 .github/workflows/openapi-generator-test-results.yaml delete mode 100644 .github/workflows/samples-c-libcurl-client.yaml delete mode 100644 .github/workflows/samples-cpp-qt-client.yaml delete mode 100644 .github/workflows/samples-dart.yaml delete mode 100644 .github/workflows/samples-dotnet-standard.yaml delete mode 100644 .github/workflows/samples-dotnet.yaml delete mode 100644 .github/workflows/samples-dotnet6-client-echo-api.yaml delete mode 100644 .github/workflows/samples-dotnet6-client.yaml delete mode 100644 .github/workflows/samples-dotnet6-server.yaml delete mode 100644 .github/workflows/samples-elm.yaml delete mode 100644 .github/workflows/samples-erlang.yaml delete mode 100644 .github/workflows/samples-go-client-echo-api.yaml delete mode 100644 .github/workflows/samples-go.yaml delete mode 100644 .github/workflows/samples-groovy.yaml delete mode 100644 .github/workflows/samples-haskell.yaml delete mode 100644 .github/workflows/samples-java-client-echo-api-jdk11.yaml delete mode 100644 .github/workflows/samples-java-client-echo-api-jdk8.yaml delete mode 100644 .github/workflows/samples-java-client-jdk11.yaml delete mode 100644 .github/workflows/samples-java-client-jdk17.yaml delete mode 100644 .github/workflows/samples-java-helidon.yaml delete mode 100644 .github/workflows/samples-java-play-framework.yaml delete mode 100644 .github/workflows/samples-java-server-jdk8.yaml delete mode 100644 .github/workflows/samples-jaxrs-jdk11.yaml delete mode 100644 .github/workflows/samples-jaxrs.yaml delete mode 100644 .github/workflows/samples-jdk17.yaml delete mode 100644 .github/workflows/samples-julia.yaml delete mode 100644 .github/workflows/samples-kotlin-client.yaml delete mode 100644 .github/workflows/samples-kotlin-server-jdk17.yaml delete mode 100644 .github/workflows/samples-kotlin-server.yaml delete mode 100644 .github/workflows/samples-php7.yaml delete mode 100644 .github/workflows/samples-php8.yaml delete mode 100644 .github/workflows/samples-python-client-echo-api.yaml delete mode 100644 .github/workflows/samples-python-petstore.yaml delete mode 100644 .github/workflows/samples-python-pydantic-v1-client-echo-api.yaml delete mode 100644 .github/workflows/samples-python-pydantic-v1-petstore.yaml delete mode 100644 .github/workflows/samples-python-server.yaml delete mode 100644 .github/workflows/samples-rust.yaml delete mode 100644 .github/workflows/samples-scala.yaml delete mode 100644 .github/workflows/samples-spring-jdk17.yaml delete mode 100644 .github/workflows/samples-spring.yaml delete mode 100644 .github/workflows/samples-swift.yaml delete mode 100644 .github/workflows/samples-typescript-axios-echo-api.yaml delete mode 100644 .github/workflows/samples-zapier.yaml delete mode 100644 .github/workflows/sonar.yml delete mode 100644 .github/workflows/windows.yaml create mode 100644 README.Equisoft.md diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 71098116b4c3..000000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,217 +0,0 @@ -version: 2.1 -commands: # a reusable command with parameters - command_build_and_test: - parameters: - nodeNo: - default: "0" - type: string - steps: - # Restore the dependency cache - - restore_cache: - keys: - # Default branch if not - - source-v2-{{ .Branch }}-{{ .Revision }} - - source-v2-{{ .Branch }}- - - source-v2- - # Machine Setup - # If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each - - run: - name: Install Headless Chrome dependencies - command: | - sudo apt-get update && sudo apt-get install -yq \ - gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \ - libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \ - libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \ - libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \ - fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget libgbm1 - # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out. - - checkout - # Prepare for artifact and test results collection equivalent to how it was done on 1.0. - # In many cases you can simplify this from what is generated here. - # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/' - - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS - # This is based on your 1.0 configuration file or project settings - #- run: - # command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV - - run: - command: java -version - - run: - command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; ' - - run: - command: | - sudo tee -a /etc/hosts \<<< "127.0.0.1 path.v1.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.1 path.v2.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.111 path.v3.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.1 operation.v1.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.1 operation.v2.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.111 operation.v3.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.1 server.v1.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.1 server.v2.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.111 server.v3.test.openapi-generator.tech" - sudo tee -a /etc/hosts \<<< "127.0.0.1 petstore.swagger.io" - cat /etc/hosts - # - run: docker pull openapitools/openapi-petstore - # - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore - - run: docker pull swaggerapi/petstore - - run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore - - run: docker ps -a - - run: sleep 30 - - run: cat /etc/hosts - - run: export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" - - run: - name: "Setup custom environment variables" - command: echo 'export CIRCLE_NODE_INDEX="<>"' >> $BASH_ENV - - run: ./CI/circle_parallel.sh - # Save dependency cache - #- save_cache: - # key: source-v2-{{ .Branch }}-{{ .Revision }} - # paths: - # # This is a broad list of cache paths to include many possible development environments - # # You can probably delete some of these entries - # - ~/.m2 - # - ~/.ivy2 - # - ~/.sbt - # - ~/.bundle - # - ~/.go_workspace - # - ~/.gradle - # - ".git" - # - ~/.stack - # - ~/R - ## save "default" cache using the key "source-v2-" - #- save_cache: - # key: source-v2- - # paths: - # # This is a broad list of cache paths to include many possible development environments - # # You can probably delete some of these entries - # - vendor/bundle - # - ~/.m2 - # - ~/.ivy2 - # - ~/.sbt - # - ~/.bundle - # - ~/.go_workspace - # - ~/.gradle - # - ~/.cache/bower - # - ".git" - # - ~/.stack - # - ~/R - # Teardown - # If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each - # Save test results - - store_test_results: - path: /tmp/circleci-test-results - # Save artifacts - - store_artifacts: - path: /tmp/circleci-artifacts - - store_artifacts: - path: /tmp/circleci-test-results - command_docker_build_and_test: - parameters: - nodeNo: - default: "0" - type: string - steps: - # Machine Setup - # If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each - # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out. - - checkout - # Prepare for artifact and test results collection equivalent to how it was done on 1.0. - # In many cases you can simplify this from what is generated here. - # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/' - - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS - # This is based on your 1.0 configuration file or project settings - # - run: - # command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV - # - run: - # Test - # - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error - - run: - name: "Setup custom environment variables" - command: echo 'export CIRCLE_NODE_INDEX="<>"' >> $BASH_ENV - - run: ./CI/circle_parallel.sh - # Teardown - # If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each - # Save test results - - store_test_results: - path: /tmp/circleci-test-results - # Save artifacts - - store_artifacts: - path: /tmp/circleci-artifacts - - store_artifacts: - path: /tmp/circleci-test-results -jobs: - node0: - machine: - image: ubuntu-2004:202201-02 - working_directory: ~/OpenAPITools/openapi-generator - shell: /bin/bash --login - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator - DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli - steps: - - command_build_and_test: - nodeNo: "0" - node1: - machine: - image: ubuntu-2004:202201-02 - working_directory: ~/OpenAPITools/openapi-generator - shell: /bin/bash --login - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator - DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli - steps: - - command_build_and_test: - nodeNo: "1" - node2: - machine: - image: ubuntu-2004:202201-02 - working_directory: ~/OpenAPITools/openapi-generator - shell: /bin/bash --login - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator - DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli - steps: - - command_build_and_test: - nodeNo: "2" - node3: - machine: - image: ubuntu-2004:202201-02 - working_directory: ~/OpenAPITools/openapi-generator - shell: /bin/bash --login - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator - DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli - steps: - - checkout - - command_build_and_test: - nodeNo: "3" - node4: - machine: - image: ubuntu-2004:202201-02 - working_directory: ~/OpenAPITools/openapi-generator - shell: /bin/bash --login - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator - DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli - steps: - - checkout - - command_build_and_test: - nodeNo: "4" -workflows: - version: 2 - build: - jobs: - - node0 - - node1 - - node2 - - node3 - - node4 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index aeb7cc5dc942..000000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "OpenAPIGenerator", - "image": "mcr.microsoft.com/devcontainers/base:debian", - "features": { - "ghcr.io/devcontainers/features/java:1": { - "version": "11", - "installMaven": true - }, - "ghcr.io/devcontainers/features/node:1": { - "version": "lts" - }, - "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {} - }, - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Set *default* container specific settings.json values on container create. - "settings": { - "java.configuration.runtimes": [ - { - "name": "JavaSE-11", - "path": "/usr/local/sdkman/candidates/java/11.0.16.1-ms", - "sources": "/usr/local/sdkman/candidates/java/11.0.16.1-ms/lib/src.zip", - "javadoc": "https://docs.oracle.com/en/java/javase/11/docs/api", - "default": true - } - ] - }, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "vscjava.vscode-java-pack", - "attilabuti.mustache-syntax-vscode", - "formulahendry.code-runner", - "visualstudioexptteam.vscodeintellicode", - "42crunch.vscode-openapi", - "mermade.openapi-lint" - ] - } - }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "mvn clean package -DskipTests", - // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode" -} diff --git a/.github/.test/auto-labeler.js b/.github/.test/auto-labeler.js deleted file mode 100644 index d8cf3ede4202..000000000000 --- a/.github/.test/auto-labeler.js +++ /dev/null @@ -1,117 +0,0 @@ -let fs = require('fs'); -let path = require('path'); -let util = require('util'); -let yaml = require('./js-yaml.js'); -let samples = require('./samples.json'); - -class LabelMatch { - constructor (match, label) { - this.match = match; - this.label = label; - } -} - -class FileError { - constructor (file, actualLabels, expectedLabels) { - this.file = file; - this.actual = actualLabels; - this.expected = expectedLabels; - } -} - -class TextError { - constructor (text, actualLabels, expectedLabels) { - this.text = text; - this.actual = actualLabels; - this.expected = expectedLabels; - } -} - -let labels = []; - -function labelsForFile(file) { - let body = fs.readFileSync(file); - return labelsForText(body) -} - -function labelsForText(text) { - let addLabels = new Set(); - let body = text; - for (const v of labels) { - if (v.match.test(body)) { - addLabels.add(v.label) - } - // reset regex state - v.match.lastIndex = 0 - } - return addLabels; -} - -try { - let config = yaml.safeLoad(fs.readFileSync('../auto-labeler.yml', 'utf8')); - - if (config && config.labels && Object.keys(config.labels).length > 0) { - for (const labelName in config.labels) { - if (config.labels.hasOwnProperty(labelName)) { - let matchAgainst = config.labels[labelName]; - if (Array.isArray(matchAgainst)) { - matchAgainst.forEach(regex => { - // noinspection JSCheckFunctionSignatures - labels.push(new LabelMatch(new RegExp(regex, 'g'), labelName)); - }) - } - } - } - } - - if (labels.length === 0) { - // noinspection ExceptionCaughtLocallyJS - throw new Error("Expected to parse config.labels, but failed.") - } - - let fileErrors = []; - samples.files.forEach(function(tester){ - let file = path.normalize(path.join('..', '..', 'bin', tester.input)); - let expectedLabels = new Set(tester.matches); - let actualLabels = labelsForFile(file); - let difference = new Set([...actualLabels].filter(x => !expectedLabels.has(x))); - if (difference.size > 0) { - fileErrors.push(new FileError(file, actualLabels, expectedLabels)); - } - }); - - let textErrors = []; - samples.text.forEach(function(tester){ - let expectedLabels = new Set(tester.matches); - let actualLabels = labelsForText(tester.input); - let difference = new Set([...actualLabels].filter(x => !expectedLabels.has(x))); - if (difference.size > 0) { - textErrors.push(new TextError(tester.input, actualLabels, expectedLabels)); - } - }); - - // These are separate (file vs text) in case we want to preview where these would fail in the file. not priority at the moment. - if (fileErrors.length > 0) { - console.warn('There were %d file tester errors', fileErrors.length); - fileErrors.forEach(function(errs) { - console.log("file: %j\n actual: %j\n expected: %j", errs.file, util.inspect(errs.actual), util.inspect(errs.expected)) - }); - } - - if (textErrors.length > 0) { - console.warn('There were %d text tester errors', textErrors.length); - textErrors.forEach(function(errs){ - console.log("input: %j\n actual: %j\n expected: %j", errs.text, util.inspect(errs.actual), util.inspect(errs.expected)) - }) - } - - let totalErrors = fileErrors.length + textErrors.length; - if (totalErrors === 0) { - console.log('Success!'); - } else { - console.log('Failure: %d total errors', totalErrors); - } -} catch (e) { - console.log(e); -} - diff --git a/.github/.test/js-yaml.js b/.github/.test/js-yaml.js deleted file mode 100644 index fcdc5f9077d6..000000000000 --- a/.github/.test/js-yaml.js +++ /dev/null @@ -1,3917 +0,0 @@ -/* js-yaml 3.12.0 https://github.com/nodeca/js-yaml */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.jsyaml = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i */ -var CHAR_QUESTION = 0x3F; /* ? */ -var CHAR_COMMERCIAL_AT = 0x40; /* @ */ -var CHAR_LEFT_SQUARE_BRACKET = 0x5B; /* [ */ -var CHAR_RIGHT_SQUARE_BRACKET = 0x5D; /* ] */ -var CHAR_GRAVE_ACCENT = 0x60; /* ` */ -var CHAR_LEFT_CURLY_BRACKET = 0x7B; /* { */ -var CHAR_VERTICAL_LINE = 0x7C; /* | */ -var CHAR_RIGHT_CURLY_BRACKET = 0x7D; /* } */ - -var ESCAPE_SEQUENCES = {}; - -ESCAPE_SEQUENCES[0x00] = '\\0'; -ESCAPE_SEQUENCES[0x07] = '\\a'; -ESCAPE_SEQUENCES[0x08] = '\\b'; -ESCAPE_SEQUENCES[0x09] = '\\t'; -ESCAPE_SEQUENCES[0x0A] = '\\n'; -ESCAPE_SEQUENCES[0x0B] = '\\v'; -ESCAPE_SEQUENCES[0x0C] = '\\f'; -ESCAPE_SEQUENCES[0x0D] = '\\r'; -ESCAPE_SEQUENCES[0x1B] = '\\e'; -ESCAPE_SEQUENCES[0x22] = '\\"'; -ESCAPE_SEQUENCES[0x5C] = '\\\\'; -ESCAPE_SEQUENCES[0x85] = '\\N'; -ESCAPE_SEQUENCES[0xA0] = '\\_'; -ESCAPE_SEQUENCES[0x2028] = '\\L'; -ESCAPE_SEQUENCES[0x2029] = '\\P'; - -var DEPRECATED_BOOLEANS_SYNTAX = [ - 'y', 'Y', 'yes', 'Yes', 'YES', 'on', 'On', 'ON', - 'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF' -]; - -function compileStyleMap(schema, map) { - var result, keys, index, length, tag, style, type; - - if (map === null) return {}; - - result = {}; - keys = Object.keys(map); - - for (index = 0, length = keys.length; index < length; index += 1) { - tag = keys[index]; - style = String(map[tag]); - - if (tag.slice(0, 2) === '!!') { - tag = 'tag:yaml.org,2002:' + tag.slice(2); - } - type = schema.compiledTypeMap['fallback'][tag]; - - if (type && _hasOwnProperty.call(type.styleAliases, style)) { - style = type.styleAliases[style]; - } - - result[tag] = style; - } - - return result; -} - -function encodeHex(character) { - var string, handle, length; - - string = character.toString(16).toUpperCase(); - - if (character <= 0xFF) { - handle = 'x'; - length = 2; - } else if (character <= 0xFFFF) { - handle = 'u'; - length = 4; - } else if (character <= 0xFFFFFFFF) { - handle = 'U'; - length = 8; - } else { - throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF'); - } - - return '\\' + handle + common.repeat('0', length - string.length) + string; -} - -function State(options) { - this.schema = options['schema'] || DEFAULT_FULL_SCHEMA; - this.indent = Math.max(1, (options['indent'] || 2)); - this.skipInvalid = options['skipInvalid'] || false; - this.flowLevel = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']); - this.styleMap = compileStyleMap(this.schema, options['styles'] || null); - this.sortKeys = options['sortKeys'] || false; - this.lineWidth = options['lineWidth'] || 80; - this.noRefs = options['noRefs'] || false; - this.noCompatMode = options['noCompatMode'] || false; - this.condenseFlow = options['condenseFlow'] || false; - - this.implicitTypes = this.schema.compiledImplicit; - this.explicitTypes = this.schema.compiledExplicit; - - this.tag = null; - this.result = ''; - - this.duplicates = []; - this.usedDuplicates = null; -} - -// Indents every line in a string. Empty lines (\n only) are not indented. -function indentString(string, spaces) { - var ind = common.repeat(' ', spaces), - position = 0, - next = -1, - result = '', - line, - length = string.length; - - while (position < length) { - next = string.indexOf('\n', position); - if (next === -1) { - line = string.slice(position); - position = length; - } else { - line = string.slice(position, next + 1); - position = next + 1; - } - - if (line.length && line !== '\n') result += ind; - - result += line; - } - - return result; -} - -function generateNextLine(state, level) { - return '\n' + common.repeat(' ', state.indent * level); -} - -function testImplicitResolving(state, str) { - var index, length, type; - - for (index = 0, length = state.implicitTypes.length; index < length; index += 1) { - type = state.implicitTypes[index]; - - if (type.resolve(str)) { - return true; - } - } - - return false; -} - -// [33] s-white ::= s-space | s-tab -function isWhitespace(c) { - return c === CHAR_SPACE || c === CHAR_TAB; -} - -// Returns true if the character can be printed without escaping. -// From YAML 1.2: "any allowed characters known to be non-printable -// should also be escaped. [However,] This isn’t mandatory" -// Derived from nb-char - \t - #x85 - #xA0 - #x2028 - #x2029. -function isPrintable(c) { - return (0x00020 <= c && c <= 0x00007E) - || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029) - || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */) - || (0x10000 <= c && c <= 0x10FFFF); -} - -// Simplified test for values allowed after the first character in plain style. -function isPlainSafe(c) { - // Uses a subset of nb-char - c-flow-indicator - ":" - "#" - // where nb-char ::= c-printable - b-char - c-byte-order-mark. - return isPrintable(c) && c !== 0xFEFF - // - c-flow-indicator - && c !== CHAR_COMMA - && c !== CHAR_LEFT_SQUARE_BRACKET - && c !== CHAR_RIGHT_SQUARE_BRACKET - && c !== CHAR_LEFT_CURLY_BRACKET - && c !== CHAR_RIGHT_CURLY_BRACKET - // - ":" - "#" - && c !== CHAR_COLON - && c !== CHAR_SHARP; -} - -// Simplified test for values allowed as the first character in plain style. -function isPlainSafeFirst(c) { - // Uses a subset of ns-char - c-indicator - // where ns-char = nb-char - s-white. - return isPrintable(c) && c !== 0xFEFF - && !isWhitespace(c) // - s-white - // - (c-indicator ::= - // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}” - && c !== CHAR_MINUS - && c !== CHAR_QUESTION - && c !== CHAR_COLON - && c !== CHAR_COMMA - && c !== CHAR_LEFT_SQUARE_BRACKET - && c !== CHAR_RIGHT_SQUARE_BRACKET - && c !== CHAR_LEFT_CURLY_BRACKET - && c !== CHAR_RIGHT_CURLY_BRACKET - // | “#” | “&” | “*” | “!” | “|” | “>” | “'” | “"” - && c !== CHAR_SHARP - && c !== CHAR_AMPERSAND - && c !== CHAR_ASTERISK - && c !== CHAR_EXCLAMATION - && c !== CHAR_VERTICAL_LINE - && c !== CHAR_GREATER_THAN - && c !== CHAR_SINGLE_QUOTE - && c !== CHAR_DOUBLE_QUOTE - // | “%” | “@” | “`”) - && c !== CHAR_PERCENT - && c !== CHAR_COMMERCIAL_AT - && c !== CHAR_GRAVE_ACCENT; -} - -// Determines whether block indentation indicator is required. -function needIndentIndicator(string) { - var leadingSpaceRe = /^\n* /; - return leadingSpaceRe.test(string); -} - -var STYLE_PLAIN = 1, - STYLE_SINGLE = 2, - STYLE_LITERAL = 3, - STYLE_FOLDED = 4, - STYLE_DOUBLE = 5; - -// Determines which scalar styles are possible and returns the preferred style. -// lineWidth = -1 => no limit. -// Pre-conditions: str.length > 0. -// Post-conditions: -// STYLE_PLAIN or STYLE_SINGLE => no \n are in the string. -// STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1). -// STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1). -function chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) { - var i; - var char; - var hasLineBreak = false; - var hasFoldableLine = false; // only checked if shouldTrackWidth - var shouldTrackWidth = lineWidth !== -1; - var previousLineBreak = -1; // count the first line correctly - var plain = isPlainSafeFirst(string.charCodeAt(0)) - && !isWhitespace(string.charCodeAt(string.length - 1)); - - if (singleLineOnly) { - // Case: no block styles. - // Check for disallowed characters to rule out plain and single. - for (i = 0; i < string.length; i++) { - char = string.charCodeAt(i); - if (!isPrintable(char)) { - return STYLE_DOUBLE; - } - plain = plain && isPlainSafe(char); - } - } else { - // Case: block styles permitted. - for (i = 0; i < string.length; i++) { - char = string.charCodeAt(i); - if (char === CHAR_LINE_FEED) { - hasLineBreak = true; - // Check if any line can be folded. - if (shouldTrackWidth) { - hasFoldableLine = hasFoldableLine || - // Foldable line = too long, and not more-indented. - (i - previousLineBreak - 1 > lineWidth && - string[previousLineBreak + 1] !== ' '); - previousLineBreak = i; - } - } else if (!isPrintable(char)) { - return STYLE_DOUBLE; - } - plain = plain && isPlainSafe(char); - } - // in case the end is missing a \n - hasFoldableLine = hasFoldableLine || (shouldTrackWidth && - (i - previousLineBreak - 1 > lineWidth && - string[previousLineBreak + 1] !== ' ')); - } - // Although every style can represent \n without escaping, prefer block styles - // for multiline, since they're more readable and they don't add empty lines. - // Also prefer folding a super-long line. - if (!hasLineBreak && !hasFoldableLine) { - // Strings interpretable as another type have to be quoted; - // e.g. the string 'true' vs. the boolean true. - return plain && !testAmbiguousType(string) - ? STYLE_PLAIN : STYLE_SINGLE; - } - // Edge case: block indentation indicator can only have one digit. - if (indentPerLevel > 9 && needIndentIndicator(string)) { - return STYLE_DOUBLE; - } - // At this point we know block styles are valid. - // Prefer literal style unless we want to fold. - return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL; -} - -// Note: line breaking/folding is implemented for only the folded style. -// NB. We drop the last trailing newline (if any) of a returned block scalar -// since the dumper adds its own newline. This always works: -// • No ending newline => unaffected; already using strip "-" chomping. -// • Ending newline => removed then restored. -// Importantly, this keeps the "+" chomp indicator from gaining an extra line. -function writeScalar(state, string, level, iskey) { - state.dump = (function () { - if (string.length === 0) { - return "''"; - } - if (!state.noCompatMode && - DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) { - return "'" + string + "'"; - } - - var indent = state.indent * Math.max(1, level); // no 0-indent scalars - // As indentation gets deeper, let the width decrease monotonically - // to the lower bound min(state.lineWidth, 40). - // Note that this implies - // state.lineWidth ≤ 40 + state.indent: width is fixed at the lower bound. - // state.lineWidth > 40 + state.indent: width decreases until the lower bound. - // This behaves better than a constant minimum width which disallows narrower options, - // or an indent threshold which causes the width to suddenly increase. - var lineWidth = state.lineWidth === -1 - ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent); - - // Without knowing if keys are implicit/explicit, assume implicit for safety. - var singleLineOnly = iskey - // No block styles in flow mode. - || (state.flowLevel > -1 && level >= state.flowLevel); - function testAmbiguity(string) { - return testImplicitResolving(state, string); - } - - switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) { - case STYLE_PLAIN: - return string; - case STYLE_SINGLE: - return "'" + string.replace(/'/g, "''") + "'"; - case STYLE_LITERAL: - return '|' + blockHeader(string, state.indent) - + dropEndingNewline(indentString(string, indent)); - case STYLE_FOLDED: - return '>' + blockHeader(string, state.indent) - + dropEndingNewline(indentString(foldString(string, lineWidth), indent)); - case STYLE_DOUBLE: - return '"' + escapeString(string, lineWidth) + '"'; - default: - throw new YAMLException('impossible error: invalid scalar style'); - } - }()); -} - -// Pre-conditions: string is valid for a block scalar, 1 <= indentPerLevel <= 9. -function blockHeader(string, indentPerLevel) { - var indentIndicator = needIndentIndicator(string) ? String(indentPerLevel) : ''; - - // note the special case: the string '\n' counts as a "trailing" empty line. - var clip = string[string.length - 1] === '\n'; - var keep = clip && (string[string.length - 2] === '\n' || string === '\n'); - var chomp = keep ? '+' : (clip ? '' : '-'); - - return indentIndicator + chomp + '\n'; -} - -// (See the note for writeScalar.) -function dropEndingNewline(string) { - return string[string.length - 1] === '\n' ? string.slice(0, -1) : string; -} - -// Note: a long line without a suitable break point will exceed the width limit. -// Pre-conditions: every char in str isPrintable, str.length > 0, width > 0. -function foldString(string, width) { - // In folded style, $k$ consecutive newlines output as $k+1$ newlines— - // unless they're before or after a more-indented line, or at the very - // beginning or end, in which case $k$ maps to $k$. - // Therefore, parse each chunk as newline(s) followed by a content line. - var lineRe = /(\n+)([^\n]*)/g; - - // first line (possibly an empty line) - var result = (function () { - var nextLF = string.indexOf('\n'); - nextLF = nextLF !== -1 ? nextLF : string.length; - lineRe.lastIndex = nextLF; - return foldLine(string.slice(0, nextLF), width); - }()); - // If we haven't reached the first content line yet, don't add an extra \n. - var prevMoreIndented = string[0] === '\n' || string[0] === ' '; - var moreIndented; - - // rest of the lines - var match; - while ((match = lineRe.exec(string))) { - var prefix = match[1], line = match[2]; - moreIndented = (line[0] === ' '); - result += prefix - + (!prevMoreIndented && !moreIndented && line !== '' - ? '\n' : '') - + foldLine(line, width); - prevMoreIndented = moreIndented; - } - - return result; -} - -// Greedy line breaking. -// Picks the longest line under the limit each time, -// otherwise settles for the shortest line over the limit. -// NB. More-indented lines *cannot* be folded, as that would add an extra \n. -function foldLine(line, width) { - if (line === '' || line[0] === ' ') return line; - - // Since a more-indented line adds a \n, breaks can't be followed by a space. - var breakRe = / [^ ]/g; // note: the match index will always be <= length-2. - var match; - // start is an inclusive index. end, curr, and next are exclusive. - var start = 0, end, curr = 0, next = 0; - var result = ''; - - // Invariants: 0 <= start <= length-1. - // 0 <= curr <= next <= max(0, length-2). curr - start <= width. - // Inside the loop: - // A match implies length >= 2, so curr and next are <= length-2. - while ((match = breakRe.exec(line))) { - next = match.index; - // maintain invariant: curr - start <= width - if (next - start > width) { - end = (curr > start) ? curr : next; // derive end <= length-2 - result += '\n' + line.slice(start, end); - // skip the space that was output as \n - start = end + 1; // derive start <= length-1 - } - curr = next; - } - - // By the invariants, start <= length-1, so there is something left over. - // It is either the whole string or a part starting from non-whitespace. - result += '\n'; - // Insert a break if the remainder is too long and there is a break available. - if (line.length - start > width && curr > start) { - result += line.slice(start, curr) + '\n' + line.slice(curr + 1); - } else { - result += line.slice(start); - } - - return result.slice(1); // drop extra \n joiner -} - -// Escapes a double-quoted string. -function escapeString(string) { - var result = ''; - var char, nextChar; - var escapeSeq; - - for (var i = 0; i < string.length; i++) { - char = string.charCodeAt(i); - // Check for surrogate pairs (reference Unicode 3.0 section "3.7 Surrogates"). - if (char >= 0xD800 && char <= 0xDBFF/* high surrogate */) { - nextChar = string.charCodeAt(i + 1); - if (nextChar >= 0xDC00 && nextChar <= 0xDFFF/* low surrogate */) { - // Combine the surrogate pair and store it escaped. - result += encodeHex((char - 0xD800) * 0x400 + nextChar - 0xDC00 + 0x10000); - // Advance index one extra since we already used that char here. - i++; continue; - } - } - escapeSeq = ESCAPE_SEQUENCES[char]; - result += !escapeSeq && isPrintable(char) - ? string[i] - : escapeSeq || encodeHex(char); - } - - return result; -} - -function writeFlowSequence(state, level, object) { - var _result = '', - _tag = state.tag, - index, - length; - - for (index = 0, length = object.length; index < length; index += 1) { - // Write only valid elements. - if (writeNode(state, level, object[index], false, false)) { - if (index !== 0) _result += ',' + (!state.condenseFlow ? ' ' : ''); - _result += state.dump; - } - } - - state.tag = _tag; - state.dump = '[' + _result + ']'; -} - -function writeBlockSequence(state, level, object, compact) { - var _result = '', - _tag = state.tag, - index, - length; - - for (index = 0, length = object.length; index < length; index += 1) { - // Write only valid elements. - if (writeNode(state, level + 1, object[index], true, true)) { - if (!compact || index !== 0) { - _result += generateNextLine(state, level); - } - - if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) { - _result += '-'; - } else { - _result += '- '; - } - - _result += state.dump; - } - } - - state.tag = _tag; - state.dump = _result || '[]'; // Empty sequence if no valid values. -} - -function writeFlowMapping(state, level, object) { - var _result = '', - _tag = state.tag, - objectKeyList = Object.keys(object), - index, - length, - objectKey, - objectValue, - pairBuffer; - - for (index = 0, length = objectKeyList.length; index < length; index += 1) { - pairBuffer = state.condenseFlow ? '"' : ''; - - if (index !== 0) pairBuffer += ', '; - - objectKey = objectKeyList[index]; - objectValue = object[objectKey]; - - if (!writeNode(state, level, objectKey, false, false)) { - continue; // Skip this pair because of invalid key; - } - - if (state.dump.length > 1024) pairBuffer += '? '; - - pairBuffer += state.dump + (state.condenseFlow ? '"' : '') + ':' + (state.condenseFlow ? '' : ' '); - - if (!writeNode(state, level, objectValue, false, false)) { - continue; // Skip this pair because of invalid value. - } - - pairBuffer += state.dump; - - // Both key and value are valid. - _result += pairBuffer; - } - - state.tag = _tag; - state.dump = '{' + _result + '}'; -} - -function writeBlockMapping(state, level, object, compact) { - var _result = '', - _tag = state.tag, - objectKeyList = Object.keys(object), - index, - length, - objectKey, - objectValue, - explicitPair, - pairBuffer; - - // Allow sorting keys so that the output file is deterministic - if (state.sortKeys === true) { - // Default sorting - objectKeyList.sort(); - } else if (typeof state.sortKeys === 'function') { - // Custom sort function - objectKeyList.sort(state.sortKeys); - } else if (state.sortKeys) { - // Something is wrong - throw new YAMLException('sortKeys must be a boolean or a function'); - } - - for (index = 0, length = objectKeyList.length; index < length; index += 1) { - pairBuffer = ''; - - if (!compact || index !== 0) { - pairBuffer += generateNextLine(state, level); - } - - objectKey = objectKeyList[index]; - objectValue = object[objectKey]; - - if (!writeNode(state, level + 1, objectKey, true, true, true)) { - continue; // Skip this pair because of invalid key. - } - - explicitPair = (state.tag !== null && state.tag !== '?') || - (state.dump && state.dump.length > 1024); - - if (explicitPair) { - if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) { - pairBuffer += '?'; - } else { - pairBuffer += '? '; - } - } - - pairBuffer += state.dump; - - if (explicitPair) { - pairBuffer += generateNextLine(state, level); - } - - if (!writeNode(state, level + 1, objectValue, true, explicitPair)) { - continue; // Skip this pair because of invalid value. - } - - if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) { - pairBuffer += ':'; - } else { - pairBuffer += ': '; - } - - pairBuffer += state.dump; - - // Both key and value are valid. - _result += pairBuffer; - } - - state.tag = _tag; - state.dump = _result || '{}'; // Empty mapping if no valid pairs. -} - -function detectType(state, object, explicit) { - var _result, typeList, index, length, type, style; - - typeList = explicit ? state.explicitTypes : state.implicitTypes; - - for (index = 0, length = typeList.length; index < length; index += 1) { - type = typeList[index]; - - if ((type.instanceOf || type.predicate) && - (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) && - (!type.predicate || type.predicate(object))) { - - state.tag = explicit ? type.tag : '?'; - - if (type.represent) { - style = state.styleMap[type.tag] || type.defaultStyle; - - if (_toString.call(type.represent) === '[object Function]') { - _result = type.represent(object, style); - } else if (_hasOwnProperty.call(type.represent, style)) { - _result = type.represent[style](object, style); - } else { - throw new YAMLException('!<' + type.tag + '> tag resolver accepts not "' + style + '" style'); - } - - state.dump = _result; - } - - return true; - } - } - - return false; -} - -// Serializes `object` and writes it to global `result`. -// Returns true on success, or false on invalid object. -// -function writeNode(state, level, object, block, compact, iskey) { - state.tag = null; - state.dump = object; - - if (!detectType(state, object, false)) { - detectType(state, object, true); - } - - var type = _toString.call(state.dump); - - if (block) { - block = (state.flowLevel < 0 || state.flowLevel > level); - } - - var objectOrArray = type === '[object Object]' || type === '[object Array]', - duplicateIndex, - duplicate; - - if (objectOrArray) { - duplicateIndex = state.duplicates.indexOf(object); - duplicate = duplicateIndex !== -1; - } - - if ((state.tag !== null && state.tag !== '?') || duplicate || (state.indent !== 2 && level > 0)) { - compact = false; - } - - if (duplicate && state.usedDuplicates[duplicateIndex]) { - state.dump = '*ref_' + duplicateIndex; - } else { - if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) { - state.usedDuplicates[duplicateIndex] = true; - } - if (type === '[object Object]') { - if (block && (Object.keys(state.dump).length !== 0)) { - writeBlockMapping(state, level, state.dump, compact); - if (duplicate) { - state.dump = '&ref_' + duplicateIndex + state.dump; - } - } else { - writeFlowMapping(state, level, state.dump); - if (duplicate) { - state.dump = '&ref_' + duplicateIndex + ' ' + state.dump; - } - } - } else if (type === '[object Array]') { - if (block && (state.dump.length !== 0)) { - writeBlockSequence(state, level, state.dump, compact); - if (duplicate) { - state.dump = '&ref_' + duplicateIndex + state.dump; - } - } else { - writeFlowSequence(state, level, state.dump); - if (duplicate) { - state.dump = '&ref_' + duplicateIndex + ' ' + state.dump; - } - } - } else if (type === '[object String]') { - if (state.tag !== '?') { - writeScalar(state, state.dump, level, iskey); - } - } else { - if (state.skipInvalid) return false; - throw new YAMLException('unacceptable kind of an object to dump ' + type); - } - - if (state.tag !== null && state.tag !== '?') { - state.dump = '!<' + state.tag + '> ' + state.dump; - } - } - - return true; -} - -function getDuplicateReferences(object, state) { - var objects = [], - duplicatesIndexes = [], - index, - length; - - inspectNode(object, objects, duplicatesIndexes); - - for (index = 0, length = duplicatesIndexes.length; index < length; index += 1) { - state.duplicates.push(objects[duplicatesIndexes[index]]); - } - state.usedDuplicates = new Array(length); -} - -function inspectNode(object, objects, duplicatesIndexes) { - var objectKeyList, - index, - length; - - if (object !== null && typeof object === 'object') { - index = objects.indexOf(object); - if (index !== -1) { - if (duplicatesIndexes.indexOf(index) === -1) { - duplicatesIndexes.push(index); - } - } else { - objects.push(object); - - if (Array.isArray(object)) { - for (index = 0, length = object.length; index < length; index += 1) { - inspectNode(object[index], objects, duplicatesIndexes); - } - } else { - objectKeyList = Object.keys(object); - - for (index = 0, length = objectKeyList.length; index < length; index += 1) { - inspectNode(object[objectKeyList[index]], objects, duplicatesIndexes); - } - } - } - } -} - -function dump(input, options) { - options = options || {}; - - var state = new State(options); - - if (!state.noRefs) getDuplicateReferences(input, state); - - if (writeNode(state, 0, input, true, true)) return state.dump + '\n'; - - return ''; -} - -function safeDump(input, options) { - return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options)); -} - -module.exports.dump = dump; -module.exports.safeDump = safeDump; - -},{"./common":2,"./exception":4,"./schema/default_full":9,"./schema/default_safe":10}],4:[function(require,module,exports){ -// YAML error class. http://stackoverflow.com/questions/8458984 -// -'use strict'; - -function YAMLException(reason, mark) { - // Super constructor - Error.call(this); - - this.name = 'YAMLException'; - this.reason = reason; - this.mark = mark; - this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : ''); - - // Include stack trace in error object - if (Error.captureStackTrace) { - // Chrome and NodeJS - Error.captureStackTrace(this, this.constructor); - } else { - // FF, IE 10+ and Safari 6+. Fallback for others - this.stack = (new Error()).stack || ''; - } -} - - -// Inherit from Error -YAMLException.prototype = Object.create(Error.prototype); -YAMLException.prototype.constructor = YAMLException; - - -YAMLException.prototype.toString = function toString(compact) { - var result = this.name + ': '; - - result += this.reason || '(unknown reason)'; - - if (!compact && this.mark) { - result += ' ' + this.mark.toString(); - } - - return result; -}; - - -module.exports = YAMLException; - -},{}],5:[function(require,module,exports){ -'use strict'; - -/*eslint-disable max-len,no-use-before-define*/ - -var common = require('./common'); -var YAMLException = require('./exception'); -var Mark = require('./mark'); -var DEFAULT_SAFE_SCHEMA = require('./schema/default_safe'); -var DEFAULT_FULL_SCHEMA = require('./schema/default_full'); - - -var _hasOwnProperty = Object.prototype.hasOwnProperty; - - -var CONTEXT_FLOW_IN = 1; -var CONTEXT_FLOW_OUT = 2; -var CONTEXT_BLOCK_IN = 3; -var CONTEXT_BLOCK_OUT = 4; - - -var CHOMPING_CLIP = 1; -var CHOMPING_STRIP = 2; -var CHOMPING_KEEP = 3; - - -var PATTERN_NON_PRINTABLE = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/; -var PATTERN_NON_ASCII_LINE_BREAKS = /[\x85\u2028\u2029]/; -var PATTERN_FLOW_INDICATORS = /[,\[\]\{\}]/; -var PATTERN_TAG_HANDLE = /^(?:!|!!|![a-z\-]+!)$/i; -var PATTERN_TAG_URI = /^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i; - - -function is_EOL(c) { - return (c === 0x0A/* LF */) || (c === 0x0D/* CR */); -} - -function is_WHITE_SPACE(c) { - return (c === 0x09/* Tab */) || (c === 0x20/* Space */); -} - -function is_WS_OR_EOL(c) { - return (c === 0x09/* Tab */) || - (c === 0x20/* Space */) || - (c === 0x0A/* LF */) || - (c === 0x0D/* CR */); -} - -function is_FLOW_INDICATOR(c) { - return c === 0x2C/* , */ || - c === 0x5B/* [ */ || - c === 0x5D/* ] */ || - c === 0x7B/* { */ || - c === 0x7D/* } */; -} - -function fromHexCode(c) { - var lc; - - if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) { - return c - 0x30; - } - - /*eslint-disable no-bitwise*/ - lc = c | 0x20; - - if ((0x61/* a */ <= lc) && (lc <= 0x66/* f */)) { - return lc - 0x61 + 10; - } - - return -1; -} - -function escapedHexLen(c) { - if (c === 0x78/* x */) { return 2; } - if (c === 0x75/* u */) { return 4; } - if (c === 0x55/* U */) { return 8; } - return 0; -} - -function fromDecimalCode(c) { - if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) { - return c - 0x30; - } - - return -1; -} - -function simpleEscapeSequence(c) { - /* eslint-disable indent */ - return (c === 0x30/* 0 */) ? '\x00' : - (c === 0x61/* a */) ? '\x07' : - (c === 0x62/* b */) ? '\x08' : - (c === 0x74/* t */) ? '\x09' : - (c === 0x09/* Tab */) ? '\x09' : - (c === 0x6E/* n */) ? '\x0A' : - (c === 0x76/* v */) ? '\x0B' : - (c === 0x66/* f */) ? '\x0C' : - (c === 0x72/* r */) ? '\x0D' : - (c === 0x65/* e */) ? '\x1B' : - (c === 0x20/* Space */) ? ' ' : - (c === 0x22/* " */) ? '\x22' : - (c === 0x2F/* / */) ? '/' : - (c === 0x5C/* \ */) ? '\x5C' : - (c === 0x4E/* N */) ? '\x85' : - (c === 0x5F/* _ */) ? '\xA0' : - (c === 0x4C/* L */) ? '\u2028' : - (c === 0x50/* P */) ? '\u2029' : ''; -} - -function charFromCodepoint(c) { - if (c <= 0xFFFF) { - return String.fromCharCode(c); - } - // Encode UTF-16 surrogate pair - // https://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B010000_to_U.2B10FFFF - return String.fromCharCode( - ((c - 0x010000) >> 10) + 0xD800, - ((c - 0x010000) & 0x03FF) + 0xDC00 - ); -} - -var simpleEscapeCheck = new Array(256); // integer, for fast access -var simpleEscapeMap = new Array(256); -for (var i = 0; i < 256; i++) { - simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0; - simpleEscapeMap[i] = simpleEscapeSequence(i); -} - - -function State(input, options) { - this.input = input; - - this.filename = options['filename'] || null; - this.schema = options['schema'] || DEFAULT_FULL_SCHEMA; - this.onWarning = options['onWarning'] || null; - this.legacy = options['legacy'] || false; - this.json = options['json'] || false; - this.listener = options['listener'] || null; - - this.implicitTypes = this.schema.compiledImplicit; - this.typeMap = this.schema.compiledTypeMap; - - this.length = input.length; - this.position = 0; - this.line = 0; - this.lineStart = 0; - this.lineIndent = 0; - - this.documents = []; - - /* - this.version; - this.checkLineBreaks; - this.tagMap; - this.anchorMap; - this.tag; - this.anchor; - this.kind; - this.result;*/ - -} - - -function generateError(state, message) { - return new YAMLException( - message, - new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart))); -} - -function throwError(state, message) { - throw generateError(state, message); -} - -function throwWarning(state, message) { - if (state.onWarning) { - state.onWarning.call(null, generateError(state, message)); - } -} - - -var directiveHandlers = { - - YAML: function handleYamlDirective(state, name, args) { - - var match, major, minor; - - if (state.version !== null) { - throwError(state, 'duplication of %YAML directive'); - } - - if (args.length !== 1) { - throwError(state, 'YAML directive accepts exactly one argument'); - } - - match = /^([0-9]+)\.([0-9]+)$/.exec(args[0]); - - if (match === null) { - throwError(state, 'ill-formed argument of the YAML directive'); - } - - major = parseInt(match[1], 10); - minor = parseInt(match[2], 10); - - if (major !== 1) { - throwError(state, 'unacceptable YAML version of the document'); - } - - state.version = args[0]; - state.checkLineBreaks = (minor < 2); - - if (minor !== 1 && minor !== 2) { - throwWarning(state, 'unsupported YAML version of the document'); - } - }, - - TAG: function handleTagDirective(state, name, args) { - - var handle, prefix; - - if (args.length !== 2) { - throwError(state, 'TAG directive accepts exactly two arguments'); - } - - handle = args[0]; - prefix = args[1]; - - if (!PATTERN_TAG_HANDLE.test(handle)) { - throwError(state, 'ill-formed tag handle (first argument) of the TAG directive'); - } - - if (_hasOwnProperty.call(state.tagMap, handle)) { - throwError(state, 'there is a previously declared suffix for "' + handle + '" tag handle'); - } - - if (!PATTERN_TAG_URI.test(prefix)) { - throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive'); - } - - state.tagMap[handle] = prefix; - } -}; - - -function captureSegment(state, start, end, checkJson) { - var _position, _length, _character, _result; - - if (start < end) { - _result = state.input.slice(start, end); - - if (checkJson) { - for (_position = 0, _length = _result.length; _position < _length; _position += 1) { - _character = _result.charCodeAt(_position); - if (!(_character === 0x09 || - (0x20 <= _character && _character <= 0x10FFFF))) { - throwError(state, 'expected valid JSON character'); - } - } - } else if (PATTERN_NON_PRINTABLE.test(_result)) { - throwError(state, 'the stream contains non-printable characters'); - } - - state.result += _result; - } -} - -function mergeMappings(state, destination, source, overridableKeys) { - var sourceKeys, key, index, quantity; - - if (!common.isObject(source)) { - throwError(state, 'cannot merge mappings; the provided source object is unacceptable'); - } - - sourceKeys = Object.keys(source); - - for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) { - key = sourceKeys[index]; - - if (!_hasOwnProperty.call(destination, key)) { - destination[key] = source[key]; - overridableKeys[key] = true; - } - } -} - -function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, startLine, startPos) { - var index, quantity; - - keyNode = String(keyNode); - - if (_result === null) { - _result = {}; - } - - if (keyTag === 'tag:yaml.org,2002:merge') { - if (Array.isArray(valueNode)) { - for (index = 0, quantity = valueNode.length; index < quantity; index += 1) { - mergeMappings(state, _result, valueNode[index], overridableKeys); - } - } else { - mergeMappings(state, _result, valueNode, overridableKeys); - } - } else { - if (!state.json && - !_hasOwnProperty.call(overridableKeys, keyNode) && - _hasOwnProperty.call(_result, keyNode)) { - state.line = startLine || state.line; - state.position = startPos || state.position; - throwError(state, 'duplicated mapping key'); - } - _result[keyNode] = valueNode; - delete overridableKeys[keyNode]; - } - - return _result; -} - -function readLineBreak(state) { - var ch; - - ch = state.input.charCodeAt(state.position); - - if (ch === 0x0A/* LF */) { - state.position++; - } else if (ch === 0x0D/* CR */) { - state.position++; - if (state.input.charCodeAt(state.position) === 0x0A/* LF */) { - state.position++; - } - } else { - throwError(state, 'a line break is expected'); - } - - state.line += 1; - state.lineStart = state.position; -} - -function skipSeparationSpace(state, allowComments, checkIndent) { - var lineBreaks = 0, - ch = state.input.charCodeAt(state.position); - - while (ch !== 0) { - while (is_WHITE_SPACE(ch)) { - ch = state.input.charCodeAt(++state.position); - } - - if (allowComments && ch === 0x23/* # */) { - do { - ch = state.input.charCodeAt(++state.position); - } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && ch !== 0); - } - - if (is_EOL(ch)) { - readLineBreak(state); - - ch = state.input.charCodeAt(state.position); - lineBreaks++; - state.lineIndent = 0; - - while (ch === 0x20/* Space */) { - state.lineIndent++; - ch = state.input.charCodeAt(++state.position); - } - } else { - break; - } - } - - if (checkIndent !== -1 && lineBreaks !== 0 && state.lineIndent < checkIndent) { - throwWarning(state, 'deficient indentation'); - } - - return lineBreaks; -} - -function testDocumentSeparator(state) { - var _position = state.position, - ch; - - ch = state.input.charCodeAt(_position); - - // Condition state.position === state.lineStart is tested - // in parent on each call, for efficiency. No needs to test here again. - if ((ch === 0x2D/* - */ || ch === 0x2E/* . */) && - ch === state.input.charCodeAt(_position + 1) && - ch === state.input.charCodeAt(_position + 2)) { - - _position += 3; - - ch = state.input.charCodeAt(_position); - - if (ch === 0 || is_WS_OR_EOL(ch)) { - return true; - } - } - - return false; -} - -function writeFoldedLines(state, count) { - if (count === 1) { - state.result += ' '; - } else if (count > 1) { - state.result += common.repeat('\n', count - 1); - } -} - - -function readPlainScalar(state, nodeIndent, withinFlowCollection) { - var preceding, - following, - captureStart, - captureEnd, - hasPendingContent, - _line, - _lineStart, - _lineIndent, - _kind = state.kind, - _result = state.result, - ch; - - ch = state.input.charCodeAt(state.position); - - if (is_WS_OR_EOL(ch) || - is_FLOW_INDICATOR(ch) || - ch === 0x23/* # */ || - ch === 0x26/* & */ || - ch === 0x2A/* * */ || - ch === 0x21/* ! */ || - ch === 0x7C/* | */ || - ch === 0x3E/* > */ || - ch === 0x27/* ' */ || - ch === 0x22/* " */ || - ch === 0x25/* % */ || - ch === 0x40/* @ */ || - ch === 0x60/* ` */) { - return false; - } - - if (ch === 0x3F/* ? */ || ch === 0x2D/* - */) { - following = state.input.charCodeAt(state.position + 1); - - if (is_WS_OR_EOL(following) || - withinFlowCollection && is_FLOW_INDICATOR(following)) { - return false; - } - } - - state.kind = 'scalar'; - state.result = ''; - captureStart = captureEnd = state.position; - hasPendingContent = false; - - while (ch !== 0) { - if (ch === 0x3A/* : */) { - following = state.input.charCodeAt(state.position + 1); - - if (is_WS_OR_EOL(following) || - withinFlowCollection && is_FLOW_INDICATOR(following)) { - break; - } - - } else if (ch === 0x23/* # */) { - preceding = state.input.charCodeAt(state.position - 1); - - if (is_WS_OR_EOL(preceding)) { - break; - } - - } else if ((state.position === state.lineStart && testDocumentSeparator(state)) || - withinFlowCollection && is_FLOW_INDICATOR(ch)) { - break; - - } else if (is_EOL(ch)) { - _line = state.line; - _lineStart = state.lineStart; - _lineIndent = state.lineIndent; - skipSeparationSpace(state, false, -1); - - if (state.lineIndent >= nodeIndent) { - hasPendingContent = true; - ch = state.input.charCodeAt(state.position); - continue; - } else { - state.position = captureEnd; - state.line = _line; - state.lineStart = _lineStart; - state.lineIndent = _lineIndent; - break; - } - } - - if (hasPendingContent) { - captureSegment(state, captureStart, captureEnd, false); - writeFoldedLines(state, state.line - _line); - captureStart = captureEnd = state.position; - hasPendingContent = false; - } - - if (!is_WHITE_SPACE(ch)) { - captureEnd = state.position + 1; - } - - ch = state.input.charCodeAt(++state.position); - } - - captureSegment(state, captureStart, captureEnd, false); - - if (state.result) { - return true; - } - - state.kind = _kind; - state.result = _result; - return false; -} - -function readSingleQuotedScalar(state, nodeIndent) { - var ch, - captureStart, captureEnd; - - ch = state.input.charCodeAt(state.position); - - if (ch !== 0x27/* ' */) { - return false; - } - - state.kind = 'scalar'; - state.result = ''; - state.position++; - captureStart = captureEnd = state.position; - - while ((ch = state.input.charCodeAt(state.position)) !== 0) { - if (ch === 0x27/* ' */) { - captureSegment(state, captureStart, state.position, true); - ch = state.input.charCodeAt(++state.position); - - if (ch === 0x27/* ' */) { - captureStart = state.position; - state.position++; - captureEnd = state.position; - } else { - return true; - } - - } else if (is_EOL(ch)) { - captureSegment(state, captureStart, captureEnd, true); - writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent)); - captureStart = captureEnd = state.position; - - } else if (state.position === state.lineStart && testDocumentSeparator(state)) { - throwError(state, 'unexpected end of the document within a single quoted scalar'); - - } else { - state.position++; - captureEnd = state.position; - } - } - - throwError(state, 'unexpected end of the stream within a single quoted scalar'); -} - -function readDoubleQuotedScalar(state, nodeIndent) { - var captureStart, - captureEnd, - hexLength, - hexResult, - tmp, - ch; - - ch = state.input.charCodeAt(state.position); - - if (ch !== 0x22/* " */) { - return false; - } - - state.kind = 'scalar'; - state.result = ''; - state.position++; - captureStart = captureEnd = state.position; - - while ((ch = state.input.charCodeAt(state.position)) !== 0) { - if (ch === 0x22/* " */) { - captureSegment(state, captureStart, state.position, true); - state.position++; - return true; - - } else if (ch === 0x5C/* \ */) { - captureSegment(state, captureStart, state.position, true); - ch = state.input.charCodeAt(++state.position); - - if (is_EOL(ch)) { - skipSeparationSpace(state, false, nodeIndent); - - // TODO: rework to inline fn with no type cast? - } else if (ch < 256 && simpleEscapeCheck[ch]) { - state.result += simpleEscapeMap[ch]; - state.position++; - - } else if ((tmp = escapedHexLen(ch)) > 0) { - hexLength = tmp; - hexResult = 0; - - for (; hexLength > 0; hexLength--) { - ch = state.input.charCodeAt(++state.position); - - if ((tmp = fromHexCode(ch)) >= 0) { - hexResult = (hexResult << 4) + tmp; - - } else { - throwError(state, 'expected hexadecimal character'); - } - } - - state.result += charFromCodepoint(hexResult); - - state.position++; - - } else { - throwError(state, 'unknown escape sequence'); - } - - captureStart = captureEnd = state.position; - - } else if (is_EOL(ch)) { - captureSegment(state, captureStart, captureEnd, true); - writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent)); - captureStart = captureEnd = state.position; - - } else if (state.position === state.lineStart && testDocumentSeparator(state)) { - throwError(state, 'unexpected end of the document within a double quoted scalar'); - - } else { - state.position++; - captureEnd = state.position; - } - } - - throwError(state, 'unexpected end of the stream within a double quoted scalar'); -} - -function readFlowCollection(state, nodeIndent) { - var readNext = true, - _line, - _tag = state.tag, - _result, - _anchor = state.anchor, - following, - terminator, - isPair, - isExplicitPair, - isMapping, - overridableKeys = {}, - keyNode, - keyTag, - valueNode, - ch; - - ch = state.input.charCodeAt(state.position); - - if (ch === 0x5B/* [ */) { - terminator = 0x5D;/* ] */ - isMapping = false; - _result = []; - } else if (ch === 0x7B/* { */) { - terminator = 0x7D;/* } */ - isMapping = true; - _result = {}; - } else { - return false; - } - - if (state.anchor !== null) { - state.anchorMap[state.anchor] = _result; - } - - ch = state.input.charCodeAt(++state.position); - - while (ch !== 0) { - skipSeparationSpace(state, true, nodeIndent); - - ch = state.input.charCodeAt(state.position); - - if (ch === terminator) { - state.position++; - state.tag = _tag; - state.anchor = _anchor; - state.kind = isMapping ? 'mapping' : 'sequence'; - state.result = _result; - return true; - } else if (!readNext) { - throwError(state, 'missed comma between flow collection entries'); - } - - keyTag = keyNode = valueNode = null; - isPair = isExplicitPair = false; - - if (ch === 0x3F/* ? */) { - following = state.input.charCodeAt(state.position + 1); - - if (is_WS_OR_EOL(following)) { - isPair = isExplicitPair = true; - state.position++; - skipSeparationSpace(state, true, nodeIndent); - } - } - - _line = state.line; - composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true); - keyTag = state.tag; - keyNode = state.result; - skipSeparationSpace(state, true, nodeIndent); - - ch = state.input.charCodeAt(state.position); - - if ((isExplicitPair || state.line === _line) && ch === 0x3A/* : */) { - isPair = true; - ch = state.input.charCodeAt(++state.position); - skipSeparationSpace(state, true, nodeIndent); - composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true); - valueNode = state.result; - } - - if (isMapping) { - storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode); - } else if (isPair) { - _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode)); - } else { - _result.push(keyNode); - } - - skipSeparationSpace(state, true, nodeIndent); - - ch = state.input.charCodeAt(state.position); - - if (ch === 0x2C/* , */) { - readNext = true; - ch = state.input.charCodeAt(++state.position); - } else { - readNext = false; - } - } - - throwError(state, 'unexpected end of the stream within a flow collection'); -} - -function readBlockScalar(state, nodeIndent) { - var captureStart, - folding, - chomping = CHOMPING_CLIP, - didReadContent = false, - detectedIndent = false, - textIndent = nodeIndent, - emptyLines = 0, - atMoreIndented = false, - tmp, - ch; - - ch = state.input.charCodeAt(state.position); - - if (ch === 0x7C/* | */) { - folding = false; - } else if (ch === 0x3E/* > */) { - folding = true; - } else { - return false; - } - - state.kind = 'scalar'; - state.result = ''; - - while (ch !== 0) { - ch = state.input.charCodeAt(++state.position); - - if (ch === 0x2B/* + */ || ch === 0x2D/* - */) { - if (CHOMPING_CLIP === chomping) { - chomping = (ch === 0x2B/* + */) ? CHOMPING_KEEP : CHOMPING_STRIP; - } else { - throwError(state, 'repeat of a chomping mode identifier'); - } - - } else if ((tmp = fromDecimalCode(ch)) >= 0) { - if (tmp === 0) { - throwError(state, 'bad explicit indentation width of a block scalar; it cannot be less than one'); - } else if (!detectedIndent) { - textIndent = nodeIndent + tmp - 1; - detectedIndent = true; - } else { - throwError(state, 'repeat of an indentation width identifier'); - } - - } else { - break; - } - } - - if (is_WHITE_SPACE(ch)) { - do { ch = state.input.charCodeAt(++state.position); } - while (is_WHITE_SPACE(ch)); - - if (ch === 0x23/* # */) { - do { ch = state.input.charCodeAt(++state.position); } - while (!is_EOL(ch) && (ch !== 0)); - } - } - - while (ch !== 0) { - readLineBreak(state); - state.lineIndent = 0; - - ch = state.input.charCodeAt(state.position); - - while ((!detectedIndent || state.lineIndent < textIndent) && - (ch === 0x20/* Space */)) { - state.lineIndent++; - ch = state.input.charCodeAt(++state.position); - } - - if (!detectedIndent && state.lineIndent > textIndent) { - textIndent = state.lineIndent; - } - - if (is_EOL(ch)) { - emptyLines++; - continue; - } - - // End of the scalar. - if (state.lineIndent < textIndent) { - - // Perform the chomping. - if (chomping === CHOMPING_KEEP) { - state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines); - } else if (chomping === CHOMPING_CLIP) { - if (didReadContent) { // i.e. only if the scalar is not empty. - state.result += '\n'; - } - } - - // Break this `while` cycle and go to the function's epilogue. - break; - } - - // Folded style: use fancy rules to handle line breaks. - if (folding) { - - // Lines starting with white space characters (more-indented lines) are not folded. - if (is_WHITE_SPACE(ch)) { - atMoreIndented = true; - // except for the first content line (cf. Example 8.1) - state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines); - - // End of more-indented block. - } else if (atMoreIndented) { - atMoreIndented = false; - state.result += common.repeat('\n', emptyLines + 1); - - // Just one line break - perceive as the same line. - } else if (emptyLines === 0) { - if (didReadContent) { // i.e. only if we have already read some scalar content. - state.result += ' '; - } - - // Several line breaks - perceive as different lines. - } else { - state.result += common.repeat('\n', emptyLines); - } - - // Literal style: just add exact number of line breaks between content lines. - } else { - // Keep all line breaks except the header line break. - state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines); - } - - didReadContent = true; - detectedIndent = true; - emptyLines = 0; - captureStart = state.position; - - while (!is_EOL(ch) && (ch !== 0)) { - ch = state.input.charCodeAt(++state.position); - } - - captureSegment(state, captureStart, state.position, false); - } - - return true; -} - -function readBlockSequence(state, nodeIndent) { - var _line, - _tag = state.tag, - _anchor = state.anchor, - _result = [], - following, - detected = false, - ch; - - if (state.anchor !== null) { - state.anchorMap[state.anchor] = _result; - } - - ch = state.input.charCodeAt(state.position); - - while (ch !== 0) { - - if (ch !== 0x2D/* - */) { - break; - } - - following = state.input.charCodeAt(state.position + 1); - - if (!is_WS_OR_EOL(following)) { - break; - } - - detected = true; - state.position++; - - if (skipSeparationSpace(state, true, -1)) { - if (state.lineIndent <= nodeIndent) { - _result.push(null); - ch = state.input.charCodeAt(state.position); - continue; - } - } - - _line = state.line; - composeNode(state, nodeIndent, CONTEXT_BLOCK_IN, false, true); - _result.push(state.result); - skipSeparationSpace(state, true, -1); - - ch = state.input.charCodeAt(state.position); - - if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) { - throwError(state, 'bad indentation of a sequence entry'); - } else if (state.lineIndent < nodeIndent) { - break; - } - } - - if (detected) { - state.tag = _tag; - state.anchor = _anchor; - state.kind = 'sequence'; - state.result = _result; - return true; - } - return false; -} - -function readBlockMapping(state, nodeIndent, flowIndent) { - var following, - allowCompact, - _line, - _pos, - _tag = state.tag, - _anchor = state.anchor, - _result = {}, - overridableKeys = {}, - keyTag = null, - keyNode = null, - valueNode = null, - atExplicitKey = false, - detected = false, - ch; - - if (state.anchor !== null) { - state.anchorMap[state.anchor] = _result; - } - - ch = state.input.charCodeAt(state.position); - - while (ch !== 0) { - following = state.input.charCodeAt(state.position + 1); - _line = state.line; // Save the current line. - _pos = state.position; - - // - // Explicit notation case. There are two separate blocks: - // first for the key (denoted by "?") and second for the value (denoted by ":") - // - if ((ch === 0x3F/* ? */ || ch === 0x3A/* : */) && is_WS_OR_EOL(following)) { - - if (ch === 0x3F/* ? */) { - if (atExplicitKey) { - storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null); - keyTag = keyNode = valueNode = null; - } - - detected = true; - atExplicitKey = true; - allowCompact = true; - - } else if (atExplicitKey) { - // i.e. 0x3A/* : */ === character after the explicit key. - atExplicitKey = false; - allowCompact = true; - - } else { - throwError(state, 'incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line'); - } - - state.position += 1; - ch = following; - - // - // Implicit notation case. Flow-style node as the key first, then ":", and the value. - // - } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) { - - if (state.line === _line) { - ch = state.input.charCodeAt(state.position); - - while (is_WHITE_SPACE(ch)) { - ch = state.input.charCodeAt(++state.position); - } - - if (ch === 0x3A/* : */) { - ch = state.input.charCodeAt(++state.position); - - if (!is_WS_OR_EOL(ch)) { - throwError(state, 'a whitespace character is expected after the key-value separator within a block mapping'); - } - - if (atExplicitKey) { - storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null); - keyTag = keyNode = valueNode = null; - } - - detected = true; - atExplicitKey = false; - allowCompact = false; - keyTag = state.tag; - keyNode = state.result; - - } else if (detected) { - throwError(state, 'can not read an implicit mapping pair; a colon is missed'); - - } else { - state.tag = _tag; - state.anchor = _anchor; - return true; // Keep the result of `composeNode`. - } - - } else if (detected) { - throwError(state, 'can not read a block mapping entry; a multiline key may not be an implicit key'); - - } else { - state.tag = _tag; - state.anchor = _anchor; - return true; // Keep the result of `composeNode`. - } - - } else { - break; // Reading is done. Go to the epilogue. - } - - // - // Common reading code for both explicit and implicit notations. - // - if (state.line === _line || state.lineIndent > nodeIndent) { - if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) { - if (atExplicitKey) { - keyNode = state.result; - } else { - valueNode = state.result; - } - } - - if (!atExplicitKey) { - storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, _line, _pos); - keyTag = keyNode = valueNode = null; - } - - skipSeparationSpace(state, true, -1); - ch = state.input.charCodeAt(state.position); - } - - if (state.lineIndent > nodeIndent && (ch !== 0)) { - throwError(state, 'bad indentation of a mapping entry'); - } else if (state.lineIndent < nodeIndent) { - break; - } - } - - // - // Epilogue. - // - - // Special case: last mapping's node contains only the key in explicit notation. - if (atExplicitKey) { - storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null); - } - - // Expose the resulting mapping. - if (detected) { - state.tag = _tag; - state.anchor = _anchor; - state.kind = 'mapping'; - state.result = _result; - } - - return detected; -} - -function readTagProperty(state) { - var _position, - isVerbatim = false, - isNamed = false, - tagHandle, - tagName, - ch; - - ch = state.input.charCodeAt(state.position); - - if (ch !== 0x21/* ! */) return false; - - if (state.tag !== null) { - throwError(state, 'duplication of a tag property'); - } - - ch = state.input.charCodeAt(++state.position); - - if (ch === 0x3C/* < */) { - isVerbatim = true; - ch = state.input.charCodeAt(++state.position); - - } else if (ch === 0x21/* ! */) { - isNamed = true; - tagHandle = '!!'; - ch = state.input.charCodeAt(++state.position); - - } else { - tagHandle = '!'; - } - - _position = state.position; - - if (isVerbatim) { - do { ch = state.input.charCodeAt(++state.position); } - while (ch !== 0 && ch !== 0x3E/* > */); - - if (state.position < state.length) { - tagName = state.input.slice(_position, state.position); - ch = state.input.charCodeAt(++state.position); - } else { - throwError(state, 'unexpected end of the stream within a verbatim tag'); - } - } else { - while (ch !== 0 && !is_WS_OR_EOL(ch)) { - - if (ch === 0x21/* ! */) { - if (!isNamed) { - tagHandle = state.input.slice(_position - 1, state.position + 1); - - if (!PATTERN_TAG_HANDLE.test(tagHandle)) { - throwError(state, 'named tag handle cannot contain such characters'); - } - - isNamed = true; - _position = state.position + 1; - } else { - throwError(state, 'tag suffix cannot contain exclamation marks'); - } - } - - ch = state.input.charCodeAt(++state.position); - } - - tagName = state.input.slice(_position, state.position); - - if (PATTERN_FLOW_INDICATORS.test(tagName)) { - throwError(state, 'tag suffix cannot contain flow indicator characters'); - } - } - - if (tagName && !PATTERN_TAG_URI.test(tagName)) { - throwError(state, 'tag name cannot contain such characters: ' + tagName); - } - - if (isVerbatim) { - state.tag = tagName; - - } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) { - state.tag = state.tagMap[tagHandle] + tagName; - - } else if (tagHandle === '!') { - state.tag = '!' + tagName; - - } else if (tagHandle === '!!') { - state.tag = 'tag:yaml.org,2002:' + tagName; - - } else { - throwError(state, 'undeclared tag handle "' + tagHandle + '"'); - } - - return true; -} - -function readAnchorProperty(state) { - var _position, - ch; - - ch = state.input.charCodeAt(state.position); - - if (ch !== 0x26/* & */) return false; - - if (state.anchor !== null) { - throwError(state, 'duplication of an anchor property'); - } - - ch = state.input.charCodeAt(++state.position); - _position = state.position; - - while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) { - ch = state.input.charCodeAt(++state.position); - } - - if (state.position === _position) { - throwError(state, 'name of an anchor node must contain at least one character'); - } - - state.anchor = state.input.slice(_position, state.position); - return true; -} - -function readAlias(state) { - var _position, alias, - ch; - - ch = state.input.charCodeAt(state.position); - - if (ch !== 0x2A/* * */) return false; - - ch = state.input.charCodeAt(++state.position); - _position = state.position; - - while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) { - ch = state.input.charCodeAt(++state.position); - } - - if (state.position === _position) { - throwError(state, 'name of an alias node must contain at least one character'); - } - - alias = state.input.slice(_position, state.position); - - if (!state.anchorMap.hasOwnProperty(alias)) { - throwError(state, 'unidentified alias "' + alias + '"'); - } - - state.result = state.anchorMap[alias]; - skipSeparationSpace(state, true, -1); - return true; -} - -function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact) { - var allowBlockStyles, - allowBlockScalars, - allowBlockCollections, - indentStatus = 1, // 1: this>parent, 0: this=parent, -1: this parentIndent) { - indentStatus = 1; - } else if (state.lineIndent === parentIndent) { - indentStatus = 0; - } else if (state.lineIndent < parentIndent) { - indentStatus = -1; - } - } - } - - if (indentStatus === 1) { - while (readTagProperty(state) || readAnchorProperty(state)) { - if (skipSeparationSpace(state, true, -1)) { - atNewLine = true; - allowBlockCollections = allowBlockStyles; - - if (state.lineIndent > parentIndent) { - indentStatus = 1; - } else if (state.lineIndent === parentIndent) { - indentStatus = 0; - } else if (state.lineIndent < parentIndent) { - indentStatus = -1; - } - } else { - allowBlockCollections = false; - } - } - } - - if (allowBlockCollections) { - allowBlockCollections = atNewLine || allowCompact; - } - - if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) { - if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) { - flowIndent = parentIndent; - } else { - flowIndent = parentIndent + 1; - } - - blockIndent = state.position - state.lineStart; - - if (indentStatus === 1) { - if (allowBlockCollections && - (readBlockSequence(state, blockIndent) || - readBlockMapping(state, blockIndent, flowIndent)) || - readFlowCollection(state, flowIndent)) { - hasContent = true; - } else { - if ((allowBlockScalars && readBlockScalar(state, flowIndent)) || - readSingleQuotedScalar(state, flowIndent) || - readDoubleQuotedScalar(state, flowIndent)) { - hasContent = true; - - } else if (readAlias(state)) { - hasContent = true; - - if (state.tag !== null || state.anchor !== null) { - throwError(state, 'alias node should not have any properties'); - } - - } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) { - hasContent = true; - - if (state.tag === null) { - state.tag = '?'; - } - } - - if (state.anchor !== null) { - state.anchorMap[state.anchor] = state.result; - } - } - } else if (indentStatus === 0) { - // Special case: block sequences are allowed to have same indentation level as the parent. - // http://www.yaml.org/spec/1.2/spec.html#id2799784 - hasContent = allowBlockCollections && readBlockSequence(state, blockIndent); - } - } - - if (state.tag !== null && state.tag !== '!') { - if (state.tag === '?') { - for (typeIndex = 0, typeQuantity = state.implicitTypes.length; typeIndex < typeQuantity; typeIndex += 1) { - type = state.implicitTypes[typeIndex]; - - // Implicit resolving is not allowed for non-scalar types, and '?' - // non-specific tag is only assigned to plain scalars. So, it isn't - // needed to check for 'kind' conformity. - - if (type.resolve(state.result)) { // `state.result` updated in resolver if matched - state.result = type.construct(state.result); - state.tag = type.tag; - if (state.anchor !== null) { - state.anchorMap[state.anchor] = state.result; - } - break; - } - } - } else if (_hasOwnProperty.call(state.typeMap[state.kind || 'fallback'], state.tag)) { - type = state.typeMap[state.kind || 'fallback'][state.tag]; - - if (state.result !== null && type.kind !== state.kind) { - throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"'); - } - - if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched - throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag'); - } else { - state.result = type.construct(state.result); - if (state.anchor !== null) { - state.anchorMap[state.anchor] = state.result; - } - } - } else { - throwError(state, 'unknown tag !<' + state.tag + '>'); - } - } - - if (state.listener !== null) { - state.listener('close', state); - } - return state.tag !== null || state.anchor !== null || hasContent; -} - -function readDocument(state) { - var documentStart = state.position, - _position, - directiveName, - directiveArgs, - hasDirectives = false, - ch; - - state.version = null; - state.checkLineBreaks = state.legacy; - state.tagMap = {}; - state.anchorMap = {}; - - while ((ch = state.input.charCodeAt(state.position)) !== 0) { - skipSeparationSpace(state, true, -1); - - ch = state.input.charCodeAt(state.position); - - if (state.lineIndent > 0 || ch !== 0x25/* % */) { - break; - } - - hasDirectives = true; - ch = state.input.charCodeAt(++state.position); - _position = state.position; - - while (ch !== 0 && !is_WS_OR_EOL(ch)) { - ch = state.input.charCodeAt(++state.position); - } - - directiveName = state.input.slice(_position, state.position); - directiveArgs = []; - - if (directiveName.length < 1) { - throwError(state, 'directive name must not be less than one character in length'); - } - - while (ch !== 0) { - while (is_WHITE_SPACE(ch)) { - ch = state.input.charCodeAt(++state.position); - } - - if (ch === 0x23/* # */) { - do { ch = state.input.charCodeAt(++state.position); } - while (ch !== 0 && !is_EOL(ch)); - break; - } - - if (is_EOL(ch)) break; - - _position = state.position; - - while (ch !== 0 && !is_WS_OR_EOL(ch)) { - ch = state.input.charCodeAt(++state.position); - } - - directiveArgs.push(state.input.slice(_position, state.position)); - } - - if (ch !== 0) readLineBreak(state); - - if (_hasOwnProperty.call(directiveHandlers, directiveName)) { - directiveHandlers[directiveName](state, directiveName, directiveArgs); - } else { - throwWarning(state, 'unknown document directive "' + directiveName + '"'); - } - } - - skipSeparationSpace(state, true, -1); - - if (state.lineIndent === 0 && - state.input.charCodeAt(state.position) === 0x2D/* - */ && - state.input.charCodeAt(state.position + 1) === 0x2D/* - */ && - state.input.charCodeAt(state.position + 2) === 0x2D/* - */) { - state.position += 3; - skipSeparationSpace(state, true, -1); - - } else if (hasDirectives) { - throwError(state, 'directives end mark is expected'); - } - - composeNode(state, state.lineIndent - 1, CONTEXT_BLOCK_OUT, false, true); - skipSeparationSpace(state, true, -1); - - if (state.checkLineBreaks && - PATTERN_NON_ASCII_LINE_BREAKS.test(state.input.slice(documentStart, state.position))) { - throwWarning(state, 'non-ASCII line breaks are interpreted as content'); - } - - state.documents.push(state.result); - - if (state.position === state.lineStart && testDocumentSeparator(state)) { - - if (state.input.charCodeAt(state.position) === 0x2E/* . */) { - state.position += 3; - skipSeparationSpace(state, true, -1); - } - return; - } - - if (state.position < (state.length - 1)) { - throwError(state, 'end of the stream or a document separator is expected'); - } else { - return; - } -} - - -function loadDocuments(input, options) { - input = String(input); - options = options || {}; - - if (input.length !== 0) { - - // Add tailing `\n` if not exists - if (input.charCodeAt(input.length - 1) !== 0x0A/* LF */ && - input.charCodeAt(input.length - 1) !== 0x0D/* CR */) { - input += '\n'; - } - - // Strip BOM - if (input.charCodeAt(0) === 0xFEFF) { - input = input.slice(1); - } - } - - var state = new State(input, options); - - // Use 0 as string terminator. That significantly simplifies bounds check. - state.input += '\0'; - - while (state.input.charCodeAt(state.position) === 0x20/* Space */) { - state.lineIndent += 1; - state.position += 1; - } - - while (state.position < (state.length - 1)) { - readDocument(state); - } - - return state.documents; -} - - -function loadAll(input, iterator, options) { - var documents = loadDocuments(input, options), index, length; - - if (typeof iterator !== 'function') { - return documents; - } - - for (index = 0, length = documents.length; index < length; index += 1) { - iterator(documents[index]); - } -} - - -function load(input, options) { - var documents = loadDocuments(input, options); - - if (documents.length === 0) { - /*eslint-disable no-undefined*/ - return undefined; - } else if (documents.length === 1) { - return documents[0]; - } - throw new YAMLException('expected a single document in the stream, but found more'); -} - - -function safeLoadAll(input, output, options) { - if (typeof output === 'function') { - loadAll(input, output, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options)); - } else { - return loadAll(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options)); - } -} - - -function safeLoad(input, options) { - return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options)); -} - - -module.exports.loadAll = loadAll; -module.exports.load = load; -module.exports.safeLoadAll = safeLoadAll; -module.exports.safeLoad = safeLoad; - -},{"./common":2,"./exception":4,"./mark":6,"./schema/default_full":9,"./schema/default_safe":10}],6:[function(require,module,exports){ -'use strict'; - - -var common = require('./common'); - - -function Mark(name, buffer, position, line, column) { - this.name = name; - this.buffer = buffer; - this.position = position; - this.line = line; - this.column = column; -} - - -Mark.prototype.getSnippet = function getSnippet(indent, maxLength) { - var head, start, tail, end, snippet; - - if (!this.buffer) return null; - - indent = indent || 4; - maxLength = maxLength || 75; - - head = ''; - start = this.position; - - while (start > 0 && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) { - start -= 1; - if (this.position - start > (maxLength / 2 - 1)) { - head = ' ... '; - start += 5; - break; - } - } - - tail = ''; - end = this.position; - - while (end < this.buffer.length && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(end)) === -1) { - end += 1; - if (end - this.position > (maxLength / 2 - 1)) { - tail = ' ... '; - end -= 5; - break; - } - } - - snippet = this.buffer.slice(start, end); - - return common.repeat(' ', indent) + head + snippet + tail + '\n' + - common.repeat(' ', indent + this.position - start + head.length) + '^'; -}; - - -Mark.prototype.toString = function toString(compact) { - var snippet, where = ''; - - if (this.name) { - where += 'in "' + this.name + '" '; - } - - where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1); - - if (!compact) { - snippet = this.getSnippet(); - - if (snippet) { - where += ':\n' + snippet; - } - } - - return where; -}; - - -module.exports = Mark; - -},{"./common":2}],7:[function(require,module,exports){ -'use strict'; - -/*eslint-disable max-len*/ - -var common = require('./common'); -var YAMLException = require('./exception'); -var Type = require('./type'); - - -function compileList(schema, name, result) { - var exclude = []; - - schema.include.forEach(function (includedSchema) { - result = compileList(includedSchema, name, result); - }); - - schema[name].forEach(function (currentType) { - result.forEach(function (previousType, previousIndex) { - if (previousType.tag === currentType.tag && previousType.kind === currentType.kind) { - exclude.push(previousIndex); - } - }); - - result.push(currentType); - }); - - return result.filter(function (type, index) { - return exclude.indexOf(index) === -1; - }); -} - - -function compileMap(/* lists... */) { - var result = { - scalar: {}, - sequence: {}, - mapping: {}, - fallback: {} - }, index, length; - - function collectType(type) { - result[type.kind][type.tag] = result['fallback'][type.tag] = type; - } - - for (index = 0, length = arguments.length; index < length; index += 1) { - arguments[index].forEach(collectType); - } - return result; -} - - -function Schema(definition) { - this.include = definition.include || []; - this.implicit = definition.implicit || []; - this.explicit = definition.explicit || []; - - this.implicit.forEach(function (type) { - if (type.loadKind && type.loadKind !== 'scalar') { - throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.'); - } - }); - - this.compiledImplicit = compileList(this, 'implicit', []); - this.compiledExplicit = compileList(this, 'explicit', []); - this.compiledTypeMap = compileMap(this.compiledImplicit, this.compiledExplicit); -} - - -Schema.DEFAULT = null; - - -Schema.create = function createSchema() { - var schemas, types; - - switch (arguments.length) { - case 1: - schemas = Schema.DEFAULT; - types = arguments[0]; - break; - - case 2: - schemas = arguments[0]; - types = arguments[1]; - break; - - default: - throw new YAMLException('Wrong number of arguments for Schema.create function'); - } - - schemas = common.toArray(schemas); - types = common.toArray(types); - - if (!schemas.every(function (schema) { return schema instanceof Schema; })) { - throw new YAMLException('Specified list of super schemas (or a single Schema object) contains a non-Schema object.'); - } - - if (!types.every(function (type) { return type instanceof Type; })) { - throw new YAMLException('Specified list of YAML types (or a single Type object) contains a non-Type object.'); - } - - return new Schema({ - include: schemas, - explicit: types - }); -}; - - -module.exports = Schema; - -},{"./common":2,"./exception":4,"./type":13}],8:[function(require,module,exports){ -// Standard YAML's Core schema. -// http://www.yaml.org/spec/1.2/spec.html#id2804923 -// -// NOTE: JS-YAML does not support schema-specific tag resolution restrictions. -// So, Core schema has no distinctions from JSON schema is JS-YAML. - - -'use strict'; - - -var Schema = require('../schema'); - - -module.exports = new Schema({ - include: [ - require('./json') - ] -}); - -},{"../schema":7,"./json":12}],9:[function(require,module,exports){ -// JS-YAML's default schema for `load` function. -// It is not described in the YAML specification. -// -// This schema is based on JS-YAML's default safe schema and includes -// JavaScript-specific types: !!js/undefined, !!js/regexp and !!js/function. -// -// Also this schema is used as default base schema at `Schema.create` function. - - -'use strict'; - - -var Schema = require('../schema'); - - -module.exports = Schema.DEFAULT = new Schema({ - include: [ - require('./default_safe') - ], - explicit: [ - require('../type/js/undefined'), - require('../type/js/regexp'), - require('../type/js/function') - ] -}); - -},{"../schema":7,"../type/js/function":18,"../type/js/regexp":19,"../type/js/undefined":20,"./default_safe":10}],10:[function(require,module,exports){ -// JS-YAML's default schema for `safeLoad` function. -// It is not described in the YAML specification. -// -// This schema is based on standard YAML's Core schema and includes most of -// extra types described at YAML tag repository. (http://yaml.org/type/) - - -'use strict'; - - -var Schema = require('../schema'); - - -module.exports = new Schema({ - include: [ - require('./core') - ], - implicit: [ - require('../type/timestamp'), - require('../type/merge') - ], - explicit: [ - require('../type/binary'), - require('../type/omap'), - require('../type/pairs'), - require('../type/set') - ] -}); - -},{"../schema":7,"../type/binary":14,"../type/merge":22,"../type/omap":24,"../type/pairs":25,"../type/set":27,"../type/timestamp":29,"./core":8}],11:[function(require,module,exports){ -// Standard YAML's Failsafe schema. -// http://www.yaml.org/spec/1.2/spec.html#id2802346 - - -'use strict'; - - -var Schema = require('../schema'); - - -module.exports = new Schema({ - explicit: [ - require('../type/str'), - require('../type/seq'), - require('../type/map') - ] -}); - -},{"../schema":7,"../type/map":21,"../type/seq":26,"../type/str":28}],12:[function(require,module,exports){ -// Standard YAML's JSON schema. -// http://www.yaml.org/spec/1.2/spec.html#id2803231 -// -// NOTE: JS-YAML does not support schema-specific tag resolution restrictions. -// So, this schema is not such strict as defined in the YAML specification. -// It allows numbers in binary notation, use `Null` and `NULL` as `null`, etc. - - -'use strict'; - - -var Schema = require('../schema'); - - -module.exports = new Schema({ - include: [ - require('./failsafe') - ], - implicit: [ - require('../type/null'), - require('../type/bool'), - require('../type/int'), - require('../type/float') - ] -}); - -},{"../schema":7,"../type/bool":15,"../type/float":16,"../type/int":17,"../type/null":23,"./failsafe":11}],13:[function(require,module,exports){ -'use strict'; - -var YAMLException = require('./exception'); - -var TYPE_CONSTRUCTOR_OPTIONS = [ - 'kind', - 'resolve', - 'construct', - 'instanceOf', - 'predicate', - 'represent', - 'defaultStyle', - 'styleAliases' -]; - -var YAML_NODE_KINDS = [ - 'scalar', - 'sequence', - 'mapping' -]; - -function compileStyleAliases(map) { - var result = {}; - - if (map !== null) { - Object.keys(map).forEach(function (style) { - map[style].forEach(function (alias) { - result[String(alias)] = style; - }); - }); - } - - return result; -} - -function Type(tag, options) { - options = options || {}; - - Object.keys(options).forEach(function (name) { - if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) { - throw new YAMLException('Unknown option "' + name + '" is met in definition of "' + tag + '" YAML type.'); - } - }); - - // TODO: Add tag format check. - this.tag = tag; - this.kind = options['kind'] || null; - this.resolve = options['resolve'] || function () { return true; }; - this.construct = options['construct'] || function (data) { return data; }; - this.instanceOf = options['instanceOf'] || null; - this.predicate = options['predicate'] || null; - this.represent = options['represent'] || null; - this.defaultStyle = options['defaultStyle'] || null; - this.styleAliases = compileStyleAliases(options['styleAliases'] || null); - - if (YAML_NODE_KINDS.indexOf(this.kind) === -1) { - throw new YAMLException('Unknown kind "' + this.kind + '" is specified for "' + tag + '" YAML type.'); - } -} - -module.exports = Type; - -},{"./exception":4}],14:[function(require,module,exports){ -'use strict'; - -/*eslint-disable no-bitwise*/ - -var NodeBuffer; - -try { - // A trick for browserified version, to not include `Buffer` shim - var _require = require; - NodeBuffer = _require('buffer').Buffer; -} catch (__) {} - -var Type = require('../type'); - - -// [ 64, 65, 66 ] -> [ padding, CR, LF ] -var BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r'; - - -function resolveYamlBinary(data) { - if (data === null) return false; - - var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP; - - // Convert one by one. - for (idx = 0; idx < max; idx++) { - code = map.indexOf(data.charAt(idx)); - - // Skip CR/LF - if (code > 64) continue; - - // Fail on illegal characters - if (code < 0) return false; - - bitlen += 6; - } - - // If there are any bits left, source was corrupted - return (bitlen % 8) === 0; -} - -function constructYamlBinary(data) { - var idx, tailbits, - input = data.replace(/[\r\n=]/g, ''), // remove CR/LF & padding to simplify scan - max = input.length, - map = BASE64_MAP, - bits = 0, - result = []; - - // Collect by 6*4 bits (3 bytes) - - for (idx = 0; idx < max; idx++) { - if ((idx % 4 === 0) && idx) { - result.push((bits >> 16) & 0xFF); - result.push((bits >> 8) & 0xFF); - result.push(bits & 0xFF); - } - - bits = (bits << 6) | map.indexOf(input.charAt(idx)); - } - - // Dump tail - - tailbits = (max % 4) * 6; - - if (tailbits === 0) { - result.push((bits >> 16) & 0xFF); - result.push((bits >> 8) & 0xFF); - result.push(bits & 0xFF); - } else if (tailbits === 18) { - result.push((bits >> 10) & 0xFF); - result.push((bits >> 2) & 0xFF); - } else if (tailbits === 12) { - result.push((bits >> 4) & 0xFF); - } - - // Wrap into Buffer for NodeJS and leave Array for browser - if (NodeBuffer) { - // Support node 6.+ Buffer API when available - return NodeBuffer.from ? NodeBuffer.from(result) : new NodeBuffer(result); - } - - return result; -} - -function representYamlBinary(object /*, style*/) { - var result = '', bits = 0, idx, tail, - max = object.length, - map = BASE64_MAP; - - // Convert every three bytes to 4 ASCII characters. - - for (idx = 0; idx < max; idx++) { - if ((idx % 3 === 0) && idx) { - result += map[(bits >> 18) & 0x3F]; - result += map[(bits >> 12) & 0x3F]; - result += map[(bits >> 6) & 0x3F]; - result += map[bits & 0x3F]; - } - - bits = (bits << 8) + object[idx]; - } - - // Dump tail - - tail = max % 3; - - if (tail === 0) { - result += map[(bits >> 18) & 0x3F]; - result += map[(bits >> 12) & 0x3F]; - result += map[(bits >> 6) & 0x3F]; - result += map[bits & 0x3F]; - } else if (tail === 2) { - result += map[(bits >> 10) & 0x3F]; - result += map[(bits >> 4) & 0x3F]; - result += map[(bits << 2) & 0x3F]; - result += map[64]; - } else if (tail === 1) { - result += map[(bits >> 2) & 0x3F]; - result += map[(bits << 4) & 0x3F]; - result += map[64]; - result += map[64]; - } - - return result; -} - -function isBinary(object) { - return NodeBuffer && NodeBuffer.isBuffer(object); -} - -module.exports = new Type('tag:yaml.org,2002:binary', { - kind: 'scalar', - resolve: resolveYamlBinary, - construct: constructYamlBinary, - predicate: isBinary, - represent: representYamlBinary -}); - -},{"../type":13}],15:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -function resolveYamlBoolean(data) { - if (data === null) return false; - - var max = data.length; - - return (max === 4 && (data === 'true' || data === 'True' || data === 'TRUE')) || - (max === 5 && (data === 'false' || data === 'False' || data === 'FALSE')); -} - -function constructYamlBoolean(data) { - return data === 'true' || - data === 'True' || - data === 'TRUE'; -} - -function isBoolean(object) { - return Object.prototype.toString.call(object) === '[object Boolean]'; -} - -module.exports = new Type('tag:yaml.org,2002:bool', { - kind: 'scalar', - resolve: resolveYamlBoolean, - construct: constructYamlBoolean, - predicate: isBoolean, - represent: { - lowercase: function (object) { return object ? 'true' : 'false'; }, - uppercase: function (object) { return object ? 'TRUE' : 'FALSE'; }, - camelcase: function (object) { return object ? 'True' : 'False'; } - }, - defaultStyle: 'lowercase' -}); - -},{"../type":13}],16:[function(require,module,exports){ -'use strict'; - -var common = require('../common'); -var Type = require('../type'); - -var YAML_FLOAT_PATTERN = new RegExp( - // 2.5e4, 2.5 and integers - '^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?' + - // .2e4, .2 - // special case, seems not from spec - '|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?' + - // 20:59 - '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*' + - // .inf - '|[-+]?\\.(?:inf|Inf|INF)' + - // .nan - '|\\.(?:nan|NaN|NAN))$'); - -function resolveYamlFloat(data) { - if (data === null) return false; - - if (!YAML_FLOAT_PATTERN.test(data) || - // Quick hack to not allow integers end with `_` - // Probably should update regexp & check speed - data[data.length - 1] === '_') { - return false; - } - - return true; -} - -function constructYamlFloat(data) { - var value, sign, base, digits; - - value = data.replace(/_/g, '').toLowerCase(); - sign = value[0] === '-' ? -1 : 1; - digits = []; - - if ('+-'.indexOf(value[0]) >= 0) { - value = value.slice(1); - } - - if (value === '.inf') { - return (sign === 1) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY; - - } else if (value === '.nan') { - return NaN; - - } else if (value.indexOf(':') >= 0) { - value.split(':').forEach(function (v) { - digits.unshift(parseFloat(v, 10)); - }); - - value = 0.0; - base = 1; - - digits.forEach(function (d) { - value += d * base; - base *= 60; - }); - - return sign * value; - - } - return sign * parseFloat(value, 10); -} - - -var SCIENTIFIC_WITHOUT_DOT = /^[-+]?[0-9]+e/; - -function representYamlFloat(object, style) { - var res; - - if (isNaN(object)) { - switch (style) { - case 'lowercase': return '.nan'; - case 'uppercase': return '.NAN'; - case 'camelcase': return '.NaN'; - } - } else if (Number.POSITIVE_INFINITY === object) { - switch (style) { - case 'lowercase': return '.inf'; - case 'uppercase': return '.INF'; - case 'camelcase': return '.Inf'; - } - } else if (Number.NEGATIVE_INFINITY === object) { - switch (style) { - case 'lowercase': return '-.inf'; - case 'uppercase': return '-.INF'; - case 'camelcase': return '-.Inf'; - } - } else if (common.isNegativeZero(object)) { - return '-0.0'; - } - - res = object.toString(10); - - // JS stringifier can build scientific format without dots: 5e-100, - // while YAML requires dot: 5.e-100. Fix it with simple hack - - return SCIENTIFIC_WITHOUT_DOT.test(res) ? res.replace('e', '.e') : res; -} - -function isFloat(object) { - return (Object.prototype.toString.call(object) === '[object Number]') && - (object % 1 !== 0 || common.isNegativeZero(object)); -} - -module.exports = new Type('tag:yaml.org,2002:float', { - kind: 'scalar', - resolve: resolveYamlFloat, - construct: constructYamlFloat, - predicate: isFloat, - represent: representYamlFloat, - defaultStyle: 'lowercase' -}); - -},{"../common":2,"../type":13}],17:[function(require,module,exports){ -'use strict'; - -var common = require('../common'); -var Type = require('../type'); - -function isHexCode(c) { - return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) || - ((0x41/* A */ <= c) && (c <= 0x46/* F */)) || - ((0x61/* a */ <= c) && (c <= 0x66/* f */)); -} - -function isOctCode(c) { - return ((0x30/* 0 */ <= c) && (c <= 0x37/* 7 */)); -} - -function isDecCode(c) { - return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)); -} - -function resolveYamlInteger(data) { - if (data === null) return false; - - var max = data.length, - index = 0, - hasDigits = false, - ch; - - if (!max) return false; - - ch = data[index]; - - // sign - if (ch === '-' || ch === '+') { - ch = data[++index]; - } - - if (ch === '0') { - // 0 - if (index + 1 === max) return true; - ch = data[++index]; - - // base 2, base 8, base 16 - - if (ch === 'b') { - // base 2 - index++; - - for (; index < max; index++) { - ch = data[index]; - if (ch === '_') continue; - if (ch !== '0' && ch !== '1') return false; - hasDigits = true; - } - return hasDigits && ch !== '_'; - } - - - if (ch === 'x') { - // base 16 - index++; - - for (; index < max; index++) { - ch = data[index]; - if (ch === '_') continue; - if (!isHexCode(data.charCodeAt(index))) return false; - hasDigits = true; - } - return hasDigits && ch !== '_'; - } - - // base 8 - for (; index < max; index++) { - ch = data[index]; - if (ch === '_') continue; - if (!isOctCode(data.charCodeAt(index))) return false; - hasDigits = true; - } - return hasDigits && ch !== '_'; - } - - // base 10 (except 0) or base 60 - - // value should not start with `_`; - if (ch === '_') return false; - - for (; index < max; index++) { - ch = data[index]; - if (ch === '_') continue; - if (ch === ':') break; - if (!isDecCode(data.charCodeAt(index))) { - return false; - } - hasDigits = true; - } - - // Should have digits and should not end with `_` - if (!hasDigits || ch === '_') return false; - - // if !base60 - done; - if (ch !== ':') return true; - - // base60 almost not used, no needs to optimize - return /^(:[0-5]?[0-9])+$/.test(data.slice(index)); -} - -function constructYamlInteger(data) { - var value = data, sign = 1, ch, base, digits = []; - - if (value.indexOf('_') !== -1) { - value = value.replace(/_/g, ''); - } - - ch = value[0]; - - if (ch === '-' || ch === '+') { - if (ch === '-') sign = -1; - value = value.slice(1); - ch = value[0]; - } - - if (value === '0') return 0; - - if (ch === '0') { - if (value[1] === 'b') return sign * parseInt(value.slice(2), 2); - if (value[1] === 'x') return sign * parseInt(value, 16); - return sign * parseInt(value, 8); - } - - if (value.indexOf(':') !== -1) { - value.split(':').forEach(function (v) { - digits.unshift(parseInt(v, 10)); - }); - - value = 0; - base = 1; - - digits.forEach(function (d) { - value += (d * base); - base *= 60; - }); - - return sign * value; - - } - - return sign * parseInt(value, 10); -} - -function isInteger(object) { - return (Object.prototype.toString.call(object)) === '[object Number]' && - (object % 1 === 0 && !common.isNegativeZero(object)); -} - -module.exports = new Type('tag:yaml.org,2002:int', { - kind: 'scalar', - resolve: resolveYamlInteger, - construct: constructYamlInteger, - predicate: isInteger, - represent: { - binary: function (obj) { return obj >= 0 ? '0b' + obj.toString(2) : '-0b' + obj.toString(2).slice(1); }, - octal: function (obj) { return obj >= 0 ? '0' + obj.toString(8) : '-0' + obj.toString(8).slice(1); }, - decimal: function (obj) { return obj.toString(10); }, - /* eslint-disable max-len */ - hexadecimal: function (obj) { return obj >= 0 ? '0x' + obj.toString(16).toUpperCase() : '-0x' + obj.toString(16).toUpperCase().slice(1); } - }, - defaultStyle: 'decimal', - styleAliases: { - binary: [ 2, 'bin' ], - octal: [ 8, 'oct' ], - decimal: [ 10, 'dec' ], - hexadecimal: [ 16, 'hex' ] - } -}); - -},{"../common":2,"../type":13}],18:[function(require,module,exports){ -'use strict'; - -var esprima; - -// Browserified version does not have esprima -// -// 1. For node.js just require module as deps -// 2. For browser try to require module via external AMD system. -// If not found - try to fallback to window.esprima. If not -// found too - then fail to parse. -// -try { - // workaround to exclude package from browserify list. - var _require = require; - esprima = _require('esprima'); -} catch (_) { - /*global window */ - if (typeof window !== 'undefined') esprima = window.esprima; -} - -var Type = require('../../type'); - -function resolveJavascriptFunction(data) { - if (data === null) return false; - - try { - var source = '(' + data + ')', - ast = esprima.parse(source, { range: true }); - - if (ast.type !== 'Program' || - ast.body.length !== 1 || - ast.body[0].type !== 'ExpressionStatement' || - (ast.body[0].expression.type !== 'ArrowFunctionExpression' && - ast.body[0].expression.type !== 'FunctionExpression')) { - return false; - } - - return true; - } catch (err) { - return false; - } -} - -function constructJavascriptFunction(data) { - /*jslint evil:true*/ - - var source = '(' + data + ')', - ast = esprima.parse(source, { range: true }), - params = [], - body; - - if (ast.type !== 'Program' || - ast.body.length !== 1 || - ast.body[0].type !== 'ExpressionStatement' || - (ast.body[0].expression.type !== 'ArrowFunctionExpression' && - ast.body[0].expression.type !== 'FunctionExpression')) { - throw new Error('Failed to resolve function'); - } - - ast.body[0].expression.params.forEach(function (param) { - params.push(param.name); - }); - - body = ast.body[0].expression.body.range; - - // Esprima's ranges include the first '{' and the last '}' characters on - // function expressions. So cut them out. - if (ast.body[0].expression.body.type === 'BlockStatement') { - /*eslint-disable no-new-func*/ - return new Function(params, source.slice(body[0] + 1, body[1] - 1)); - } - // ES6 arrow functions can omit the BlockStatement. In that case, just return - // the body. - /*eslint-disable no-new-func*/ - return new Function(params, 'return ' + source.slice(body[0], body[1])); -} - -function representJavascriptFunction(object /*, style*/) { - return object.toString(); -} - -function isFunction(object) { - return Object.prototype.toString.call(object) === '[object Function]'; -} - -module.exports = new Type('tag:yaml.org,2002:js/function', { - kind: 'scalar', - resolve: resolveJavascriptFunction, - construct: constructJavascriptFunction, - predicate: isFunction, - represent: representJavascriptFunction -}); - -},{"../../type":13}],19:[function(require,module,exports){ -'use strict'; - -var Type = require('../../type'); - -function resolveJavascriptRegExp(data) { - if (data === null) return false; - if (data.length === 0) return false; - - var regexp = data, - tail = /\/([gim]*)$/.exec(data), - modifiers = ''; - - // if regexp starts with '/' it can have modifiers and must be properly closed - // `/foo/gim` - modifiers tail can be maximum 3 chars - if (regexp[0] === '/') { - if (tail) modifiers = tail[1]; - - if (modifiers.length > 3) return false; - // if expression starts with /, is should be properly terminated - if (regexp[regexp.length - modifiers.length - 1] !== '/') return false; - } - - return true; -} - -function constructJavascriptRegExp(data) { - var regexp = data, - tail = /\/([gim]*)$/.exec(data), - modifiers = ''; - - // `/foo/gim` - tail can be maximum 4 chars - if (regexp[0] === '/') { - if (tail) modifiers = tail[1]; - regexp = regexp.slice(1, regexp.length - modifiers.length - 1); - } - - return new RegExp(regexp, modifiers); -} - -function representJavascriptRegExp(object /*, style*/) { - var result = '/' + object.source + '/'; - - if (object.global) result += 'g'; - if (object.multiline) result += 'm'; - if (object.ignoreCase) result += 'i'; - - return result; -} - -function isRegExp(object) { - return Object.prototype.toString.call(object) === '[object RegExp]'; -} - -module.exports = new Type('tag:yaml.org,2002:js/regexp', { - kind: 'scalar', - resolve: resolveJavascriptRegExp, - construct: constructJavascriptRegExp, - predicate: isRegExp, - represent: representJavascriptRegExp -}); - -},{"../../type":13}],20:[function(require,module,exports){ -'use strict'; - -var Type = require('../../type'); - -function resolveJavascriptUndefined() { - return true; -} - -function constructJavascriptUndefined() { - /*eslint-disable no-undefined*/ - return undefined; -} - -function representJavascriptUndefined() { - return ''; -} - -function isUndefined(object) { - return typeof object === 'undefined'; -} - -module.exports = new Type('tag:yaml.org,2002:js/undefined', { - kind: 'scalar', - resolve: resolveJavascriptUndefined, - construct: constructJavascriptUndefined, - predicate: isUndefined, - represent: representJavascriptUndefined -}); - -},{"../../type":13}],21:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -module.exports = new Type('tag:yaml.org,2002:map', { - kind: 'mapping', - construct: function (data) { return data !== null ? data : {}; } -}); - -},{"../type":13}],22:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -function resolveYamlMerge(data) { - return data === '<<' || data === null; -} - -module.exports = new Type('tag:yaml.org,2002:merge', { - kind: 'scalar', - resolve: resolveYamlMerge -}); - -},{"../type":13}],23:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -function resolveYamlNull(data) { - if (data === null) return true; - - var max = data.length; - - return (max === 1 && data === '~') || - (max === 4 && (data === 'null' || data === 'Null' || data === 'NULL')); -} - -function constructYamlNull() { - return null; -} - -function isNull(object) { - return object === null; -} - -module.exports = new Type('tag:yaml.org,2002:null', { - kind: 'scalar', - resolve: resolveYamlNull, - construct: constructYamlNull, - predicate: isNull, - represent: { - canonical: function () { return '~'; }, - lowercase: function () { return 'null'; }, - uppercase: function () { return 'NULL'; }, - camelcase: function () { return 'Null'; } - }, - defaultStyle: 'lowercase' -}); - -},{"../type":13}],24:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -var _hasOwnProperty = Object.prototype.hasOwnProperty; -var _toString = Object.prototype.toString; - -function resolveYamlOmap(data) { - if (data === null) return true; - - var objectKeys = [], index, length, pair, pairKey, pairHasKey, - object = data; - - for (index = 0, length = object.length; index < length; index += 1) { - pair = object[index]; - pairHasKey = false; - - if (_toString.call(pair) !== '[object Object]') return false; - - for (pairKey in pair) { - if (_hasOwnProperty.call(pair, pairKey)) { - if (!pairHasKey) pairHasKey = true; - else return false; - } - } - - if (!pairHasKey) return false; - - if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey); - else return false; - } - - return true; -} - -function constructYamlOmap(data) { - return data !== null ? data : []; -} - -module.exports = new Type('tag:yaml.org,2002:omap', { - kind: 'sequence', - resolve: resolveYamlOmap, - construct: constructYamlOmap -}); - -},{"../type":13}],25:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -var _toString = Object.prototype.toString; - -function resolveYamlPairs(data) { - if (data === null) return true; - - var index, length, pair, keys, result, - object = data; - - result = new Array(object.length); - - for (index = 0, length = object.length; index < length; index += 1) { - pair = object[index]; - - if (_toString.call(pair) !== '[object Object]') return false; - - keys = Object.keys(pair); - - if (keys.length !== 1) return false; - - result[index] = [ keys[0], pair[keys[0]] ]; - } - - return true; -} - -function constructYamlPairs(data) { - if (data === null) return []; - - var index, length, pair, keys, result, - object = data; - - result = new Array(object.length); - - for (index = 0, length = object.length; index < length; index += 1) { - pair = object[index]; - - keys = Object.keys(pair); - - result[index] = [ keys[0], pair[keys[0]] ]; - } - - return result; -} - -module.exports = new Type('tag:yaml.org,2002:pairs', { - kind: 'sequence', - resolve: resolveYamlPairs, - construct: constructYamlPairs -}); - -},{"../type":13}],26:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -module.exports = new Type('tag:yaml.org,2002:seq', { - kind: 'sequence', - construct: function (data) { return data !== null ? data : []; } -}); - -},{"../type":13}],27:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -var _hasOwnProperty = Object.prototype.hasOwnProperty; - -function resolveYamlSet(data) { - if (data === null) return true; - - var key, object = data; - - for (key in object) { - if (_hasOwnProperty.call(object, key)) { - if (object[key] !== null) return false; - } - } - - return true; -} - -function constructYamlSet(data) { - return data !== null ? data : {}; -} - -module.exports = new Type('tag:yaml.org,2002:set', { - kind: 'mapping', - resolve: resolveYamlSet, - construct: constructYamlSet -}); - -},{"../type":13}],28:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -module.exports = new Type('tag:yaml.org,2002:str', { - kind: 'scalar', - construct: function (data) { return data !== null ? data : ''; } -}); - -},{"../type":13}],29:[function(require,module,exports){ -'use strict'; - -var Type = require('../type'); - -var YAML_DATE_REGEXP = new RegExp( - '^([0-9][0-9][0-9][0-9])' + // [1] year - '-([0-9][0-9])' + // [2] month - '-([0-9][0-9])$'); // [3] day - -var YAML_TIMESTAMP_REGEXP = new RegExp( - '^([0-9][0-9][0-9][0-9])' + // [1] year - '-([0-9][0-9]?)' + // [2] month - '-([0-9][0-9]?)' + // [3] day - '(?:[Tt]|[ \\t]+)' + // ... - '([0-9][0-9]?)' + // [4] hour - ':([0-9][0-9])' + // [5] minute - ':([0-9][0-9])' + // [6] second - '(?:\\.([0-9]*))?' + // [7] fraction - '(?:[ \\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour - '(?::([0-9][0-9]))?))?$'); // [11] tz_minute - -function resolveYamlTimestamp(data) { - if (data === null) return false; - if (YAML_DATE_REGEXP.exec(data) !== null) return true; - if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true; - return false; -} - -function constructYamlTimestamp(data) { - var match, year, month, day, hour, minute, second, fraction = 0, - delta = null, tz_hour, tz_minute, date; - - match = YAML_DATE_REGEXP.exec(data); - if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data); - - if (match === null) throw new Error('Date resolve error'); - - // match: [1] year [2] month [3] day - - year = +(match[1]); - month = +(match[2]) - 1; // JS month starts with 0 - day = +(match[3]); - - if (!match[4]) { // no hour - return new Date(Date.UTC(year, month, day)); - } - - // match: [4] hour [5] minute [6] second [7] fraction - - hour = +(match[4]); - minute = +(match[5]); - second = +(match[6]); - - if (match[7]) { - fraction = match[7].slice(0, 3); - while (fraction.length < 3) { // milli-seconds - fraction += '0'; - } - fraction = +fraction; - } - - // match: [8] tz [9] tz_sign [10] tz_hour [11] tz_minute - - if (match[9]) { - tz_hour = +(match[10]); - tz_minute = +(match[11] || 0); - delta = (tz_hour * 60 + tz_minute) * 60000; // delta in milliseconds - if (match[9] === '-') delta = -delta; - } - - date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction)); - - if (delta) date.setTime(date.getTime() - delta); - - return date; -} - -function representYamlTimestamp(object /*, style*/) { - return object.toISOString(); -} - -module.exports = new Type('tag:yaml.org,2002:timestamp', { - kind: 'scalar', - resolve: resolveYamlTimestamp, - construct: constructYamlTimestamp, - instanceOf: Date, - represent: representYamlTimestamp -}); - -},{"../type":13}],"/":[function(require,module,exports){ -'use strict'; - - -var yaml = require('./lib/js-yaml.js'); - - -module.exports = yaml; - -},{"./lib/js-yaml.js":1}]},{},[])("/") -}); diff --git a/.github/.test/samples.json b/.github/.test/samples.json deleted file mode 100644 index 9d960634ec3b..000000000000 --- a/.github/.test/samples.json +++ /dev/null @@ -1,1344 +0,0 @@ -{ - "files": [ - { - "input": "ada-petstore.sh", - "matches": [ - "Client: Ada" - ] - }, - { - "input": "android-petstore-httpclient.sh", - "matches": [ - "Client: Android" - ] - }, - { - "input": "android-petstore-volley.sh", - "matches": [ - "Client: Android" - ] - }, - { - "input": "apache2-petstore-config.sh", - "matches": [ - "Config: Apache" - ] - }, - { - "input": "apex-petstore.sh", - "matches": [ - "Client: Apex" - ] - }, - { - "input": "aspnetcore-petstore-server.sh", - "matches": [ - "Server: C-Sharp" - ] - }, - { - "input": "bash-petstore.sh", - "matches": [ - "Client: Bash" - ] - }, - { - "input": "c-petstore.sh", - "matches": [ - "Client: C" - ] - }, - { - "input": "clojure-petstore.sh", - "matches": [ - "Client: Clojure" - ] - }, - { - "input": "cpp-pistache-server-petstore.sh", - "matches": [ - "Server: C++" - ] - }, - { - "input": "cpp-qt5-petstore.sh", - "matches": [ - "Client: C++", - "Client: QT" - ] - }, - { - "input": "cpp-qt5-qhttpengine-server-petstore.sh", - "matches": [ - "Server: C++" - ] - }, - { - "input": "cpp-restbed-petstore-server.sh", - "matches": [ - "Server: C++" - ] - }, - { - "input": "cpp-restsdk-petstore.sh", - "matches": [ - "Client: C++" - ] - }, - { - "input": "cpp-tizen-petstore.sh", - "matches": [ - "Client: C++" - ] - }, - { - "input": "csharp-dotnet2-petstore.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "csharp-petstore-net-35.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "csharp-petstore-net-40.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "csharp-petstore-net-standard.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "csharp-petstore-netcore-project.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "csharp-petstore.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "csharp-property-changed-petstore.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "csharp-netcore-petstore.sh", - "matches": [ - "Client: C-Sharp" - ] - }, - { - "input": "cwiki-petstore.sh", - "matches": [ - "Documentation: Cwiki" - ] - }, - { - "input": "dart-dio-petstore.sh", - "matches": [ - "Client: Dart" - ] - }, - { - "input": "dart-petstore.sh", - "matches": [ - "Client: Dart" - ] - }, - { - "input": "dart2-petstore.sh", - "matches": [ - "Client: Dart" - ] - }, - { - "input": "dynamic-html.sh", - "matches": [ - "Documentation: Dynamic HTML" - ] - }, - { - "input": "eiffel-petstore.sh", - "matches": [ - "Client: Eiffel" - ] - }, - { - "input": "elixir-petstore.sh", - "matches": [ - "Client: Elixir" - ] - }, - { - "input": "elm-0.18-petstore.sh", - "matches": [ - "Client: Elm" - ] - }, - { - "input": "elm-petstore.sh", - "matches": [ - "Client: Elm" - ] - }, - { - "input": "erlang-petstore-client.sh", - "matches": [ - "Client: Erlang" - ] - }, - { - "input": "erlang-petstore-proper.sh", - "matches": [ - "Client: Erlang" - ] - }, - { - "input": "erlang-petstore-server.sh", - "matches": [ - "Server: Erlang" - ] - }, - { - "input": "scala-finch-petstore-server.sh", - "matches": [ - "Server: Scala" - ] - }, - { - "input": "go-gin-petstore-server.sh", - "matches": [ - "Server: Go" - ] - }, - { - "input": "go-petstore-server.sh", - "matches": [ - "Server: Go" - ] - }, - { - "input": "go-petstore-withxml.sh", - "matches": [ - "Client: Go" - ] - }, - { - "input": "go-petstore.sh", - "matches": [ - "Client: Go" - ] - }, - { - "input": "graphql-schema-petstore.sh", - "matches": [ - "Schema: GraphQL" - ] - }, - { - "input": "graphql-nodejs-express-server.sh", - "matches": [ - "Server: GraphQL" - ] - }, - { - "input": "groovy-petstore.sh", - "matches": [ - "Client: Groovy" - ] - }, - { - "input": "haskell-http-client-petstore.sh", - "matches": [ - "Client: Haskell" - ] - }, - { - "input": "haskell-servant-petstore.sh", - "matches": [ - "Server: Haskell" - ] - }, - { - "input": "html-markdown.sh", - "matches": [ - "Client: HTML" - ] - }, - { - "input": "html-petstore.sh", - "matches": [ - "Client: HTML" - ] - }, - { - "input": "html2-petstore.sh", - "matches": [ - "Client: HTML" - ] - }, - { - "input": "java-inflector-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-msf4j-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-petstore-feign-10x.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-feign.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-google-api-client.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-jersey2-java6.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-jersey2.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-okhttp-gson-parcelable.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-okhttp-gson.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-rest-assured.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-resteasy.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-resttemplate-withxml.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-resttemplate.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-retrofit.sh", - "matches": [ - "Client: Java", - "Client: Retrofit" - ] - }, - { - "input": "java-petstore-retrofit2-play24.sh", - "matches": [ - "Client: Java", - "Client: Retrofit" - ] - }, - { - "input": "java-petstore-retrofit2-play25.sh", - "matches": [ - "Client: Java", - "Client: Retrofit" - ] - }, - { - "input": "java-petstore-retrofit2-play26.sh", - "matches": [ - "Client: Java", - "Client: Retrofit" - ] - }, - { - "input": "java-petstore-retrofit2.sh", - "matches": [ - "Client: Java", - "Client: Retrofit" - ] - }, - { - "input": "java-petstore-retrofit2rx.sh", - "matches": [ - "Client: Java", - "Client: Retrofit" - ] - }, - { - "input": "java-petstore-retrofit2rx2.sh", - "matches": [ - "Client: Java", - "Client: Retrofit" - ] - }, - { - "input": "java-petstore-vertx.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-petstore-webclient.sh", - "matches": [ - "Client: Java" - ] - }, - { - "input": "java-pkmst-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-api-package-override.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-async.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-controller-only.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-fake-endpoints.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-no-bean-validation.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-no-exception-handling.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-no-interface.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-no-swagger-ui.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server-no-wrap-calls.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-play-framework-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-undertow-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-vertx-async-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "java-vertx-rx-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "javascript-closure-angular.sh", - "matches": [ - "Client: JavaScript/Node.js" - ] - }, - { - "input": "javascript-es6-petstore.sh", - "matches": [ - "Client: JavaScript/Node.js" - ] - }, - { - "input": "javascript-flowtyped-petstore.sh", - "matches": [ - "Client: JavaScript/Node.js" - ] - }, - { - "input": "javascript-petstore.sh", - "matches": [ - "Client: JavaScript/Node.js" - ] - }, - { - "input": "javascript-promise-es6-petstore.sh", - "matches": [ - "Client: JavaScript/Node.js" - ] - }, - { - "input": "javascript-promise-petstore.sh", - "matches": [ - "Client: JavaScript/Node.js" - ] - }, - { - "input": "jaxrs-cxf-cdi-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-cxf-client-petstore.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-cxf-petstore-server-annotated-base-path.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-cxf-petstore-server-non-spring-application.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-cxf-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-petstore-server-datelib-j8.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-resteasy-eap-java8-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-resteasy-eap-joda-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-resteasy-eap-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-resteasy-joda-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-resteasy-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-spec-petstore-server-interface-returning-response.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-spec-petstore-server-interface.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-spec-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jaxrs-usetags-petstore-server.sh", - "matches": [ - "Server: Java" - ] - }, - { - "input": "jmeter-petstore.sh", - "matches": [ - "Client: JMeter" - ] - }, - { - "input": "kotlin-client-petstore.sh", - "matches": [ - "Client: Kotlin" - ] - }, - { - "input": "kotlin-client-string.sh", - "matches": [ - "Client: Kotlin" - ] - }, - { - "input": "kotlin-client-threetenbp.sh", - "matches": [ - "Client: Kotlin" - ] - }, - { - "input": "kotlin-server-petstore.sh", - "matches": [ - "Server: Kotlin" - ] - }, - { - "input": "kotlin-springboot-petstore-server.sh", - "matches": [ - "Server: Kotlin" - ] - }, - { - "input": "lua-petstore.sh", - "matches": [ - "Client: Lua" - ] - }, - { - "input": "mysql-schema-petstore.sh", - "matches": [ - "Schema: MySQL" - ] - }, - { - "input": "nodejs-petstore-google-cloud-functions.sh", - "matches": [ - "Server: Nodejs" - ] - }, - { - "input": "nodejs-petstore-server.sh", - "matches": [ - "Server: Nodejs" - ] - }, - { - "input": "objc-petstore-coredata.sh", - "matches": [ - "Client: Objc" - ] - }, - { - "input": "objc-petstore.sh", - "matches": [ - "Client: Objc" - ] - }, - { - "input": "perl-deep-module-petstore.sh", - "matches": [ - "Client: Perl" - ] - }, - { - "input": "perl-petstore.sh", - "matches": [ - "Client: Perl" - ] - }, - { - "input": "php-laravel-petstore-server.sh", - "matches": [ - "Server: PHP" - ] - }, - { - "input": "php-lumen-petstore-server.sh", - "matches": [ - "Server: PHP" - ] - }, - { - "input": "php-petstore.sh", - "matches": [ - "Server: PHP" - ] - }, - { - "input": "php-silex-petstore-server.sh", - "matches": [ - "Server: PHP" - ] - }, - { - "input": "php-slim-server-petstore.sh", - "matches": [ - "Server: PHP" - ] - }, - { - "input": "php-symfony-petstore.sh", - "matches": [ - "Server: PHP" - ] - }, - { - "input": "php-mezzio-ph-petstore-server.sh", - "matches": [ - "Server: PHP" - ] - }, - { - "input": "powershell-petstore.sh", - "matches": [ - "Client: PowerShell" - ] - }, - { - "input": "python-asyncio-petstore.sh", - "matches": [ - "Client: Python" - ] - }, - { - "input": "python-server-flask-petstore.sh", - "matches": [ - "Server: Python" - ] - }, - { - "input": "python-petstore.sh", - "matches": [ - "Client: Python" - ] - }, - { - "input": "python-tornado-petstore.sh", - "matches": [ - "Client: Python" - ] - }, - { - "input": "r-petstore.sh", - "matches": [ - "Client: R" - ] - }, - { - "input": "ruby-client-petstore.sh", - "matches": [ - "Client: Ruby" - ] - }, - { - "input": "ruby-on-rails-server-petstore.sh", - "matches": [ - "Server: Ruby" - ] - }, - { - "input": "ruby-sinatra-server-petstore.sh", - "matches": [ - "Server: Ruby" - ] - }, - { - "input": "rust-petstore.sh", - "matches": [ - "Client: Rust" - ] - }, - { - "input": "rust-server-petstore.sh", - "matches": [ - "Server: Rust" - ] - }, - { - "input": "scala-akka-petstore.sh", - "matches": [ - "Client: Scala" - ] - }, - { - "input": "scala-gatling-petstore.sh", - "matches": [ - "Client: Scala" - ] - }, - { - "input": "scala-httpclient-petstore.sh", - "matches": [ - "Client: Scala" - ] - }, - { - "input": "scala-lagom-server-petstore.sh", - "matches": [ - "Server: Scala" - ] - }, - { - "input": "scalatra-petstore-server.sh", - "matches": [ - "Server: Scala" - ] - }, - { - "input": "scalaz-petstore.sh", - "matches": [ - "Client: Scala" - ] - }, - { - "input": "spring-all-petstore.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "spring-cloud-feign-petstore.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "spring-delegate-j8.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "spring-delegate.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "spring-stubs.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "springboot-petstore-server-beanvalidation.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "springboot-petstore-server-implicitHeaders.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "springboot-petstore-server-reactive.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "springboot-petstore-server-useOptional.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "springboot-petstore-server.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "springboot-virtualan-petstore-server.sh", - "matches": [ - "Server: Spring" - ] - }, - { - "input": "swift-petstore-promisekit.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift-petstore-rxswift.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift-petstore.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift3-petstore-objcCompatible.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift3-petstore-promisekit.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift3-petstore-rxswift.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift3-petstore-unwraprequired.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift3-petstore.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift4-petstore-objcCompatible.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift4-petstore-promisekit.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift4-petstore-rxswift.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift4-petstore-unwrapRequired.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift4-petstore.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "swift4-test.sh", - "matches": [ - "Client: Swift" - ] - }, - { - "input": "typescript-angular-v2-petstore-interfaces.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v2-petstore-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v2-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v4-petstore-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v4.3-petstore-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v6-petstore-not-provided-in-root-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v6-petstore-not-provided-in-root.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v6-petstore-provided-in-root-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v6-petstore-provided-in-root.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v7-petstore-not-provided-in-root-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v7-petstore-not-provided-in-root.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v7-petstore-provided-in-root-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angular-v7-petstore-provided-in-root.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-angularjs-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-aurelia-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-axios-petstore-interfaces.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-axios-petstore-target-es6.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-axios-petstore-with-npm-version.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-axios-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-fetch-petstore-interfaces.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-fetch-petstore-target-es6.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-fetch-petstore-with-npm-version.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-fetch-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-inversify-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-jquery-petstore-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-jquery-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-nestjs-v6-petstore-not-provided-in-root-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-nestjs-v6-petstore-not-provided-in-root.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-nestjs-v6-petstore-provided-in-root-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-nestjs-v6-petstore-provided-in-root.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-nestjs-v8-petstore-provided-in-root.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-node-petstore-with-npm.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-node-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-rxjs-petstore-interfaces.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-rxjs-petstore-target-es6.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-rxjs-petstore-with-npm-version.sh", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "typescript-rxjs-petstore.sh", - "matches": [ - "Client: TypeScript" - ] - } - ], - "text": [ - { - "input": "WIP: Example", - "matches": [ - "WIP" - ] - }, - { - "input": "[help wanted] Looking for help", - "matches": [ - "help wanted" - ] - }, - { - "input": "[Announcement] Release 1.0", - "matches": [ - "Announcement" - ] - }, - { - "input": "[announcement] Release 2.0", - "matches": [ - "Announcement" - ] - }, - { - "input": "[typescript] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-angular] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-angularjs] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-aurelia] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-axios] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-fetch] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-inversify] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-jquery] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-node] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "[typescript-rxjs] Generic typescript text", - "matches": [ - "Client: TypeScript" - ] - }, - { - "input": "Should not auto-label for typescript outside of brackets.", - "matches": [] - } - ] -} diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 416f9199ba27..0fc6dfd914d1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,35 +1 @@ -## Core team -modules/openapi-generator/src/main/java/org/openapitools/codegen/*.java @OpenAPITools/generator-core-team -modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/*.java @OpenAPITools/generator-core-team -modules/openapi-generator/src/main/java/org/openapitools/codegen/config/*.java @OpenAPITools/generator-core-team -modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/*.java @OpenAPITools/generator-core-team -modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/**/*.java @OpenAPITools/generator-core-team -modules/openapi-generator/src/main/java/org/openapitools/codegen/serializer/*.java @OpenAPITools/generator-core-team -modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/**/*.java @OpenAPITools/generator-core-team -modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/**/*.java @OpenAPITools/generator-core-team -modules/openapi-generator-core/**/* @OpenAPITools/generator-core-team - -# No need for auto-generated subdirectories (reduces noise) -docs/ @OpenAPITools/generator-core-team - -## Individual interests -.github/**/* @jimschubert -scripts/**/* @jimschubert -website/**/* @jimschubert -bin/ci/**/* @jimschubert - -## Build related -CI/**/* @OpenAPITools/build -.mvn/**/* @OpenAPITools/build -bin/utils/**/* @OpenAPITools/build - -## Module-specific -modules/openapi-generator-cli/**/* @jimschubert -modules/openapi-generator-gradle-plugin/**/* @jimschubert -modules/openapi-generator-maven-plugin/**/* @jimschubert - -# Martin Delille -/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java @martindelille -/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java @martindelille -/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/resources/cpp-qt-client @martindelille -/Users/martin/dev/clone/openapi-generator/samples/client/petstore/cpp-qt @martindelille +* @kronostechnologies/platform diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 85134f29aa2b..000000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -open_collective: openapi_generator diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 5c7bdfdce011..000000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,46 +0,0 @@ - - -##### Description - - - -##### openapi-generator version - - - -##### OpenAPI declaration file content or url - - - -##### Command line used for generation - - - -##### Steps to reproduce - - - -##### Related issues/PRs - - - -##### Suggest a fix/enhancement - - - diff --git a/.github/ISSUE_TEMPLATE/announcement.md b/.github/ISSUE_TEMPLATE/announcement.md deleted file mode 100644 index 3b3c1d2d9a30..000000000000 --- a/.github/ISSUE_TEMPLATE/announcement.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Announcement -about: Announcements related to the project -title: "[Announcement] TITLE" -labels: Announcement -assignees: '' - ---- - - diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index c453503d315e..000000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,67 +0,0 @@ ---- -name: Bug report -about: Create a bug report to help us improve -title: "[BUG] Description" -labels: 'Issue: Bug' -assignees: '' - ---- - -#### Bug Report Checklist - -- [ ] Have you provided a full/minimal spec to reproduce the issue? -- [ ] Have you validated the input using an OpenAPI validator ([example](https://apidevtools.org/swagger-parser/online/))? -- [ ] Have you [tested with the latest master](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) to confirm the issue still exists? -- [ ] Have you searched for related issues/PRs? -- [ ] What's the actual output vs expected output? -- [ ] [Optional] Sponsorship to speed up the bug fix or feature request ([example](https://github.com/OpenAPITools/openapi-generator/issues/6178)) - - - -##### Description - - - -##### openapi-generator version - - - -##### OpenAPI declaration file content or url - - - -##### Generation Details - - - -##### Steps to reproduce - - - -##### Related issues/PRs - - - -##### Suggest a fix - - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 404498fa9a22..000000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: "[REQ] Feature Request Description" -labels: 'Enhancement: Feature' -assignees: '' - ---- - -### Is your feature request related to a problem? Please describe. - - - -## Describe the solution you'd like - - - -## Describe alternatives you've considered - - - -## Additional context - - diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 0e596306d9dd..000000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,21 +0,0 @@ - - - -### PR checklist - -- [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md). -- [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community. -- [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples: - ``` - ./mvnw clean package - ./bin/generate-samples.sh ./bin/configs/*.yaml - ./bin/utils/export_docs_generators.sh - ``` - (For Windows users, please run the script in [Git BASH](https://gitforwindows.org/)) - Commit all changed files. - This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. - These must match the expectations made by your contribution. - You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. - IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed. -- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.1.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks) -- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request. diff --git a/.github/actions/run-samples/action.yaml b/.github/actions/run-samples/action.yaml deleted file mode 100644 index 3bb8c279e1d1..000000000000 --- a/.github/actions/run-samples/action.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: 'Run samples' -description: 'Runs sample integration test profile with Maven' -inputs: - name: - description: 'The Maven profile name' - required: true - goal: - description: 'Maven goal' - required: false - default: 'verify' - args: - description: 'Additional maven arguments' - required: false - default: '' -runs: - using: "composite" - steps: - - run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet ${{ inputs.goal }} -P${{ inputs.name }} -Dintegration-test -Dmaven.javadoc.skip=true ${{ inputs.args }} - shell: bash diff --git a/.github/auto-labeler.yml b/.github/auto-labeler.yml deleted file mode 100644 index 6a4f6a18ce04..000000000000 --- a/.github/auto-labeler.yml +++ /dev/null @@ -1,286 +0,0 @@ -comment: | - 👍 Thanks for opening this issue! - 🏷 I have applied any labels matching special text in your issue. - - The team will review the labels and make any necessary changes. -labels: - 'Announcement': - - '\s*?\[[Aa]nnouncement\]\s*?' - 'Breaking change (with fallback)': - - '\s*?[bB]reaking [cC]hange [wW]ith [fF]allback\s*?' - 'Breaking change (without fallback)': - - '\s*?[bB]reaking [cC]hange [wW]ithout [fF]allback\s*?' - 'Client: Ada': - - '\s*?\[ada\]\s*?' - - '\s*?-[gl] ada(?!-)\b' - 'Client: Android': - - '\s*?\[android\]\s*?' - - '\s*?-[gl] android(?!-)\b' - 'Client: Apex': - - '\s*?\[apex\]\s*?' - - '\s*?-[gl] apex(?!-)\b' - 'Client: Bash': - - '\s*?\[bash\]\s*?' - - '\s*?-[gl] bash(?!-)\b' - 'Client: C': - - '\s*?\[[cC]\]\s*?' - - '\s*?-[gl] c(?!-)\b' - # 'Client: Ceylon': - 'Client: C++': - - '\s*?\[cpp(-.*)?-client\]\s*?' - - '\s*?-[gl] cpp(-.*)?-client\s*?' - - '\s*?-[gl] cpp-restsdk(?!-)\b' - - '\s*?-[gl] cpp-tizen(?!-)\b' - 'Client: C-Sharp': - - '\s*?-[gl] csharp(?!-)\b' - - '\s*?[cC]-[sS]harp [cC]lient\s*?' - - '\s*?-[gl] csharp-dotnet2\s*?' - - '\s*?-[gl] csharp-refactor?\s*?' - - '\s*?\[[Cc]#\]' - - '\s*?\[csharp\]\s*?' - 'Client: Clojure': - - '\s*?\[clojure\]\s*?' - - '\s*?-[gl] clojure(?!-)\b' - # 'Client: Crystal': - 'Client: Dart': - - '\s*?\[dart\]\s*?' - - '\s*?-[gl] dart(?!-)\b' - 'Client: Dukescript': - - '\s*?\[dukescript\]\s*?' - - '\s*?-g dukescript\s*?' - 'Client: Eiffel': - - '\s*?\[eiffel\]\s*?' - - '\s*?-[gl] eiffel(?!-)\b' - 'Client: Elixir': - - '\s*?\[elixir\]\s*?' - - '\s*?-[gl] elixir(?!-)\b' - 'Client: Elm': - - '\s*?\[elm\]\s*?' - - '\s*?-[gl] elm(?!-)\b' - 'Client: Erlang': - - '\s*?\[erlang(-.*)?-client\]\s*?' - - '\s*?-[gl] erlang(-.*)?-client\s*?' - - '\s*?\[erlang-proper\]\s*?' - - '\s*?-[gl] erlang-proper\s*?' - 'Client: Go': - - '\s*?\[go\]\s*?' - - '\s*?-[gl] go(?!-)\b' - 'Client: Groovy': - - '\s*?\[groovy\]\s*?' - - '\s*?-[gl] groovy(?!-)\b' - 'Client: HTML': - - '\s*?\[html[2]?\]\s*?' - - '\s*?-[gl] html[2]?\s*?' - 'Client: Haskell': - - '\s*?\[haskell(-.*)?-client\]\s*?' - - '\s*?-[gl] haskell(-.*)?-client\s*?' - 'Client: JMeter': - - '\s*?\[jmeter\]\s*?' - - '\s*?-[gl] jmeter\s*?' - 'Client: Java': - - '\s*?\[java\]\s*?' - - '\s*?-[gl] java(?!-)\b' - 'Client: JavaScript/Node.js': - - '\s*?\[javascript\]\s*?' - - '\s*?-[gl] javascript\s*?' - - '\s*?-[gl] javascript-(\S)*\s*?' - # 'Client: Julia': # NOTE: Not yet implemented - 'Client: Kotlin': - - '\s*?\[kotlin\]\s*?' - - '\s*?-[gl] kotlin(?!-)\b' - 'Client: Lisp': - - '\s*?\[lisp\]\s*?' - - '\s*?-[gl] lisp(?!-)\b' - 'Client: Lua': - - '\s*?\[lua\]\s*?' - - '\s*?-[gl] lua(?!-)\b' - 'Client: Objc': - - '\s*?\[objc\]\s*?' - - '\s*?-[gl] objc\s*?' - # 'Client: OCaml': - 'Client: Perl': - - '\s*?\[perl\]\s*?' - - '\s*?-[gl] perl(?!-)\b' - # 'Client: PHP': - 'Client: PowerShell': - - '\s*?\[powershell\]\s*?' - - '\s*?-[gl] powershell\s*?' - 'Client: Python': - - '\s*?\[python\]\s*?' - - '\s*?-[gl] python(?!-)\b' - 'Client: QT': - - '\s*?\[cpp-qt5-client\]\s*?' - - '\s*?-[gl] cpp-qt5-client\s*?' - 'Client: R': - - '\s*?\[[rR]\]\s*?' - - '\s*?-[gl] r(?!-)\b' - 'Client: Reason ML': - - '\s*?\[reasonml\]\s*?' - - '\s*?-[g] reasonml\s*?' - 'Client: Retrofit': - - '\s*?retrofit.*?\s*?' - 'Client: Ruby': - - '\s*?\[ruby\]\s*?' - - '\s*?-[gl] ruby(?!-)\b' - 'Client: Rust': - - '\s*?\[rust\]\s*?' - - '\s*?-[gl] rust(?!-)\b' - 'Client: Scala': - - '\s*?\[scalaz\]\s*?' - - '\s*?-[gl] scalaz\s*?' - - '\s*?\[scala-(?!finch)[a-z]+\]\b' - - '\s*?-[gl] scala-(?!finch)[a-z]+?(?!-)\b' - 'Client: Swift': - - '\s*?\[swift[34]+\]\s*?' - - '\s*?-[gl] swift[34]+\s*?' - - '\s*?-[gl] swift2-deprecated\s*?' - 'Client: TypeScript': - - '\s*?\[typescript\]\s*?' - - '\s*?\[typescript-[\-a-z]+\]\s*?' - - '\s*?-[gl] typescript-[\-a-z]+\s*?' - # 'Client: VB/VB.net': # NOTE: Not yet implemented - # 'Client: Visual Basic': # TODO: REMOVE UNUSED LABEL - 'Config: Apache': - - '\s*?\[apache2\]\s*?' - - '\s*?-[gl] apache2\s*?' - 'Docker': - - '\s*?\[docker\]\s*?' - 'Documentation: Cwiki': - - '\s*?\[cwiki\]\s*?' - - '\s*?-[gl] cwiki\s*?' - 'Documentation: Dynamic HTML': - - '\s*?\[dynamic-html\]\s*?' - - '\s*?-[gl] dynamic-html\s*?' - 'Enhancement: CI/Test': - - '\s*?\[ci\]\s*?' - 'Enhancement: Code format': - - '\s*?\[format(ting)?\]\s*?' - # 'Enhancement: Compatibility': - 'Enhancement: Feature': - - '\s*?\[feat(ure)?s*?' - 'Enhancement: General': - - '\s*?\[general\]\s*?' - - '\s*?\[core\]\s*?' - # 'Enhancement: New generator': - 'Enhancement: Performance': - - '\s*?\[perf\]\s*?' - # 'Feature List: API clients': - # 'Feature List: API documentations': - # 'Feature List: API servers': - # 'Feature: Authentication': - # 'Feature: Composition / Inheritance': - # 'Feature: Documentation': - # 'Feature: Enum': - # 'Feature: Generator': - 'Feature: OAS 3.0 spec support': - - '\s*?\[oas3[\.0]?\]\s*?' - # 'General: Awaiting feedback': - 'General: Discussion': - - '\s*?\[discussion\]\s*?' - 'General: Question': - - '\s*?\[question\]\s*?' - 'General: Suggestion': - - '\s*?\[suggestion\]\s*?' - 'General: Support': - - '\s*?\[support\]\s*?' - 'Issue: Bug': - - '\s*?\[bug(s)?\]\s*?' - - '\s*?\[fix(es)?\]\s*?' - # 'Issue: Invalid spec': - # 'Issue: Migration': - # 'Issue: Non-operational': - # 'Issue: Platform': - # 'Issue: Regression': - 'Issue: Security': - - '\s*?\[security\]\s*?' - # 'Issue: Unable to reproduce': - # 'Issue: Undo changes': - # 'Issue: Usage/Installation': - # 'Issue: Workaround available': - 'OpenAPI Generator CLI': - - '\s*?\[cli\]\s*?' - 'OpenAPI Generator Gradle Plugin': - - '\s*?\[gradle\]\s*?' - 'OpenAPI Generator Maven Plugin': - - '\s*?\[maven\]\s*?' - 'OpenAPI Generator Online': - - '\s*?\[online\]\s*?' - 'Schema: MySQL': - - '\s*?\[mysql\]\s*?' - - '\s*?-[gl] mysql\s*?' - 'Schema: GraphQL': - - '\s*?\[graphql-schema\]\s*?' - - '\s*?-[gl] graphql-schema\s*?' - 'Server: Ada': - - '\s*?\[ada(-.*)?-server\]\s*?' - - '\s*?-[gl] ada(-.*)?-server\s*?' - 'Server: C++': - - '\s*?\[cpp(-.*)?-server\]\s*?' - - '\s*?-[gl] cpp(-.*)?-server\s*?' - 'Server: C-Sharp': - - '\s*?\[aspnetcore\]\s*?' - - '\s*?-[gl] aspnetcore\s*?' - # 'Server: Ceylon': # TODO: REMOVE UNUSED LABEL - 'Server: Eiffel': - - '\s*?\[eiffel(-.*)?-server\]\s*?' - - '\s*?-[gl] eiffel(-.*)?-server\s*?' - 'Server: Elixir': - - '\s*?\[elixir(-.*)?-server\]\s*?' - - '\s*?-[gl] elixir(-.*)?-server\s*?' - 'Server: Erlang': - - '\s*?\[erlang-server\]\s*?' - - '\s*?-[gl] erlang-server\s*?' - 'Server: Go': - - '\s*?\[go(-.*)?-server\]\s*?' - - '\s*?-[gl] go(-.*)?-server\s*?' - 'Server: GraphQL': - - '\s*?\[graphql(-.*)?-server\]\s*?' - - '\s*?-[gl] graphql(-.*)?-server\s*?' - 'Server: Haskell': - - '\s*?\[haskell]\s*?' - - '\s*?-[gl] haskell(?!-)\b' - 'Server: Java': - - '\s*?\[java-.*?\]\s*?' - - '\s*?-[gl] java-.*?\s*?' - - '\s*?-[gl] jaxrs-.*?\s*?' - 'Server: Kotlin': - - '\s*?\[ktor]\s*?' - - '\s*?\[kotlin-spring]\s*?' - - '\s*?\[kotlin(-.*)?-server\]\s*?' - - '\s*?-[gl] kotlin(-.*)?-server\s*?' - - '\s*?-[gl] kotlin-spring\s*?' - 'Server: Nodejs': - - '\s*?\[nodejs(-.*)?-server\]\s*?' - - '\s*?-[gl] nodejs(-.*)?-server\s*?' - 'Server: PHP': - - '\s*?\[php-.*?\]\s*?' - - '\s*?-[gl] php-.*?\s*?' - 'Server: Perl': - - '\s*?\[perl(-.*)?-server\]\s*?' - - '\s*?-g perl(-.*)?-server\s*?' - 'Server: Python': - - '\s*?\[python-.*?\]\s*?' - - '\s*?-[gl] python-.*?\s*?' - 'Server: Ruby': - - '\s*?\[ruby-.*?\]\s*?' - - '\s*?-[gl] ruby-.*?\s*?' - 'Server: Rust': - - '\s*?\[rust(-.*)?-server\]\s*?' - - '\s*?-[gl] rust(-.*)?-server\s*?' - 'Server: Scala': - - '\s*?\[scala(-.*)?-server\]\s*?' - - '\s*?-[gl] scala(-.*)?-server\s*?' - - '\s*?\[scalatra\]\s*?' - - '\s*?-[gl] scalatra\s*?' - - '\s*?\[scala-finch\]\s*?' - - '\s*?-[gl] scala-finch\s*?' - 'Server: Spring': - - '\s*?\[spring\]\s*?' - - '\s*?-[g] spring\s*?' - # 'Swagger-Parser': - 'WIP': - - '\s*?\[wip\]\s*?' - - '\s*?\[WIP\]\s*?' - - '\bWIP:.*?' - 'help wanted': - - '\s*?\[help wanted\]\s*?' diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 8b0d3c6224f9..000000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "weekly" - allow: - - dependency-name: "com.gradle.*" diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml deleted file mode 100644 index b52ce072c0d5..000000000000 --- a/.github/workflows/docker.yaml +++ /dev/null @@ -1,39 +0,0 @@ -name: Docker tests - -on: - push: - paths: - - Dockerfile - - run-in-docker.sh - - pom.xml - - modules/openapi-generator-online/pom.xml - - modules/openapi-generator-online/Dockerfile - pull_request: - paths: - - Dockerfile - - run-in-docker.sh - - pom.xml - - modules/openapi-generator-online/pom.xml - - modules/openapi-generator-online/Dockerfile -jobs: - build: - name: 'Build: Docker' - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v4 - - - name: Test run-in-docker.sh - shell: bash - run: | - sed -i 's/ -it / /g' run-in-docker.sh - ./run-in-docker.sh mvn clean install - - - name: Build Dockerfile - shell: bash - run: docker build . - - - name: Build modules/openapi-generator-online - shell: bash - run: | - docker build modules/openapi-generator-online/ -t test diff --git a/.github/workflows/gradle-plugin-tests.yaml b/.github/workflows/gradle-plugin-tests.yaml deleted file mode 100644 index fdf278761b01..000000000000 --- a/.github/workflows/gradle-plugin-tests.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: Gradle plugin tests - -on: - push: - paths: - - modules/openapi-generator-gradle-plugin/** - pull_request: - paths: - - modules/openapi-generator-gradle-plugin/** - -jobs: - test: - name: Gradle plugin tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: cache-maven-repository - with: - path: | - ~/.m2/repository - ~/.gradle - !~/.gradle/caches/modules-2/modules-2.lock - !~/.gradle/caches/*/plugin-resolution/ - !~/.m2/repository/org/openapitools/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-test-gradle-plugin-${{ env.cache-name }}- - ${{ runner.os }}-test-gradle-plugin- - - name: Run tests - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - run: | - ./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate) - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildDotnetSdk) - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && gradle buildJavaResttemplateSdk) # not using gradle wrapper diff --git a/.github/workflows/gradle-test.yaml b/.github/workflows/gradle-test.yaml deleted file mode 100644 index 2746851ca013..000000000000 --- a/.github/workflows/gradle-test.yaml +++ /dev/null @@ -1,54 +0,0 @@ -name: Gradle tests (Java samples) - -on: - push: - paths: - - 'samples/client/petstore/java/**' - - 'samples/openapi3/client/petstore/java/**' - pull_request: - paths: - - 'samples/client/petstore/java/**' - - 'samples/openapi3/client/petstore/java/**' -env: - GRADLE_VERSION: 7.2 - -jobs: - build: - name: Gradle tests - runs-on: ubuntu-latest - container: gradle:jdk11 - strategy: - fail-fast: true - matrix: - sample: - - samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8 - - samples/openapi3/client/petstore/java/jersey2-java8-special-characters - - samples/openapi3/client/petstore/java/jersey2-java8 - - samples/client/petstore/java/jersey2-java8-localdatetime - - samples/client/petstore/java/jersey2-java8 - - samples/client/petstore/java/okhttp-gson - - samples/client/petstore/java/okhttp-gson-group-parameter - - samples/client/petstore/java/webclient-swagger2 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - # Cache Gradle Dependencies - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }} - - # Cache Gradle Wrapper - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v3 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - - name: Build - working-directory: ${{ matrix.sample }} - run: /bin/sh gradlew build -x test diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml deleted file mode 100644 index c57a41dc0043..000000000000 --- a/.github/workflows/linux.yaml +++ /dev/null @@ -1,108 +0,0 @@ -name: Linux tests - -on: - push: - branches: - - master - - '[5-9]+.[0-9]+.x' - pull_request: - branches: - - master - - '[5-9]+.[0-9]+.x' - -jobs: - build: - name: 'Build: JDK ${{ matrix.java }} (${{ matrix.os }})' - runs-on: ${{ matrix.os }} - strategy: - matrix: - java: [11, 17] - os: [ubuntu-latest] - steps: - - name: Check out code - uses: actions/checkout@v4 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - - - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('modules/openapi-generator-gradle-plugin/pom.xml') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Setup Maven - uses: s4u/setup-maven-action@v1.10.0 - with: - java-version: ${{ matrix.java }} - maven-version: 3.8.8 - - - name: Build with Maven - shell: bash - run: ./mvnw clean -nsu -B --quiet -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - - - name: Upload Maven build artifact - uses: actions/upload-artifact@v3 - if: matrix.java == '11' && matrix.os == 'ubuntu-latest' - with: - name: artifact - path: modules/openapi-generator-cli/target/openapi-generator-cli.jar - - - name: Test Gradle plugin usage - shell: bash - run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace - - - name: Test Maven plugin integration - if: matrix.java == '11' - shell: bash - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - run: | - cd modules/openapi-generator-maven-plugin - mvn clean verify -Pintegration - - verify: - name: Verify outputs on ${{ matrix.os }} - needs: build - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] - steps: - - name: Check out code - uses: actions/checkout@v4 - - name: Setup Maven - uses: s4u/setup-maven-action@v1.10.0 - with: - java-version: 11 - maven-version: 3.8.8 - - name: Download build artifact - uses: actions/download-artifact@v3 - with: - name: artifact - - name: Run Ensures Script - shell: bash - run: | - git config --global core.fileMode false - git config --global core.safecrlf false - git config --global core.autocrlf true - ./mvnw clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true - # test with java (jersey2) client generation only as ensure-up-to-date script is run in another job instead - ./bin/generate-samples.sh ./bin/configs/java-jersey2-8.yaml - # test debugSupportingFiles - ./bin/generate-samples.sh ./bin/configs/go-petstore.yaml -- --global-property debugSupportingFiles diff --git a/.github/workflows/maven-plugin-tests.yaml b/.github/workflows/maven-plugin-tests.yaml deleted file mode 100644 index fe46066a3351..000000000000 --- a/.github/workflows/maven-plugin-tests.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: Maven plugin tests - -on: - push: - paths: - - modules/openapi-generator-maven-plugin/** - pull_request: - paths: - - modules/openapi-generator-maven-plugin/** - -jobs: - test: - name: Maven plugin tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: cache-maven-repository - with: - path: | - ~/.m2/repository - ~/.gradle - !~/.gradle/caches/*/plugin-resolution/ - !~/.m2/repository/org/openapitools/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-test-maven-plugin-${{ env.cache-name }}- - ${{ runner.os }}-test-maven-plugin- - - name: Run tests - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - run: | - ./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true - ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error - ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error - ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error - ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error diff --git a/.github/workflows/misc-test.yaml b/.github/workflows/misc-test.yaml deleted file mode 100644 index e561489642a2..000000000000 --- a/.github/workflows/misc-test.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: Misc Tests - -on: - push: - branches: - - master - - '[5-9]+.[0-9]+.x' - pull_request: - branches: - - master - - '[5-9]+.[0-9]+.x' - -jobs: - build: - name: Misc tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: '2.6' - bundler-cache: false # runs 'bundle install' and caches installed gems automatically - - name: Detect tabs - run: /bin/bash ./bin/utils/detect_tab_in_templates.sh - - name: Detect changes in test files - run: ./bin/utils/detect_test_file_changes.rb bin/utils/test_file_list.yaml - - name: Detect carriage return - run: /bin/bash ./bin/utils/detect_carriage_return.sh - - name: Detect merge conflicts - run: /bin/bash ./bin/utils/detect_merge_conflict.sh - - name: Detect tabs - run: /bin/bash ./bin/utils/detect_tab_in_java_class.sh diff --git a/.github/workflows/openapi-generator-test-results.yaml b/.github/workflows/openapi-generator-test-results.yaml deleted file mode 100644 index f246b16c36b1..000000000000 --- a/.github/workflows/openapi-generator-test-results.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: OpenAPI Generator Test Report - -on: - workflow_run: - workflows: ['OpenAPI Generator'] - types: - - completed - -# separate workflow required due to https://github.com/dorny/test-reporter#recommended-setup-for-public-repositories -jobs: - report: - runs-on: ubuntu-latest - steps: - - uses: dorny/test-reporter@v1 - with: - artifact: surefire-test-results - name: JUnit Test results - path: '**/surefire-reports/TEST-*.xml' - reporter: java-junit diff --git a/.github/workflows/openapi-generator.yaml b/.github/workflows/openapi-generator.yaml index 5fb9a9c4cb6e..b6d920852a78 100644 --- a/.github/workflows/openapi-generator.yaml +++ b/.github/workflows/openapi-generator.yaml @@ -3,12 +3,10 @@ name: OpenAPI Generator on: push: branches: - - master - - '[5-9]+.[0-9]+.x' + - equisoft/v7.1.x pull_request: branches: - - master - - '[5-9]+.[0-9]+.x' + - equisoft/* jobs: build: @@ -37,8 +35,8 @@ jobs: ${{ runner.os }}-build- - name: Run maven run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + #env: + # GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - run: ls -la modules/openapi-generator-cli/target - name: Upload openapi-generator-cli.jar artifact uses: actions/upload-artifact@v3 @@ -46,114 +44,3 @@ jobs: name: openapi-generator-cli.jar path: modules/openapi-generator-cli/target/openapi-generator-cli.jar retention-days: 1 - - test: - name: Unit tests - runs-on: ubuntu-latest - needs: - - build - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: cache-maven-repository - with: - path: | - ~/.m2/repository - ~/.gradle - !~/.gradle/caches/*/plugin-resolution/ - !~/.m2/repository/org/openapitools/ - key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - - name: Run unit tests - run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - - name: Publish unit test reports - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: surefire-test-results - path: '**/surefire-reports/TEST-*.xml' - - documentation: - name: Docs up-to-date - runs-on: ubuntu-latest - needs: - - build - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - name: Download openapi-generator-cli.jar artifact - uses: actions/download-artifact@v3 - with: - name: openapi-generator-cli.jar - path: modules/openapi-generator-cli/target - - name: Generate docs - run: | - bash bin/meta-codegen.sh - bash bin/utils/export_docs_generators.sh - bash bin/utils/copy-to-website.sh - bash bin/utils/export_generators_readme.sh - - name: Verify git status - run: | - if [[ "$(git status --porcelain)" != "" ]]; then - echo "UNCOMMITTED CHANGES ERROR" - echo "There are uncommitted changes in working tree after execution of 'bin/ensure-up-to-date'" - echo "Perform git diff" - git --no-pager diff - echo "Perform git status" - git status - echo -e "\nThis script runs in pull requests against the anticipated merge commit (as if the PR was merged now)." - echo "When you see unexpected files here, it likely means that there are newer commits in master that you need to " - echo -e "rebase or merge into your branch.\n" - echo "Please run 'bin/utils/ensure-up-to-date' locally and commit changes (UNCOMMITTED CHANGES ERROR)" - exit 1 - fi - - samples: - name: Samples up-to-date - needs: - - build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - name: Download openapi-generator-cli.jar artifact - uses: actions/download-artifact@v3 - with: - name: openapi-generator-cli.jar - path: modules/openapi-generator-cli/target - - name: Generate samples - run: bash bin/generate-samples.sh - - name: Verify git status - run: | - if [[ "$(git status --porcelain)" != "" ]]; then - echo "UNCOMMITTED CHANGES ERROR" - echo "There are uncommitted changes in working tree after execution of 'bin/generate-samples.sh'" - echo "Perform git diff" - git --no-pager diff - echo "Perform git status" - git status - echo -e "\nThis script runs in pull requests against the anticipated merge commit (as if the PR was merged now)." - echo "When you see unexpected files here, it likely means that there are newer commits in master that you need to " - echo -e "rebase or merge into your branch.\n" - echo "Please run 'bin/generate-samples.sh' locally and commit changes (UNCOMMITTED CHANGES ERROR)" - exit 1 - fi diff --git a/.github/workflows/samples-c-libcurl-client.yaml b/.github/workflows/samples-c-libcurl-client.yaml deleted file mode 100644 index 79f2b286dce3..000000000000 --- a/.github/workflows/samples-c-libcurl-client.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: Samples c libcurl client - -on: - push: - paths: - - 'samples/client/petstore/c/**' - pull_request: - paths: - - 'samples/client/petstore/c/**' - -jobs: - build: - name: Build c libcurl client - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Prepare - run: | - sudo apt-get update - sudo apt-get install -y libssl-dev libcurl4-openssl-dev - - name: Build - working-directory: "samples/client/petstore/c" - run: | - mkdir build - cd build - cmake .. - make diff --git a/.github/workflows/samples-cpp-qt-client.yaml b/.github/workflows/samples-cpp-qt-client.yaml deleted file mode 100644 index de602c41e628..000000000000 --- a/.github/workflows/samples-cpp-qt-client.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: Samples cpp qt client - -on: - push: - branches: - - 'samples/client/petstore/cpp-qt/**' - pull_request: - paths: - - 'samples/client/petstore/cpp-qt/**' - -env: - GRADLE_VERSION: 6.9 - -jobs: - build: - name: Build cpp qt client - strategy: - matrix: - qt-version: - - '5.15.2' - - '6.4.2' - os: - - ubuntu-latest - - macOS-latest - - windows-latest - include: - - os: windows-latest - tools: 'tools_openssl_x64' - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: jurplel/install-qt-action@v4 - with: - version: ${{ matrix.qt-version }} - tools: ${{ matrix.tools }} - - name: Build - working-directory: "samples/client/petstore/cpp-qt" - run: cmake . && cmake --build . diff --git a/.github/workflows/samples-dart.yaml b/.github/workflows/samples-dart.yaml deleted file mode 100644 index b6095e56c412..000000000000 --- a/.github/workflows/samples-dart.yaml +++ /dev/null @@ -1,39 +0,0 @@ -name: Samples Dart - -on: - push: - branches: - - master - - '[5-9]+.[0-9]+.x' - pull_request: - branches: - - master - - '[5-9]+.[0-9]+.x' - paths: - - 'samples/openapi3/client/petstore/dart*/**' - -jobs: - tests-dart: - name: Tests Dart - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - cache: maven - - name: Cache test dependencies - uses: actions/cache@v3 - env: - cache-name: pub-cache - with: - path: $PUB_CACHE - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.*') }} - - uses: dart-lang/setup-dart@v1 - with: - sdk: 2.15.0 - - name: Run tests - uses: ./.github/actions/run-samples - with: - name: samples.dart diff --git a/.github/workflows/samples-dotnet-standard.yaml b/.github/workflows/samples-dotnet-standard.yaml deleted file mode 100644 index cde1955e6931..000000000000 --- a/.github/workflows/samples-dotnet-standard.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: Samples C# .Net Standard - -on: - push: - paths: - - 'samples/client/petstore/csharp/**netstandard**/' - pull_request: - paths: - - 'samples/client/petstore/csharp/**netstandard**/' -jobs: - build: - name: Build .Net projects - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v3.2.0 - with: - dotnet-version: 3.1.* - - name: Build - working-directory: ${{ matrix.sample }} - run: dotnet build Org.OpenAPITools.sln - - name: Test - working-directory: ${{ matrix.sample }} - run: dotnet test Org.OpenAPITools.sln diff --git a/.github/workflows/samples-dotnet.yaml b/.github/workflows/samples-dotnet.yaml deleted file mode 100644 index 8ee577de2c86..000000000000 --- a/.github/workflows/samples-dotnet.yaml +++ /dev/null @@ -1,54 +0,0 @@ -name: Samples C# .Net 7 - -on: - push: - paths: - - 'samples/client/petstore/csharp/**net6.0**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**' - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' - pull_request: - paths: - - 'samples/client/petstore/csharp/**net6.0**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**' - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-project4Models/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' - - 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**' - - 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**' -jobs: - build: - name: Build .Net projects - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0 - - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests - - samples/server/petstore/aspnetcore-6.0 - - samples/server/petstore/aspnetcore-6.0-pocoModels - - samples/server/petstore/aspnetcore-6.0-project4Models - - samples/server/petstore/aspnetcore-6.0-useSwashBuckle - - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse - - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v3.2.0 - with: - dotnet-version: '7.0.x' - - name: Build - working-directory: ${{ matrix.sample }} - run: dotnet build Org.OpenAPITools.sln - - name: Test - working-directory: ${{ matrix.sample }} - run: dotnet test Org.OpenAPITools.sln diff --git a/.github/workflows/samples-dotnet6-client-echo-api.yaml b/.github/workflows/samples-dotnet6-client-echo-api.yaml deleted file mode 100644 index a0dcb8a58c2a..000000000000 --- a/.github/workflows/samples-dotnet6-client-echo-api.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: Samples C# .Net 6 - -on: - push: - paths: - - samples/client/echo_api/csharp-restsharp/** - pull_request: - paths: - - samples/client/echo_api/csharp-restsharp/** -jobs: - build: - name: Build .Net clients - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/echo_api/csharp-restsharp/ - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v3.2.0 - with: - dotnet-version: '6.0.x' - - name: Run echo server - run: | - git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server - (cd http-echo-server && npm install && npm start &) - - name: Build - working-directory: ${{ matrix.sample }} - run: | - dotnet build Org.OpenAPITools.sln - dotnet test Org.OpenAPITools.sln diff --git a/.github/workflows/samples-dotnet6-client.yaml b/.github/workflows/samples-dotnet6-client.yaml deleted file mode 100644 index fdfbdab7db55..000000000000 --- a/.github/workflows/samples-dotnet6-client.yaml +++ /dev/null @@ -1,81 +0,0 @@ -name: Samples C# .Net 6 - -on: - push: - paths: - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** - # build C# API client (httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/** - # build C# API client (generichost) - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/** - # build C# API client (netcore) - - samples/client/petstore/csharp/OpenAPIClient/** - - samples/client/petstore/csharp/OpenAPIClientCore/** - # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp/OpenAPIClient-net47/** - # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp/OpenAPIClient-net48/** - # build C# API client (.net 5.0) - - samples/client/petstore/csharp/OpenAPIClient-net5.0/** - # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** - # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp-restsharp-name-parameter-mappings/** - pull_request: - paths: - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** - # build C# API client (httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/** - # build C# API client (generichost) - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/** - # build C# API client (netcore) - - samples/client/petstore/csharp/OpenAPIClient/** - - samples/client/petstore/csharp/OpenAPIClientCore/** - # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp/OpenAPIClient-net47/** - # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp/OpenAPIClient-net48/** - # build C# API client (.net 5.0) - - samples/client/petstore/csharp/OpenAPIClient-net5.0/** - # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** - # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp-restsharp-name-parameter-mappings/** -jobs: - build: - name: Build .Net clients - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/ - # build C# API client (httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/ - # build C# API client (generichost) - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/ - # build C# API client (netcore) - - samples/client/petstore/csharp/OpenAPIClient/ - - samples/client/petstore/csharp/OpenAPIClientCore/ - # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp/OpenAPIClient-net47/ - # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp/OpenAPIClient-net48/ - # build C# API client (.net 5.0) - - samples/client/petstore/csharp/OpenAPIClient-net5.0/ - # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/ - # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp-restsharp-name-parameter-mappings - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v3.2.0 - with: - dotnet-version: '6.0.x' - - name: Build - working-directory: ${{ matrix.sample }} - run: dotnet build Org.OpenAPITools.sln diff --git a/.github/workflows/samples-dotnet6-server.yaml b/.github/workflows/samples-dotnet6-server.yaml deleted file mode 100644 index ea8a278a0327..000000000000 --- a/.github/workflows/samples-dotnet6-server.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: Samples C# .Net 6 - -on: - push: - paths: - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' - pull_request: - paths: - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-project4Models/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' - - 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**' - - 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**' -jobs: - build: - name: Build .Net servers - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - - samples/server/petstore/aspnetcore-6.0 - - samples/server/petstore/aspnetcore-6.0-pocoModels - - samples/server/petstore/aspnetcore-6.0-project4Models - - samples/server/petstore/aspnetcore-6.0-useSwashBuckle - - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse - - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v3.2.0 - with: - dotnet-version: '6.0.x' - - name: Build - working-directory: ${{ matrix.sample }} - run: dotnet build Org.OpenAPITools.sln - - name: Test - working-directory: ${{ matrix.sample }} - run: dotnet test Org.OpenAPITools.sln diff --git a/.github/workflows/samples-elm.yaml b/.github/workflows/samples-elm.yaml deleted file mode 100644 index 33f6f1200004..000000000000 --- a/.github/workflows/samples-elm.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Samples Elm - -on: - push: - paths: - - samples/client/petstore/elm/** - - samples/openapi3/client/elm/** - pull_request: - paths: - - samples/client/petstore/elm/** - - samples/openapi3/client/elm/** -jobs: - build: - name: Build Elm clients - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/petstore/elm - - samples/openapi3/client/elm - steps: - - uses: actions/checkout@v4 - - uses: jorelali/setup-elm@v5 - with: - elm-version: 0.19.1 - - name: Build - working-directory: ${{ matrix.sample }} - # Try to compile all .elm files - # This fails if: - # An .elm file couldn't be compiled - # No .elm files were found - # No elm.json file could be found in the root of the working directory - run: elm make $(find . -name *.elm) --output=/dev/null diff --git a/.github/workflows/samples-erlang.yaml b/.github/workflows/samples-erlang.yaml deleted file mode 100644 index c9e0981e49c4..000000000000 --- a/.github/workflows/samples-erlang.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Samples Erlang - -on: - push: - paths: - # comment out due to errors - # ===> Compiling src/openapi_pet_handler.erl failed - # src/openapi_pet_handler.erl:278: function is_authorized/2 already defined - #- samples/server/petstore/erlang-server/** - - samples/client/petstore/erlang-client/** - - samples/client/petstore/erlang-proper/** - pull_request: - paths: - #- samples/server/petstore/erlang-server/** - - samples/client/petstore/erlang-client/** - - samples/client/petstore/erlang-proper/** -jobs: - build: - name: Build Erlang projects - runs-on: ubuntu-20.04 - strategy: - fail-fast: false - matrix: - sample: - #- samples/server/petstore/erlang-server/ - - samples/client/petstore/erlang-client/ - - samples/client/petstore/erlang-proper/ - steps: - - uses: actions/checkout@v4 - - uses: erlef/setup-beam@v1 - with: - otp-version: '22.2' - rebar3-version: '3.14.3' - - run: rebar3 compile - working-directory: ${{ matrix.sample }} diff --git a/.github/workflows/samples-go-client-echo-api.yaml b/.github/workflows/samples-go-client-echo-api.yaml deleted file mode 100644 index 77b4f2b21c1d..000000000000 --- a/.github/workflows/samples-go-client-echo-api.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: Go Client (Echo API) - -on: - pull_request: - paths: - - samples/client/echo_api/go/** - - .github/workflows/samples-go-client-echo-api.yaml -jobs: - build: - name: Test Go client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/echo_api/go - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 - with: - go-version: "stable" - - name: Setup node.js - uses: actions/setup-node@v4 - - name: Run echo server - run: | - git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server - (cd http-echo-server && npm install && npm start &) - - run: go version - - name: Run test - working-directory: ${{ matrix.sample }} - run: go test -mod=mod -v diff --git a/.github/workflows/samples-go.yaml b/.github/workflows/samples-go.yaml deleted file mode 100644 index 55446d513bb9..000000000000 --- a/.github/workflows/samples-go.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: Samples Go - -on: - push: - paths: - - 'samples/server/petstore/go-echo-server/**' - - 'samples/server/petstore/go-api-server/**' - - 'samples/server/petstore/go-chi-server/**' - pull_request: - paths: - - 'samples/server/petstore/go-echo-server/**' - - 'samples/server/petstore/go-api-server/**' - - 'samples/server/petstore/go-chi-server/**' - -jobs: - build: - name: Build Go - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - - samples/server/petstore/go-echo-server/ - - samples/server/petstore/go-api-server/ - - samples/server/petstore/go-chi-server/ - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 - with: - go-version: "stable" - - run: go version - - name: Run test - working-directory: ${{ matrix.sample }} - run: go test -mod=mod -v diff --git a/.github/workflows/samples-groovy.yaml b/.github/workflows/samples-groovy.yaml deleted file mode 100644 index fd735ae7a9df..000000000000 --- a/.github/workflows/samples-groovy.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: Samples Groovy - -on: - push: - paths: - - 'samples/client/petstore/groovy**' - pull_request: - paths: - - 'samples/client/petstore/groovy**' - -env: - GRADLE_VERSION: 6.9 - -jobs: - build: - name: Build Groovy - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - - samples/client/petstore/groovy - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.gradle - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Install Gradle wrapper - uses: eskatos/gradle-command-action@v2 - with: - gradle-version: ${{ env.GRADLE_VERSION }} - build-root-directory: ${{ matrix.sample }} - arguments: wrapper - - name: Build - working-directory: ${{ matrix.sample }} - run: ./gradlew build -x test diff --git a/.github/workflows/samples-haskell.yaml b/.github/workflows/samples-haskell.yaml deleted file mode 100644 index a1d7d3940fc3..000000000000 --- a/.github/workflows/samples-haskell.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: Samples Haskell - -on: - push: - paths: - - samples/server/petstore/haskell-yesod/** - - samples/server/petstore/haskell-servant/** - - samples/client/petstore/haskell-http-client/** - pull_request: - paths: - - samples/server/petstore/haskell-yesod/** - - samples/server/petstore/haskell-servant/** - - samples/client/petstore/haskell-http-client/** -jobs: - build: - name: Build stack projects - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - - samples/server/petstore/haskell-yesod/ - - samples/server/petstore/haskell-servant/ - - samples/client/petstore/haskell-http-client/ - steps: - - uses: actions/checkout@v4 - - uses: haskell/actions/setup@v2 - with: - # ghc-version: '8.8.4' # Exact version of ghc to use - # cabal-version: 'latest'. Omitted, but defaults to 'latest' - enable-stack: true - stack-version: 'latest' - - name: stack test - working-directory: ${{ matrix.sample }} - run: stack test diff --git a/.github/workflows/samples-java-client-echo-api-jdk11.yaml b/.github/workflows/samples-java-client-echo-api-jdk11.yaml deleted file mode 100644 index d32c404a1a71..000000000000 --- a/.github/workflows/samples-java-client-echo-api-jdk11.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: Java Client (Echo API) JDK11 - -on: - push: - paths: - - samples/client/echo_api/java/** - pull_request: - paths: - - samples/client/echo_api/java/** -jobs: - build: - name: Build Java Client JDK11 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/echo_api/java/apache-httpclient - - samples/client/echo_api/java/native - - samples/client/echo_api/java/feign-gson - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Setup node.js - uses: actions/setup-node@v4 - - name: Run echo server - run: | - git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server - (cd http-echo-server && npm install && npm start &) - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-java-client-echo-api-jdk8.yaml b/.github/workflows/samples-java-client-echo-api-jdk8.yaml deleted file mode 100644 index 5f91e7c8db88..000000000000 --- a/.github/workflows/samples-java-client-echo-api-jdk8.yaml +++ /dev/null @@ -1,48 +0,0 @@ -name: Java Client (Echo API) JDK8 - -on: - push: - paths: - - samples/client/echo_api/java/apache-httpclient/** - - samples/client/echo_api/java/feign-gson/** - - samples/client/echo_api/java/okhttp-gson/** - pull_request: - paths: - - samples/client/echo_api/java/apache-httpclient/** - - samples/client/echo_api/java/feign-gson/** - - samples/client/echo_api/java/okhttp-gson/** -jobs: - build: - name: Build Java Client JDK8 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/echo_api/java/apache-httpclient - - samples/client/echo_api/java/feign-gson - - samples/client/echo_api/java/okhttp-gson - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Setup node.js - uses: actions/setup-node@v4 - - name: Run echo server - run: | - git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server - (cd http-echo-server && npm install && npm start &) - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-java-client-jdk11.yaml b/.github/workflows/samples-java-client-jdk11.yaml deleted file mode 100644 index c87152d319d1..000000000000 --- a/.github/workflows/samples-java-client-jdk11.yaml +++ /dev/null @@ -1,89 +0,0 @@ -name: Samples Java Client JDK11 - -on: - push: - paths: - - 'samples/client/petstore/java/**' - - samples/client/petstore/jaxrs-cxf-client/** - - samples/client/petstore/java-micronaut-client/** - - samples/openapi3/client/petstore/java/jersey2-java8-special-characters/** - - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/** - - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/** - - samples/openapi3/client/petstore/java/native** - - samples/client/others/java/okhttp-gson-oneOf/** - - samples/client/others/java/resttemplate-useAbstractionForFiles/** - - samples/client/others/java/webclient-useAbstractionForFiles/** - pull_request: - paths: - - 'samples/client/petstore/java/**' - - samples/client/petstore/jaxrs-cxf-client/** - - samples/client/petstore/java-micronaut-client/** - - samples/openapi3/client/petstore/java/jersey2-java8-special-characters/** - - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/** - - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/** - - samples/openapi3/client/petstore/java/native** - - samples/client/others/java/okhttp-gson-oneOf/** - - samples/client/others/java/resttemplate-useAbstractionForFiles/** - - samples/client/others/java/webclient-useAbstractionForFiles/** -jobs: - build: - name: Build Java Client JDK11 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/petstore/jaxrs-cxf-client - - samples/client/petstore/java/native - - samples/client/petstore/java/native-async - - samples/client/petstore/java/native-jakarta - - samples/client/petstore/java/retrofit2 - - samples/client/petstore/java/retrofit2rx2 - - samples/client/petstore/java/retrofit2rx3 - - samples/client/petstore/java/retrofit2-play26 - - samples/client/petstore/java/resttemplate - - samples/client/petstore/java/resttemplate-withXml - - samples/client/petstore/java/webclient - - samples/client/petstore/java/webclient-nullable-arrays - - samples/client/petstore/java/webclient-swagger2 - - samples/client/petstore/java/vertx - - samples/client/petstore/java/jersey2-java8-localdatetime - - samples/client/petstore/java/google-api-client - - samples/client/petstore/java/rest-assured - - samples/client/petstore/java/rest-assured-jackson - - samples/client/petstore/java/microprofile-rest-client - - samples/client/petstore/java/microprofile-rest-client-3.0 - - samples/client/petstore/java/microprofile-rest-client-3.0-jackson - - samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml - - samples/client/petstore/java/apache-httpclient - - samples/client/petstore/java/feign - - samples/client/petstore/java/okhttp-gson-awsv4signature - - samples/openapi3/client/petstore/java/jersey2-java8-special-characters - - samples/openapi3/client/petstore/java/native - - samples/client/petstore/java/okhttp-gson-swagger1/ - - samples/client/petstore/java/resttemplate-swagger1/ - - samples/openapi3/client/petstore/java/jersey2-java8-swagger1/ - - samples/client/petstore/java/okhttp-gson-swagger2/ - - samples/client/petstore/java/resttemplate-swagger2/ - - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/ - - samples/client/others/java/okhttp-gson-oneOf/ - - samples/client/others/java/resttemplate-useAbstractionForFiles/ - - samples/client/others/java/webclient-useAbstractionForFiles/ - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-java-client-jdk17.yaml b/.github/workflows/samples-java-client-jdk17.yaml deleted file mode 100644 index afaa76e0c68d..000000000000 --- a/.github/workflows/samples-java-client-jdk17.yaml +++ /dev/null @@ -1,42 +0,0 @@ -name: Samples Java Client JDK17 - -on: - push: - paths: - - samples/client/petstore/java/resttemplate-jakarta/** - - samples/client/petstore/java/webclient-jakarta/** - pull_request: - paths: - - samples/client/petstore/java/resttemplate-jakarta/** - - samples/client/petstore/java/webclient-jakarta/** -jobs: - build: - name: Build Java Client JDK17 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/petstore/java/resttemplate-jakarta - - samples/client/petstore/java/webclient-jakarta - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build with Maven - working-directory: ${{ matrix.sample }} - run: mvn clean package - - name: Build with Gradle - working-directory: ${{ matrix.sample }} - run: gradle clean build diff --git a/.github/workflows/samples-java-helidon.yaml b/.github/workflows/samples-java-helidon.yaml deleted file mode 100644 index abc22170f3c6..000000000000 --- a/.github/workflows/samples-java-helidon.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: Samples Java Helidon - -on: - push: - paths: - - samples/client/petstore/java-helidon-client/** - - samples/server/petstore/java-helidon-server/** - pull_request: - paths: - - samples/client/petstore/java-helidon-client/** - - samples/server/petstore/java-helidon-server/** -jobs: - build: - name: Build Java Helidon - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - - samples/client/petstore/java-helidon-client/mp - - samples/client/petstore/java-helidon-client/se - - samples/server/petstore/java-helidon-server/mp - - samples/server/petstore/java-helidon-server/se - version: [17] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.version }} - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-java-play-framework.yaml b/.github/workflows/samples-java-play-framework.yaml deleted file mode 100644 index 17cf0c678516..000000000000 --- a/.github/workflows/samples-java-play-framework.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: Samples Java Play Framework - -on: - push: - paths: - - 'samples/server/petstore/java-play-framework**' - pull_request: - paths: - - 'samples/server/petstore/java-play-framework**' -jobs: - build: - name: Build Java Play Framework - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - - samples/server/petstore/java-play-framework - - samples/server/petstore/java-play-framework-api-package-override - - samples/server/petstore/java-play-framework-async - - samples/server/petstore/java-play-framework-controller-only - - samples/server/petstore/java-play-framework-fake-endpoints - - samples/server/petstore/java-play-framework-fake-endpoints-with-security - - samples/server/petstore/java-play-framework-no-bean-validation - - samples/server/petstore/java-play-framework-no-exception-handling - - samples/server/petstore/java-play-framework-no-interface - - samples/server/petstore/java-play-framework-no-nullable - - samples/server/petstore/java-play-framework-no-swagger-ui - - samples/server/petstore/java-play-framework-no-wrap-calls - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-java-server-jdk8.yaml b/.github/workflows/samples-java-server-jdk8.yaml deleted file mode 100644 index 342a624b0c79..000000000000 --- a/.github/workflows/samples-java-server-jdk8.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: Samples Java Server - -on: - push: - paths: - # java-camel is tested locally for the time being - #- 'samples/server/petstore/java-camel/**' - - 'samples/server/petstore/java-vertx-web/**' - - 'samples/server/petstore/java-inflector/**' - - 'samples/server/petstore/java-pkmst/**' - # test in circleci instead - - 'samples/server/petstore/java-undertow/**' - pull_request: - paths: - #- 'samples/server/petstore/java-camel/**' - - 'samples/server/petstore/java-vertx-web/**' - - 'samples/server/petstore/java-inflector/**' - - 'samples/server/petstore/java-pkmst/**' - #- 'samples/server/petstore/java-undertow/**' -jobs: - build: - name: Build Java Server - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - #- samples/server/petstore/java-camel/ - - samples/server/petstore/java-vertx-web/ - - samples/server/petstore/java-inflector/ - - samples/server/petstore/java-pkmst/ - #- samples/server/petstore/java-undertow/ - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-jaxrs-jdk11.yaml b/.github/workflows/samples-jaxrs-jdk11.yaml deleted file mode 100644 index f97f134ba979..000000000000 --- a/.github/workflows/samples-jaxrs-jdk11.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: Samples JAX-RS (JDK11) - -on: - push: - paths: - - samples/server/petstore/jaxrs/jersey3/** - pull_request: - paths: - - samples/server/petstore/jaxrs/jersey3/** -jobs: - build: - name: Build JAX-RS - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - - samples/server/petstore/jaxrs/jersey3 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-jaxrs.yaml b/.github/workflows/samples-jaxrs.yaml deleted file mode 100644 index 744216754463..000000000000 --- a/.github/workflows/samples-jaxrs.yaml +++ /dev/null @@ -1,56 +0,0 @@ -name: Samples JAX-RS - -on: - push: - paths: - - 'samples/server/petstore/jaxrs*/**' - pull_request: - paths: - - 'samples/server/petstore/jaxrs*/**' -jobs: - build: - name: Build JAX-RS - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - - samples/server/petstore/jaxrs/jersey2 - - samples/server/petstore/jaxrs/jersey2-useTags - - samples/server/petstore/jaxrs-jersey - - samples/server/petstore/jaxrs-spec - - samples/server/petstore/jaxrs-spec-interface - - samples/server/petstore/jaxrs-spec-interface-response - - samples/server/petstore/jaxrs-jersey - - samples/server/petstore/jaxrs-spec - - samples/server/petstore/jaxrs-spec-interface - - samples/server/petstore/jaxrs-spec-interface-response - - samples/server/petstore/jaxrs-datelib-j8 - - samples/server/petstore/jaxrs-resteasy/default - - samples/server/petstore/jaxrs-resteasy/eap - - samples/server/petstore/jaxrs-resteasy/eap-joda - - samples/server/petstore/jaxrs-resteasy/eap-java8 - - samples/server/petstore/jaxrs-resteasy/joda - - samples/server/petstore/jaxrs-cxf - - samples/server/petstore/jaxrs-cxf-annotated-base-path - - samples/server/petstore/jaxrs-cxf-cdi - - samples/server/petstore/jaxrs-cxf-non-spring-app - - samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-jdk17.yaml b/.github/workflows/samples-jdk17.yaml deleted file mode 100644 index e264ec628a5b..000000000000 --- a/.github/workflows/samples-jdk17.yaml +++ /dev/null @@ -1,63 +0,0 @@ -name: Samples JDK17 -on: - push: - paths: - # clients - - samples/openapi3/client/petstore/spring-cloud-3/** - - samples/client/petstore/java-helidon-client/mp/** - - samples/client/petstore/java-helidon-client/se/** - - samples/client/petstore/spring-http-interface-reactive/** - - samples/client/petstore/spring-http-interface/** - # servers - - samples/openapi3/server/petstore/springboot-3/** - - samples/server/petstore/java-helidon-server/mp/** - - samples/server/petstore/java-helidon-server/se/** - pull_request: - paths: - # clients - - samples/openapi3/client/petstore/spring-cloud-3/** - - samples/client/petstore/java-helidon-client/mp/** - - samples/client/petstore/java-helidon-client/se/** - - samples/client/petstore/spring-http-interface-reactive/** - - samples/client/petstore/spring-http-interface/** - # servers - - samples/openapi3/server/petstore/springboot-3/** - - samples/server/petstore/java-helidon-server/mp/** - - samples/server/petstore/java-helidon-server/se/** -jobs: - build: - name: Build with JDK17 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/openapi3/client/petstore/spring-cloud-3 - - samples/client/petstore/java-helidon-client/mp - - samples/client/petstore/java-helidon-client/se - - samples/client/petstore/spring-http-interface-reactive - - samples/client/petstore/spring-http-interface - # servers - - samples/openapi3/server/petstore/springboot-3 - - samples/server/petstore/java-helidon-server/mp - - samples/server/petstore/java-helidon-server/se - - samples/client/petstore/spring-http-interface-reactive - - samples/client/petstore/spring-http-interface - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-julia.yaml b/.github/workflows/samples-julia.yaml deleted file mode 100644 index b692a6b4a5f5..000000000000 --- a/.github/workflows/samples-julia.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: Samples Julia - -on: - push: - paths: - - 'samples/client/petstore/julia/**' - - 'samples/server/petstore/julia/**' - pull_request: - paths: - - 'samples/client/petstore/julia/**' - - 'samples/server/petstore/julia/**' - -jobs: - tests-julia: - name: Tests Julia - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 - with: - version: 1.8 - arch: x64 - - name: Test - shell: bash - working-directory: 'samples' - run: | - currdir=`pwd` - # Using a specific version of OpenAPI.jl helps avoid introducing version inter-dependencies - # and allows breaking changes to be done in either repos independently - # Using develop mode to install package so that it is easier to modify the package test files - julia -e "using Pkg; Pkg.develop(\"OpenAPI\");" - cd ~/.julia/dev/OpenAPI - git checkout v0.1.14 - cd $currdir - rm -rf ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore - rm -rf ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore - cp -r client/petstore/julia ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore - cp -r server/petstore/julia ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore - # setting this env runs only the tests relevant to the openapi-generator repo - export OPENAPI_GENERATOR=true - julia -e "using Pkg; Pkg.test(\"OpenAPI\");" diff --git a/.github/workflows/samples-kotlin-client.yaml b/.github/workflows/samples-kotlin-client.yaml deleted file mode 100644 index ba36425e2cf2..000000000000 --- a/.github/workflows/samples-kotlin-client.yaml +++ /dev/null @@ -1,89 +0,0 @@ -name: Samples Kotlin client - -on: - push: - branches: - - 'samples/client/petstore/kotlin*/**' - - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**' - pull_request: - paths: - - 'samples/client/petstore/kotlin*/**' - - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**' - -env: - GRADLE_VERSION: 6.9 - -jobs: - build: - name: Build Kotlin client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # client - - samples/client/petstore/kotlin - - samples/client/petstore/kotlin-gson - - samples/client/petstore/kotlin-jackson - # needs Android configured - #- samples/client/petstore/kotlin-json-request-string - - samples/client/petstore/kotlin-jvm-okhttp4-coroutines - - samples/client/petstore/kotlin-jvm-volley - - samples/client/petstore/kotlin-moshi-codegen - - samples/client/petstore/kotlin-multiplatform - - samples/client/petstore/kotlin-nonpublic - - samples/client/petstore/kotlin-nullable - - samples/client/petstore/kotlin-okhttp3 - - samples/client/petstore/kotlin-retrofit2 - - samples/client/petstore/kotlin-retrofit2-kotlinx_serialization - - samples/client/petstore/kotlin-retrofit2-rx3 - - samples/client/petstore/kotlin-string - - samples/client/petstore/kotlin-threetenbp - - samples/client/petstore/kotlin-uppercase-enum - - samples/client/petstore/kotlin-default-values-jvm-okhttp3 - - samples/client/petstore/kotlin-default-values-jvm-okhttp4 - - samples/client/petstore/kotlin-default-values-jvm-retrofit2 - - samples/client/petstore/kotlin-default-values-jvm-volley - - samples/client/petstore/kotlin-default-values-multiplatform - - samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3 - - samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4 - - samples/client/petstore/kotlin-array-simple-string-jvm-volley - - samples/client/petstore/kotlin-array-simple-string-multiplatform - - samples/client/petstore/kotlin-bigdecimal-default-multiplatform - - samples/client/petstore/kotlin-bigdecimal-default-okhttp4 - - samples/client/petstore/kotlin-jvm-jackson - - samples/client/petstore/kotlin-jvm-ktor-jackson - - samples/client/petstore/kotlin-jvm-ktor-gson - - samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization - - samples/client/petstore/kotlin-jvm-vertx-gson - - samples/client/petstore/kotlin-jvm-vertx-jackson - - samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines - - samples/client/petstore/kotlin-jvm-vertx-moshi - - samples/client/petstore/kotlin-jvm-spring-2-webclient - - samples/client/petstore/kotlin-jvm-spring-3-webclient - - samples/client/petstore/kotlin-spring-cloud - - samples/client/petstore/kotlin-name-parameter-mappings - - samples/client/others/kotlin-jvm-okhttp-parameter-tests - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.gradle - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Install Gradle wrapper - uses: eskatos/gradle-command-action@v2 - with: - gradle-version: ${{ env.GRADLE_VERSION }} - build-root-directory: ${{ matrix.sample }} - arguments: wrapper - - name: Build - working-directory: ${{ matrix.sample }} - run: ./gradlew build -x test diff --git a/.github/workflows/samples-kotlin-server-jdk17.yaml b/.github/workflows/samples-kotlin-server-jdk17.yaml deleted file mode 100644 index 44e918ded1f2..000000000000 --- a/.github/workflows/samples-kotlin-server-jdk17.yaml +++ /dev/null @@ -1,52 +0,0 @@ -name: Samples Kotlin server - -on: - push: - branches: - - 'samples/server/petstore/kotlin-springboot-3*/**' - # comment out due to gradle build failure - # - samples/server/petstore/kotlin-spring-default/** - pull_request: - paths: - - 'samples/server/petstore/kotlin-springboot-3*/**' - # comment out due to gradle build failure - # - samples/server/petstore/kotlin-spring-default/** - -env: - GRADLE_VERSION: 7.4 - -jobs: - build: - name: Build Kotlin server - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # server - - samples/server/petstore/kotlin-springboot-3 - # comment out due to gradle build failure - # - samples/server/petstore/kotlin-spring-default/ - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.gradle - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Install Gradle wrapper - uses: eskatos/gradle-command-action@v2 - with: - gradle-version: ${{ env.GRADLE_VERSION }} - build-root-directory: ${{ matrix.sample }} - arguments: wrapper - - name: Build - working-directory: ${{ matrix.sample }} - run: ./gradlew build -x test diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml deleted file mode 100644 index 61fbccaeadd8..000000000000 --- a/.github/workflows/samples-kotlin-server.yaml +++ /dev/null @@ -1,67 +0,0 @@ -name: Samples Kotlin server - -on: - push: - branches: - - samples/server/others/kotlin-server/jaxrs-spec/** - - 'samples/server/petstore/kotlin*/**' - # comment out due to gradle build failure - #- samples/server/petstore/kotlin-spring-default/** - pull_request: - paths: - - samples/server/others/kotlin-server/jaxrs-spec/** - - 'samples/server/petstore/kotlin*/**' - # comment out due to gradle build failure - # - samples/server/petstore/kotlin-spring-default/** - -env: - GRADLE_VERSION: 6.9 - -jobs: - build: - name: Build Kotlin server - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # server - - samples/server/petstore/kotlin-springboot - - samples/server/petstore/kotlin-springboot-delegate - - samples/server/petstore/kotlin-springboot-modelMutable - - samples/server/petstore/kotlin-springboot-reactive - - samples/server/petstore/kotlin-springboot-source-swagger1 - - samples/server/petstore/kotlin-springboot-source-swagger2 - - samples/server/petstore/kotlin-springboot-springfox - - samples/server/petstore/kotlin-server/ktor - - samples/server/petstore/kotlin-server/jaxrs-spec - - samples/server/petstore/kotlin-server/jaxrs-spec-mutiny - - samples/server/petstore/kotlin-server-modelMutable - - samples/server/others/kotlin-server/jaxrs-spec - # comment out due to gradle build failure - #- samples/server/petstore/kotlin-spring-default - # no build.gradle file - #- samples/server/petstore/kotlin-vertx-modelMutable - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.gradle - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Install Gradle wrapper - uses: eskatos/gradle-command-action@v2 - with: - gradle-version: ${{ env.GRADLE_VERSION }} - build-root-directory: ${{ matrix.sample }} - arguments: wrapper - - name: Build - working-directory: ${{ matrix.sample }} - run: ./gradlew build -x test diff --git a/.github/workflows/samples-php7.yaml b/.github/workflows/samples-php7.yaml deleted file mode 100644 index 54b50e8c03ab..000000000000 --- a/.github/workflows/samples-php7.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: Samples PHP 7.x - -on: - push: - paths: - - samples/server/petstore/php-laravel/lib/ - pull_request: - paths: - - samples/server/petstore/php-laravel/lib/ -jobs: - build: - name: Build PHP projects - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - - samples/server/petstore/php-laravel/lib/ - steps: - - uses: actions/checkout@v4 - - name: Setup PHP with tools - uses: shivammathur/setup-php@v2 - with: - php-version: '7.4' - tools: php-cs-fixer, phpunit - - name: composer install - working-directory: ${{ matrix.sample }} - run: composer install - - name: phpunit - working-directory: ${{ matrix.sample }} - run: vendor/bin/phpunit diff --git a/.github/workflows/samples-php8.yaml b/.github/workflows/samples-php8.yaml deleted file mode 100644 index 82ead5c953a6..000000000000 --- a/.github/workflows/samples-php8.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: Samples PHP 8.x - -on: - push: - paths: - - samples/server/petstore/php-symfony/SymfonyBundle-php/** - pull_request: - paths: - - samples/server/petstore/php-symfony/SymfonyBundle-php/** -jobs: - build: - name: Build PHP projects - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - - samples/server/petstore/php-symfony/SymfonyBundle-php/ - steps: - - uses: actions/checkout@v4 - - name: Setup PHP with tools - uses: shivammathur/setup-php@v2 - with: - php-version: '8.1' - tools: php-cs-fixer, phpunit - - name: composer install - working-directory: ${{ matrix.sample }} - run: composer install - - name: phpunit - working-directory: ${{ matrix.sample }} - run: vendor/bin/phpunit diff --git a/.github/workflows/samples-python-client-echo-api.yaml b/.github/workflows/samples-python-client-echo-api.yaml deleted file mode 100644 index 5b5b3f05f632..000000000000 --- a/.github/workflows/samples-python-client-echo-api.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: Python Client (Echo API) - -on: - pull_request: - paths: - - samples/client/echo_api/python/** - - .github/workflows/samples-python-client-echo-api.yaml -jobs: - build: - name: Test Python client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/echo_api/python - - samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true - python-version: - - "3.7" - - "3.8" - - "3.9" - - "3.10" - - "3.11" - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Setup node.js - uses: actions/setup-node@v4 - - name: Run echo server - run: | - git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server - (cd http-echo-server && npm install && npm start &) - - name: Install - working-directory: ${{ matrix.sample }} - run: | - pip install -r requirements.txt - pip install -r test-requirements.txt - - - name: Test - working-directory: ${{ matrix.sample }} - run: python -m pytest diff --git a/.github/workflows/samples-python-petstore.yaml b/.github/workflows/samples-python-petstore.yaml deleted file mode 100644 index 21c80cc42db6..000000000000 --- a/.github/workflows/samples-python-petstore.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: "Python Client: Petstore" - -on: - pull_request: - paths: - - samples/openapi3/client/petstore/python-aiohttp/** - - samples/openapi3/client/petstore/python/** - - .github/workflows/samples-python-petstore.yaml - -jobs: - build: - name: Test Python client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: - - "3.7" - - "3.8" - - "3.9" - - "3.10" - - "3.11" - sample: - - samples/openapi3/client/petstore/python-aiohttp - - samples/openapi3/client/petstore/python - services: - petstore-api: - image: swaggerapi/petstore - ports: - - 80:8080 - env: - SWAGGER_HOST: http://petstore.swagger.io - SWAGGER_BASE_PATH: /v2 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - id: py - with: - python-version: ${{ matrix.python-version }} - - - name: Cache - uses: actions/cache@v3 - with: - key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}- - path: | - ~/.cache/pypoetry/virtualenvs/ - ~/.local/pipx/venvs/poetry/ - .mypy_cache/ - - - name: Install poetry - run: pipx install --python '${{ steps.py.outputs.python-path }}' poetry - - - name: Install - working-directory: ${{ matrix.sample }} - run: poetry install - - - name: Test - working-directory: ${{ matrix.sample }} - run: poetry run pytest -v diff --git a/.github/workflows/samples-python-pydantic-v1-client-echo-api.yaml b/.github/workflows/samples-python-pydantic-v1-client-echo-api.yaml deleted file mode 100644 index f52bf471e135..000000000000 --- a/.github/workflows/samples-python-pydantic-v1-client-echo-api.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: Python Client pydantic v1 (Echo API) - -on: - pull_request: - paths: - - samples/client/echo_api/python-pydantic-v1/** - - .github/workflows/samples-python-pydantic-v1-client-echo-api.yaml - -jobs: - build: - name: Test Python client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/echo_api/python-pydantic-v1/ - python-version: - - "3.7" - - "3.8" - - "3.9" - - "3.10" - - "3.11" - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Setup node.js - uses: actions/setup-node@v4 - - name: Run echo server - run: | - git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server - (cd http-echo-server && npm install && npm start &) - - name: Install - working-directory: ${{ matrix.sample }} - run: | - pip install -r requirements.txt - pip install -r test-requirements.txt - - - name: Test - working-directory: ${{ matrix.sample }} - run: python -m pytest diff --git a/.github/workflows/samples-python-pydantic-v1-petstore.yaml b/.github/workflows/samples-python-pydantic-v1-petstore.yaml deleted file mode 100644 index ce5c1265d3ea..000000000000 --- a/.github/workflows/samples-python-pydantic-v1-petstore.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: "Python Client pydantic v1: Petstore" - -on: - pull_request: - paths: - - samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/** - - samples/openapi3/client/petstore/python-pydantic-v1/** - - .github/workflows/samples-python-pydantic-v1-petstore.yaml - -jobs: - build: - name: Test Python client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: - - "3.7" - - "3.8" - - "3.9" - - "3.10" - - "3.11" - sample: - - samples/openapi3/client/petstore/python-pydantic-v1-aiohttp - - samples/openapi3/client/petstore/python-pydantic-v1 - services: - petstore-api: - image: swaggerapi/petstore - ports: - - 80:8080 - env: - SWAGGER_HOST: http://petstore.swagger.io - SWAGGER_BASE_PATH: /v2 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - id: py - with: - python-version: ${{ matrix.python-version }} - - - name: Cache - uses: actions/cache@v3 - with: - key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}- - path: | - ~/.cache/pypoetry/virtualenvs/ - ~/.local/pipx/venvs/poetry/ - .mypy_cache/ - - - name: Install poetry - run: pipx install --python '${{ steps.py.outputs.python-path }}' poetry - - - name: Install - working-directory: ${{ matrix.sample }} - run: poetry install - - - name: Test - working-directory: ${{ matrix.sample }} - run: poetry run pytest -v diff --git a/.github/workflows/samples-python-server.yaml b/.github/workflows/samples-python-server.yaml deleted file mode 100644 index 4ff5ca98c629..000000000000 --- a/.github/workflows/samples-python-server.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: Python Server - -on: - push: - paths: - - samples/server/petstore/python-aiohttp/** - pull_request: - paths: - - samples/server/petstore/python-aiohttp/** -jobs: - build: - name: Test Python server - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # servers - - samples/server/petstore/python-aiohttp/ - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - with: - python-version: '3.7' - - name: Test - working-directory: ${{ matrix.sample }} - run: make test-all diff --git a/.github/workflows/samples-rust.yaml b/.github/workflows/samples-rust.yaml deleted file mode 100644 index 02d885611d6c..000000000000 --- a/.github/workflows/samples-rust.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: Samples Rust - -on: - push: - paths: - - "samples/client/others/rust/**" - - "samples/server/petstore/rust-server/**" - - "samples/client/petstore/rust-server/**" - pull_request: - paths: - - "samples/client/others/rust/**" - - "samples/client/petstore/rust/**" - - "samples/server/petstore/rust-server/**" - -jobs: - build: - name: Build Rust - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # these folders contain sub-projects of rust clients, servers - - samples/client/others/rust/ - - samples/client/petstore/rust/ - - samples/server/petstore/rust-server/ - steps: - - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Build - working-directory: ${{ matrix.sample }} - run: cargo build diff --git a/.github/workflows/samples-scala.yaml b/.github/workflows/samples-scala.yaml deleted file mode 100644 index 29fa8d8f3bbc..000000000000 --- a/.github/workflows/samples-scala.yaml +++ /dev/null @@ -1,49 +0,0 @@ -name: Samples Scala/sbt - -on: - push: - paths: - - 'samples/client/petstore/scala**' - - 'samples/server/petstore/scala**' - - 'samples/client/petstore/java/okhttp-gson/**' - pull_request: - paths: - - 'samples/client/petstore/scala**' - - 'samples/server/petstore/scala**' - - 'samples/client/petstore/java/okhttp-gson/**' -jobs: - build: - name: Build sbt/Scala client, servers - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - 'samples/client/petstore/java/okhttp-gson' - - samples/client/petstore/scalaz - #- samples/client/petstore/scala-sttp # won't pass while the same tests in circleci pass - # servers - - samples/server/petstore/scala-lagom-server - - samples/server/petstore/scala-play-server - - samples/server/petstore/scala-akka-http-server - - samples/server/petstore/scala-pekko-http-server - - samples/server/petstore/scalatra - - samples/server/petstore/scala-finch # cannot be tested with jdk11 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.ivy2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/build.sbt') }} - - name: Build and test - working-directory: ${{ matrix.sample }} - run: sbt -v +test diff --git a/.github/workflows/samples-spring-jdk17.yaml b/.github/workflows/samples-spring-jdk17.yaml deleted file mode 100644 index 9c594477a268..000000000000 --- a/.github/workflows/samples-spring-jdk17.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: Samples Java Spring (JDK17) - -on: - push: - paths: - - samples/openapi3/client/petstore/spring-cloud-3-with-optional - pull_request: - paths: - - samples/openapi3/client/petstore/spring-cloud-3-with-optional -jobs: - build: - name: Build Java Spring (JDK17) - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/openapi3/client/petstore/spring-cloud-3-with-optional - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml deleted file mode 100644 index 8baf85b44b63..000000000000 --- a/.github/workflows/samples-spring.yaml +++ /dev/null @@ -1,75 +0,0 @@ -name: Samples Java Spring - -on: - push: - paths: - # clients - - 'samples/client/petstore/spring*/**' - # servers - - 'samples/server/petstore/spring*/**' - - 'samples/openapi3/server/petstore/spring*/**' - pull_request: - paths: - # clients - - 'samples/client/petstore/spring*/**' - # servers - - 'samples/server/petstore/spring*/**' - - 'samples/openapi3/server/petstore/spring*/**' -jobs: - build: - name: Build Java Spring - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/petstore/spring-cloud - - samples/openapi3/client/petstore/spring-cloud - - samples/client/petstore/spring-cloud-date-time - - samples/openapi3/client/petstore/spring-cloud-date-time - - samples/openapi3/client/petstore/spring-stubs - - samples/openapi3/client/petstore/spring-stubs-skip-default-interface - - samples/openapi3/client/petstore/spring-cloud-async - - samples/openapi3/client/petstore/spring-cloud-spring-pageable - - samples/client/petstore/spring-cloud-tags - - samples/client/petstore/spring-cloud-deprecated - # servers - - samples/server/petstore/springboot - - samples/openapi3/server/petstore/springboot - - samples/server/petstore/springboot-beanvalidation - - samples/server/petstore/springboot-useoptional - - samples/server/petstore/springboot-reactive - - samples/server/petstore/springboot-reactive-noResponseEntity - - samples/server/petstore/springboot-implicitHeaders - - samples/openapi3/server/petstore/springboot-implicitHeaders - - samples/server/petstore/springboot-delegate - - samples/server/petstore/springboot-delegate-no-response-entity - - samples/openapi3/server/petstore/springboot-delegate - - samples/server/petstore/spring-boot-nullable-set - - samples/server/petstore/spring-boot-defaultInterface-unhandledException - - samples/openapi3/server/petstore/spring-boot-oneof - - samples/server/petstore/springboot-virtualan - - samples/server/petstore/springboot-implicitHeaders-annotationLibrary - - samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8 - - samples/server/petstore/springboot-spring-pageable-delegatePattern - - samples/server/petstore/springboot-spring-pageable-without-j8 - - samples/server/petstore/springboot-spring-pageable - - samples/server/petstore/springboot-spring-provide-args - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: maven-repository - with: - path: | - ~/.m2 - key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build - working-directory: ${{ matrix.sample }} - run: mvn clean package diff --git a/.github/workflows/samples-swift.yaml b/.github/workflows/samples-swift.yaml deleted file mode 100644 index 94f440953e25..000000000000 --- a/.github/workflows/samples-swift.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: Samples Swift - -on: - push: - paths: - - samples/client/petstore/swift5/** - pull_request: - paths: - - samples/client/petstore/swift5/** - -jobs: - build: - strategy: - fail-fast: false - matrix: - os: [macos-latest] - sample: - - samples/client/petstore/swift5/alamofireLibrary - - samples/client/petstore/swift5/anycodableLibrary - - samples/client/petstore/swift5/asyncAwaitLibrary - - samples/client/petstore/swift5/combineLibrary - - samples/client/petstore/swift5/default - - samples/client/petstore/swift5/deprecated - - samples/client/petstore/swift5/frozenEnums - - samples/client/petstore/swift5/nonPublicApi - - samples/client/petstore/swift5/objcCompatible - - samples/client/petstore/swift5/oneOf - - samples/client/petstore/swift5/promisekitLibrary - - samples/client/petstore/swift5/readonlyProperties - - samples/client/petstore/swift5/resultLibrary - - samples/client/petstore/swift5/rxswiftLibrary - - samples/client/petstore/swift5/urlsessionLibrary - - samples/client/petstore/swift5/validation - # NOTE: disabled as vaporLibrary doesnt build when adding this CI config - #- samples/client/petstore/swift5/vaporLibrary - - samples/client/petstore/swift5/x-swift-hashable - include: - - os: ubuntu-latest - sample: samples/client/petstore/swift5/alamofireLibrary - name: Build Swift samples - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: swift-actions/setup-swift@v1 - if: ${{ matrix.os == 'ubuntu-latest' }} - with: - swift-version: '5' - - name: Build - working-directory: ${{ matrix.sample }} - run: swift build \ No newline at end of file diff --git a/.github/workflows/samples-typescript-axios-echo-api.yaml b/.github/workflows/samples-typescript-axios-echo-api.yaml deleted file mode 100644 index b729b27112cf..000000000000 --- a/.github/workflows/samples-typescript-axios-echo-api.yaml +++ /dev/null @@ -1,42 +0,0 @@ -name: TypeScript Axios Client (Echo API) - -on: - pull_request: - paths: - - samples/client/echo_api/typescript-axios/** - - .github/workflows/samples-typescript-axios-echo-api.yaml -jobs: - build: - name: Test TypeScript Axios client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - # clients - - samples/client/echo_api/typescript-axios/test - node-version: - - 16 - - 18 - - 20 - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Run echo server - run: | - git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server - (cd http-echo-server && npm install && npm start &) - - - name: Install - working-directory: ${{ matrix.sample }} - run: | - npm run preinstall - npm i - - - name: Test - working-directory: ${{ matrix.sample }} - run: npm test diff --git a/.github/workflows/samples-zapier.yaml b/.github/workflows/samples-zapier.yaml deleted file mode 100644 index 820d41362b70..000000000000 --- a/.github/workflows/samples-zapier.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: Samples Zapier - -on: - push: - branches: - - 'samples/client/petstore/zapier/**' - pull_request: - paths: - - 'samples/client/petstore/zapier/**' - -jobs: - validate: - name: Test zapier generation - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sample: - - samples/client/petstore/zapier - steps: - - uses: actions/checkout@v4 - - name: Setup node - uses: actions/setup-node@v4 - - name: Install dependencies - working-directory: ${{ matrix.sample }} - run: | - npm install - - name: Validate - working-directory: ${{ matrix.sample }} - run: node index.js \ No newline at end of file diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml deleted file mode 100644 index 4f3bf722a3fe..000000000000 --- a/.github/workflows/sonar.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Sonar CI -on: - push: - branches: - - master - - '[4-9]+.[0-9]+.x' - - sonar - -jobs: - build: - - runs-on: ubuntu-latest - if: ${{ github.repository_owner == 'OpenAPITools' }} - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - - name: Compile with Maven - run: ./mvnw -B -q clean install jacoco:report - - name: Jacoco Aggregate - run: ./mvnw jacoco:report-aggregate - - name: Publish to Sonar - run: ./mvnw -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/} diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml deleted file mode 100644 index 27d151cc86d7..000000000000 --- a/.github/workflows/windows.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: Windows tests - -on: - push: - branches: - - master - - '[5-9]+.[0-9]+.x' - pull_request: - branches: - - master - - '[5-9]+.[0-9]+.x' - -jobs: - build: - name: Build - runs-on: windows-latest - strategy: - matrix: - java: [11, 17] - steps: - - uses: actions/checkout@v4 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: 'temurin' - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: cache-maven-repository - with: - path: | - ~/.m2/repository - ~/.gradle - !~/.gradle/caches/*/plugin-resolution/ - !~/.m2/repository/org/openapitools/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - - name: Setup Maven - uses: s4u/setup-maven-action@v1.10.0 - with: - java-version: ${{ matrix.java }} - maven-version: 3.8.8 - - name: Run maven - run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - - name: Test Template Retrieval - run: | - cd modules/openapi-generator-cli/target - # generator names containing "-" caused problems in the past, see https://github.com/OpenAPITools/openapi-generator/issues/9528 - java -jar ./openapi-generator-cli.jar author template --verbose -g jaxrs-spec --library quarkus - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Gradle tests - run: | - gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace diff --git a/README.Equisoft.md b/README.Equisoft.md new file mode 100644 index 000000000000..abd07f2abf04 --- /dev/null +++ b/README.Equisoft.md @@ -0,0 +1,42 @@ +# Equisoft OpenAPI fork + +## Rebuild and publish to maven local +``` + ./mvnw clean install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Djacoco.skip=true +``` + +## Bump version + +Edit pom.xml at the root and in all modules directories. Look for "equisoft" + +## Run against sample + +Create a sample definition file bin/configs/FILE.yaml + +``` +./bin/generate-samples.sh bin/configs/FILE.yaml +``` + +## Publish to github maven repository + +Configure your github credentials in ~/.m2/settings.xml with a github personal access token (PAT) with write:packages permission. + +``` + + + + + github + GITHUB_USERNAME + GITHUB_PAT + + + +``` + +Deploy + +``` +./mvnw deploy -P equisoft-openapi-generator +``` + diff --git a/README.md b/README.md index 04b38af027e7..25cfe75b6a9e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -

OpenAPI Generator

+Equisoft Fork see: [README.Equisoft.md](README.Equisoft.md) +

OpenAPI Generator

diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index 7ccfdb524652..44c1357056ef 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -1,10 +1,10 @@ - org.openapitools + com.equisoft.openapitools openapi-generator-project - 7.1.0 + 7.1.0-equisoft-SNAPSHOT ../.. @@ -111,7 +111,7 @@ - org.openapitools + com.equisoft.openapitools openapi-generator ${project.version} diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index f1b952df6c2f..1caaaf515b9f 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> openapi-generator-project - org.openapitools + com.equisoft.openapitools - 7.1.0 + 7.1.0-equisoft-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index f660266e856d..7fc5d84a9e5a 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -12,7 +12,7 @@ plugins { id("signing") } -group = "org.openapitools" +group = "com.equisoft.openapitools" version = "$openApiGeneratorVersion" ext.isReleaseVersion = !version.endsWith("SNAPSHOT") @@ -33,6 +33,10 @@ java { repositories { mavenLocal() mavenCentral() + maven { + name = "equisoft-openapi-generators" + url = uri("https://maven.pkg.github.com/kronostechnologies/openapi-generators") + } maven { name = "Sonatype Snapshots" url "https://oss.sonatype.org/content/repositories/snapshots/" @@ -40,7 +44,7 @@ repositories { } dependencies { - implementation("org.openapitools:openapi-generator:$openApiGeneratorVersion") + implementation("com.equisoft.openapitools:openapi-generator:$openApiGeneratorVersion") testImplementation("org.jetbrains.kotlin:kotlin-test-testng:1.7.10") } diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index 94e2d97a9260..c71414f6cd3a 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=7.1.0 +openApiGeneratorVersion=7.1.0-equisoft-SNAPSHOT # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index b41f9b57bec3..1b369f78578c 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -1,10 +1,10 @@ - org.openapitools + com.equisoft.openapitools openapi-generator-project - 7.1.0 + 7.1.0-equisoft-SNAPSHOT ../.. @@ -37,7 +37,7 @@ - org.openapitools + com.equisoft.openapitools openapi-generator ${project.version} diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index dbd3332a5fc1..f0b9091a4e3f 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.openapitools + com.equisoft.openapitools openapi-generator-project - 7.1.0 + 7.1.0-equisoft-SNAPSHOT ../.. @@ -54,7 +54,7 @@ 3.9.0 - org.openapitools + com.equisoft.openapitools openapi-generator ${project.version} diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index fac8f23004b2..7ba2cd87a5ea 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -1,10 +1,10 @@ 4.0.0 - org.openapitools + com.equisoft.openapitools openapi-generator-project - 7.1.0 + 7.1.0-equisoft-SNAPSHOT ../.. @@ -121,7 +121,7 @@ jakarta.validation-api - org.openapitools + com.equisoft.openapitools openapi-generator ${project.parent.version} diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index a7dabda64f09..32ba22a92e0f 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -1,10 +1,10 @@ - org.openapitools + com.equisoft.openapitools openapi-generator-project - 7.1.0 + 7.1.0-equisoft-SNAPSHOT ../.. @@ -147,67 +147,6 @@ - - - release-profile - - true - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - static-analysis - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${project.parent.basedir}${file.separator}spotbugs-exclude.xml - - - - org.apache.maven.plugins - maven-pmd-plugin - - - se.bjurr.violations - violations-maven-plugin - - - 65 - - - - - - target/site @@ -392,7 +331,7 @@ ${jackson-threetenbp.version} - org.openapitools + com.equisoft.openapitools openapi-generator-core ${project.parent.version} diff --git a/pom.xml b/pom.xml index 4dd9d63fc342..796bd43dccae 100644 --- a/pom.xml +++ b/pom.xml @@ -8,12 +8,12 @@ 4.0.0 - org.openapitools + com.equisoft.openapitools openapi-generator-project pom openapi-generator-project - 7.1.0 + 7.1.0-equisoft-SNAPSHOT https://github.com/openapitools/openapi-generator @@ -60,12 +60,14 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + github + GitHub kronostechnologies Apache Maven Packages + https://maven.pkg.github.com/kronostechnologies/openapi-generator - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + github + GitHub kronostechnologies Apache Maven Packages + https://maven.pkg.github.com/kronostechnologies/openapi-generator @@ -315,6 +317,7 @@ false org.openapitools:* + com.equisoft.openapitools:* @@ -415,65 +418,7 @@ - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - @@ -1136,6 +1081,29 @@ modules/openapi-generator-online + + equisoft-openapi-generator + + true + + + modules/openapi-generator-core + modules/openapi-generator + modules/openapi-generator-cli + modules/openapi-generator-maven-plugin + modules/openapi-generator-gradle-plugin + modules/openapi-generator-online + + + + github + https://maven.pkg.github.com/kronostechnologies/openapi-generator + + true + + + + target/site @@ -1191,8 +1159,8 @@ - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots + github + https://maven.pkg.github.com/kronostechnologies/openapi-generator true @@ -1221,7 +1189,7 @@ 4.13.2 1.6.21 1.6.21 - 1.18.24 + 1.18.30 3.6.0 3.11.0 3.3.0 From ed6918946f6cc4845c679d26b36efd14d7901866 Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Sat, 18 Nov 2023 17:32:18 -0500 Subject: [PATCH 02/14] Port standards-jvm template patches --- .../kotlin-client/build.gradle.mustache | 17 +++++++++++++++-- .../libraries/jvm-okhttp/api.mustache | 6 +++++- .../infrastructure/ApiClient.kt.mustache | 17 ++++++++++++++++- .../kotlin-client/settings.gradle.mustache | 6 ++++++ .../resources/php/ObjectSerializer.mustache | 8 ++++++-- .../main/resources/php/model_generic.mustache | 7 +++++++ .../resources/typescript-fetch/apis.mustache | 6 +++++- 7 files changed, 60 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache index 26c07b6e3edd..82bea74773f8 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache @@ -3,13 +3,13 @@ version '{{artifactVersion}}' {{^omitGradleWrapper}} wrapper { - gradleVersion = '7.5' + gradleVersion = '{{gradleVersion}}' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } {{/omitGradleWrapper}} buildscript { - ext.kotlin_version = '1.8.10' + ext.kotlin_version = '1.9.20' {{#jvm-ktor}} ext.ktor_version = '2.2.3' {{/jvm-ktor}} @@ -68,6 +68,12 @@ apply plugin: 'maven-publish' apply plugin: 'com.diffplug.spotless' {{^useSettingsGradle}} +files( + "local.build.gradle", + "local.build.gradle.kts", +).filter({ it.exists() } as Spec) + .forEach({ apply from: it }) + repositories { maven { url "https://repo1.maven.org/maven2" } } @@ -216,3 +222,10 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { } } {{/kotlinx_serialization}} +{{#moshi}} +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + kotlinOptions { + freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" + } +} +{{/moshi}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache index 5ede536438e0..21929830ea41 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache @@ -48,7 +48,11 @@ import {{packageName}}.infrastructure.Success import {{packageName}}.infrastructure.toMultiValue {{#operations}} -{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) { +{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}( + basePath: kotlin.String = defaultBasePath, + accessToken: String? = null, + client: OkHttpClient = ApiClient.defaultClient +) : ApiClient(basePath, accessToken, client) { companion object { @JvmStatic val defaultBasePath: String by lazy { diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache index 36f6ce3288e8..62bffaffe8b9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache @@ -77,7 +77,11 @@ import com.fasterxml.jackson.core.type.TypeReference import com.squareup.moshi.adapter {{/moshi}} -{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) { +{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient( + val baseUrl: String, + accessToken: String? = null, + val client: OkHttpClient = defaultClient +) { {{#nonPublicApi}}internal {{/nonPublicApi}}companion object { protected const val ContentType = "Content-Type" protected const val Accept = "Accept" @@ -104,6 +108,17 @@ import com.squareup.moshi.adapter val builder: OkHttpClient.Builder = OkHttpClient.Builder() } + private var internalAccessToken: String? = null + var accessToken: String? + get() = internalAccessToken ?: Companion.accessToken + set(value) { + internalAccessToken = value + } + + init { + internalAccessToken = accessToken + } + /** * Guess Content-Type header from the given file (defaults to "application/octet-stream"). * diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/settings.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/settings.gradle.mustache index 32cef71d95a0..903e6590e8c6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/settings.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/settings.gradle.mustache @@ -1,2 +1,8 @@ {{#multiplatform}}enableFeaturePreview('GRADLE_METADATA'){{/multiplatform}} rootProject.name = '{{artifactId}}' + +files( + "local.settings.gradle", + "local.settings.gradle.kts", +).filter({ it.exists() } as Spec) + .forEach({ apply from: it }) diff --git a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache index 6639723ec508..c19bc16b15da 100644 --- a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache +++ b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache @@ -464,7 +464,7 @@ class ObjectSerializer // determine file name if ( is_array($httpHeaders) - && array_key_exists('Content-Disposition', $httpHeaders) + && array_key_exists('Content-Disposition', $httpHeaders) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match) ) { $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]); @@ -504,7 +504,11 @@ class ObjectSerializer // If a discriminator is defined and points to a valid subclass, use it. $discriminator = $class::DISCRIMINATOR; if (!empty($discriminator) && isset($data->{$discriminator}) && is_string($data->{$discriminator})) { - $subclass = '\{{invokerPackage}}\Model\\' . $data->{$discriminator}; + if (isset($class::DISCRIMINATOR_MAP[$data->{$discriminator}])) { + $subclass = '\{{invokerPackage}}\Model\\' . $class::DISCRIMINATOR_MAP[$data->{$discriminator}]; + } else { + $subclass = '\{{invokerPackage}}\Model\\' . $data->{$discriminator}; + } if (is_subclass_of($subclass, $class)) { $class = $subclass; } diff --git a/modules/openapi-generator/src/main/resources/php/model_generic.mustache b/modules/openapi-generator/src/main/resources/php/model_generic.mustache index aa508136092a..fbb3639af81e 100644 --- a/modules/openapi-generator/src/main/resources/php/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/php/model_generic.mustache @@ -1,6 +1,13 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^parentSchema}}implements ModelInterface, ArrayAccess, \JsonSerializable{{/parentSchema}} { public const DISCRIMINATOR = {{#discriminator}}'{{discriminatorName}}'{{/discriminator}}{{^discriminator}}null{{/discriminator}}; +{{#discriminator}} + public const DISCRIMINATOR_MAP = [ + {{#discriminator.mappedModels}} + "{{mappingName}}" => "{{modelName}}", +{{/discriminator.mappedModels}} + ]; + {{/discriminator}} /** * The original name of the model. diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 23aa2e526804..b7aedfb78d92 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -205,7 +205,11 @@ export class {{classname}} extends runtime.BaseAPI { {{#isOAuth}} if (this.configuration && this.configuration.accessToken) { // oauth required - headerParameters["Authorization"] = await this.configuration.accessToken("{{name}}", [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}]); + const token = this.configuration.accessToken; + const tokenString = await token("{{name}}", [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}]); + if (tokenString) { + headerParameters["Authorization"] = `Bearer ${tokenString}`; + } } {{/isOAuth}} From 7ca86115baa54b16cd73cabed60aa86fd6e75524 Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Mon, 4 Dec 2023 15:23:44 -0500 Subject: [PATCH 03/14] Fix nullable property with only one oneOf ref (#4) --- .../main/java/org/openapitools/codegen/OpenAPINormalizer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index 66b85ff9e81a..ee6703fbb951 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -746,6 +746,9 @@ private Schema processSimplifyOneOf(Schema schema) { } return (Schema) oneOfSchemas.get(0); } + } else if(Boolean.TRUE.equals(schema.getNullable()) && oneOfSchemas.size() == 1) { + ((Schema) oneOfSchemas.get(0)).setNullable(true); + return (Schema) oneOfSchemas.get(0); } } From 984ac3d27ab82e2f02f1da0a6cb66d52225c2868 Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Mon, 4 Dec 2023 15:24:47 -0500 Subject: [PATCH 04/14] PHP Client - Multi-Part upload with a json part (#2) * PHP Generator - Support multipart upload with json part * do not touch psr-18 version --- .../src/main/resources/php/api.mustache | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache index ef964c535d85..8da3d9d3e287 100644 --- a/modules/openapi-generator/src/main/resources/php/api.mustache +++ b/modules/openapi-generator/src/main/resources/php/api.mustache @@ -675,10 +675,14 @@ use {{invokerPackage}}\ObjectSerializer; $formParams['{{baseName}}'] = []; $paramFiles = is_array(${{paramName}}) ? ${{paramName}} : [${{paramName}}]; foreach ($paramFiles as $paramFile) { - $formParams['{{baseName}}'][] = \GuzzleHttp\Psr7\Utils::tryFopen( - ObjectSerializer::toFormValue($paramFile), - 'rb' - ); + if ($paramFile instanceof \Psr\Http\Message\StreamInterface) { + $formParams['{{baseName}}'][] = $paramFile; + } else { + $formParams['{{baseName}}'][] = \GuzzleHttp\Psr7\Utils::tryFopen( + ObjectSerializer::toFormValue($paramFile), + 'rb' + ); + } } {{/isFile}} {{^isFile}} @@ -712,10 +716,22 @@ use {{invokerPackage}}\ObjectSerializer; foreach ($formParams as $formParamName => $formParamValue) { $formParamValueItems = is_array($formParamValue) ? $formParamValue : [$formParamValue]; foreach ($formParamValueItems as $formParamValueItem) { - $multipartContents[] = [ - 'name' => $formParamName, - 'contents' => $formParamValueItem - ]; + if (is_string($formParamValueItem)) { + // JSON part + $multipartContents[] = [ + 'name' => $formParamName, + 'contents' => $formParamValueItem, + 'headers' => [ + 'Content-Disposition' => "form-data; name=\"$formParamName\"; filename=\"$formParamName.json\"", + 'Content-Type' => 'application/json; charset=UTF-8' + ] + ]; + } else { + $multipartContents[] = [ + 'name' => $formParamName, + 'contents' => $formParamValueItem + ]; + } } } // for HTTP post (form) From b682a919d202103343d8092a0a2be54f52f9aab3 Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Tue, 5 Dec 2023 18:22:05 -0500 Subject: [PATCH 05/14] Release 7.1.0-equisoft1 and improve documentation --- README.Equisoft.md | 9 ++++++++- modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- .../openapi-generator-gradle-plugin/gradle.properties | 2 +- modules/openapi-generator-gradle-plugin/pom.xml | 2 +- modules/openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.Equisoft.md b/README.Equisoft.md index abd07f2abf04..2fb98c4abe37 100644 --- a/README.Equisoft.md +++ b/README.Equisoft.md @@ -7,7 +7,14 @@ ## Bump version -Edit pom.xml at the root and in all modules directories. Look for "equisoft" +Edit pom.xml at the root and in all modules directories. This can be done with : + +``` +./mvnw versions:set -DnewVersion=7.1.0-equisoft1 +``` + +Edit the version for the gradle plugin in [gradle.properties](modules/openapi-generator-gradle-plugin/gradle.properties) + ## Run against sample diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index 44c1357056ef..fb78badf17e4 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft-SNAPSHOT + 7.1.0-equisoft1 ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index 1caaaf515b9f..da545508a5ec 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project com.equisoft.openapitools - 7.1.0-equisoft-SNAPSHOT + 7.1.0-equisoft1 ../.. diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index c71414f6cd3a..d5eb7151713c 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=7.1.0-equisoft-SNAPSHOT +openApiGeneratorVersion=7.1.0-equisoft1 # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 1b369f78578c..13c6ed807fc7 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft-SNAPSHOT + 7.1.0-equisoft1 ../.. diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index f0b9091a4e3f..ebbdd0db1c78 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft-SNAPSHOT + 7.1.0-equisoft1 ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 7ba2cd87a5ea..dd0e214e34a4 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft-SNAPSHOT + 7.1.0-equisoft1 ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 32ba22a92e0f..f1ccff196aba 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft-SNAPSHOT + 7.1.0-equisoft1 ../.. diff --git a/pom.xml b/pom.xml index 796bd43dccae..679a4c203e14 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ pom openapi-generator-project - 7.1.0-equisoft-SNAPSHOT + 7.1.0-equisoft1 https://github.com/openapitools/openapi-generator From 8c238e29f94de31da054f165b0ab02c5356bb6fb Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Tue, 5 Dec 2023 18:28:26 -0500 Subject: [PATCH 06/14] SNAPSHOT version --- README.Equisoft.md | 3 +++ modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- modules/openapi-generator-gradle-plugin/gradle.properties | 2 +- modules/openapi-generator-gradle-plugin/pom.xml | 2 +- modules/openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.Equisoft.md b/README.Equisoft.md index 2fb98c4abe37..750f3312627f 100644 --- a/README.Equisoft.md +++ b/README.Equisoft.md @@ -11,10 +11,13 @@ Edit pom.xml at the root and in all modules directories. This can be done with : ``` ./mvnw versions:set -DnewVersion=7.1.0-equisoft1 +./mvnw versions:commit ``` Edit the version for the gradle plugin in [gradle.properties](modules/openapi-generator-gradle-plugin/gradle.properties) +New development can be tested with `SNAPSHOT` version. Ex: `7.1.0-equisoft2-SNAPSHOT` + ## Run against sample diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index fb78badf17e4..dd28be5f136b 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft1 + 7.1.0-equisoft2-SNAPSHOT ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index da545508a5ec..b2756bd5d6ef 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project com.equisoft.openapitools - 7.1.0-equisoft1 + 7.1.0-equisoft2-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index d5eb7151713c..4e573f05bf20 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=7.1.0-equisoft1 +openApiGeneratorVersion=7.1.0-equisoft2-SNAPSHOT # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 13c6ed807fc7..4610ba8284f8 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft1 + 7.1.0-equisoft2-SNAPSHOT ../.. diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index ebbdd0db1c78..219890660b54 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft1 + 7.1.0-equisoft2-SNAPSHOT ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index dd0e214e34a4..88fdf8ec014d 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft1 + 7.1.0-equisoft2-SNAPSHOT ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index f1ccff196aba..f561ff4b7249 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft1 + 7.1.0-equisoft2-SNAPSHOT ../.. diff --git a/pom.xml b/pom.xml index 679a4c203e14..24028a430241 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ pom openapi-generator-project - 7.1.0-equisoft1 + 7.1.0-equisoft2-SNAPSHOT https://github.com/openapitools/openapi-generator From 0c35ab5d5b16a98749fadd229c9ba25b4ff89ad6 Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Wed, 6 Dec 2023 17:49:00 -0500 Subject: [PATCH 07/14] Fix gradle plugin publication --- README.Equisoft.md | 7 +- .../build.gradle | 102 ++++-------------- 2 files changed, 29 insertions(+), 80 deletions(-) diff --git a/README.Equisoft.md b/README.Equisoft.md index 750f3312627f..0eb58a028076 100644 --- a/README.Equisoft.md +++ b/README.Equisoft.md @@ -44,9 +44,14 @@ Configure your github credentials in ~/.m2/settings.xml with a github personal a ``` -Deploy +Deploy the maven part ``` ./mvnw deploy -P equisoft-openapi-generator ``` +Deploy the gradle plugin + +``` +cd modules/openapi-generator-gradle-plugin && ./gradlew publish +``` diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index 7fc5d84a9e5a..9c1ed4ff673c 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -1,15 +1,10 @@ -import io.github.gradlenexus.publishplugin.CloseNexusStagingRepository -import io.github.gradlenexus.publishplugin.ReleaseNexusStagingRepository import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("com.gradle.plugin-publish") version "1.1.0" - id("io.github.gradle-nexus.publish-plugin") version "1.1.0" id("java-gradle-plugin") id("maven-publish") id("org.gradle.kotlin.kotlin-dsl") version "2.4.1" id("org.jetbrains.kotlin.jvm") version "1.7.10" - id("signing") } group = "com.equisoft.openapitools" @@ -34,12 +29,16 @@ repositories { mavenLocal() mavenCentral() maven { - name = "equisoft-openapi-generators" - url = uri("https://maven.pkg.github.com/kronostechnologies/openapi-generators") - } - maven { - name = "Sonatype Snapshots" - url "https://oss.sonatype.org/content/repositories/snapshots/" + name "equisoft-openapi-generator-gradle-plugin" + url "https://maven.pkg.github.com/kronostechnologies/openapi-generator" + credentials { + username = project.findProperty("gpr.user")?.toString() + ?: System.getenv("GPR_USER") + ?: System.getenv("GHCR_USER") + password = project.findProperty("gpr.key")?.toString() + ?: System.getenv("GPR_KEY") + ?: System.getenv("GHCR_TOKEN") + } } } @@ -77,20 +76,13 @@ tasks.withType(Javadoc).configureEach { } } -tasks.withType(CloseNexusStagingRepository).configureEach { - onlyIf { nexusPublishing.useStaging.get() } -} - -tasks.withType(ReleaseNexusStagingRepository).configureEach { - onlyIf { nexusPublishing.useStaging.get() } -} - gradlePlugin { website = "https://openapi-generator.tech/" vcsUrl = "https://github.com/OpenAPITools/openapi-generator" + group = "com.equisoft.openapitools" plugins { openApiGenerator { - id = "org.openapi.generator" + id = "com.equisoft.openapitools" description = "OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)." displayName = "OpenAPI Generator Gradle Plugin" implementationClass = "org.openapitools.generator.gradle.plugin.OpenApiGeneratorPlugin" @@ -99,69 +91,21 @@ gradlePlugin { } } -nexusPublishing { - repositories { - sonatype { - username = project.properties["ossrhUsername"] - password = project.properties["ossrhPassword"] - - // To retrieve: ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="$SIGNING_SECRET" getStagingProfile - stagingProfileId = "456297f829bbbe" - } - } -} - -// Signing requires three keys to be defined: signing.keyId, signing.password, and signing.secretKeyRingFile. -// These can be passed to the Gradle command: -// ./gradlew -Psigning.keyId=yourid -// or stored as key=value pairs in ~/.gradle/gradle.properties -// You can also apply them in CI via environment variables. See Gradle's docs for details. -signing { - required { isReleaseVersion && gradle.taskGraph.hasTask("publishPluginMavenPublicationToSonatypeRepository") } - sign(publishing.publications) -} - // afterEvaluate is necessary because java-gradle-plugin // creates its publications in an afterEvaluate callback afterEvaluate { - tasks.named("publishToSonatype").configure { - dependsOn("check") - } - publishing { - publications { - pluginMaven { - pom { - name = "OpenAPI-Generator Contributors" - description = project.description - url = "https://openapi-generator.tech" - organization { - name = "org.openapitools" - url = "https://github.com/OpenAPITools" - } - licenses { - license { - name = "The Apache Software License, Version 2.0" - url = "https://www.apache.org/licenses/LICENSE-2.0.txt" - distribution = "repo" - } - } - developers { - developer { - id = "openapitools" - name = "OpenAPI-Generator Contributors" - email = "team@openapitools.org" - } - } - scm { - url = "https://github.com/OpenAPITools/openapi-generator" - connection = "scm:git:git://github.com/OpenAPITools/openapi-generator.git" - developerConnection = "scm:git:ssh://git@github.com:OpenAPITools/openapi-generator.git" - } - issueManagement { - system = "GitHub" - url = "https://github.com/OpenAPITools/openapi-generator/issues" - } + repositories { + maven { + name "equisoft-openapi-generator-gradle-plugin" + url "https://maven.pkg.github.com/kronostechnologies/openapi-generator" + credentials { + username = project.findProperty("gpr.write.user")?.toString() + ?: System.getenv("GPR_USER") + ?: System.getenv("GHCR_USER") + password = project.findProperty("gpr.write.key")?.toString() + ?: System.getenv("GPR_KEY") + ?: System.getenv("GHCR_TOKEN") } } } From b15753967fb06621e1a3532e37c14969575306f8 Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Tue, 19 Dec 2023 11:29:38 -0500 Subject: [PATCH 08/14] Support Micronaut4 (#5) * Support Micronaut4 * fix micronaut plugin version and default api base-path to / * retour de review * Migrate to .kts and improve build for equisoft * fix gradle plugin publication * bump version --- modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- .../README.adoc | 4 +- .../build.gradle | 2 +- .../gradle.properties | 2 +- .../openapi-generator-gradle-plugin/pom.xml | 2 +- .../samples/local-spec/build.gradle | 2 +- .../openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- .../JavaMicronautAbstractCodegen.java | 40 ++++- .../java-micronaut/client/api.mustache | 2 +- .../gradle/build.gradle.kts.mustache | 137 ++++++++++++++++++ .../gradle/build.gradle.mustache | 77 ---------- .../gradle/settings.gradle.kts.mustache | 9 ++ .../gradle/settings.gradle.mustache | 1 - .../configuration/gradlew/gradle-wrapper.jar | Bin 0 -> 59536 bytes .../gradle-wrapper.properties.mustache | 2 +- .../configuration/gradlew/gradlew.mustache | 2 +- pom.xml | 2 +- 20 files changed, 198 insertions(+), 96 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache delete mode 100644 modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.mustache create mode 100644 modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.kts.mustache delete mode 100644 modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.mustache mode change 100644 => 100755 modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradlew.mustache diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index dd28be5f136b..98ff84702dec 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft2-SNAPSHOT + 7.1.0-equisoft3-SNAPSHOT ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index b2756bd5d6ef..329a2edb0743 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project com.equisoft.openapitools - 7.1.0-equisoft2-SNAPSHOT + 7.1.0-equisoft3-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc index 3b75426d3615..19078bd0a156 100644 --- a/modules/openapi-generator-gradle-plugin/README.adoc +++ b/modules/openapi-generator-gradle-plugin/README.adoc @@ -113,7 +113,7 @@ buildscript { // url "https://plugins.gradle.org/m2/" } dependencies { - classpath "org.openapitools:openapi-generator-gradle-plugin:6.6.0" + classpath "com.equisoft.openapitools:openapi-generator-gradle-plugin:6.6.0" } } @@ -761,7 +761,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' - classpath('org.openapitools:openapi-generator-gradle-plugin:6.6.0') { + classpath('com.equisoft.openapitools:openapi-generator-gradle-plugin:6.6.0') { exclude group: 'com.google.guava' } } diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index 9c1ed4ff673c..1bb9bfb03d00 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -82,7 +82,7 @@ gradlePlugin { group = "com.equisoft.openapitools" plugins { openApiGenerator { - id = "com.equisoft.openapitools" + id = "org.openapi.generator" description = "OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)." displayName = "OpenAPI Generator Gradle Plugin" implementationClass = "org.openapitools.generator.gradle.plugin.OpenApiGeneratorPlugin" diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index 4e573f05bf20..85d4b255dce3 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=7.1.0-equisoft2-SNAPSHOT +openApiGeneratorVersion=7.1.0-equisoft3-SNAPSHOT # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 4610ba8284f8..7b34e3996b3d 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft2-SNAPSHOT + 7.1.0-equisoft3-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle index 516328c2036a..7d7e0a2fa403 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { // Updated version can be passed via command line arg as -PopenApiGeneratorVersion=VERSION - classpath "org.openapitools:openapi-generator-gradle-plugin:$openApiGeneratorVersion" + classpath "com.equisoft.openapitools:openapi-generator-gradle-plugin:$openApiGeneratorVersion" } } diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 219890660b54..63294a882386 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft2-SNAPSHOT + 7.1.0-equisoft3-SNAPSHOT ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 88fdf8ec014d..525351681740 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft2-SNAPSHOT + 7.1.0-equisoft3-SNAPSHOT ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index f561ff4b7249..3c42ef429f24 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft2-SNAPSHOT + 7.1.0-equisoft3-SNAPSHOT ../.. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java index e169a653e8d8..bdf3a9f0fc86 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java @@ -15,6 +15,7 @@ import org.openapitools.codegen.model.ModelsMap; import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; +import org.openapitools.codegen.utils.SemVer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +26,6 @@ import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE; import static org.openapitools.codegen.utils.StringUtils.camelize; -import static org.openapitools.codegen.utils.StringUtils.underscore; public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen implements BeanValidationFeatures, OptionalFeatures { public static final String OPT_TITLE = "title"; @@ -38,6 +38,9 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i public static final String OPT_TEST_SPOCK = "spock"; public static final String OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR = "requiredPropertiesInConstructor"; public static final String OPT_MICRONAUT_VERSION = "micronautVersion"; + public static final String OPT_IS_MICRONAUT4_OR_GREATER = "isMicronaut4OrGreater"; + public static final String OPT_MICRONAUT_VALIDATION_GROUP_ID = "micronautValidationGroupId"; + public static final String OPT_MICRONAUT_PLUGIN_VERSION = "micronautPluginVersion"; public static final String OPT_USE_AUTH = "useAuth"; public static final String OPT_VISITABLE = "visitable"; public static final String OPT_DATE_LIBRARY_JAVA8 = "java8"; @@ -65,6 +68,9 @@ public enum SERIALIZATION_LIBRARY_TYPE {jackson, micronaut_serde_jackson} protected String testTool; protected boolean requiredPropertiesInConstructor = true; protected String micronautVersion; + protected boolean isMicronaut4OrGreater; + protected String micronautValidationGroupId; + protected String micronautPluginVersion; protected boolean reactive; protected boolean wrapInHttpResponse; protected String appName; @@ -101,6 +107,9 @@ public JavaMicronautAbstractCodegen() { modelDocPath = "docs/models"; dateLibrary = OPT_DATE_LIBRARY_JAVA8; micronautVersion = "3.4.3"; + isMicronaut4OrGreater = false; + micronautValidationGroupId = "io.micronaut"; + micronautPluginVersion = "3.7.10"; reactive = true; wrapInHttpResponse = false; appName = artifactId; @@ -218,6 +227,8 @@ public void processOpts() { additionalProperties.put(OPT_MICRONAUT_VERSION, micronautVersion); } + processEquisoftOpts(); + if (additionalProperties.containsKey(OPT_APPLICATION_NAME)) { appName = (String) additionalProperties.get(OPT_APPLICATION_NAME); } else { @@ -326,8 +337,8 @@ public void processOpts() { if (buildTool.equals(OPT_BUILD_GRADLE) || buildTool.equals(OPT_BUILD_ALL)) { // Gradle files - supportingFiles.add(new SupportingFile("common/configuration/gradle/build.gradle.mustache", "", "build.gradle").doNotOverwrite()); - supportingFiles.add(new SupportingFile("common/configuration/gradle/settings.gradle.mustache", "", "settings.gradle").doNotOverwrite()); + supportingFiles.add(new SupportingFile("common/configuration/gradle/build.gradle.kts.mustache", "", "build.gradle.kts").doNotOverwrite()); + supportingFiles.add(new SupportingFile("common/configuration/gradle/settings.gradle.kts.mustache", "", "settings.gradle.kts").doNotOverwrite()); supportingFiles.add(new SupportingFile("common/configuration/gradle/gradle.properties.mustache", "", "gradle.properties").doNotOverwrite()); // Gradlew files @@ -394,6 +405,29 @@ public void processOpts() { additionalProperties.put("modelFolder", modelFolder); } + private void processEquisoftOpts() { + isMicronaut4OrGreater = (new SemVer(micronautVersion)).atLeast("4.0.0"); + additionalProperties.put(OPT_IS_MICRONAUT4_OR_GREATER, isMicronaut4OrGreater); + + if (additionalProperties.containsKey(OPT_MICRONAUT_VALIDATION_GROUP_ID)) { + micronautValidationGroupId = (String) additionalProperties.get(OPT_MICRONAUT_VALIDATION_GROUP_ID); + } else { + if(isMicronaut4OrGreater) { + micronautValidationGroupId = "io.micronaut.validation"; + } + additionalProperties.put(OPT_MICRONAUT_VALIDATION_GROUP_ID, micronautValidationGroupId); + } + + if (additionalProperties.containsKey(OPT_MICRONAUT_PLUGIN_VERSION)) { + micronautPluginVersion = (String) additionalProperties.get(OPT_MICRONAUT_PLUGIN_VERSION); + } else { + if(isMicronaut4OrGreater) { + micronautPluginVersion = "4.2.1"; + } + additionalProperties.put(OPT_MICRONAUT_PLUGIN_VERSION, micronautPluginVersion); + } + } + @Override public String apiTestFileFolder() { if (testTool.equals(OPT_TEST_SPOCK)) { diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache index 9f0b70835f4e..7d5cca325972 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache @@ -46,7 +46,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; {{>common/generatedAnnotation}} @Client({{#configureClientId}} id = "{{clientId}}", - path = {{/configureClientId}}"${{openbrace}}{{{applicationName}}}{{basePathSeparator}}base-path{{closebrace}}") + path = {{/configureClientId}}"${{openbrace}}{{{applicationName}}}{{basePathSeparator}}base-path:/{{closebrace}}") public interface {{classname}} { {{#operations}} {{#operation}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache new file mode 100644 index 000000000000..69ef01789e54 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache @@ -0,0 +1,137 @@ +import org.gradle.api.publish.PublishingExtension +import org.gradle.api.publish.maven.MavenPublication +{{^client}} +import io.micronaut.gradle.MicronautRuntime.NETTY +{{/client}} +{{#isTestSpock}} +import io.micronaut.gradle.MicronautTestRuntime.SPOCK_2 +{{/isTestSpock}} +{{#isTestJunit}} +import io.micronaut.gradle.MicronautTestRuntime.JUNIT_5 +{{/isTestJunit}} + +version = project.findProperty("application.version")?.toString() ?: "{{artifactVersion}}" +group = "{{invokerPackage}}" + +plugins { + {{#isTestSpock}} + id("groovy") + {{/isTestSpock}} + {{#client}} + id("io.micronaut.library") version "{{micronautPluginVersion}}" + {{/client}} + {{^client}} + id("com.github.johnrengelman.shadow") version "8.1.1" + id("io.micronaut.application") version "{{micronautPluginVersion}}" + {{/client}} + {{#gitProjectName}} + `maven-publish` + {{/gitProjectName}} +} + +repositories { + mavenCentral() +} + +micronaut { + {{^client}} + runtime.set("netty") + {{/client}} + {{#isTestSpock}} + testRuntime.set(SPOCK_2) + {{/isTestSpock}} + {{#isTestJunit}} + testRuntime.set(JUNIT_5) + {{/isTestJunit}} + processing { + incremental.set(true) + annotations("{{invokerPackage}}.*") + } +} + +dependencies { + annotationProcessor("io.micronaut:micronaut-http-validation") + {{#useAuth}} + annotationProcessor("io.micronaut.security:micronaut-security-annotations") + {{/useAuth}} + {{#micronaut_serde_jackson}} + annotationProcessor("io.micronaut.serde:micronaut-serde-processor") + implementation("io.micronaut.serde:micronaut-serde-jackson") + {{/micronaut_serde_jackson}} + implementation("io.micronaut:micronaut-http-client") + implementation("io.micronaut:micronaut-runtime") + implementation("{{{micronautValidationGroupId}}}:micronaut-validation") + {{#useAuth}} + implementation("io.micronaut.security:micronaut-security") + implementation("io.micronaut.security:micronaut-security-oauth2") + {{/useAuth}} + {{#reactive}} + implementation("io.micronaut.reactor:micronaut-reactor") + {{/reactive}} + {{#generateSwagger1Annotations}} + implementation("io.swagger:swagger-annotations:1.6.5") + {{/generateSwagger1Annotations}} + {{#generateSwagger2Annotations}} + implementation("io.swagger.core.v3:swagger-annotations:2.2.19") + {{/generateSwagger2Annotations}} + runtimeOnly("ch.qos.logback:logback-classic") + {{#isMicronaut4OrGreater}} + runtimeOnly("org.yaml:snakeyaml") + {{/isMicronaut4OrGreater}} +} +{{#micronaut_serde_jackson}}{{^isMicronaut4OrGreater}} +// TODO Please, check the version of the serde, maybe it must be upgraded. +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute(module("io.micronaut:micronaut-jackson-databind")) + .using(module("io.micronaut.serde:micronaut-serde-jackson:1.3.3")) + } +} +{{/isMicronaut4OrGreater}}{{/micronaut_serde_jackson}} + +{{^client}} +// TODO Set the main class +application { + mainClass.set("{{invokerPackage}}.Application") +} +{{/client}} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +graalvmNative.toolchainDetection = false + +tasks { + wrapper { + distributionType = Wrapper.DistributionType.ALL + gradleVersion = "8.5" + } +} + +{{#gitProjectName}} +configure { + repositories { + maven { + name = "{{gitProjectName}}" + url = uri("{{packageUrl}}") + credentials { + name = "gprWrite" + username = project.findProperty("gpr.user")?.toString() + ?: System.getenv("GPR_USER") + ?: System.getenv("GHCR_USER") + password = project.findProperty("gpr.key")?.toString() + ?: System.getenv("GPR_TOKEN") + ?: System.getenv("GHCR_TOKEN") + } + } + } + + publications { + create("gpr") { + from(components["java"]) + } + } +} +{{/gitProjectName}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.mustache deleted file mode 100644 index 341fce57ab45..000000000000 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.mustache +++ /dev/null @@ -1,77 +0,0 @@ -plugins { - {{#isTestSpock}} - id("groovy") - {{/isTestSpock}} - id("com.github.johnrengelman.shadow") version "7.1.1" - id("io.micronaut.application") version "3.1.1" -} - -version = "{{artifactVersion}}" -group = "{{invokerPackage}}" - -repositories { - mavenCentral() -} - -micronaut { - runtime("netty") - {{#isTestSpock}} - testRuntime("spock2") - {{/isTestSpock}} - {{#isTestJunit}} - testRuntime("junit5") - {{/isTestJunit}} - processing { - incremental(true) - annotations("{{invokerPackage}}.*") - } -} - - -dependencies { - annotationProcessor("io.micronaut:micronaut-http-validation") - {{#useAuth}} - annotationProcessor("io.micronaut.security:micronaut-security-annotations") - {{/useAuth}} - {{#micronaut_serde_jackson}} - annotationProcessor("io.micronaut.serde:micronaut-serde-processor") - implementation("io.micronaut.serde:micronaut-serde-jackson") - {{/micronaut_serde_jackson}} - implementation("io.micronaut:micronaut-http-client") - implementation("io.micronaut:micronaut-runtime") - implementation("io.micronaut:micronaut-validation") - {{#useAuth}} - implementation("io.micronaut.security:micronaut-security") - implementation("io.micronaut.security:micronaut-security-oauth2") - {{/useAuth}} - {{#reactive}} - implementation("io.micronaut.reactor:micronaut-reactor") - {{/reactive}} - {{#generateSwagger1Annotations}} - implementation("io.swagger:swagger-annotations:1.6.5") - {{/generateSwagger1Annotations}} - {{#generateSwagger2Annotations}} - implementation("io.swagger.core.v3:swagger-annotations:2.2.0") - {{/generateSwagger2Annotations}} - runtimeOnly("ch.qos.logback:logback-classic") -} -{{#micronaut_serde_jackson}} -// TODO Please, check the version of the serde, maybe it must be upgraded. -configurations.all { - resolutionStrategy.dependencySubstitution { - substitute(module("io.micronaut:micronaut-jackson-databind")) - .using(module("io.micronaut.serde:micronaut-serde-jackson:1.3.3")) - } -} -{{/micronaut_serde_jackson}} - -// TODO Set the main class -application { - mainClass.set("{{invokerPackage}}.Application") -} -java { - sourceCompatibility = JavaVersion.toVersion("1.8") - targetCompatibility = JavaVersion.toVersion("1.8") -} - -graalvmNative.toolchainDetection = false diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.kts.mustache new file mode 100644 index 000000000000..f35b9225ab39 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.kts.mustache @@ -0,0 +1,9 @@ +rootProject.name = "{{artifactId}}" + +val isCiServer = System.getenv().containsKey("CI") + +buildCache { + local { + isEnabled = !isCiServer + } +} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.mustache deleted file mode 100644 index b8fd6c4c41f9..000000000000 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/settings.gradle.mustache +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "{{artifactId}}" \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.jar b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.jar index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch literal 59536 zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^ zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~ ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u z=ASkePDZA-X8)rp%D;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5 z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5 zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59e zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!) zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl z(o?YlOI=jl(`L9^ z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d* zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP zWOeX5G;9(m@?GOG7g;e74i_|SmE?`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB z?2iK-u(DC_T1};KaUT@3nP~LEcENT^UgPvp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)na-5x1#OsVE#m*+k84Y^+UMeSAa zbrVZHU=mFwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7~-6hl;*-*}2Xz;J#a8Wn;_B5=m zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{ z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*#1!6}5K<*xDPJ{wv4& zM$17DFd~L*Te3A%yD;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0> z@x>;EzyBv>AI-~{D6l6{ST=em*U( z(r$nuXY-#CCi^8Z2#v#UXOt`dbYN1z5jzNF2 z411?w)whZrfA20;nl&C1Gi+gk<`JSm+{|*2o<< zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto& zR`c~ClHpE~4Z=uKa5S(-?M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F>k6k zz21?d+dw7b&i*>Kv5L(LH-?J%@WnqT7j#qZ9B>|Zl+=> z^U-pV@1y_ptHo4hl^cPRWewbLQ#g6XYQ@EkiP z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It z0CBpUcMA*QvsPy)#lr!lIdCi@1k4V2m!NH)%Px(vu-r(Q)HYc!p zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMiNP_o*lvx*q%_odv49Dsv$NV;6J z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB8zyvh*xhHKE``99>y#TdD z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4 z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@ zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp zOH4qlEOW4OMUc)_m)fMR_rl^pCfXc{$fQbI*E&mV77}kRF z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf! zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr# zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-PyuqGn3^M^Rz%WT{e?OI^svARX&SAdU77V(C~ zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<%z*+!*<e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4 z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!dchdkRiHbXW1FMrIIBwjsai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^# z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5ShD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@ zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&5#YbXkl`q?<*XtsqD z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-} z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;RN zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0 zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7z|=ALF5SNGkrtPG@Y~niUQV2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHpyznGG4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc? zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9ZybFY%jdnA)PeHvtBe- zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>( z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7 zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe zq!K%{e-rT5jX19`(bP23LUN4+_zh2KD~EAYzhpEO3MUG8@}uBHH@4J zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V%|; zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7 z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa z@w;^c|K3da#$TB0P3;MPlF7RuQeXT$ zS<<|C0OF(k)>fr&wOB=gP8!Qm>F41u;3esv7_0l%QHt(~+n; zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90jH@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`? zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb zpe^BChDK>sc-WLKl<6 zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re* zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK| zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#* zBP=a{)K#CwIY%p} zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!OY{eB24%xY7ml@|M7I(Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{ zv9@%7*#RI9;fv;Yii5CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0 zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^CfoY`?|#x9)-*yjv#lo&zP=uI`M?J zbzC<^3x7GfXA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_ zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W* z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L z@w67!DqVf7D%7XtXX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k= zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb zv(n3+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L65B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR z>U+KQekVGon)Yi<93(d!(yw1h3&X0N(PxN2{%vn}cnV?rYw z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpAi-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_ znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$ z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7sBDOA)$VThRCI0_+2=( zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;hg0Umh#c;hU3RhCUX=8aR>rmd` z7Orw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y( zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF& zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K| z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3 zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$I{Z^Hsj@D=E{MnnL+TbC@HEU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG zlP>XLMj2!VF^0k#ole7`-c~*~+_T5ls?x4)ah(j8vo_ zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@ z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j z1v&%a;OSKc8EIrodmIiw$lOES2hzGDcjjB`kEDfJe{r}yE6`eZL zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3 z03s0-sSlwbvgi&_R8s={6<~M^pGvBNjKOa>tWenzS8s zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+ zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2 zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_ z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE& z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{ zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3 z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_$r-2{$d~0g2oLETx9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f# zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)>gpS~1rNEh z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-pqZ1t|?cnaVOd;1(h9 z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al zvLo7Xte=C{aIt*otJD}BUq)|_pdR>{zBMT< z(^1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb- z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4` z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@ zM2NVLDxZ@GIv7*gzl1 zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U} zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl@O!Ak;(o*m!pZqe9 z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&q zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I> z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe= z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65 z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM z`Ub{+J3dMD!)mzC8b(2tZtokKW5pAwHa?NFiso~# z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3 z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4 z7ib0UOPqN40X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl})G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0 zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3 z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_ zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{ z0QQ(8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!IgDTVqt31wX#n+@!a_A0ZQkA zCJ2@M_4Gb5MfCrm5UPggeyh)8 zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgDs4swy5&8RAHZ~$)hrTF4W zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(35$ zWa07ON$`OMBOHgCmfO(9RFc<)?$x)N}Jd2A(<*Ll7+4jrRt9w zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8 z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+; zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+ zmcZ6?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50; zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?MM`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$ zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8 zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN zv98?fqqTUH8r8C7v(cx#BQ5P9W>- zmW93;eH6T`vuJ~rqtIBg%A6>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB zK_7G3!n7PL>d!kj){HQE zE8(%J%dWLh1_k%gVXTZt zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i( zZcTT@2`9(Mecptm@{3A_Y(X`w9K0EwtPq~O!16bq{7c0f7#(3wn-^)h zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7 zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH zqgcqW>Gm?6oV#AldDPKVRcEyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT zBbj@*SY;o2^_h*>R0e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot zmb)sZaly_P%BeX_9 zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}> z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e! z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-Nj$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR= z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@a? z%({Gn14b4-a|#uY^=@iiKH+k?~~wTj5K1A&hU z2^9-HTC)7zpoWK|$JXaBL6C z#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#yEFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={( zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|FAcx?r4$N z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd-(+9>G7*Nt%T zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6 zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8 ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5 z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%* zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9 zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ( zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;? zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?S|P z5|6b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0 zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S z7l(riiCwgghC=Lm5hWGf5NdGp#01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd z*6+-QXJ*&Kvk9ht0f0*rO_|FMBALen{j7T1l%=Q>gf#kma zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3 zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3< zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+Ln1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7 zcMcD$Hsjko3`-{bn)jPL6E9Ds{WskMrivsUu5apD z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90KT!JXUhYS`ZgX3jnu@Ja^seA*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S z6NE`3z!IS^$s7m}PCwQutVQ#~w+V z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_) zvE|L(L1jP@F%gOGtnlXtIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd>XI3-O?Wp z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm znsNt@Q&N{TLrmsoKFw0&_M9$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(- zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x z0$!q7iFu zZ`tryM70qBI6JWWTF9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye} zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*H9=l=D3r!GLM?UV zOxa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D zzDp3c9yEbGCY$U<8biJ_gB*`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu$$-C=*|X?R0~hu z8`J6TdgflslhrmDZq1f?GXF7*ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC z)ff9Yk?wZ}dZ-^)?cbb9Fw#EjqQ8jxF4G3=L?Ra zg_)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{ zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4 zeBs>KR)izRG1gRVL;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)CWNn9pCtBE}+`Jelk4{>S)M)`Ll=!~gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux} z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~ z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$ zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw% zGz)~?B4}u0CzOf@l^um}HZzbaIwPmb<)< zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$ zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_` zfnHQPANx z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@ zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+cU@DbR^_SXY`MC7HOsCN z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$NkI!0E;Y z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X? z6vV3*m~IBHTy*^E!<0nA(tCOJW2G4DsH7)BxLV8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-D zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}SjL=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-# zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN*zw9N+_=odt<$_H_8dbo;0=42wcAETPCVGUr~v(`Uai zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3 zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xfVqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6 zImRCr?(iyu_4W_6AWo3*vxTPUw@vPwy@E0`(>1Qi=%>5eSIrp^`` zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6 z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|ITJ}JDg@o8y>(rF9mXk5M z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j! zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(XuAYtTsYy-dz+w=$ir)VJpe!_$ z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~ z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3aPp z;o)|L6Rk569KGxFLUPx@!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1 z4=jk@7EEj`u(jy$HnzE33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5 zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|moUBAV_^f$hpaUuyQeY3da^ zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl z-OylnqOpLg}or7_VNwRg2za3VBK6FUfFX{|TD z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t zE%t!J0 zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9 z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$ zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_muEFI}U_4$phjvYgleK~`Fo`;GiC07&Hq1F<%p;9Q;tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%&p~D=K#KpfoJ@ zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXzjYaM{8$s&wEx@aVkQ6M{E2 zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7am^_F!Lz>;~{VrIO$;!#30XRhE1QqO_~#+Ux;B_D{Nk=grn z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw z*T#a=+WcTwL78exTgBn|iNE3#EsOorO z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8# z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4 z0DIL&vsJ1_s%<@y%U*-eX z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8# zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK} zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{JohU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~- zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$) z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$ z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)2r9W<> zT5L8BB^er3zxKt1v(y&OYk!^aoQisqU zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i z8lWr4g5nctBHtigX%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB>u&aUQl+7GiY2|dAEg@%Al3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3 zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI z_(gk!k+0%CG)%!WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7 z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_ z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrHFcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^% zmrkc4o6rvBI;Q8rj4*=AZacy*n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K& z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0 zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dWB7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG ztIHpY8F5xBP{mtQidqNRoz= z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$# zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G zFj6bV{`Y6)YoKgqnir2&+sl+i6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+= zYO=&t#5oSKB^pYhNdzPgH~aEGW2=ec1O#s-KG z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn< zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ| zJ5Wlj+4q~($hbtuY zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l~ zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5& znWoHlA-(z@3n0=l{E)R-p8sB9XkV zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g= zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8 zCRvMB^{GO@j=cHfmy}_pCGbP%xb{pNN>? z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0 zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jnTT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)Us)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP# zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|Uivj5u!xk0 z_^-N9r9o;(rFDt~q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL^d!r z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94 zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?w}{>8>$3236T-VMh@B zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG` zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h9sF@U20DHSB3~WMa zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR zE%B`Vi&m8f3T~&myTEK28BDWCVzfWir1I?03;pX))|kY5ClO^+bae z*7E?g=3g7EiisYOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU= zE*OY%QY58fW#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW>Z z`)>V2XC?NJT26mL^@ zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZupzM77m^=9 z&(a?-LxIq}*nvv)y?27lZ{j zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{`4 zU#kYOv{#A&gGPwT+$Ud}AXlK3K7hYzo$(fBSFjrP{QQ zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G! z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4 zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms| zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X zucyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~ z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^ zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF! z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJisifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8 z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~ zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h?Y8rS1S&-G+m$FNMP?(8N`MZP zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!by?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|) z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c zfs`aw?II0e(h=|7o&T+hq&m$; zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h) zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+K@61f}0e z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$Je1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`THd>2 zsWfU$9=p;yLyJyM^t zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2 zO?n3DEzpT+EoSV-%OdvZvNF+pDd-ZVZ&d8 zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op% z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc& zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{8r?;q3_kpZZ${?|( z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K> zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8 z6Mkf>2)WunY2eU@C-Uj-A zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK`` z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg z191aWoR^rDX#@iSq0n z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$ zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh z)lMbA69y7*5ufET>P*gXQrxsW+ zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBXQI2|g}FGJfJ+ zY-*2hB?o{TVL;Wt_ek;AP5PBqfDR4@Z->_182W z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24 z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU* zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)cEZ%vge965AS_am#DK#pjPRr-!^za8>`kksCAUj(Xr*1NW5~e zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%# zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0bD@_vGAr*NcFoMW;@r?@LUhRI zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V> zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g zJGpKk%%Sdc5xBa$Q^_I~(F97eqDO7AN3EN0u)PNBAb+n+ zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$N4yr^^o$ON8d{PQ=!O zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35va%4v>gc zEX-@h8esj=a4szW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1* znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP> zrp)BWKA9<}^R9g!0q7yWlh;gr_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(36sFU&K8}hA85U61faW&{ zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx zK%p23>M&=KTCgR!Ee8c?DAO2_R?B zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw- z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8 z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*( ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)diEX zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_ zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm zZi-noqS!^Ftb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@ zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn` zEgAp!h|r03h7B!$#OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@ zK^kpH8=yFuP+vI^+59|3%Zqnb5lTDAykf z9S#X`3N(X^SpdMyWQGOQRjhiwlj!0W-yD<3aEj^&X%=?`6lCy~?`&WSWt z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRHZphp zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY>zwgfm81DdoaVwNH;or{{eSyybt)m<=zXoA^RALYG-2t zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhRmh=)R0bg~ zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+ zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai< z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF# zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg% zbOg8>mbRN%7^Um-7oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi zPbLg_pxm`+HZurtFZ;wZ=`Vk*do~$wB zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P;=!y-AjFrERh%8la!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2 zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJSBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-} z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU? zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R% zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=Es(9&S@K@)ZjA{lj3ea7_MBP zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5 zI7{`Z=z_X*no8s>mY;>BvEXK%b`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw z`P+tft^E2B$domKT@|nNW`EHwyj>&}K;eDpe z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA zv!b;%yo{g*9l2)>tsZJOOp}U~8VUH`}$ z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3 z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6< znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_ z%7SUeH6=TrXt3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9ATD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j( ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|HQ`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^ zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K! z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^vq@Q_SRl|V z#lU<~n67$mT)NvHh`%als+G-)x1`Y%4Bp*6Un5Ri9h=_Db zA-AdP!f>f0m@~>7X#uBM?diI@)Egjuz@jXKvm zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#> z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|rlC1EA<1#`iuyNO z(=;irt{_&K=i4)^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf zL#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84 z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d zbzar4Fz&RSR(-|s!Z6+za&Z zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<815<5sOHQdeax9_!PyM&;{P zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L% z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+WXyYu*y3?px*=8MAK@EA+jRX8{CG?GI-< z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*qVE*y0`7J>l2wCmW zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw z4)>7caf^Ki_KJ^Zx2JUb z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ zC(JupLfFp8y43%PMj2}T|VS@%LVp>hv4Y!RPMF?pp8U_$xCJ)S zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR& zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk zwDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){} zGr}Exom_qDO{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6 zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj zKYug($r*Q#W9`p%Bf{bi6;IY0v`pB^^qu)gbg9QHQ7 zWBj(a1YSu)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>kYJC z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8iVx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY zSmfi)F`m94zL8>#zu;8|{aBui@RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm){>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(Xekg*ix@r|ymDw*{*s0?dlVys2e)z62u1 z+k3esbJE=-P5S$&KdFp+2H7_2e=}OKDrf( z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9 z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>Kwe zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L0JV9f3g{-RK!A?vBUA}${YF(vO4)@`6f1 z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi! zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0& QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache index f2e1eb1fd471..fce403e45e40 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradlew.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradlew.mustache old mode 100644 new mode 100755 index 4f906e0c811f..744e882ed572 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradlew.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradlew.mustache @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/pom.xml b/pom.xml index 24028a430241..62384b56acb8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ pom openapi-generator-project - 7.1.0-equisoft2-SNAPSHOT + 7.1.0-equisoft3-SNAPSHOT https://github.com/openapitools/openapi-generator From 8eedcdeed299367bf215fad33473946ab99717db Mon Sep 17 00:00:00 2001 From: Eric Durand-Tremblay Date: Tue, 19 Dec 2023 14:30:52 -0500 Subject: [PATCH 09/14] fix plugin publication (#6) --- .../README.adoc | 6 +++--- .../build.gradle | 2 +- .../samples/local-spec/build.gradle | 2 +- .../GenerateTaskConfigurationCacheTest.kt | 2 +- .../src/test/kotlin/GenerateTaskDslTest.kt | 18 +++++++++--------- .../test/kotlin/GenerateTaskFromCacheTest.kt | 2 +- .../test/kotlin/GenerateTaskUpToDateTest.kt | 2 +- .../src/test/kotlin/GeneratorsTaskDslTest.kt | 4 ++-- .../src/test/kotlin/MetaTaskDslTest.kt | 4 ++-- .../src/test/kotlin/ValidateTaskDslTest.kt | 14 +++++++------- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc index 19078bd0a156..eb4b38b0a2bd 100644 --- a/modules/openapi-generator-gradle-plugin/README.adoc +++ b/modules/openapi-generator-gradle-plugin/README.adoc @@ -97,7 +97,7 @@ task validateGoodSpec(type: org.openapitools.generator.gradle.plugin.tasks.Valid [source,group] ---- plugins { - id "org.openapi.generator" version "6.6.0" + id "com.equisoft.openapi.generator" version "6.6.0" } ---- @@ -117,7 +117,7 @@ buildscript { } } -apply plugin: 'org.openapi.generator' +apply plugin: 'com.equisoft.openapi.generator' ---- //# /RELEASE_VERSION @@ -772,7 +772,7 @@ configurations { compile.exclude module: 'guava-jdk5' } // … -apply plugin: 'org.openapi.generator' +apply plugin: 'com.equisoft.openapi.generator' ``` //# /RELEASE_VERSION diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index 1bb9bfb03d00..8095283c630f 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -82,7 +82,7 @@ gradlePlugin { group = "com.equisoft.openapitools" plugins { openApiGenerator { - id = "org.openapi.generator" + id = "com.equisoft.openapi.generator" description = "OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)." displayName = "OpenAPI Generator Gradle Plugin" implementationClass = "org.openapitools.generator.gradle.plugin.OpenApiGeneratorPlugin" diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle index 7d7e0a2fa403..7f4fd8737da8 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle @@ -18,7 +18,7 @@ buildscript { } } -apply plugin: 'org.openapi.generator' +apply plugin: 'com.equisoft.openapi.generator' openApiMeta { generatorName = "Sample" diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskConfigurationCacheTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskConfigurationCacheTest.kt index b1636e2b0aea..c1f8f181f565 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskConfigurationCacheTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskConfigurationCacheTest.kt @@ -110,7 +110,7 @@ class GenerateTaskConfigurationCacheTest : TestBase() { val buildContents = """ plugins { id 'base' - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { $extensionContents diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt index 30a725f70e08..19387e23f999 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt @@ -16,7 +16,7 @@ class GenerateTaskDslTest : TestBase() { private val defaultBuildGradle = """ plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" @@ -37,7 +37,7 @@ class GenerateTaskDslTest : TestBase() { // Arrange val buildContents = """ plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" @@ -100,7 +100,7 @@ class GenerateTaskDslTest : TestBase() { // Arrange val buildContents = """ plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" @@ -241,7 +241,7 @@ class GenerateTaskDslTest : TestBase() { withProject( """ plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" @@ -292,7 +292,7 @@ class GenerateTaskDslTest : TestBase() { ) withProject(""" plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "java" @@ -428,7 +428,7 @@ class GenerateTaskDslTest : TestBase() { withProject(""" plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" @@ -466,7 +466,7 @@ class GenerateTaskDslTest : TestBase() { withProject(""" plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" @@ -503,7 +503,7 @@ class GenerateTaskDslTest : TestBase() { withProject(""" plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" @@ -539,7 +539,7 @@ class GenerateTaskDslTest : TestBase() { withProject( """ plugins { - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { generatorName = "kotlin" diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt index 9f73e0e388a3..6feba4cdce8e 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt @@ -181,7 +181,7 @@ class GenerateTaskFromCacheTest : TestBase() { val buildContents = """ plugins { id 'base' - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { $extensionContents diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt index 7cfe81fd2766..961211c40db7 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt @@ -160,7 +160,7 @@ class GenerateTaskUpToDateTest : TestBase() { val buildContents = """ plugins { id 'base' - id 'org.openapi.generator' + id 'com.equisoft.openapi.generator' } openApiGenerate { $extensionContents diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GeneratorsTaskDslTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GeneratorsTaskDslTest.kt index 712b3c3c3448..d5753e9d9ceb 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GeneratorsTaskDslTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GeneratorsTaskDslTest.kt @@ -15,7 +15,7 @@ class GeneratorsTaskDslTest : TestBase() { // Arrange withProject(""" | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } """.trimMargin()) @@ -35,4 +35,4 @@ class GeneratorsTaskDslTest : TestBase() { assertEquals(TaskOutcome.SUCCESS, result.task(":openApiGenerators")?.outcome, "Expected a successful run, but found ${result.task(":openApiGenerators")?.outcome}") } -} \ No newline at end of file +} diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/MetaTaskDslTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/MetaTaskDslTest.kt index 724b693f5a06..03414052a0a2 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/MetaTaskDslTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/MetaTaskDslTest.kt @@ -16,7 +16,7 @@ class MetaTaskDslTest : TestBase() { val buildDirReplacement = "\$buildDir/meta" withProject(""" | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | openApiMeta { @@ -55,4 +55,4 @@ class MetaTaskDslTest : TestBase() { "Expected a successful run, but found ${result.task(":openApiMeta")?.outcome}" ) } -} \ No newline at end of file +} diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt index ff05a5784ca1..f88a690cfbfc 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt @@ -37,7 +37,7 @@ class ValidateTaskDslTest : TestBase() { withProject( """ | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | openApiValidate { @@ -82,7 +82,7 @@ class ValidateTaskDslTest : TestBase() { withProject( """ | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | openApiValidate { @@ -118,7 +118,7 @@ class ValidateTaskDslTest : TestBase() { withProject( """ | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | openApiValidate { @@ -155,7 +155,7 @@ class ValidateTaskDslTest : TestBase() { withProject( """ | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | task validateGoodSpec(type: org.openapitools.generator.gradle.plugin.tasks.ValidateTask) { @@ -191,7 +191,7 @@ class ValidateTaskDslTest : TestBase() { withProject( """ | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | task validateBadSpec(type: org.openapitools.generator.gradle.plugin.tasks.ValidateTask) { @@ -229,7 +229,7 @@ class ValidateTaskDslTest : TestBase() { withProject( """ | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | openApiValidate { @@ -270,7 +270,7 @@ class ValidateTaskDslTest : TestBase() { withProject( """ | plugins { - | id 'org.openapi.generator' + | id 'com.equisoft.openapi.generator' | } | | openApiValidate { From b92867a89b8df28fc5106b82b02b78b464f04655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20M=C3=A9riouma-Caron?= Date: Thu, 28 Dec 2023 14:03:14 -0500 Subject: [PATCH 10/14] fix gradle version and GPR property name --- .../common/configuration/gradle/build.gradle.kts.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache index 69ef01789e54..e29590085e9f 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.kts.mustache @@ -106,7 +106,7 @@ graalvmNative.toolchainDetection = false tasks { wrapper { distributionType = Wrapper.DistributionType.ALL - gradleVersion = "8.5" + gradleVersion = "{{gradleVersion}}" } } @@ -122,7 +122,7 @@ configure { ?: System.getenv("GPR_USER") ?: System.getenv("GHCR_USER") password = project.findProperty("gpr.key")?.toString() - ?: System.getenv("GPR_TOKEN") + ?: System.getenv("GPR_KEY") ?: System.getenv("GHCR_TOKEN") } } From 1eb9d8b9be7b3621443f1db52ce8a342e97b71c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20M=C3=A9riouma-Caron?= Date: Wed, 10 Jan 2024 00:34:32 -0500 Subject: [PATCH 11/14] add default gradle version --- .../codegen/languages/JavaMicronautAbstractCodegen.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java index bdf3a9f0fc86..7d4e57dadd51 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java @@ -41,6 +41,7 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i public static final String OPT_IS_MICRONAUT4_OR_GREATER = "isMicronaut4OrGreater"; public static final String OPT_MICRONAUT_VALIDATION_GROUP_ID = "micronautValidationGroupId"; public static final String OPT_MICRONAUT_PLUGIN_VERSION = "micronautPluginVersion"; + public static final String OPT_GRADLE_VERSION = "gradleVersion"; public static final String OPT_USE_AUTH = "useAuth"; public static final String OPT_VISITABLE = "visitable"; public static final String OPT_DATE_LIBRARY_JAVA8 = "java8"; @@ -426,6 +427,8 @@ private void processEquisoftOpts() { } additionalProperties.put(OPT_MICRONAUT_PLUGIN_VERSION, micronautPluginVersion); } + + additionalProperties.putIfAbsent(OPT_GRADLE_VERSION, "8.5"); } @Override From 4dc637565baa3148e9e704c6cb23f2aa1d3f5690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20M=C3=A9riouma-Caron?= Date: Wed, 10 Jan 2024 11:31:50 -0500 Subject: [PATCH 12/14] release 7.1.0-equisoft3 and bump SNAPSHOT --- modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- modules/openapi-generator-gradle-plugin/gradle.properties | 2 +- modules/openapi-generator-gradle-plugin/pom.xml | 2 +- modules/openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index 98ff84702dec..6ce8cc6b8acb 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft3-SNAPSHOT + 7.1.0-equisoft4-SNAPSHOT ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index 329a2edb0743..a80f39688d12 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project com.equisoft.openapitools - 7.1.0-equisoft3-SNAPSHOT + 7.1.0-equisoft4-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index 85d4b255dce3..97c9962c1f85 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=7.1.0-equisoft3-SNAPSHOT +openApiGeneratorVersion=7.1.0-equisoft4-SNAPSHOT # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 7b34e3996b3d..69259c7db652 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft3-SNAPSHOT + 7.1.0-equisoft4-SNAPSHOT ../.. diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 63294a882386..45dff10db3f3 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft3-SNAPSHOT + 7.1.0-equisoft4-SNAPSHOT ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 525351681740..80ec4924d0db 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft3-SNAPSHOT + 7.1.0-equisoft4-SNAPSHOT ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 3c42ef429f24..3a537fe14efb 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft3-SNAPSHOT + 7.1.0-equisoft4-SNAPSHOT ../.. diff --git a/pom.xml b/pom.xml index 62384b56acb8..6f846db4334a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ pom openapi-generator-project - 7.1.0-equisoft3-SNAPSHOT + 7.1.0-equisoft4-SNAPSHOT https://github.com/openapitools/openapi-generator From 376d314219dc2636fec6e583c56e943b3ac8a343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20M=C3=A9riouma-Caron?= Date: Wed, 10 Jan 2024 22:14:02 -0500 Subject: [PATCH 13/14] fix missing gradleVersion --- .../configuration/gradlew/gradle-wrapper.properties.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache index fce403e45e40..b3782b100cf4 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradlew/gradle-wrapper.properties.mustache @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-{{gradleVersion}}-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f744aba0a2434370ac02277e8b3b6827b8bc59ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20M=C3=A9riouma-Caron?= Date: Wed, 10 Jan 2024 22:45:13 -0500 Subject: [PATCH 14/14] release 7.1.0-equisoft4 and bump SNAPSHOT --- modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- modules/openapi-generator-gradle-plugin/gradle.properties | 2 +- modules/openapi-generator-gradle-plugin/pom.xml | 2 +- modules/openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index 6ce8cc6b8acb..7c88632faf8f 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft4-SNAPSHOT + 7.1.0-equisoft5-SNAPSHOT ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index a80f39688d12..2d0dbcb63a79 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project com.equisoft.openapitools - 7.1.0-equisoft4-SNAPSHOT + 7.1.0-equisoft5-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index 97c9962c1f85..074b14c7e851 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=7.1.0-equisoft4-SNAPSHOT +openApiGeneratorVersion=7.1.0-equisoft5-SNAPSHOT # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 69259c7db652..35efda3ab244 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft4-SNAPSHOT + 7.1.0-equisoft5-SNAPSHOT ../.. diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 45dff10db3f3..e1bbf9d9367b 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft4-SNAPSHOT + 7.1.0-equisoft5-SNAPSHOT ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 80ec4924d0db..92e9010809ca 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft4-SNAPSHOT + 7.1.0-equisoft5-SNAPSHOT ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 3a537fe14efb..d8434c7924d7 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ com.equisoft.openapitools openapi-generator-project - 7.1.0-equisoft4-SNAPSHOT + 7.1.0-equisoft5-SNAPSHOT ../.. diff --git a/pom.xml b/pom.xml index 6f846db4334a..ed6f334f1be9 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ pom openapi-generator-project - 7.1.0-equisoft4-SNAPSHOT + 7.1.0-equisoft5-SNAPSHOT https://github.com/openapitools/openapi-generator