From 38502b5243caff533c724760c458b44aee375834 Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Sun, 20 Aug 2023 02:43:55 -0700 Subject: [PATCH 1/5] build(deps): overall minor upgrade of npm dependencies - 2023-08-18 Fixes #2627 Signed-off-by: Peter Somogyvari --- .../package.json | 2 +- .../package.json | 6 +- .../typescript/package.json | 2 +- .../package.json | 2 +- .../package.json | 8 +- .../asset-reference/typescript/package.json | 2 +- .../package.json | 2 +- .../package.json | 6 +- .../tools/periodicExecuter/package.json | 2 +- .../tools/transferNumericAsset/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../cactus-example-tcs-huawei/package.json | 6 +- .../tools/periodicExecuter/package.json | 2 +- .../tools/transferNumericAsset/package.json | 2 +- examples/test-run-transaction/package.json | 6 +- package.json | 75 +- packages/cactus-cmd-api-server/package.json | 10 +- .../cactus-cmd-socketio-server/package.json | 2 +- packages/cactus-common/package.json | 4 +- packages/cactus-core-api/package.json | 6 +- .../package.json | 2 +- .../package.json | 2 +- .../cactus-plugin-keychain-vault/package.json | 2 +- .../package.json | 2 +- .../package.json | 4 +- .../test/typescript/unit-test/package.json | 2 +- .../package.json | 6 +- .../package.json | 4 +- .../test/typescript/unit-test/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../cactus-plugin-odap-hermes/package.json | 4 +- .../package.json | 2 +- packages/cactus-test-tooling/package.json | 4 +- .../cactus-test-verifier-client/package.json | 2 +- .../drivers/fabric-driver/package-local.json | 8 +- .../core/drivers/fabric-driver/package.json | 6 +- .../iin-agent/package-local.json | 2 +- .../iin-agent/package.json | 2 +- .../samples/besu/besu-cli/package-local.json | 4 +- weaver/samples/besu/besu-cli/package.json | 2 +- weaver/sdks/besu/node/package-local.json | 4 +- weaver/sdks/besu/node/package.json | 4 +- .../package-local.json | 4 +- .../interoperation-node-sdk/package.json | 4 +- yarn.lock | 1878 +++++++++-------- 47 files changed, 1106 insertions(+), 1005 deletions(-) diff --git a/examples/cactus-check-connection-ethereum-validator/package.json b/examples/cactus-check-connection-ethereum-validator/package.json index ad6df5cede..2db7a8d36c 100644 --- a/examples/cactus-check-connection-ethereum-validator/package.json +++ b/examples/cactus-check-connection-ethereum-validator/package.json @@ -19,6 +19,6 @@ }, "devDependencies": { "@types/escape-html": "1.0.1", - "@types/node": "15.14.7" + "@types/node": "15.14.9" } } diff --git a/examples/cactus-example-carbon-accounting-backend/package.json b/examples/cactus-example-carbon-accounting-backend/package.json index 008aa1c04d..6c362f0cd6 100644 --- a/examples/cactus-example-carbon-accounting-backend/package.json +++ b/examples/cactus-example-carbon-accounting-backend/package.json @@ -66,7 +66,7 @@ "@openzeppelin/contracts-upgradeable": "4.9.3", "async-exit-hook": "2.0.1", "fabric-network": "2.2.18", - "fs-extra": "10.0.0", + "fs-extra": "10.1.0", "openapi-types": "9.1.0", "typescript-optional": "2.0.1", "uuid": "8.3.2", @@ -75,9 +75,9 @@ }, "devDependencies": { "@types/express": "4.17.13", - "@types/fs-extra": "9.0.12", + "@types/fs-extra": "9.0.13", "@types/json-stable-stringify": "1.0.34", - "@types/uuid": "8.3.1", + "@types/uuid": "8.3.4", "express-jwt": "8.4.1", "hardhat": "2.13.1", "http-status-codes": "2.1.4", diff --git a/examples/cactus-example-carbon-accounting-backend/src/utility-emissions-channel/typescript/package.json b/examples/cactus-example-carbon-accounting-backend/src/utility-emissions-channel/typescript/package.json index 151f69da2c..ed29d3a7e7 100644 --- a/examples/cactus-example-carbon-accounting-backend/src/utility-emissions-channel/typescript/package.json +++ b/examples/cactus-example-carbon-accounting-backend/src/utility-emissions-channel/typescript/package.json @@ -16,7 +16,7 @@ "@types/chai": "4.3.5", "@types/crypto-js": "4.1.1", "@types/mocha": "8.2.2", - "@types/node": "16.18.40", + "@types/node": "16.18.41", "@types/rewire": "2.5.28", "chai": "4.3.7", "mocha": "8.4.0", diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json b/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json index 1c84fd2552..4caec7103a 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json @@ -73,7 +73,7 @@ "devDependencies": { "@types/express": "4.17.13", "@types/ssh2": "0.5.47", - "@types/uuid": "8.3.1" + "@types/uuid": "8.3.4" }, "engines": { "node": ">=10", diff --git a/examples/cactus-example-cbdc-bridging-backend/package.json b/examples/cactus-example-cbdc-bridging-backend/package.json index 70bf4681cc..0fc66b77a6 100644 --- a/examples/cactus-example-cbdc-bridging-backend/package.json +++ b/examples/cactus-example-cbdc-bridging-backend/package.json @@ -74,7 +74,7 @@ "crypto-js": "4.1.1", "dotenv": "^16.0.1", "fabric-network": "2.2.10", - "fs-extra": "10.0.0", + "fs-extra": "10.1.0", "ipfs-http-client": "51.0.1", "knex": "2.5.1", "nyc": "^13.1.0", @@ -91,9 +91,9 @@ "@types/cucumber": "^4.0.4", "@types/express": "4.17.13", "@types/express-jwt": "6.0.2", - "@types/fs-extra": "9.0.12", - "@types/node": "^10.7.1", - "@types/uuid": "8.3.1", + "@types/fs-extra": "9.0.13", + "@types/node": "^10.17.60", + "@types/uuid": "8.3.4", "chai": "^4.1.2", "cucumber": "^5.0.3", "hardhat": "2.6.0", diff --git a/examples/cactus-example-cbdc-bridging-backend/src/fabric-contracts/asset-reference/typescript/package.json b/examples/cactus-example-cbdc-bridging-backend/src/fabric-contracts/asset-reference/typescript/package.json index 7bb68c8fdb..147aaa10df 100644 --- a/examples/cactus-example-cbdc-bridging-backend/src/fabric-contracts/asset-reference/typescript/package.json +++ b/examples/cactus-example-cbdc-bridging-backend/src/fabric-contracts/asset-reference/typescript/package.json @@ -27,7 +27,7 @@ "@types/chai": "^4.2.11", "@types/chai-as-promised": "^7.1.2", "@types/mocha": "^7.0.2", - "@types/node": "^13.9.3", + "@types/node": "^13.13.52", "@types/sinon": "^7.5.2", "@types/sinon-chai": "^3.2.3", "chai": "^4.2.0", diff --git a/examples/cactus-example-discounted-asset-trade/package.json b/examples/cactus-example-discounted-asset-trade/package.json index d3085d967e..2119e2d4c1 100644 --- a/examples/cactus-example-discounted-asset-trade/package.json +++ b/examples/cactus-example-discounted-asset-trade/package.json @@ -18,7 +18,7 @@ "@hyperledger/cactus-cmd-socketio-server": "2.0.0-alpha.1", "@hyperledger/cactus-core-api": "2.0.0-alpha.1", "@hyperledger/cactus-verifier-client": "2.0.0-alpha.1", - "@types/node": "14.18.12", + "@types/node": "14.18.54", "axios": "0.24.0", "body-parser": "1.19.2", "cookie-parser": "1.4.6", diff --git a/examples/cactus-example-electricity-trade/package.json b/examples/cactus-example-electricity-trade/package.json index c73bd62e2c..c44941fa0b 100644 --- a/examples/cactus-example-electricity-trade/package.json +++ b/examples/cactus-example-electricity-trade/package.json @@ -16,7 +16,7 @@ "dependencies": { "@hyperledger/cactus-cmd-socketio-server": "2.0.0-alpha.1", "@hyperledger/cactus-verifier-client": "2.0.0-alpha.1", - "@types/node": "14.18.12", + "@types/node": "14.18.54", "body-parser": "1.19.2", "cookie-parser": "1.4.6", "debug": "3.1.0", @@ -43,8 +43,8 @@ "@typescript-eslint/eslint-plugin": "4.33.0", "@typescript-eslint/parser": "4.33.0", "eslint": "7.32.0", - "eslint-config-prettier": "8.4.0", + "eslint-config-prettier": "8.10.0", "eslint-plugin-prettier": "4.0.0", - "prettier": "2.5.1" + "prettier": "2.8.8" } } diff --git a/examples/cactus-example-electricity-trade/tools/periodicExecuter/package.json b/examples/cactus-example-electricity-trade/tools/periodicExecuter/package.json index b0215c5ed3..e7718664d3 100644 --- a/examples/cactus-example-electricity-trade/tools/periodicExecuter/package.json +++ b/examples/cactus-example-electricity-trade/tools/periodicExecuter/package.json @@ -8,7 +8,7 @@ "tslint": "tslint -c tslint.json -p tsconfig.json" }, "dependencies": { - "@types/node": "14.18.12", + "@types/node": "14.18.54", "ts-node": "9.1.1" }, "devDependencies": { diff --git a/examples/cactus-example-electricity-trade/tools/transferNumericAsset/package.json b/examples/cactus-example-electricity-trade/tools/transferNumericAsset/package.json index e87c985c87..9f8263ca6a 100644 --- a/examples/cactus-example-electricity-trade/tools/transferNumericAsset/package.json +++ b/examples/cactus-example-electricity-trade/tools/transferNumericAsset/package.json @@ -9,7 +9,7 @@ "copy-static-assets": "ts-node copyStaticAssets.ts" }, "dependencies": { - "@types/node": "14.18.12", + "@types/node": "14.18.54", "config": "1.31.0", "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", diff --git a/examples/cactus-example-supply-chain-backend/package.json b/examples/cactus-example-supply-chain-backend/package.json index 8117647530..c996f13515 100644 --- a/examples/cactus-example-supply-chain-backend/package.json +++ b/examples/cactus-example-supply-chain-backend/package.json @@ -78,7 +78,7 @@ }, "devDependencies": { "@types/express": "4.17.13", - "@types/uuid": "8.3.1" + "@types/uuid": "8.3.4" }, "engines": { "node": ">=10", diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/package.json b/examples/cactus-example-supply-chain-business-logic-plugin/package.json index 3a2a29106c..28e82e2170 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/package.json +++ b/examples/cactus-example-supply-chain-business-logic-plugin/package.json @@ -74,7 +74,7 @@ "devDependencies": { "@types/express": "4.17.13", "@types/ssh2": "0.5.47", - "@types/uuid": "8.3.1" + "@types/uuid": "8.3.4" }, "engines": { "node": ">=10", diff --git a/examples/cactus-example-tcs-huawei/package.json b/examples/cactus-example-tcs-huawei/package.json index a6435d34d0..5f7cae6274 100644 --- a/examples/cactus-example-tcs-huawei/package.json +++ b/examples/cactus-example-tcs-huawei/package.json @@ -14,7 +14,7 @@ "dependencies": { "@hyperledger/cactus-cmd-socketio-server": "2.0.0-alpha.1", "@hyperledger/cactus-verifier-client": "2.0.0-alpha.1", - "@types/node": "14.18.12", + "@types/node": "14.18.54", "body-parser": "1.19.2", "cookie-parser": "1.4.6", "debug": "2.6.9", @@ -43,8 +43,8 @@ "@typescript-eslint/eslint-plugin": "4.33.0", "@typescript-eslint/parser": "4.33.0", "eslint": "7.32.0", - "eslint-config-prettier": "8.4.0", + "eslint-config-prettier": "8.10.0", "eslint-plugin-prettier": "4.0.0", - "prettier": "2.5.1" + "prettier": "2.8.8" } } diff --git a/examples/cactus-example-tcs-huawei/tools/periodicExecuter/package.json b/examples/cactus-example-tcs-huawei/tools/periodicExecuter/package.json index b0215c5ed3..e7718664d3 100644 --- a/examples/cactus-example-tcs-huawei/tools/periodicExecuter/package.json +++ b/examples/cactus-example-tcs-huawei/tools/periodicExecuter/package.json @@ -8,7 +8,7 @@ "tslint": "tslint -c tslint.json -p tsconfig.json" }, "dependencies": { - "@types/node": "14.18.12", + "@types/node": "14.18.54", "ts-node": "9.1.1" }, "devDependencies": { diff --git a/examples/cactus-example-tcs-huawei/tools/transferNumericAsset/package.json b/examples/cactus-example-tcs-huawei/tools/transferNumericAsset/package.json index 8e837964e1..5d0ac2231f 100644 --- a/examples/cactus-example-tcs-huawei/tools/transferNumericAsset/package.json +++ b/examples/cactus-example-tcs-huawei/tools/transferNumericAsset/package.json @@ -9,7 +9,7 @@ "copy-static-assets": "ts-node copyStaticAssets.ts" }, "dependencies": { - "@types/node": "14.18.12", + "@types/node": "14.18.54", "config": "1.31.0", "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", diff --git a/examples/test-run-transaction/package.json b/examples/test-run-transaction/package.json index b1ca82e359..746d9db363 100644 --- a/examples/test-run-transaction/package.json +++ b/examples/test-run-transaction/package.json @@ -13,7 +13,7 @@ "init-test-run-transaction": "ln -s ../examples/test-run-transaction/node_modules ../../dist/node_modules" }, "dependencies": { - "@types/node": "14.18.12", + "@types/node": "14.18.54", "body-parser": "1.19.2", "cookie-parser": "1.4.6", "debug": "2.6.9", @@ -38,9 +38,9 @@ "@typescript-eslint/parser": "4.33.0", "@types/escape-html": "1.0.1", "eslint": "7.32.0", - "eslint-config-prettier": "8.4.0", + "eslint-config-prettier": "8.10.0", "eslint-plugin-prettier": "4.0.0", - "prettier": "2.5.1", + "prettier": "2.8.8", "tslint": "6.0.0", "typescript": "4.9.5" } diff --git a/package.json b/package.json index 665a3e96dc..6e8826eddc 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "test:jest:all": "NODE_OPTIONS=--max_old_space_size=3072 jest", "test:tap:all": "tap", "test:all": "yarn test:jest:all && yarn test:tap:all", - "posttest:all": "tap --no-check-coverage --coverage-report=lcov && codecov", + "posttest:all": "tap --no-check-coverage --coverage-report=lcov", "test:unit": "tap --ts --node-arg=--max-old-space-size=4096 --timeout=600 --no-check-coverage \"packages/cactus-*/src/test/typescript/unit/\"", "test:benchmark": "tap --ts --jobs=1 --no-timeout --no-check-coverage \"packages/cactus-*/src/test/typescript/benchmark/\"", "test:integration": "tap --ts --node-arg=--max-old-space-size=4096 --jobs=1 --timeout=3600 --no-check-coverage \"packages/cactus-*/src/test/typescript/integration/\"", @@ -93,77 +93,76 @@ "init-registries": "npm config set @iroha2:registry=https://nexus.iroha.tech/repository/npm-group/" }, "devDependencies": { - "@commitlint/cli": "13.1.0", - "@commitlint/config-conventional": "13.1.0", + "@commitlint/cli": "13.2.1", + "@commitlint/config-conventional": "13.2.0", "@lerna-lite/cli": "1.17.0", "@lerna-lite/exec": "1.17.0", "@lerna-lite/list": "1.17.0", "@lerna-lite/run": "1.17.0", - "@openapitools/openapi-generator-cli": "2.4.14", - "@types/fs-extra": "9.0.12", + "@openapitools/openapi-generator-cli": "2.7.0", + "@types/fs-extra": "9.0.13", "@types/jest": "29.5.3", - "@types/node": "15.14.7", - "@types/node-fetch": "2.5.12", - "@types/tape": "4.13.2", + "@types/node": "16.18.41", + "@types/node-fetch": "2.6.4", + "@types/tape": "4.13.4", "@types/tape-promise": "4.0.1", - "@types/uuid": "8.3.1", + "@types/uuid": "8.3.4", "@types/yargs": "17.0.24", - "@typescript-eslint/eslint-plugin": "6.0.0", - "@typescript-eslint/parser": "6.0.0", + "@typescript-eslint/eslint-plugin": "6.4.0", + "@typescript-eslint/parser": "6.4.0", "buffer": "6.0.3", - "codecov": "3.8.3", - "cpy-cli": "4.1.0", + "cpy-cli": "4.2.0", "cross-env": "7.0.3", "crypto-browserify": "3.12.0", - "cspell": "5.6.6", + "cspell": "5.21.2", "del-cli": "4.0.1", - "es-main": "1.0.2", + "es-main": "1.2.0", "eslint": "7.32.0", - "eslint-config-prettier": "8.3.0", + "eslint-config-prettier": "8.10.0", "eslint-config-standard": "16.0.3", - "eslint-plugin-import": "2.24.0", + "eslint-plugin-import": "2.28.1", "eslint-plugin-node": "11.1.0", - "eslint-plugin-prettier": "3.4.0", - "eslint-plugin-promise": "5.1.0", + "eslint-plugin-prettier": "3.4.1", + "eslint-plugin-promise": "5.2.0", "eslint-plugin-standard": "5.0.0", "fast-safe-stringify": "2.1.1", - "fs-extra": "10.0.0", - "globby": "12.0.0", + "fs-extra": "10.1.0", + "globby": "12.2.0", "google-protobuf": "3.21.2", - "grpc-tools": "1.11.2", - "grpc_tools_node_protoc_ts": "5.3.1", - "husky": "7.0.1", - "inquirer": "8.1.2", + "grpc-tools": "1.12.4", + "grpc_tools_node_protoc_ts": "5.3.3", + "husky": "7.0.4", + "inquirer": "8.2.6", "jest": "29.6.2", "jest-extended": "4.0.1", - "json5": "2.2.2", + "json5": "2.2.3", "license-report": "6.4.0", - "lint-staged": "11.1.2", - "make-dir-cli": "3.0.0", + "lint-staged": "11.2.6", + "make-dir-cli": "3.1.0", "node-polyfill-webpack-plugin": "1.1.4", "npm-run-all": "4.1.5", "npm-watch": "0.11.0", "openapi-types": "12.1.3", - "prettier": "2.1.2", + "prettier": "2.8.8", "protoc-gen-ts": "0.8.6", "run-time-error": "1.4.0", - "secp256k1": "4.0.2", + "secp256k1": "4.0.3", "semver-parser": "4.1.4", "shebang-loader": "0.0.1", "simple-git": "3.19.1", - "sort-package-json": "1.53.1", - "source-map-loader": "3.0.0", + "sort-package-json": "1.57.0", + "source-map-loader": "3.0.2", "stream-browserify": "3.0.0", - "tap": "16.3.7", - "tape": "5.6.3", + "tap": "16.3.8", + "tape": "5.6.6", "tape-promise": "4.0.0", "ts-jest": "29.1.1", - "ts-loader": "9.2.5", + "ts-loader": "9.4.4", "ts-node": "10.9.1", "typescript": "4.9.5", - "webpack": "5.76.0", - "webpack-bundle-analyzer": "4.4.2", - "webpack-cli": "4.7.2", + "webpack": "5.88.2", + "webpack-bundle-analyzer": "4.9.0", + "webpack-cli": "4.10.0", "wget-improved": "3.4.0", "yargs": "17.7.2" }, diff --git a/packages/cactus-cmd-api-server/package.json b/packages/cactus-cmd-api-server/package.json index f4570cee19..a2605886fc 100644 --- a/packages/cactus-cmd-api-server/package.json +++ b/packages/cactus-cmd-api-server/package.json @@ -77,7 +77,7 @@ "express-jwt": "8.4.1", "express-openapi-validator": "5.0.4", "express-rate-limit": "6.7.0", - "fs-extra": "10.0.0", + "fs-extra": "10.1.0", "google-protobuf": "3.18.0-rc.2", "jose": "4.9.2", "json-stable-stringify": "1.0.2", @@ -95,7 +95,7 @@ "devDependencies": { "@hyperledger/cactus-plugin-keychain-vault": "2.0.0-alpha.1", "@hyperledger/cactus-test-tooling": "2.0.0-alpha.1", - "@openapitools/openapi-generator-cli": "2.4.14", + "@openapitools/openapi-generator-cli": "2.7.0", "@types/compression": "1.7.1", "@types/convict": "6.1.1", "@types/cors": "2.8.12", @@ -111,12 +111,12 @@ "@types/passport-saml": "1.1.3", "@types/passport-strategy": "0.2.35", "@types/semver": "7.3.8", - "@types/uuid": "8.3.1", + "@types/uuid": "8.3.4", "@types/xml2js": "0.4.9", "artillery": "2.0.0-35", "google-protobuf": "3.18.0-rc.2", - "grpc-tools": "1.11.2", - "grpc_tools_node_protoc_ts": "5.3.1", + "grpc-tools": "1.12.4", + "grpc_tools_node_protoc_ts": "5.3.3", "http-status-codes": "2.1.4", "protobufjs": "7.2.4" }, diff --git a/packages/cactus-cmd-socketio-server/package.json b/packages/cactus-cmd-socketio-server/package.json index ed79b2fcfd..c3e0f4ff7c 100644 --- a/packages/cactus-cmd-socketio-server/package.json +++ b/packages/cactus-cmd-socketio-server/package.json @@ -44,7 +44,7 @@ "dependencies": { "@hyperledger/cactus-common": "2.0.0-alpha.1", "@hyperledger/cactus-core-api": "2.0.0-alpha.1", - "@types/node": "14.17.32", + "@types/node": "14.18.54", "body-parser": "1.19.2", "config": "3.3.7", "cookie-parser": "1.4.5", diff --git a/packages/cactus-common/package.json b/packages/cactus-common/package.json index 0ca3969710..03fb263249 100644 --- a/packages/cactus-common/package.json +++ b/packages/cactus-common/package.json @@ -56,14 +56,14 @@ "loglevel": "1.7.1", "loglevel-plugin-prefix": "0.8.4", "sanitize-html": "2.7.0", - "secp256k1": "4.0.2", + "secp256k1": "4.0.3", "sha3": "2.1.4" }, "devDependencies": { "@types/json-stable-stringify": "1.0.33", "@types/sanitize-html": "2.6.2", "@types/secp256k1": "4.0.3", - "@types/uuid": "8.3.1", + "@types/uuid": "8.3.4", "uuid": "8.3.2" }, "engines": { diff --git a/packages/cactus-core-api/package.json b/packages/cactus-core-api/package.json index 902fc4b659..a91affaba9 100644 --- a/packages/cactus-core-api/package.json +++ b/packages/cactus-core-api/package.json @@ -83,9 +83,9 @@ "@grpc/proto-loader": "0.7.8", "@types/express": "4.17.13", "@types/google-protobuf": "3.15.5", - "grpc-tools": "1.11.2", - "grpc_tools_node_protoc_ts": "5.3.1", - "make-dir-cli": "3.0.0", + "grpc-tools": "1.12.4", + "grpc_tools_node_protoc_ts": "5.3.3", + "make-dir-cli": "3.1.0", "npm-run-all": "4.1.5", "rxjs": "7.8.1", "socket.io": "4.5.4", diff --git a/packages/cactus-plugin-consortium-manual/package.json b/packages/cactus-plugin-consortium-manual/package.json index b4c75a8590..94b7c09529 100644 --- a/packages/cactus-plugin-consortium-manual/package.json +++ b/packages/cactus-plugin-consortium-manual/package.json @@ -70,7 +70,7 @@ "devDependencies": { "@types/express": "4.17.13", "@types/json-stable-stringify": "1.0.33", - "@types/uuid": "8.3.1" + "@types/uuid": "8.3.4" }, "engines": { "node": ">=10", diff --git a/packages/cactus-plugin-keychain-memory-wasm/package.json b/packages/cactus-plugin-keychain-memory-wasm/package.json index 3a59491216..cdcf2ba7c0 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/package.json +++ b/packages/cactus-plugin-keychain-memory-wasm/package.json @@ -70,7 +70,7 @@ }, "devDependencies": { "@types/express": "4.17.13", - "cpy-cli": "4.1.0", + "cpy-cli": "4.2.0", "del-cli": "4.0.1" }, "engines": { diff --git a/packages/cactus-plugin-keychain-vault/package.json b/packages/cactus-plugin-keychain-vault/package.json index a023c9b565..61c2f3a530 100644 --- a/packages/cactus-plugin-keychain-vault/package.json +++ b/packages/cactus-plugin-keychain-vault/package.json @@ -71,7 +71,7 @@ "@types/internal-ip": "4.1.0", "@types/request": "2.48.7", "@types/tape-promise": "4.0.1", - "@types/uuid": "8.3.1", + "@types/uuid": "8.3.4", "express": "4.17.3", "internal-ip": "6.2.0", "openapi-types": "9.1.0" diff --git a/packages/cactus-plugin-ledger-connector-cdl-socketio/package.json b/packages/cactus-plugin-ledger-connector-cdl-socketio/package.json index ed17788e25..de6e3f7ed8 100644 --- a/packages/cactus-plugin-ledger-connector-cdl-socketio/package.json +++ b/packages/cactus-plugin-ledger-connector-cdl-socketio/package.json @@ -71,7 +71,7 @@ "@types/express": "4.17.13", "@types/http-errors": "2.0.1", "@types/jsonwebtoken": "9.0.2", - "@types/node": "14.17.32", + "@types/node": "14.18.54", "@types/sanitize-html": "2.6.2", "jest-extended": "4.0.1", "uuid": "8.3.2" diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json index e8d63a8514..6999d40f94 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json @@ -16,7 +16,7 @@ "dependencies": { "@hyperledger/cactus-cmd-socketio-server": "2.0.0-alpha.1", "@hyperledger/cactus-common": "2.0.0-alpha.1", - "@types/node": "14.17.32", + "@types/node": "14.18.54", "body-parser": "1.17.2", "cookie-parser": "1.4.6", "debug": "3.1.0", @@ -24,7 +24,7 @@ "fabric-ca-client": "1.4.19", "fabric-client": "1.4.19", "fabric-network": "1.4.19", - "fs-extra": "10.0.0", + "fs-extra": "10.1.0", "grpc": "1.24.11", "js-yaml": "3.14.1", "jsonwebtoken": "9.0.0", diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json index 63b283d05a..8083b47f5d 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json @@ -9,7 +9,7 @@ "copy-static-assets": "ts-node copyStaticAssets.ts" }, "dependencies": { - "@types/node": "14.18.12", + "@types/node": "14.18.54", "config": "1.31.0", "socket.io-client": "4.5.4", "ts-node": "9.1.1", diff --git a/packages/cactus-plugin-ledger-connector-fabric/package.json b/packages/cactus-plugin-ledger-connector-fabric/package.json index 189a26671a..a72e52a2b4 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/package.json +++ b/packages/cactus-plugin-ledger-connector-fabric/package.json @@ -92,14 +92,14 @@ "@hyperledger/cactus-test-tooling": "2.0.0-alpha.1", "@types/bn.js": "5.1.0", "@types/express": "4.17.13", - "@types/fs-extra": "9.0.12", + "@types/fs-extra": "9.0.13", "@types/jsrsasign": "8.0.13", "@types/multer": "1.4.7", "@types/node-vault": "0.9.13", "@types/sanitize-html": "2.6.2", "@types/temp": "0.9.1", - "@types/uuid": "8.3.1", - "fs-extra": "10.0.0", + "@types/uuid": "8.3.4", + "fs-extra": "10.1.0", "internal-ip": "6.2.0", "socket.io": "4.5.4", "ws-wallet": "1.1.5" diff --git a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/package.json b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/package.json index 3563938b9e..ed42856045 100644 --- a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/package.json +++ b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/package.json @@ -47,7 +47,7 @@ "dependencies": { "@hyperledger/cactus-cmd-socketio-server": "2.0.0-alpha.1", "@hyperledger/cactus-common": "2.0.0-alpha.1", - "@types/node": "15.14.7", + "@types/node": "15.14.9", "body-parser": "1.17.2", "cookie-parser": "1.4.6", "debug": "3.1.0", @@ -69,7 +69,7 @@ "@types/cookie-parser": "1.4.3", "@types/express": "4.17.13", "@types/http-errors": "2.0.1", - "@types/node": "15.14.7", + "@types/node": "15.14.9", "@types/shelljs": "0.8.12", "shelljs": "0.8.5", "socket.io-client": "4.5.4" diff --git a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/package.json b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/package.json index 192c179b1b..261691e33d 100644 --- a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/package.json +++ b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/package.json @@ -9,7 +9,7 @@ "copy-static-assets": "ts-node copyStaticAssets.ts" }, "dependencies": { - "@types/node": "14.18.12", + "@types/node": "14.18.54", "config": "1.31.0", "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", diff --git a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json index 0e94cbe0fd..2e34a36429 100644 --- a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json +++ b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "@hyperledger/cactus-cmd-socketio-server": "2.0.0-alpha.1", - "@types/node": "14.17.32", + "@types/node": "14.18.54", "body-parser": "1.17.2", "cbor": "6.0.1", "cookie-parser": "1.4.6", diff --git a/packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/package.json b/packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/package.json index 4400c20980..f5c8df08bf 100644 --- a/packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/package.json +++ b/packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/package.json @@ -46,7 +46,7 @@ "init": "cp -af ../../yarn.lock ./dist/yarn.lock" }, "dependencies": { - "@types/node": "14.17.32", + "@types/node": "14.18.54", "body-parser": "1.17.2", "cbor": "6.0.1", "config": "3.3.7", diff --git a/packages/cactus-plugin-odap-hermes/package.json b/packages/cactus-plugin-odap-hermes/package.json index 223315ded0..6a7679b6dc 100644 --- a/packages/cactus-plugin-odap-hermes/package.json +++ b/packages/cactus-plugin-odap-hermes/package.json @@ -60,7 +60,7 @@ "axios": "0.21.4", "crypto-js": "4.0.0", "knex": "2.4.0", - "secp256k1": "4.0.2", + "secp256k1": "4.0.3", "socket.io": "4.5.4", "sqlite3": "5.1.5", "typescript-optional": "2.0.1", @@ -70,7 +70,7 @@ "devDependencies": { "@types/crypto-js": "4.0.1", "@types/express": "4.17.8", - "@types/tape": "4.13.0", + "@types/tape": "4.13.4", "crypto-js": "4.0.0", "fabric-network": "2.2.18", "ipfs-http-client": "51.0.1", diff --git a/packages/cactus-plugin-persistence-fabric/package.json b/packages/cactus-plugin-persistence-fabric/package.json index 17c1999fb1..aa58c71834 100644 --- a/packages/cactus-plugin-persistence-fabric/package.json +++ b/packages/cactus-plugin-persistence-fabric/package.json @@ -83,7 +83,7 @@ "@hyperledger/cactus-test-tooling": "2.0.0-alpha.1", "@types/express": "4.17.13", "@types/pg": "8.6.5", - "@types/uuid": "8.3.1", + "@types/uuid": "8.3.4", "body-parser": "1.19.0", "express": "4.17.1", "fabric-network": "1.4.19", diff --git a/packages/cactus-test-tooling/package.json b/packages/cactus-test-tooling/package.json index a82d4ed376..322a6a3625 100644 --- a/packages/cactus-test-tooling/package.json +++ b/packages/cactus-test-tooling/package.json @@ -68,7 +68,7 @@ "execa": "5.1.1", "fabric-ca-client": "2.5.0-snapshot.23", "fabric-network": "2.5.0-snapshot.23", - "fs-extra": "10.0.0", + "fs-extra": "10.1.0", "internal-ip": "6.2.0", "is-port-reachable": "3.0.0", "joi": "17.9.1", @@ -92,7 +92,7 @@ "devDependencies": { "@types/dockerode": "3.2.7", "@types/esm": "3.2.0", - "@types/fs-extra": "9.0.12", + "@types/fs-extra": "9.0.13", "@types/js-yaml": "4.0.3", "@types/lodash": "4.14.172", "@types/node-forge": "1.3.0", diff --git a/packages/cactus-test-verifier-client/package.json b/packages/cactus-test-verifier-client/package.json index caf535e9cf..d5a9e2b7e1 100644 --- a/packages/cactus-test-verifier-client/package.json +++ b/packages/cactus-test-verifier-client/package.json @@ -56,7 +56,7 @@ "web3": "1.7.3" }, "devDependencies": { - "@types/node": "14.17.32" + "@types/node": "14.18.54" }, "engines": { "node": ">=10", diff --git a/weaver/core/drivers/fabric-driver/package-local.json b/weaver/core/drivers/fabric-driver/package-local.json index 0fe4d10572..6ff8e30741 100644 --- a/weaver/core/drivers/fabric-driver/package-local.json +++ b/weaver/core/drivers/fabric-driver/package-local.json @@ -23,10 +23,10 @@ "@grpc/grpc-js": "1.9.0", "@hyperledger/cacti-weaver-protos-js": "file:./protos-js", "@hyperledger/cacti-weaver-sdk-fabric": "file:./cacti-weaver-sdk-fabric", - "@typescript-eslint/eslint-plugin": "5.54.1", - "@typescript-eslint/parser": "5.54.1", + "@typescript-eslint/eslint-plugin": "5.62.0", + "@typescript-eslint/parser": "5.62.0", "dotenv": "8.6.0", - "eslint-config-prettier": "8.9.0", + "eslint-config-prettier": "8.10.0", "eslint-plugin-prettier": "3.4.1", "fabric-ca-client": "2.2.18", "fabric-network": "2.2.18", @@ -34,7 +34,7 @@ "winston": "3.10.0" }, "devDependencies": { - "@types/node": "16.11.7", + "@types/node": "16.18.41", "nodemon": "2.0.22", "patch-package": "6.5.1", "typedoc": "0.24.8", diff --git a/weaver/core/drivers/fabric-driver/package.json b/weaver/core/drivers/fabric-driver/package.json index 1fdb99360e..c966c824ac 100644 --- a/weaver/core/drivers/fabric-driver/package.json +++ b/weaver/core/drivers/fabric-driver/package.json @@ -23,8 +23,8 @@ "@grpc/grpc-js": "1.9.0", "@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha.1", "@hyperledger/cacti-weaver-sdk-fabric": "2.0.0-alpha.1", - "@typescript-eslint/eslint-plugin": "5.54.1", - "@typescript-eslint/parser": "5.54.1", + "@typescript-eslint/eslint-plugin": "5.62.0", + "@typescript-eslint/parser": "5.62.0", "dotenv": "8.6.0", "eslint-config-prettier": "8.9.0", "eslint-plugin-prettier": "3.4.1", @@ -34,7 +34,7 @@ "winston": "3.10.0" }, "devDependencies": { - "@types/node": "16.11.7", + "@types/node": "16.18.41", "nodemon": "2.0.22", "patch-package": "6.5.1", "typedoc": "0.24.8", diff --git a/weaver/core/identity-management/iin-agent/package-local.json b/weaver/core/identity-management/iin-agent/package-local.json index 91b86f9265..4c647193e9 100644 --- a/weaver/core/identity-management/iin-agent/package-local.json +++ b/weaver/core/identity-management/iin-agent/package-local.json @@ -33,7 +33,7 @@ "fabric-network": "2.2.18" }, "devDependencies": { - "@types/node": "16.11.7", + "@types/node": "16.18.41", "chai": "4.3.7", "chai-as-promised": "7.1.1", "mocha": "5.2.0", diff --git a/weaver/core/identity-management/iin-agent/package.json b/weaver/core/identity-management/iin-agent/package.json index f8da0673e9..b229dd78f4 100644 --- a/weaver/core/identity-management/iin-agent/package.json +++ b/weaver/core/identity-management/iin-agent/package.json @@ -33,7 +33,7 @@ "fabric-network": "2.2.18" }, "devDependencies": { - "@types/node": "16.11.7", + "@types/node": "16.18.41", "chai": "4.3.7", "chai-as-promised": "7.1.1", "mocha": "5.2.0", diff --git a/weaver/samples/besu/besu-cli/package-local.json b/weaver/samples/besu/besu-cli/package-local.json index 41b2fe763e..f2766284a7 100644 --- a/weaver/samples/besu/besu-cli/package-local.json +++ b/weaver/samples/besu/besu-cli/package-local.json @@ -39,9 +39,9 @@ }, "devDependencies": { "@types/jest": "29.5.3", - "@types/node": "12.7.11", + "@types/node": "16.18.41", "jest": "29.6.2", - "prettier": "1.12.1", + "prettier": "1.19.1", "ts-jest": "29.1.1", "ts-node": "10.9.1", "tslint": "5.12.0", diff --git a/weaver/samples/besu/besu-cli/package.json b/weaver/samples/besu/besu-cli/package.json index f3d119f46e..d17ef874cb 100644 --- a/weaver/samples/besu/besu-cli/package.json +++ b/weaver/samples/besu/besu-cli/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/jest": "29.5.3", - "@types/node": "16.18.40", + "@types/node": "16.18.41", "jest": "29.6.2", "prettier": "1.19.1", "ts-jest": "29.1.1", diff --git a/weaver/sdks/besu/node/package-local.json b/weaver/sdks/besu/node/package-local.json index 3f2123edc3..bcc647f88e 100644 --- a/weaver/sdks/besu/node/package-local.json +++ b/weaver/sdks/besu/node/package-local.json @@ -20,7 +20,7 @@ "web3": "1.10.0" }, "devDependencies": { - "@types/node": "16.18.40", + "@types/node": "16.18.41", "@typescript-eslint/eslint-plugin": "3.10.1", "@typescript-eslint/parser": "3.10.1", "chai": "4.3.7", @@ -28,7 +28,7 @@ "eslint": "7.32.0", "eslint-config-airbnb-base": "14.2.1", "eslint-config-prettier": "6.15.0", - "eslint-plugin-import": "2.28.0", + "eslint-plugin-import": "2.28.1", "eslint-plugin-prettier": "3.4.1", "mocha": "5.2.0", "nyc": "12.0.2", diff --git a/weaver/sdks/besu/node/package.json b/weaver/sdks/besu/node/package.json index a03c41ac62..e56e9c4544 100644 --- a/weaver/sdks/besu/node/package.json +++ b/weaver/sdks/besu/node/package.json @@ -20,7 +20,7 @@ "web3": "1.10.0" }, "devDependencies": { - "@types/node": "16.18.40", + "@types/node": "16.18.41", "@typescript-eslint/eslint-plugin": "3.10.1", "@typescript-eslint/parser": "3.10.1", "chai": "4.3.7", @@ -28,7 +28,7 @@ "eslint": "7.32.0", "eslint-config-airbnb-base": "14.2.1", "eslint-config-prettier": "6.15.0", - "eslint-plugin-import": "2.28.0", + "eslint-plugin-import": "2.28.1", "eslint-plugin-prettier": "3.4.1", "mocha": "5.2.0", "nyc": "12.0.2", diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json index e3abc26f17..5da9eac79a 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json +++ b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json @@ -43,7 +43,7 @@ "uuid": "8.3.2" }, "devDependencies": { - "@types/node": "16.18.40", + "@types/node": "16.18.41", "@typescript-eslint/eslint-plugin": "4.33.0", "@typescript-eslint/parser": "4.33.0", "chai": "4.3.7", @@ -51,7 +51,7 @@ "eslint": "7.32.0", "eslint-config-airbnb-base": "14.2.1", "eslint-config-prettier": "8.10.0", - "eslint-plugin-import": "2.28.0", + "eslint-plugin-import": "2.28.1", "eslint-plugin-prettier": "3.4.1", "mocha": "5.2.0", "nyc": "12.0.2", diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package.json b/weaver/sdks/fabric/interoperation-node-sdk/package.json index bcd88dbc08..871a357045 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/package.json +++ b/weaver/sdks/fabric/interoperation-node-sdk/package.json @@ -43,7 +43,7 @@ "uuid": "8.3.2" }, "devDependencies": { - "@types/node": "16.18.40", + "@types/node": "16.18.41", "@typescript-eslint/eslint-plugin": "4.33.0", "@typescript-eslint/parser": "4.33.0", "chai": "4.3.7", @@ -51,7 +51,7 @@ "eslint": "7.32.0", "eslint-config-airbnb-base": "14.2.1", "eslint-config-prettier": "8.10.0", - "eslint-plugin-import": "2.28.0", + "eslint-plugin-import": "2.28.1", "eslint-plugin-prettier": "3.4.1", "mocha": "5.2.0", "nyc": "12.0.2", diff --git a/yarn.lock b/yarn.lock index dd4b18a93f..5c79bad76c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4053,31 +4053,31 @@ __metadata: languageName: node linkType: hard -"@commitlint/cli@npm:13.1.0": - version: 13.1.0 - resolution: "@commitlint/cli@npm:13.1.0" +"@commitlint/cli@npm:13.2.1": + version: 13.2.1 + resolution: "@commitlint/cli@npm:13.2.1" dependencies: - "@commitlint/format": ^13.1.0 - "@commitlint/lint": ^13.1.0 - "@commitlint/load": ^13.1.0 - "@commitlint/read": ^13.1.0 - "@commitlint/types": ^13.1.0 + "@commitlint/format": ^13.2.0 + "@commitlint/lint": ^13.2.0 + "@commitlint/load": ^13.2.1 + "@commitlint/read": ^13.2.0 + "@commitlint/types": ^13.2.0 lodash: ^4.17.19 resolve-from: 5.0.0 resolve-global: 1.0.0 yargs: ^17.0.0 bin: commitlint: cli.js - checksum: 70d2a5e083c9362bdc4351125976c6052719c7b59c41ae6837193455ad288af4f92e70e30675777a4ba2e069db7b83462016fa076f961d015a4e294ca62a676b + checksum: 41b74874ec3e3b1da69f07710ea080654017d6e9a73d98d06c061259bb255e09a4870a516da0ee92f86776f030e608eb797cdd44dac804c39f2f32e798e81a60 languageName: node linkType: hard -"@commitlint/config-conventional@npm:13.1.0": - version: 13.1.0 - resolution: "@commitlint/config-conventional@npm:13.1.0" +"@commitlint/config-conventional@npm:13.2.0": + version: 13.2.0 + resolution: "@commitlint/config-conventional@npm:13.2.0" dependencies: conventional-changelog-conventionalcommits: ^4.3.1 - checksum: c3c5313efa8eb57fa8456537de812cbfcf3406dde7911184dc047c5ed3979788c69f504a31feb0880cf70f1138311a3d52423822e4818783450934a7c5f8fef8 + checksum: fd659269fe31df17bf479b90e915e063c7dc61b795396458d403c4154f037e152ad015463c078a881af18456c638ab3b6c1b67966abc42b131e5a900ad3c2753 languageName: node linkType: hard @@ -4098,7 +4098,7 @@ __metadata: languageName: node linkType: hard -"@commitlint/format@npm:^13.1.0": +"@commitlint/format@npm:^13.2.0": version: 13.2.0 resolution: "@commitlint/format@npm:13.2.0" dependencies: @@ -4118,7 +4118,7 @@ __metadata: languageName: node linkType: hard -"@commitlint/lint@npm:^13.1.0": +"@commitlint/lint@npm:^13.2.0": version: 13.2.0 resolution: "@commitlint/lint@npm:13.2.0" dependencies: @@ -4130,7 +4130,7 @@ __metadata: languageName: node linkType: hard -"@commitlint/load@npm:^13.1.0": +"@commitlint/load@npm:^13.2.1": version: 13.2.1 resolution: "@commitlint/load@npm:13.2.1" dependencies: @@ -4165,7 +4165,7 @@ __metadata: languageName: node linkType: hard -"@commitlint/read@npm:^13.1.0": +"@commitlint/read@npm:^13.2.0": version: 13.2.0 resolution: "@commitlint/read@npm:13.2.0" dependencies: @@ -4218,7 +4218,7 @@ __metadata: languageName: node linkType: hard -"@commitlint/types@npm:^13.1.0, @commitlint/types@npm:^13.2.0": +"@commitlint/types@npm:^13.2.0": version: 13.2.0 resolution: "@commitlint/types@npm:13.2.0" dependencies: @@ -4227,64 +4227,65 @@ __metadata: languageName: node linkType: hard -"@cspell/cspell-bundled-dicts@npm:^5.18.5": - version: 5.18.5 - resolution: "@cspell/cspell-bundled-dicts@npm:5.18.5" +"@cspell/cspell-bundled-dicts@npm:^5.21.2": + version: 5.21.2 + resolution: "@cspell/cspell-bundled-dicts@npm:5.21.2" dependencies: "@cspell/dict-ada": ^2.0.0 "@cspell/dict-aws": ^2.0.0 - "@cspell/dict-bash": ^2.0.1 - "@cspell/dict-companies": ^2.0.2 - "@cspell/dict-cpp": ^2.0.0 + "@cspell/dict-bash": ^2.0.2 + "@cspell/dict-companies": ^2.0.4 + "@cspell/dict-cpp": ^3.1.0 "@cspell/dict-cryptocurrencies": ^2.0.0 - "@cspell/dict-csharp": ^2.0.1 + "@cspell/dict-csharp": ^3.0.1 "@cspell/dict-css": ^2.0.0 "@cspell/dict-dart": ^1.1.0 "@cspell/dict-django": ^2.0.0 - "@cspell/dict-dotnet": ^2.0.0 - "@cspell/dict-elixir": ^2.0.0 + "@cspell/dict-dotnet": ^2.0.1 + "@cspell/dict-elixir": ^2.0.1 "@cspell/dict-en-gb": ^1.1.33 - "@cspell/dict-en_us": ^2.1.7 + "@cspell/dict-en_us": ^2.2.5 "@cspell/dict-filetypes": ^2.0.1 "@cspell/dict-fonts": ^2.0.0 - "@cspell/dict-fullstack": ^2.0.4 - "@cspell/dict-golang": ^2.0.0 + "@cspell/dict-fullstack": ^2.0.5 + "@cspell/dict-git": ^1.0.1 + "@cspell/dict-golang": ^3.0.1 "@cspell/dict-haskell": ^2.0.0 - "@cspell/dict-html": ^3.0.0 - "@cspell/dict-html-symbol-entities": ^2.0.0 + "@cspell/dict-html": ^3.0.1 + "@cspell/dict-html-symbol-entities": ^3.0.0 "@cspell/dict-java": ^2.0.0 - "@cspell/dict-latex": ^2.0.0 + "@cspell/dict-latex": ^2.0.3 "@cspell/dict-lorem-ipsum": ^2.0.0 "@cspell/dict-lua": ^2.0.0 - "@cspell/dict-node": ^2.0.0 - "@cspell/dict-npm": ^2.0.1 + "@cspell/dict-node": ^2.0.1 + "@cspell/dict-npm": ^2.0.3 "@cspell/dict-php": ^2.0.0 "@cspell/dict-powershell": ^2.0.0 "@cspell/dict-public-licenses": ^1.0.4 - "@cspell/dict-python": ^2.0.6 + "@cspell/dict-python": ^3.0.5 "@cspell/dict-r": ^1.0.2 - "@cspell/dict-ruby": ^2.0.0 + "@cspell/dict-ruby": ^2.0.1 "@cspell/dict-rust": ^2.0.0 "@cspell/dict-scala": ^2.0.0 - "@cspell/dict-software-terms": ^2.1.0 + "@cspell/dict-software-terms": ^2.1.7 "@cspell/dict-swift": ^1.0.2 "@cspell/dict-typescript": ^2.0.0 "@cspell/dict-vue": ^2.0.2 - checksum: 8de5aae0a907bc5ae1eef0cf585f59c5bb9dd9f37ea75d550d849893c90a7e84eb853a436610eb842885c757919dde7fae9e4502097c441aacfc6569bf99a29d + checksum: 6bc367b8fe708762d374cac05ff9775d1801ace41a4bf9e987f85ff5dc48e9667d29a6ba7796c1a4bcec7d15c8606aa4f336505483ed1a3a34baa178e71a7279 languageName: node linkType: hard -"@cspell/cspell-pipe@npm:^5.18.5": - version: 5.18.5 - resolution: "@cspell/cspell-pipe@npm:5.18.5" - checksum: a2563b475c63eb0dab67b78d92694ffaa6b36f2c31f259793110954314d119e3b8aacc6f3ee19a13d07e5b681fd59742e45771589d1868647a5e4c7b7a378dde +"@cspell/cspell-pipe@npm:^5.21.2": + version: 5.21.2 + resolution: "@cspell/cspell-pipe@npm:5.21.2" + checksum: 197dd443c03386c15d29075a3b6a59265f94782dfcabffc810771a05a7c1b0413157266bdf5b1ab98e9c6e0354edc457168ccaf7311278448fe676f8ae086068 languageName: node linkType: hard -"@cspell/cspell-types@npm:^5.18.5, @cspell/cspell-types@npm:^5.6.5": - version: 5.18.5 - resolution: "@cspell/cspell-types@npm:5.18.5" - checksum: 7d296bb67fa31b86ef1d8fa0578ec5b5d84b839c1da8761b42aac8ddea01208e3e0769a73e6d1036acff9d318d6a3d2a5533c0064ef92d37be6a5e71bd0bc020 +"@cspell/cspell-types@npm:^5.21.2": + version: 5.21.2 + resolution: "@cspell/cspell-types@npm:5.21.2" + checksum: 137dfe4d0ece10a4e8e413af2002fcf9fb886a0ff98de56e9fe174dd70297026128f00c2d25249191b3cfb41eb18a3c3e18049853a2584944906ce56023706c6 languageName: node linkType: hard @@ -4302,24 +4303,24 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-bash@npm:^2.0.1": - version: 2.0.1 - resolution: "@cspell/dict-bash@npm:2.0.1" - checksum: 39f0703a6ab57a550d27217def7d511dd57439d81c03029001056f42649464513b6c05c6331be587185a62d788ca533a08284fcff039456f024875af7885ea32 +"@cspell/dict-bash@npm:^2.0.2": + version: 2.0.4 + resolution: "@cspell/dict-bash@npm:2.0.4" + checksum: 319521811adb2d172fe6fa816408783ae5dad1d5623631eeee63b902d4a340f70b020b3af516296a49f363d44b4e8bba33610dacbfae10e70faa6ddeed1172fc languageName: node linkType: hard -"@cspell/dict-companies@npm:^2.0.2": - version: 2.0.2 - resolution: "@cspell/dict-companies@npm:2.0.2" - checksum: 1d495d08f2927165185dfb1a4ec236e87239b987aeedd3f8b6daa76ddfed82b3cf06e629d017d42448a66b37d8c7c4266ca608306f55ee194cf70227dc0d210a +"@cspell/dict-companies@npm:^2.0.4": + version: 2.0.14 + resolution: "@cspell/dict-companies@npm:2.0.14" + checksum: 5a7b3468c48ddfba8297f3c849d43df87e2ef6e8cd04c3dffff643be69f33616be41c7fa441fe82b6dc6fc05174c1149bf0ab1d22f3e39ff5b8adf9fa03eb2d8 languageName: node linkType: hard -"@cspell/dict-cpp@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-cpp@npm:2.0.0" - checksum: 4a930d39cf835f7229136f5e5dcfaeee40c815db2dd2736d06a3ab873b5cd79ccd9268ecf98133f6e34e6050963e726027d25d008614cdbde378fb4601ed844d +"@cspell/dict-cpp@npm:^3.1.0": + version: 3.2.1 + resolution: "@cspell/dict-cpp@npm:3.2.1" + checksum: 71dfdb2bfee993e7a85b5fe8bc68dd76997de7402a6dcbd4be7ee68b938acde792f625a87ecf339d213d498e82abb33899053c9681901b59031ae235cfb4d688 languageName: node linkType: hard @@ -4330,10 +4331,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-csharp@npm:^2.0.1": - version: 2.0.1 - resolution: "@cspell/dict-csharp@npm:2.0.1" - checksum: aea44f296d8d899476a1dc79b550b9473f24ed63e82d283a052aa6e69b15c5cf95e5906e572cb367b2e17431b64f13718737f9041029bf44242ba7a86ca18a94 +"@cspell/dict-csharp@npm:^3.0.1": + version: 3.0.1 + resolution: "@cspell/dict-csharp@npm:3.0.1" + checksum: 98e1e5a37166204f16a582ed6ba6f3e4a4b19e228c6ff9ac6dd4afd733277416fad595ed3e1a4a535c5eb4713da0a7aac47415af8277cbc990093c8f0a6db85c languageName: node linkType: hard @@ -4358,17 +4359,17 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-dotnet@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-dotnet@npm:2.0.0" - checksum: 80626e1e8145825820ada8a9a527ddd93c17c18da7a3d0c2609e7cda60ac7dd16d6fa504afed14e3a108c30ef92d6df846fdcdd3404eb42c78b50efc4797c653 +"@cspell/dict-dotnet@npm:^2.0.1": + version: 2.0.1 + resolution: "@cspell/dict-dotnet@npm:2.0.1" + checksum: 4aa27b315ffc51db4a285a0bf97a3069a4d8326eb091967f491bab88392db3256ffee5faf3db416f2f4b5084f4f63a423d3c1263beac851b23c584e6f6bf3c4b languageName: node linkType: hard -"@cspell/dict-elixir@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-elixir@npm:2.0.0" - checksum: 5bdb2c54ce674fc89c195ecb307613574b870aaf2be271f1d8b06ddbe4b316432c9f740f067b1a20879aab7d2842904253c8f3a31f9cea79abaeab262a925beb +"@cspell/dict-elixir@npm:^2.0.1": + version: 2.0.1 + resolution: "@cspell/dict-elixir@npm:2.0.1" + checksum: e9cfa4c060c3ad38b48a0b87cfa7a90ea21f6dd12b72f383560756b713d522dab861184d00729ffd6c7824c956ceebd1e0bd7c13cc1ffb6ba0f27cfa5acdb3aa languageName: node linkType: hard @@ -4379,10 +4380,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-en_us@npm:^2.1.7": - version: 2.1.7 - resolution: "@cspell/dict-en_us@npm:2.1.7" - checksum: f0b86b38a41b5221057fbd69a9c7a0dad53720af0a4142c2f23180c581cfd920d0bc9fae1d9aca02953398e2bcf4275f2a936862003f41116c79288dbc483874 +"@cspell/dict-en_us@npm:^2.2.5": + version: 2.3.3 + resolution: "@cspell/dict-en_us@npm:2.3.3" + checksum: 3ec9447a9f41664b53421fe4f64f4b34bb3700b7dedc618f10c5b4393b4fed0c83106927f5922a5b968b8fd3447a954ebf3dadefa81597cb84d1309e1375dc8e languageName: node linkType: hard @@ -4400,17 +4401,24 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-fullstack@npm:^2.0.4": - version: 2.0.4 - resolution: "@cspell/dict-fullstack@npm:2.0.4" - checksum: 77d58941123f655effe61e67d897797a7685a99e18fa70f881d04dafe2225e5c811c1c6439b20c7efb0dd77dea500cbb943298dbbefe25f9847f562e12b9c4ff +"@cspell/dict-fullstack@npm:^2.0.5": + version: 2.0.6 + resolution: "@cspell/dict-fullstack@npm:2.0.6" + checksum: 0a085cfa6160e34f96624a9712a5126e2973706c02ede3503e16b128acf6d001ecc092fa27dc64bfc47d8e05f9307e2156950b3b7063f8fcc101d21e6f9a45ab languageName: node linkType: hard -"@cspell/dict-golang@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-golang@npm:2.0.0" - checksum: 10ff051f776a0d67e876ecc31f1ce17b0fe20d28f35f0bddbd0b788b20b3ee2dd6cc0d4dc0a2149446046228adc9786c84fd65e74d8367cd46359b7e74f9ccbd +"@cspell/dict-git@npm:^1.0.1": + version: 1.0.1 + resolution: "@cspell/dict-git@npm:1.0.1" + checksum: 352864bcb4e9a9dba19ea5e4d23fc107670c69fab038a0043c9921164b5fdff1ca25370ad7458e18cb81fceeb6b242b3f397aa18a6912771688f5b2e98e52d8e + languageName: node + linkType: hard + +"@cspell/dict-golang@npm:^3.0.1": + version: 3.0.1 + resolution: "@cspell/dict-golang@npm:3.0.1" + checksum: 1f2f68766e2ccae72eb48c8dc0dc9211da63b580a30e1793a815d1f9d25b86da36db14fd22f2551c486d799348fa3be6840109562a4219d57dc1c8a3279a1d31 languageName: node linkType: hard @@ -4421,17 +4429,17 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-html-symbol-entities@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-html-symbol-entities@npm:2.0.0" - checksum: 31ac7e82a3de4fe6d547c05f4f2b03d5b591529ab93a9e258a7b1385616da69e4adb0e344757fde84bb1b589161458be614a815fe3df2f1078ec72feae49af42 +"@cspell/dict-html-symbol-entities@npm:^3.0.0": + version: 3.0.0 + resolution: "@cspell/dict-html-symbol-entities@npm:3.0.0" + checksum: bb230243e08213c1a0eb3a426cb205a6a2c9f80768cdc9f5706da88435a190b0929b3eac1f097775d57132cee061e4eb611e2bd7c3dad9b139fc88f3bafff5ea languageName: node linkType: hard -"@cspell/dict-html@npm:^3.0.0": - version: 3.0.0 - resolution: "@cspell/dict-html@npm:3.0.0" - checksum: 2834356e94dc88081b6eed5ef2661f6e87bd9cd0a036084e1b0e78d57d773f127ceecde24a6bb31486a65ca3bb61cf481ef0d4cdc070fa9f518c9a10ad9f0220 +"@cspell/dict-html@npm:^3.0.1": + version: 3.3.2 + resolution: "@cspell/dict-html@npm:3.3.2" + checksum: 5aecb2a24e0d3d22d890578e18771e04457828505b395ebb1918bc68000075e87f9c7ad2544ae18e53e87974d309556f44774887d05878a8603b8744e26449aa languageName: node linkType: hard @@ -4442,10 +4450,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-latex@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-latex@npm:2.0.0" - checksum: 85c1ee0895ec4f0348e085ca68fc49e09634a73e393cad2df830218a0926cf584373c1c0413454a3cf92551e2da24b48eab789013259ecec3053f63345dfa94a +"@cspell/dict-latex@npm:^2.0.3": + version: 2.0.9 + resolution: "@cspell/dict-latex@npm:2.0.9" + checksum: fe748a69a8da9b84523e59bcd429c0d41a822d26cabbd4fd7777cfbfbdabd29f1b0806b75fffe20dda54ce0785bff5b21b69fdaa572f076f06308307d8da42da languageName: node linkType: hard @@ -4463,17 +4471,17 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-node@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-node@npm:2.0.0" - checksum: 11f74a354a468cc4293815787d937219acef3b530b540dec0be2a57fe52f240260b012179e194fc03a60ef1708d0ebcc4e60e88e68caab6b426b538c5b5b3dc3 +"@cspell/dict-node@npm:^2.0.1": + version: 2.0.1 + resolution: "@cspell/dict-node@npm:2.0.1" + checksum: 20eef1dd4ec3aaf00de97e321cfaa48f2a693395b67f9a52872754b849942240827d14a11a6cc0ede195d3b9d9cbd20e2b41a77fb4f575c4ca9ea63008049c3b languageName: node linkType: hard -"@cspell/dict-npm@npm:^2.0.1": - version: 2.0.1 - resolution: "@cspell/dict-npm@npm:2.0.1" - checksum: baf86c5a5c1d02e80834b15b797a6fec0c702359a8d645face1dc581eae180d01bef3d1ab13854ebb4f150b462675676a956135fc98b7651f1b9d04a2c812ea3 +"@cspell/dict-npm@npm:^2.0.3": + version: 2.0.5 + resolution: "@cspell/dict-npm@npm:2.0.5" + checksum: 6ab275c144d5afa24a82a7615d329e85f917d09d95dc7d0c416881a43675a33fff287adcff87182a545caaf603b0a2923f7f77587545d4004a70ee1310c4f335 languageName: node linkType: hard @@ -4498,10 +4506,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-python@npm:^2.0.6": - version: 2.0.6 - resolution: "@cspell/dict-python@npm:2.0.6" - checksum: 900e3fd7fdcd361ffc88a068f793dddc40a6a56b92c98e564d54522d0545630a686f23154b54a3c8373b821e4b813ac2fdef1a4eee32f05c91610b6484bfd37b +"@cspell/dict-python@npm:^3.0.5": + version: 3.0.6 + resolution: "@cspell/dict-python@npm:3.0.6" + checksum: 3597d65927dfc41f517e3c6dbf196b1c91932e1051dd20b9a8af26ad17a0a3720de9032405d54ab8cb39d27a5a23c95100fdad90b33c2823e0b692d31024d817 languageName: node linkType: hard @@ -4512,10 +4520,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-ruby@npm:^2.0.0": - version: 2.0.0 - resolution: "@cspell/dict-ruby@npm:2.0.0" - checksum: 2d7b61cb0fe6af08de1d70e9d6163e6d811e54570a317940f64b7fe0efd50b350b28e7f15ab36371a024a9665a0d5c9b4b8946ecafaff8557566e4e0a57e3977 +"@cspell/dict-ruby@npm:^2.0.1": + version: 2.0.2 + resolution: "@cspell/dict-ruby@npm:2.0.2" + checksum: 471a0d09c0904d727442c3282c1554fbdee8b473a1993d1befa1d8cd416348d9f880e8355aa6189fe51231b4e20c551c5ba270a47db41e49d11682f19f21e2d3 languageName: node linkType: hard @@ -4533,10 +4541,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-software-terms@npm:^2.1.0": - version: 2.1.1 - resolution: "@cspell/dict-software-terms@npm:2.1.1" - checksum: 117a4b119cad55a5b076f10abb95d8e1edeaf6ba3173a2bfc02a2d97a0067a21ec982eef83ef090f58599cd108878a28d9ba7734d196429a8b2f98343ef8fa88 +"@cspell/dict-software-terms@npm:^2.1.7": + version: 2.3.0 + resolution: "@cspell/dict-software-terms@npm:2.3.0" + checksum: ce705186ef008fede89421351c871f748a7d753a497568a2f75af87e3a7a626d1ea94dbd2ab99aeef1e4f45d9964bc8dbf8427f3c19eff9fb2d0a035ea8c2962 languageName: node linkType: hard @@ -4837,7 +4845,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.3.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -4848,10 +4856,10 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.5.0": - version: 4.5.1 - resolution: "@eslint-community/regexpp@npm:4.5.1" - checksum: 6d901166d64998d591fab4db1c2f872981ccd5f6fe066a1ad0a93d4e11855ecae6bfb76660869a469563e8882d4307228cebd41142adb409d182f2966771e57e +"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.1": + version: 4.6.2 + resolution: "@eslint-community/regexpp@npm:4.6.2" + checksum: a3c341377b46b54fa228f455771b901d1a2717f95d47dcdf40199df30abc000ba020f747f114f08560d119e979d882a94cf46cfc51744544d54b00319c0f2724 languageName: node linkType: hard @@ -5972,7 +5980,7 @@ __metadata: "@hyperledger/cacti-weaver-sdk-besu": 2.0.0-alpha.1 "@truffle/contract": 4.6.28 "@types/jest": 29.5.3 - "@types/node": 16.18.40 + "@types/node": 16.18.41 gluegun: 5.1.3 jest: 29.6.2 prettier: 1.19.1 @@ -6026,9 +6034,9 @@ __metadata: "@grpc/grpc-js": 1.9.0 "@hyperledger/cacti-weaver-protos-js": 2.0.0-alpha.1 "@hyperledger/cacti-weaver-sdk-fabric": 2.0.0-alpha.1 - "@types/node": 16.11.7 - "@typescript-eslint/eslint-plugin": 5.54.1 - "@typescript-eslint/parser": 5.54.1 + "@types/node": 16.18.41 + "@typescript-eslint/eslint-plugin": 5.62.0 + "@typescript-eslint/parser": 5.62.0 dotenv: 8.6.0 eslint-config-prettier: 8.9.0 eslint-plugin-prettier: 3.4.1 @@ -6095,7 +6103,7 @@ __metadata: "@grpc/grpc-js": 1.9.0 "@hyperledger/cacti-weaver-protos-js": 2.0.0-alpha.1 "@hyperledger/cacti-weaver-sdk-fabric": 2.0.0-alpha.1 - "@types/node": 16.11.7 + "@types/node": 16.18.41 "@typescript-eslint/eslint-plugin": 3.10.1 "@typescript-eslint/parser": 3.10.1 chai: 4.3.7 @@ -6138,7 +6146,7 @@ __metadata: resolution: "@hyperledger/cacti-weaver-sdk-besu@workspace:weaver/sdks/besu/node" dependencies: "@hyperledger/cacti-weaver-protos-js": 2.0.0-alpha.1 - "@types/node": 16.18.40 + "@types/node": 16.18.41 "@typescript-eslint/eslint-plugin": 3.10.1 "@typescript-eslint/parser": 3.10.1 chai: 4.3.7 @@ -6146,7 +6154,7 @@ __metadata: eslint: 7.32.0 eslint-config-airbnb-base: 14.2.1 eslint-config-prettier: 6.15.0 - eslint-plugin-import: 2.28.0 + eslint-plugin-import: 2.28.1 eslint-plugin-prettier: 3.4.1 log4js: 6.9.1 mocha: 5.2.0 @@ -6170,7 +6178,7 @@ __metadata: "@grpc/grpc-js": 1.9.0 "@grpc/proto-loader": 0.7.8 "@hyperledger/cacti-weaver-protos-js": 2.0.0-alpha.1 - "@types/node": 16.18.40 + "@types/node": 16.18.41 "@typescript-eslint/eslint-plugin": 4.33.0 "@typescript-eslint/parser": 4.33.0 chai: 4.3.7 @@ -6179,7 +6187,7 @@ __metadata: eslint: 7.32.0 eslint-config-airbnb-base: 14.2.1 eslint-config-prettier: 8.10.0 - eslint-plugin-import: 2.28.0 + eslint-plugin-import: 2.28.1 eslint-plugin-prettier: 3.4.1 fabric-common: 2.2.18 fabric-network: 2.2.18 @@ -6233,7 +6241,7 @@ __metadata: "@hyperledger/cactus-core-api": 2.0.0-alpha.1 "@hyperledger/cactus-plugin-keychain-vault": 2.0.0-alpha.1 "@hyperledger/cactus-test-tooling": 2.0.0-alpha.1 - "@openapitools/openapi-generator-cli": 2.4.14 + "@openapitools/openapi-generator-cli": 2.7.0 "@thream/socketio-jwt": 2.1.1 "@types/compression": 1.7.1 "@types/convict": 6.1.1 @@ -6250,7 +6258,7 @@ __metadata: "@types/passport-saml": 1.1.3 "@types/passport-strategy": 0.2.35 "@types/semver": 7.3.8 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 "@types/xml2js": 0.4.9 artillery: 2.0.0-35 async-exit-hook: 2.0.1 @@ -6266,10 +6274,10 @@ __metadata: express-jwt: 8.4.1 express-openapi-validator: 5.0.4 express-rate-limit: 6.7.0 - fs-extra: 10.0.0 + fs-extra: 10.1.0 google-protobuf: 3.18.0-rc.2 - grpc-tools: 1.11.2 - grpc_tools_node_protoc_ts: 5.3.1 + grpc-tools: 1.12.4 + grpc_tools_node_protoc_ts: 5.3.3 http-status-codes: 2.1.4 jose: 4.9.2 json-stable-stringify: 1.0.2 @@ -6303,7 +6311,7 @@ __metadata: "@types/jsonwebtoken": 9.0.0 "@types/lodash": 4.14.195 "@types/morgan": 1.9.1 - "@types/node": 14.17.32 + "@types/node": 14.18.54 "@types/shelljs": 0.8.11 body-parser: 1.19.2 config: 3.3.7 @@ -6339,14 +6347,14 @@ __metadata: "@types/json-stable-stringify": 1.0.33 "@types/sanitize-html": 2.6.2 "@types/secp256k1": 4.0.3 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 fast-safe-stringify: 2.1.1 json-stable-stringify: 1.0.1 key-encoder: 2.0.3 loglevel: 1.7.1 loglevel-plugin-prefix: 0.8.4 sanitize-html: 2.7.0 - secp256k1: 4.0.2 + secp256k1: 4.0.3 sha3: 2.1.4 uuid: 8.3.2 languageName: unknown @@ -6376,9 +6384,9 @@ __metadata: "@types/express": 4.17.13 "@types/google-protobuf": 3.15.5 axios: 0.21.4 - grpc-tools: 1.11.2 - grpc_tools_node_protoc_ts: 5.3.1 - make-dir-cli: 3.0.0 + grpc-tools: 1.12.4 + grpc_tools_node_protoc_ts: 5.3.3 + make-dir-cli: 3.1.0 npm-run-all: 4.1.5 rxjs: 7.8.1 socket.io: 4.5.4 @@ -6418,13 +6426,13 @@ __metadata: "@openzeppelin/contracts": 4.9.3 "@openzeppelin/contracts-upgradeable": 4.9.3 "@types/express": 4.17.13 - "@types/fs-extra": 9.0.12 + "@types/fs-extra": 9.0.13 "@types/json-stable-stringify": 1.0.34 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 async-exit-hook: 2.0.1 express-jwt: 8.4.1 fabric-network: 2.2.18 - fs-extra: 10.0.0 + fs-extra: 10.1.0 hardhat: 2.13.1 http-status-codes: 2.1.4 jose: 4.9.2 @@ -6451,7 +6459,7 @@ __metadata: "@hyperledger/cactus-plugin-ledger-connector-xdai": 2.0.0-alpha.1 "@types/express": 4.17.13 "@types/ssh2": 0.5.47 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 async-exit-hook: 2.0.1 axios: 0.21.4 express: 4.17.1 @@ -6524,9 +6532,9 @@ __metadata: "@types/cucumber": ^4.0.4 "@types/express": 4.17.13 "@types/express-jwt": 6.0.2 - "@types/fs-extra": 9.0.12 - "@types/node": ^10.7.1 - "@types/uuid": 8.3.1 + "@types/fs-extra": 9.0.13 + "@types/node": ^10.17.60 + "@types/uuid": 8.3.4 async-exit-hook: 2.0.1 axios: ^0.27.2 chai: ^4.1.2 @@ -6534,7 +6542,7 @@ __metadata: cucumber: ^5.0.3 dotenv: ^16.0.1 fabric-network: 2.2.10 - fs-extra: 10.0.0 + fs-extra: 10.1.0 hardhat: 2.6.0 http-status-codes: 2.1.4 ipfs-http-client: 51.0.1 @@ -6563,7 +6571,7 @@ __metadata: "@types/escape-html": 1.0.1 "@types/express": 4.17.13 "@types/jsrsasign": 10.5.8 - "@types/node": 14.18.12 + "@types/node": 14.18.54 axios: 0.24.0 body-parser: 1.19.2 cookie-parser: 1.4.6 @@ -6597,7 +6605,7 @@ __metadata: "@hyperledger/cactus-verifier-client": 2.0.0-alpha.1 "@types/escape-html": 1.0.1 "@types/express": 4.17.13 - "@types/node": 14.18.12 + "@types/node": 14.18.54 "@typescript-eslint/eslint-plugin": 4.33.0 "@typescript-eslint/parser": 4.33.0 body-parser: 1.19.2 @@ -6605,7 +6613,7 @@ __metadata: debug: 3.1.0 escape-html: 1.0.3 eslint: 7.32.0 - eslint-config-prettier: 8.4.0 + eslint-config-prettier: 8.10.0 eslint-plugin-prettier: 4.0.0 ethereumjs-common: 1.5.2 ethereumjs-tx: 2.1.2 @@ -6617,7 +6625,7 @@ __metadata: jsonwebtoken: 9.0.0 log4js: 6.4.0 morgan: 1.9.1 - prettier: 2.5.1 + prettier: 2.8.8 shelljs: 0.8.5 socket.io: 4.5.4 ts-node: 8.9.1 @@ -6644,7 +6652,7 @@ __metadata: "@hyperledger/cactus-plugin-ledger-connector-quorum": 2.0.0-alpha.1 "@hyperledger/cactus-test-tooling": 2.0.0-alpha.1 "@types/express": 4.17.13 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 async-exit-hook: 2.0.1 axios: 0.21.4 dotenv: 16.0.0 @@ -6675,7 +6683,7 @@ __metadata: "@hyperledger/cactus-plugin-ledger-connector-quorum": 2.0.0-alpha.1 "@types/express": 4.17.13 "@types/ssh2": 0.5.47 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 async-exit-hook: 2.0.1 axios: 0.21.4 express: 4.17.3 @@ -6736,7 +6744,7 @@ __metadata: "@types/cookie-parser": 1.4.2 "@types/escape-html": 1.0.1 "@types/express": 4.17.13 - "@types/node": 14.18.12 + "@types/node": 14.18.54 "@typescript-eslint/eslint-plugin": 4.33.0 "@typescript-eslint/parser": 4.33.0 body-parser: 1.19.2 @@ -6744,7 +6752,7 @@ __metadata: debug: 2.6.9 escape-html: 1.0.3 eslint: 7.32.0 - eslint-config-prettier: 8.4.0 + eslint-config-prettier: 8.10.0 eslint-plugin-prettier: 4.0.0 ethereumjs-common: 1.5.2 ethereumjs-tx: 2.1.2 @@ -6756,7 +6764,7 @@ __metadata: jsonwebtoken: 8.5.1 log4js: 6.4.0 morgan: 1.9.1 - prettier: 2.5.1 + prettier: 2.8.8 shelljs: 0.8.5 socket.io: 4.5.4 ts-node: 8.9.1 @@ -6770,7 +6778,7 @@ __metadata: resolution: "@hyperledger/cactus-examples-check-connection-ethereum-validator@workspace:examples/cactus-check-connection-ethereum-validator" dependencies: "@types/escape-html": 1.0.1 - "@types/node": 15.14.7 + "@types/node": 15.14.9 escape-html: 1.0.3 socket.io: 4.5.4 languageName: unknown @@ -6785,7 +6793,7 @@ __metadata: "@hyperledger/cactus-core-api": 2.0.0-alpha.1 "@types/express": 4.17.13 "@types/json-stable-stringify": 1.0.33 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 axios: 0.21.4 body-parser: 1.19.0 express: 4.17.3 @@ -6940,7 +6948,7 @@ __metadata: "@hyperledger/cactus-core-api": 2.0.0-alpha.1 "@types/express": 4.17.13 axios: 0.21.4 - cpy-cli: 4.1.0 + cpy-cli: 4.2.0 del-cli: 4.0.1 express: 4.17.1 prom-client: 13.2.0 @@ -6976,7 +6984,7 @@ __metadata: "@types/internal-ip": 4.1.0 "@types/request": 2.48.7 "@types/tape-promise": 4.0.1 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 axios: 0.21.4 express: 4.17.3 http-status-codes: 2.1.4 @@ -7028,7 +7036,7 @@ __metadata: "@types/express": 4.17.13 "@types/http-errors": 2.0.1 "@types/jsonwebtoken": 9.0.2 - "@types/node": 14.17.32 + "@types/node": 14.18.54 "@types/sanitize-html": 2.6.2 axios: 0.27.2 body-parser: 1.20.2 @@ -7086,7 +7094,7 @@ __metadata: "@types/http-errors": 2.0.1 "@types/jsrsasign": 10.5.8 "@types/lodash": 4.14.195 - "@types/node": 14.17.32 + "@types/node": 14.18.54 body-parser: 1.17.2 cookie-parser: 1.4.6 debug: 3.1.0 @@ -7094,7 +7102,7 @@ __metadata: fabric-ca-client: 1.4.19 fabric-client: 1.4.19 fabric-network: 1.4.19 - fs-extra: 10.0.0 + fs-extra: 10.1.0 grpc: 1.24.11 js-yaml: 3.14.1 jsonwebtoken: 9.0.0 @@ -7121,13 +7129,13 @@ __metadata: "@hyperledger/cactus-test-tooling": 2.0.0-alpha.1 "@types/bn.js": 5.1.0 "@types/express": 4.17.13 - "@types/fs-extra": 9.0.12 + "@types/fs-extra": 9.0.13 "@types/jsrsasign": 8.0.13 "@types/multer": 1.4.7 "@types/node-vault": 0.9.13 "@types/sanitize-html": 2.6.2 "@types/temp": 0.9.1 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 axios: 0.21.4 bl: 5.0.0 bn.js: 4.12.0 @@ -7138,7 +7146,7 @@ __metadata: fabric-protos: 2.5.0-snapshot.23 fast-safe-stringify: 2.1.1 form-data: 4.0.0 - fs-extra: 10.0.0 + fs-extra: 10.1.0 http-status-codes: 2.1.4 internal-ip: 6.2.0 jsrsasign: 10.5.25 @@ -7174,7 +7182,7 @@ __metadata: "@types/cookie-parser": 1.4.3 "@types/express": 4.17.13 "@types/http-errors": 2.0.1 - "@types/node": 15.14.7 + "@types/node": 15.14.9 "@types/shelljs": 0.8.12 body-parser: 1.17.2 cookie-parser: 1.4.6 @@ -7299,7 +7307,7 @@ __metadata: "@types/cookie-parser": 1.4.3 "@types/express": 4.17.13 "@types/http-errors": 2.0.1 - "@types/node": 14.17.32 + "@types/node": 14.18.54 body-parser: 1.17.2 cbor: 6.0.1 cookie-parser: 1.4.6 @@ -7325,7 +7333,7 @@ __metadata: "@types/cookie-parser": 1.4.3 "@types/express": 4.17.13 "@types/http-errors": 2.0.1 - "@types/node": 14.17.32 + "@types/node": 14.18.54 body-parser: 1.17.2 cbor: 6.0.1 config: 3.3.7 @@ -7415,13 +7423,13 @@ __metadata: "@hyperledger/cactus-test-tooling": 2.0.0-alpha.1 "@types/crypto-js": 4.0.1 "@types/express": 4.17.8 - "@types/tape": 4.13.0 + "@types/tape": 4.13.4 axios: 0.21.4 crypto-js: 4.0.0 fabric-network: 2.2.18 ipfs-http-client: 51.0.1 knex: 2.4.0 - secp256k1: 4.0.2 + secp256k1: 4.0.3 socket.io: 4.5.4 sqlite3: 5.1.5 typescript: 4.9.5 @@ -7472,7 +7480,7 @@ __metadata: "@hyperledger/cactus-test-tooling": 2.0.0-alpha.1 "@types/express": 4.17.13 "@types/pg": 8.6.5 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 axios: 0.21.4 body-parser: 1.19.0 express: 4.17.1 @@ -7619,7 +7627,7 @@ __metadata: "@hyperledger/cactus-common": 2.0.0-alpha.1 "@types/dockerode": 3.2.7 "@types/esm": 3.2.0 - "@types/fs-extra": 9.0.12 + "@types/fs-extra": 9.0.13 "@types/js-yaml": 4.0.3 "@types/lodash": 4.14.172 "@types/node-forge": 1.3.0 @@ -7635,7 +7643,7 @@ __metadata: execa: 5.1.1 fabric-ca-client: 2.5.0-snapshot.23 fabric-network: 2.5.0-snapshot.23 - fs-extra: 10.0.0 + fs-extra: 10.1.0 internal-ip: 6.2.0 is-port-reachable: 3.0.0 joi: 17.9.1 @@ -7668,7 +7676,7 @@ __metadata: "@hyperledger/cactus-plugin-ledger-connector-go-ethereum-socketio": 2.0.0-alpha.1 "@hyperledger/cactus-test-tooling": 2.0.0-alpha.1 "@hyperledger/cactus-verifier-client": 2.0.0-alpha.1 - "@types/node": 14.17.32 + "@types/node": 14.18.54 log4js: 6.4.1 web3: 1.7.3 languageName: unknown @@ -7707,77 +7715,76 @@ __metadata: version: 0.0.0-use.local resolution: "@hyperledger/cactus@workspace:." dependencies: - "@commitlint/cli": 13.1.0 - "@commitlint/config-conventional": 13.1.0 + "@commitlint/cli": 13.2.1 + "@commitlint/config-conventional": 13.2.0 "@lerna-lite/cli": 1.17.0 "@lerna-lite/exec": 1.17.0 "@lerna-lite/list": 1.17.0 "@lerna-lite/run": 1.17.0 - "@openapitools/openapi-generator-cli": 2.4.14 - "@types/fs-extra": 9.0.12 + "@openapitools/openapi-generator-cli": 2.7.0 + "@types/fs-extra": 9.0.13 "@types/jest": 29.5.3 - "@types/node": 15.14.7 - "@types/node-fetch": 2.5.12 - "@types/tape": 4.13.2 + "@types/node": 16.18.41 + "@types/node-fetch": 2.6.4 + "@types/tape": 4.13.4 "@types/tape-promise": 4.0.1 - "@types/uuid": 8.3.1 + "@types/uuid": 8.3.4 "@types/yargs": 17.0.24 - "@typescript-eslint/eslint-plugin": 6.0.0 - "@typescript-eslint/parser": 6.0.0 + "@typescript-eslint/eslint-plugin": 6.4.0 + "@typescript-eslint/parser": 6.4.0 buffer: 6.0.3 - codecov: 3.8.3 - cpy-cli: 4.1.0 + cpy-cli: 4.2.0 cross-env: 7.0.3 crypto-browserify: 3.12.0 - cspell: 5.6.6 + cspell: 5.21.2 del-cli: 4.0.1 - es-main: 1.0.2 + es-main: 1.2.0 eslint: 7.32.0 - eslint-config-prettier: 8.3.0 + eslint-config-prettier: 8.10.0 eslint-config-standard: 16.0.3 - eslint-plugin-import: 2.24.0 + eslint-plugin-import: 2.28.1 eslint-plugin-node: 11.1.0 - eslint-plugin-prettier: 3.4.0 - eslint-plugin-promise: 5.1.0 + eslint-plugin-prettier: 3.4.1 + eslint-plugin-promise: 5.2.0 eslint-plugin-standard: 5.0.0 fast-safe-stringify: 2.1.1 - fs-extra: 10.0.0 - globby: 12.0.0 + fs-extra: 10.1.0 + globby: 12.2.0 google-protobuf: 3.21.2 - grpc-tools: 1.11.2 - grpc_tools_node_protoc_ts: 5.3.1 - husky: 7.0.1 - inquirer: 8.1.2 + grpc-tools: 1.12.4 + grpc_tools_node_protoc_ts: 5.3.3 + husky: 7.0.4 + inquirer: 8.2.6 jest: 29.6.2 jest-extended: 4.0.1 - json5: 2.2.2 + json5: 2.2.3 license-report: 6.4.0 - lint-staged: 11.1.2 - make-dir-cli: 3.0.0 + lint-staged: 11.2.6 + make-dir-cli: 3.1.0 node-polyfill-webpack-plugin: 1.1.4 npm-run-all: 4.1.5 npm-watch: 0.11.0 openapi-types: 12.1.3 - prettier: 2.1.2 + prettier: 2.8.8 protoc-gen-ts: 0.8.6 run-time-error: 1.4.0 - secp256k1: 4.0.2 + secp256k1: 4.0.3 semver-parser: 4.1.4 shebang-loader: 0.0.1 simple-git: 3.19.1 - sort-package-json: 1.53.1 - source-map-loader: 3.0.0 + sort-package-json: 1.57.0 + source-map-loader: 3.0.2 stream-browserify: 3.0.0 - tap: 16.3.7 - tape: 5.6.3 + tap: 16.3.8 + tape: 5.6.6 tape-promise: 4.0.0 ts-jest: 29.1.1 - ts-loader: 9.2.5 + ts-loader: 9.4.4 ts-node: 10.9.1 typescript: 4.9.5 - webpack: 5.76.0 - webpack-bundle-analyzer: 4.4.2 - webpack-cli: 4.7.2 + webpack: 5.88.2 + webpack-bundle-analyzer: 4.9.0 + webpack-cli: 4.10.0 wget-improved: 3.4.0 yargs: 17.7.2 dependenciesMeta: @@ -8368,6 +8375,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/source-map@npm:^0.3.3": + version: 0.3.5 + resolution: "@jridgewell/source-map@npm:0.3.5" + dependencies: + "@jridgewell/gen-mapping": ^0.3.0 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 1ad4dec0bdafbade57920a50acec6634f88a0eb735851e0dda906fa9894e7f0549c492678aad1a10f8e144bfe87f238307bf2a914a1bc85b7781d345417e9f6f + languageName: node + linkType: hard + "@jridgewell/sourcemap-codec@npm:1.4.14": version: 1.4.14 resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" @@ -8700,6 +8717,29 @@ __metadata: languageName: node linkType: hard +"@ljharb/resumer@npm:^0.0.1": + version: 0.0.1 + resolution: "@ljharb/resumer@npm:0.0.1" + dependencies: + "@ljharb/through": ^2.3.9 + checksum: 1cff0a485cb857933d2921cb05a349f8fe894fa2bb6b31a347010ecccc4a2b369e43ebe5383a32a60ee6c9572d2c83fcab383eb01727e1507bf29c59f312dae6 + languageName: node + linkType: hard + +"@ljharb/through@npm:^2.3.9": + version: 2.3.9 + resolution: "@ljharb/through@npm:2.3.9" + checksum: a47ffed12ef4b08d07458db8bff5f7a13a7030fddf7dbfa947a765581a634d42ee90f7b8c249315aad122c21ad061e97a74f65aef3c03d2c09291d11312f0bfb + languageName: node + linkType: hard + +"@lukeed/csprng@npm:^1.0.0": + version: 1.1.0 + resolution: "@lukeed/csprng@npm:1.1.0" + checksum: 926f5f7fc629470ca9a8af355bfcd0271d34535f7be3890f69902432bddc3262029bb5dbe9025542cf6c9883d878692eef2815fc2f3ba5b92e9da1f9eba2e51b + languageName: node + linkType: hard + "@mapbox/node-pre-gyp@npm:^1.0.0, @mapbox/node-pre-gyp@npm:^1.0.4, @mapbox/node-pre-gyp@npm:^1.0.5": version: 1.0.9 resolution: "@mapbox/node-pre-gyp@npm:1.0.9" @@ -8732,16 +8772,28 @@ __metadata: languageName: node linkType: hard -"@nestjs/common@npm:8.2.0": - version: 8.2.0 - resolution: "@nestjs/common@npm:8.2.0" +"@nestjs/axios@npm:0.1.0": + version: 0.1.0 + resolution: "@nestjs/axios@npm:0.1.0" + dependencies: + axios: 0.27.2 + peerDependencies: + "@nestjs/common": ^7.0.0 || ^8.0.0 || ^9.0.0 + reflect-metadata: ^0.1.12 + rxjs: ^6.0.0 || ^7.0.0 + checksum: 72929b25caacb85517bae962b13d865a31aa3984aa9e55305e0a2306e54338fe51a7eb38ca38cab0fe8b4116fb35219bd02c8b0c4cac70e7b5aeb84d03a1db3f + languageName: node + linkType: hard + +"@nestjs/common@npm:9.3.11": + version: 9.3.11 + resolution: "@nestjs/common@npm:9.3.11" dependencies: - axios: 0.24.0 iterare: 1.2.1 - tslib: 2.3.1 - uuid: 8.3.2 + tslib: 2.5.0 + uid: 2.0.1 peerDependencies: - cache-manager: "*" + cache-manager: <=5 class-transformer: "*" class-validator: "*" reflect-metadata: ^0.1.12 @@ -8753,26 +8805,25 @@ __metadata: optional: true class-validator: optional: true - checksum: d6adb3862ac4583d8ed0d71d9044db3070debac7680c4b6438b003753240ee4b4f8b885eb1d06e878fd177748b50539e760b4da08f5ea323717c768b774f1e56 + checksum: c39dfa9f02268e3f7fa22c4e9eecff0cfbee39c4d4dd0efc757a52117696dc9aec1f87588252b8b267a18469a6c12987707708b44f97ccbb5c6297396c0d9c00 languageName: node linkType: hard -"@nestjs/core@npm:8.2.0": - version: 8.2.0 - resolution: "@nestjs/core@npm:8.2.0" +"@nestjs/core@npm:9.3.11": + version: 9.3.11 + resolution: "@nestjs/core@npm:9.3.11" dependencies: "@nuxtjs/opencollective": 0.3.2 fast-safe-stringify: 2.1.1 iterare: 1.2.1 - object-hash: 2.2.0 path-to-regexp: 3.2.0 - tslib: 2.3.1 - uuid: 8.3.2 + tslib: 2.5.0 + uid: 2.0.1 peerDependencies: - "@nestjs/common": ^8.0.0 - "@nestjs/microservices": ^8.0.0 - "@nestjs/platform-express": ^8.0.0 - "@nestjs/websockets": ^8.0.0 + "@nestjs/common": ^9.0.0 + "@nestjs/microservices": ^9.0.0 + "@nestjs/platform-express": ^9.0.0 + "@nestjs/websockets": ^9.0.0 reflect-metadata: ^0.1.12 rxjs: ^7.1.0 peerDependenciesMeta: @@ -8782,7 +8833,7 @@ __metadata: optional: true "@nestjs/websockets": optional: true - checksum: 31acfa500f3093905ea9d0173a20b448c93a072b46c7701f7a76089e70efc019877cdb7c2b0b11a27fc4427474aa985f2a8e2c50838e965010b96ae3ee5a1d80 + checksum: 39d49e5b16cc260887233dd6701dbc53c073dc7522975d592f6c355db1f42fcf31eeaf300b9d03c63943f7330ecee910281cb78bb66d1c2d938d9b13491e70b4 languageName: node linkType: hard @@ -9548,28 +9599,29 @@ __metadata: languageName: node linkType: hard -"@openapitools/openapi-generator-cli@npm:2.4.14": - version: 2.4.14 - resolution: "@openapitools/openapi-generator-cli@npm:2.4.14" +"@openapitools/openapi-generator-cli@npm:2.7.0": + version: 2.7.0 + resolution: "@openapitools/openapi-generator-cli@npm:2.7.0" dependencies: - "@nestjs/common": 8.2.0 - "@nestjs/core": 8.2.0 + "@nestjs/axios": 0.1.0 + "@nestjs/common": 9.3.11 + "@nestjs/core": 9.3.11 "@nuxtjs/opencollective": 0.3.2 chalk: 4.1.2 commander: 8.3.0 - compare-versions: 3.6.0 - concurrently: 6.3.0 + compare-versions: 4.1.4 + concurrently: 6.5.1 console.table: 0.10.0 - fs-extra: 10.0.0 + fs-extra: 10.1.0 glob: 7.1.6 - inquirer: 8.2.0 + inquirer: 8.2.5 lodash: 4.17.21 reflect-metadata: 0.1.13 - rxjs: 7.4.0 + rxjs: 7.8.0 tslib: 2.0.3 bin: openapi-generator-cli: main.js - checksum: 619ce8ed58f917981e2c7e185ce9abbdbcf35da099521786a4c8cca6a8169e9e4b1d041c996ec01d79076fe764a752d433bb98e26489087ccacb8496764a9119 + checksum: 92ca36779b43fe1e4868cd89bde4cb96918868aa62c8a69a9e199711d8e7093bab67f484d266fcbf37ca4ad87e4e91ea5759fb322c7999a299f5bfdc179065b8 languageName: node linkType: hard @@ -11385,6 +11437,13 @@ __metadata: languageName: node linkType: hard +"@types/estree@npm:^1.0.0": + version: 1.0.1 + resolution: "@types/estree@npm:1.0.1" + checksum: e9aa175eacb797216fafce4d41e8202c7a75555bc55232dee0f9903d7171f8f19f0ae7d5191bb1a88cb90e65468be508c0df850a9fb81b4433b293a5a749899d + languageName: node + linkType: hard + "@types/express-http-proxy@npm:1.6.2": version: 1.6.2 resolution: "@types/express-http-proxy@npm:1.6.2" @@ -11494,12 +11553,12 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:9.0.12": - version: 9.0.12 - resolution: "@types/fs-extra@npm:9.0.12" +"@types/fs-extra@npm:9.0.13": + version: 9.0.13 + resolution: "@types/fs-extra@npm:9.0.13" dependencies: "@types/node": "*" - checksum: c63834f0be8d0993c55abcc0b2c90f3c095cf3aa9e827973472167bd93687df9da546bd5e0823ddc9e83e1651c9cfb09bbac99fa57a15ab28fd21280426e472c + checksum: add79e212acd5ac76b97b9045834e03a7996aef60a814185e0459088fd290519a3c1620865d588fa36c4498bf614210d2a703af5cf80aa1dbc125db78f6edac3 languageName: node linkType: hard @@ -11624,7 +11683,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:^7.0.11": +"@types/json-schema@npm:^7.0.12": version: 7.0.12 resolution: "@types/json-schema@npm:7.0.12" checksum: 00239e97234eeb5ceefb0c1875d98ade6e922bfec39dd365ec6bd360b5c2f825e612ac4f6e5f1d13601b8b30f378f15e6faa805a3a732f4a1bbe61915163d293 @@ -11826,13 +11885,13 @@ __metadata: languageName: node linkType: hard -"@types/node-fetch@npm:2.5.12": - version: 2.5.12 - resolution: "@types/node-fetch@npm:2.5.12" +"@types/node-fetch@npm:2.6.4": + version: 2.6.4 + resolution: "@types/node-fetch@npm:2.6.4" dependencies: "@types/node": "*" form-data: ^3.0.0 - checksum: ad63c85ba6a9477b8e057ec8682257738130d98e8ece4e31141789bd99df9d9147985cc8bc0cb5c8983ed5aa6bb95d46df23d1e055f4ad5cf8b82fc69cf626c7 + checksum: f3e1d881bb42269e676ecaf49f0e096ab345e22823a2b2d071d60619414817fe02df48a31a8d05adb23054028a2a65521bdb3906ceb763ab6d3339c8d8775058 languageName: node linkType: hard @@ -11887,42 +11946,28 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:14.17.32": - version: 14.17.32 - resolution: "@types/node@npm:14.17.32" - checksum: c3ec45db5d8ca6ed80bcc2fe3cd9f15c1518d43cf048dd5444d1fcbe308d302a42721cb3f19548ac2e7b8b7db4f7f6cd4bf9ed58ab1d30a0bf61758350edd9d5 +"@types/node@npm:14.18.54": + version: 14.18.54 + resolution: "@types/node@npm:14.18.54" + checksum: 9fd66f91fcd8e9b25067f784a9c60bd710ef86a89c838c131ab2b1921398adc53b1c70d741bceed48bb2403b75c434b1bbbb255240773819cde36295c4b6abf1 languageName: node linkType: hard -"@types/node@npm:14.18.12": - version: 14.18.12 - resolution: "@types/node@npm:14.18.12" - checksum: 8a0273caa0584020adb8802784fc7d4f18f05e6c205335b7f3818a91d6b0c22736b9f51da3428d5bc54076ad47f1a4d6d57990a3ce8489a520ac66b2b3ff24bc +"@types/node@npm:15.14.9": + version: 15.14.9 + resolution: "@types/node@npm:15.14.9" + checksum: 49f7f0522a3af4b8389aee660e88426490cd54b86356672a1fedb49919a8797c00d090ec2dcc4a5df34edc2099d57fc2203d796c4e7fbd382f2022ccd789eee7 languageName: node linkType: hard -"@types/node@npm:15.14.7": - version: 15.14.7 - resolution: "@types/node@npm:15.14.7" - checksum: 9622cc3d46cbc434f690c0d086ca61fa43df1bbc28276b857452ea56a33e1b61345d4bd6c9393cd73dd9c3b78222ca86e1b96d0c5e37b6edac98fa21f8482ba0 +"@types/node@npm:16.18.41": + version: 16.18.41 + resolution: "@types/node@npm:16.18.41" + checksum: b12650d8e4289edafcf0453c8a66c00d6397d465a48b1c683babba4f16f92a6418f678e98a85751e3fef78d23c2b07f641df8da14bf5428ad8282b57b2695243 languageName: node linkType: hard -"@types/node@npm:16.11.7": - version: 16.11.7 - resolution: "@types/node@npm:16.11.7" - checksum: 2706403e6efc4aa40fdce8f0b5d9884d5600c3c8610aedc7fa5e7e298d30366f7e8b7296028d52898dca3edef4c3e827b03bf20952c4780f13fa4e79864f7a86 - languageName: node - linkType: hard - -"@types/node@npm:16.18.40": - version: 16.18.40 - resolution: "@types/node@npm:16.18.40" - checksum: a683930491b4fd7cb2dc7684e32bbeedc4a83fb1949a7b15ea724fbfaa9988cec59091f169a3f1090cb91992caba8c1a7d50315b2c67c6e2579a3788bb09eec4 - languageName: node - linkType: hard - -"@types/node@npm:^10.1.0, @types/node@npm:^10.7.1": +"@types/node@npm:^10.1.0, @types/node@npm:^10.17.60": version: 10.17.60 resolution: "@types/node@npm:10.17.60" checksum: 2cdb3a77d071ba8513e5e8306fa64bf50e3c3302390feeaeff1fd325dd25c8441369715dfc8e3701011a72fed5958c7dfa94eb9239a81b3c286caa4d97db6eef @@ -12151,7 +12196,7 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.3.12": +"@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0": version: 7.5.0 resolution: "@types/semver@npm:7.5.0" checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2 @@ -12280,7 +12325,7 @@ __metadata: languageName: node linkType: hard -"@types/tape@npm:*, @types/tape@npm:4.13.2": +"@types/tape@npm:*": version: 4.13.2 resolution: "@types/tape@npm:4.13.2" dependencies: @@ -12289,12 +12334,13 @@ __metadata: languageName: node linkType: hard -"@types/tape@npm:4.13.0": - version: 4.13.0 - resolution: "@types/tape@npm:4.13.0" +"@types/tape@npm:4.13.4": + version: 4.13.4 + resolution: "@types/tape@npm:4.13.4" dependencies: "@types/node": "*" - checksum: cf4865af198f169069de0f545d9460299ffff68b4ac9bb071dbe757a03c5740e067918c9993c536fd423333f9e5f1030b6a4060fc38a7ecb7c47a682473c3078 + "@types/through": "*" + checksum: d69eada4645076a18bd728aa2cab9400082b1ad2124089c6e0e2931bf98fdad16579e9051db1f922c28ae0cb5f9ad2e88fac4ba9c5ba18e8400cc7558f28803d languageName: node linkType: hard @@ -12316,6 +12362,15 @@ __metadata: languageName: node linkType: hard +"@types/through@npm:*": + version: 0.0.30 + resolution: "@types/through@npm:0.0.30" + dependencies: + "@types/node": "*" + checksum: 9578470db0b527c26e246a1220ae9bffc6bf47f20f89c54aac467c083ab1f7e16c00d9a7b4bb6cb4e2dfae465027270827e5908a6236063f6214625e50585d78 + languageName: node + linkType: hard + "@types/tough-cookie@npm:*, @types/tough-cookie@npm:^4.0.0": version: 4.0.1 resolution: "@types/tough-cookie@npm:4.0.1" @@ -12332,10 +12387,10 @@ __metadata: languageName: node linkType: hard -"@types/uuid@npm:8.3.1": - version: 8.3.1 - resolution: "@types/uuid@npm:8.3.1" - checksum: b41bdc5e86c6f0f1899306be10455636da0f2168c9489b869edd6837ddeb7c0e501b1ff7d857402462986bada2a379125743dd895fa801d03437cd632116a373 +"@types/uuid@npm:8.3.4": + version: 8.3.4 + resolution: "@types/uuid@npm:8.3.4" + checksum: 6f11f3ff70f30210edaa8071422d405e9c1d4e53abbe50fdce365150d3c698fe7bbff65c1e71ae080cbfb8fded860dbb5e174da96fdbbdfcaa3fb3daa474d20f languageName: node linkType: hard @@ -12449,18 +12504,18 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/eslint-plugin@npm:5.54.1" +"@typescript-eslint/eslint-plugin@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0" dependencies: - "@typescript-eslint/scope-manager": 5.54.1 - "@typescript-eslint/type-utils": 5.54.1 - "@typescript-eslint/utils": 5.54.1 + "@eslint-community/regexpp": ^4.4.0 + "@typescript-eslint/scope-manager": 5.62.0 + "@typescript-eslint/type-utils": 5.62.0 + "@typescript-eslint/utils": 5.62.0 debug: ^4.3.4 - grapheme-splitter: ^1.0.4 + graphemer: ^1.4.0 ignore: ^5.2.0 natural-compare-lite: ^1.4.0 - regexpp: ^3.2.0 semver: ^7.3.7 tsutils: ^3.21.0 peerDependencies: @@ -12469,26 +12524,24 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 76476c08ca0142a9bf6e2381f5cd1c037d86fbafa9c0dded4a97bd3b23b5962dd2c3943bade11b21d674195674f0e36dbf80faa15a1906f5a2ca1f699baf1dd5 + checksum: fc104b389c768f9fa7d45a48c86d5c1ad522c1d0512943e782a56b1e3096b2cbcc1eea3fcc590647bf0658eef61aac35120a9c6daf979bf629ad2956deb516a1 languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.0.0" +"@typescript-eslint/eslint-plugin@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.4.0" dependencies: - "@eslint-community/regexpp": ^4.5.0 - "@typescript-eslint/scope-manager": 6.0.0 - "@typescript-eslint/type-utils": 6.0.0 - "@typescript-eslint/utils": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 + "@eslint-community/regexpp": ^4.5.1 + "@typescript-eslint/scope-manager": 6.4.0 + "@typescript-eslint/type-utils": 6.4.0 + "@typescript-eslint/utils": 6.4.0 + "@typescript-eslint/visitor-keys": 6.4.0 debug: ^4.3.4 - grapheme-splitter: ^1.0.4 graphemer: ^1.4.0 ignore: ^5.2.4 natural-compare: ^1.4.0 - natural-compare-lite: ^1.4.0 - semver: ^7.5.0 + semver: ^7.5.4 ts-api-utils: ^1.0.1 peerDependencies: "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha @@ -12496,7 +12549,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 863f30b8ceb24d104fc8a41774e4f597a35525533aa99721198293b51628a2d986dcc6413893f27eb9db5a49c2fd2cc91d3aece8ed23d590f3eb4e9939c3d6ad + checksum: d59e88228a4088f3dcaa614103eefa7a0c57315ed79ee1c48afd9817ad013522aa9a9f987e90e1fd7dccc0bbb03ed23e4df6f5ea5cceef8856db33c78ea13d53 languageName: node linkType: hard @@ -12566,38 +12619,38 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/parser@npm:5.54.1" +"@typescript-eslint/parser@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/parser@npm:5.62.0" dependencies: - "@typescript-eslint/scope-manager": 5.54.1 - "@typescript-eslint/types": 5.54.1 - "@typescript-eslint/typescript-estree": 5.54.1 + "@typescript-eslint/scope-manager": 5.62.0 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/typescript-estree": 5.62.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: f466513d306ca926b97c2cec1eebaf2cd15d45bd5633a4358f23ba9a4de1b0ec4630b1c20abc395943934ed1d2ef65f545fd6737c317a7abe579612101e8a83f + checksum: d168f4c7f21a7a63f47002e2d319bcbb6173597af5c60c1cf2de046b46c76b4930a093619e69faf2d30214c29ab27b54dcf1efc7046a6a6bd6f37f59a990e752 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/parser@npm:6.0.0" +"@typescript-eslint/parser@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/parser@npm:6.4.0" dependencies: - "@typescript-eslint/scope-manager": 6.0.0 - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/typescript-estree": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 + "@typescript-eslint/scope-manager": 6.4.0 + "@typescript-eslint/types": 6.4.0 + "@typescript-eslint/typescript-estree": 6.4.0 + "@typescript-eslint/visitor-keys": 6.4.0 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: a22f0c8f67eb244134f9d79d78faf1b6e2c0965495d78eef94a5680868f3d0fd9446a3ce5dc1e36dde02587da5d962944f3d83679c712d0b819ac99cdb9f7143 + checksum: 36c8dbeacfc03af9c5a4a0f065861ac6f3747fc64be582a32b0b084de5b5247cef086a0c0052291b97145e0ea8f82acbec452dd927b7b7a1917d56381d59a17c languageName: node linkType: hard @@ -12611,32 +12664,32 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/scope-manager@npm:5.54.1" +"@typescript-eslint/scope-manager@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/scope-manager@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.54.1 - "@typescript-eslint/visitor-keys": 5.54.1 - checksum: 9add24cf3a7852634ad0680a827646860ac4698a6ac8aae31e8b781e29f59e84b51f0cdaacffd0747811012647f01b51969d988da9b302ead374ceebffbe204b + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/visitor-keys": 5.62.0 + checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/scope-manager@npm:6.0.0" +"@typescript-eslint/scope-manager@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/scope-manager@npm:6.4.0" dependencies: - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 - checksum: 450015be6454f953d0ea0da020ab47597e96a7a15c1002eed16c57430783bd7b045513d57a126606fb35e8971f1ce65fbefd845e3b5496bf75284cbe1681d0b9 + "@typescript-eslint/types": 6.4.0 + "@typescript-eslint/visitor-keys": 6.4.0 + checksum: 19406eac3a1899f77eb7c3aa52577e2146075e1318c6eb34d220678afa167832b89c90860714f33b99e107544b48f6970594ca4bcf48c5ede8f2a14a0795ba33 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/type-utils@npm:5.54.1" +"@typescript-eslint/type-utils@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/type-utils@npm:5.62.0" dependencies: - "@typescript-eslint/typescript-estree": 5.54.1 - "@typescript-eslint/utils": 5.54.1 + "@typescript-eslint/typescript-estree": 5.62.0 + "@typescript-eslint/utils": 5.62.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -12644,16 +12697,16 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 0073838b782b7f4619775be124ca6643fec43a2d56043eaf3ceb100960a5193f14ac747b28ce17a5c9ac643fdee8abda82a7d905c81521358de7b27a2dcbc9af + checksum: fc41eece5f315dfda14320be0da78d3a971d650ea41300be7196934b9715f3fe1120a80207551eb71d39568275dbbcf359bde540d1ca1439d8be15e9885d2739 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/type-utils@npm:6.0.0" +"@typescript-eslint/type-utils@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/type-utils@npm:6.4.0" dependencies: - "@typescript-eslint/typescript-estree": 6.0.0 - "@typescript-eslint/utils": 6.0.0 + "@typescript-eslint/typescript-estree": 6.4.0 + "@typescript-eslint/utils": 6.4.0 debug: ^4.3.4 ts-api-utils: ^1.0.1 peerDependencies: @@ -12661,7 +12714,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 53f46237891cfa738f6a4bc766a4dbb8d745b1cb9cbe2d2b40f2a4abcf0327d4aa92d9ce5361e87cd26d82e0159f358e28b0c67759eb053c4fd752654dc9dcb1 + checksum: 7930d2ffdc844a5b706d48ae3e4584882f7f0c06d581a3b06bc280a351c55974b16dbb73f1842f7389f04b80c2cfaf867edd2f261b699804d8a4fea9c20b3869 languageName: node linkType: hard @@ -12679,17 +12732,17 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/types@npm:5.54.1" - checksum: 84a8f725cfa10646af389659e09c510c38d82c65960c7b613f844a264acc0e197471cba03f3e8f4b6411bc35dca28922c8352a7bd44621411c73fd6dd4096da2 +"@typescript-eslint/types@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/types@npm:5.62.0" + checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/types@npm:6.0.0" - checksum: a2e232b66b0b057152f4a94d7e0be75f32e389c9c1ec9ed9901ed5aab6e5df08c07bde9865710e315d835e4400ec2232f9c3c525b6edf8a85675ebfbfb69d3a5 +"@typescript-eslint/types@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/types@npm:6.4.0" + checksum: 85b293ad1559dbf8103b2c4cfd0db11c3d9c970d502e2c13d4b1d35e420567042d7077a716d2b4e5113286314d5260f378f242a6dd22ad4b94b4aa69c5f79223 languageName: node linkType: hard @@ -12730,12 +12783,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.54.1" +"@typescript-eslint/typescript-estree@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.54.1 - "@typescript-eslint/visitor-keys": 5.54.1 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/visitor-keys": 5.62.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -12744,61 +12797,60 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ea42bdb4832fa96fa1121237c9b664ac4506e2836646651e08a8542c8601d78af6c288779707f893ca4c884221829bb7d7b4b43c4a9c3ed959519266d03a139b + checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.0.0" +"@typescript-eslint/typescript-estree@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.4.0" dependencies: - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 + "@typescript-eslint/types": 6.4.0 + "@typescript-eslint/visitor-keys": 6.4.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 - semver: ^7.5.0 + semver: ^7.5.4 ts-api-utils: ^1.0.1 peerDependenciesMeta: typescript: optional: true - checksum: 6214ff9cc3c4fd7fe03f846e96a498ecf85916083bb60d419bc5a12142cff912670032b1de5ea52ab353ca7eeb4e1cc8fa475a22958b010043c88e274df49859 + checksum: a8db3896550515d0adf140ee115527b409916c4a14ac1f45b5623d130a27ae2d08a1ac906ceda440b01167c88846e2b91ca2025f3d718bff389948f66990c1e7 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/utils@npm:5.54.1" +"@typescript-eslint/utils@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/utils@npm:5.62.0" dependencies: + "@eslint-community/eslint-utils": ^4.2.0 "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.54.1 - "@typescript-eslint/types": 5.54.1 - "@typescript-eslint/typescript-estree": 5.54.1 + "@typescript-eslint/scope-manager": 5.62.0 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/typescript-estree": 5.62.0 eslint-scope: ^5.1.1 - eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 8f428ea4d338ce85d55fd0c9ae2b217b323f29f51b7c9f8077fef7001ca21d28b032c5e5165b67ae6057aef69edb0e7a164c3c483703be6f3e4e574248bbc399 + checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931 languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/utils@npm:6.0.0" +"@typescript-eslint/utils@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/utils@npm:6.4.0" dependencies: - "@eslint-community/eslint-utils": ^4.3.0 - "@types/json-schema": ^7.0.11 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 6.0.0 - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/typescript-estree": 6.0.0 - eslint-scope: ^5.1.1 - semver: ^7.5.0 + "@eslint-community/eslint-utils": ^4.4.0 + "@types/json-schema": ^7.0.12 + "@types/semver": ^7.5.0 + "@typescript-eslint/scope-manager": 6.4.0 + "@typescript-eslint/types": 6.4.0 + "@typescript-eslint/typescript-estree": 6.4.0 + semver: ^7.5.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 94b9b616282f6fa1ae50ba371a482a3c8c50268ef8039b4e86d29c445e95025c819358a5cc9955c4668482d97ef026e7a49e7f4b3a4685347136ef5bbd297e4d + checksum: abc55382c601c7ed298076548d2df78f15b07ed6830086db6ce1b82d461f0a190ee103a804690ac9205cdca9f373a864e1dd3e20012e9d103f3137963e0aa5ea languageName: node linkType: hard @@ -12821,23 +12873,23 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.54.1" +"@typescript-eslint/visitor-keys@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.54.1 + "@typescript-eslint/types": 5.62.0 eslint-visitor-keys: ^3.3.0 - checksum: 3a691abd2a43b86a0c41526d14a2afcc93a2e0512b5f8b9ec43f6029c493870808036eae5ee4fc655d26e1999017c4a4dffb241f47c36c2a1238ec9fbd08719c + checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.0.0" +"@typescript-eslint/visitor-keys@npm:6.4.0": + version: 6.4.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.4.0" dependencies: - "@typescript-eslint/types": 6.0.0 + "@typescript-eslint/types": 6.4.0 eslint-visitor-keys: ^3.4.1 - checksum: b0d9848a4490174db1d25b5f336548bb11dde4e0ce664c3dc341bed89fb3a3ada091aeb7f5d2d371433815332d93339c6cb77f7a24469c329c3d055b15237bfa + checksum: 42eb614b9c0a49b6929e093757d772fd27fe5dda9c75f4c7820d1710012c8257eea9bd4f1c4173e2265a8a9ad86cefc1a21869893e7304f3b29b94fa1f987554 languageName: node linkType: hard @@ -12866,6 +12918,16 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5": + version: 1.11.6 + resolution: "@webassemblyjs/ast@npm:1.11.6" + dependencies: + "@webassemblyjs/helper-numbers": 1.11.6 + "@webassemblyjs/helper-wasm-bytecode": 1.11.6 + checksum: 38ef1b526ca47c210f30975b06df2faf1a8170b1636ce239fc5738fc231ce28389dd61ecedd1bacfc03cbe95b16d1af848c805652080cb60982836eb4ed2c6cf + languageName: node + linkType: hard + "@webassemblyjs/floating-point-hex-parser@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.1" @@ -12873,6 +12935,13 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/floating-point-hex-parser@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6" + checksum: 29b08758841fd8b299c7152eda36b9eb4921e9c584eb4594437b5cd90ed6b920523606eae7316175f89c20628da14326801090167cc7fbffc77af448ac84b7e2 + languageName: node + linkType: hard + "@webassemblyjs/helper-api-error@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/helper-api-error@npm:1.11.1" @@ -12880,6 +12949,13 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/helper-api-error@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-api-error@npm:1.11.6" + checksum: e8563df85161096343008f9161adb138a6e8f3c2cc338d6a36011aa55eabb32f2fd138ffe63bc278d009ada001cc41d263dadd1c0be01be6c2ed99076103689f + languageName: node + linkType: hard + "@webassemblyjs/helper-buffer@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/helper-buffer@npm:1.11.1" @@ -12887,6 +12963,13 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/helper-buffer@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-buffer@npm:1.11.6" + checksum: b14d0573bf680d22b2522e8a341ec451fddd645d1f9c6bd9012ccb7e587a2973b86ab7b89fe91e1c79939ba96095f503af04369a3b356c8023c13a5893221644 + languageName: node + linkType: hard + "@webassemblyjs/helper-numbers@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/helper-numbers@npm:1.11.1" @@ -12898,6 +12981,17 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/helper-numbers@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-numbers@npm:1.11.6" + dependencies: + "@webassemblyjs/floating-point-hex-parser": 1.11.6 + "@webassemblyjs/helper-api-error": 1.11.6 + "@xtuc/long": 4.2.2 + checksum: f4b562fa219f84368528339e0f8d273ad44e047a07641ffcaaec6f93e5b76fd86490a009aa91a294584e1436d74b0a01fa9fde45e333a4c657b58168b04da424 + languageName: node + linkType: hard + "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1" @@ -12905,6 +12999,13 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6" + checksum: 3535ef4f1fba38de3475e383b3980f4bbf3de72bbb631c2b6584c7df45be4eccd62c6ff48b5edd3f1bcff275cfd605a37679ec199fc91fd0a7705d7f1e3972dc + languageName: node + linkType: hard + "@webassemblyjs/helper-wasm-section@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.1" @@ -12917,6 +13018,18 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/helper-wasm-section@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": 1.11.6 + "@webassemblyjs/helper-buffer": 1.11.6 + "@webassemblyjs/helper-wasm-bytecode": 1.11.6 + "@webassemblyjs/wasm-gen": 1.11.6 + checksum: b2cf751bf4552b5b9999d27bbb7692d0aca75260140195cb58ea6374d7b9c2dc69b61e10b211a0e773f66209c3ddd612137ed66097e3684d7816f854997682e9 + languageName: node + linkType: hard + "@webassemblyjs/ieee754@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/ieee754@npm:1.11.1" @@ -12926,6 +13039,15 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/ieee754@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/ieee754@npm:1.11.6" + dependencies: + "@xtuc/ieee754": ^1.2.0 + checksum: 13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de + languageName: node + linkType: hard + "@webassemblyjs/leb128@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/leb128@npm:1.11.1" @@ -12935,6 +13057,15 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/leb128@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/leb128@npm:1.11.6" + dependencies: + "@xtuc/long": 4.2.2 + checksum: 7ea942dc9777d4b18a5ebfa3a937b30ae9e1d2ce1fee637583ed7f376334dd1d4274f813d2e250056cca803e0952def4b954913f1a3c9068bcd4ab4ee5143bf0 + languageName: node + linkType: hard + "@webassemblyjs/utf8@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/utf8@npm:1.11.1" @@ -12942,6 +13073,13 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/utf8@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/utf8@npm:1.11.6" + checksum: 807fe5b5ce10c390cfdd93e0fb92abda8aebabb5199980681e7c3743ee3306a75729bcd1e56a3903980e96c885ee53ef901fcbaac8efdfa480f9c0dae1d08713 + languageName: node + linkType: hard + "@webassemblyjs/wasm-edit@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/wasm-edit@npm:1.11.1" @@ -12958,6 +13096,22 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/wasm-edit@npm:^1.11.5": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-edit@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": 1.11.6 + "@webassemblyjs/helper-buffer": 1.11.6 + "@webassemblyjs/helper-wasm-bytecode": 1.11.6 + "@webassemblyjs/helper-wasm-section": 1.11.6 + "@webassemblyjs/wasm-gen": 1.11.6 + "@webassemblyjs/wasm-opt": 1.11.6 + "@webassemblyjs/wasm-parser": 1.11.6 + "@webassemblyjs/wast-printer": 1.11.6 + checksum: 29ce75870496d6fad864d815ebb072395a8a3a04dc9c3f4e1ffdc63fc5fa58b1f34304a1117296d8240054cfdbc38aca88e71fb51483cf29ffab0a61ef27b481 + languageName: node + linkType: hard + "@webassemblyjs/wasm-gen@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/wasm-gen@npm:1.11.1" @@ -12971,6 +13125,19 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/wasm-gen@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-gen@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": 1.11.6 + "@webassemblyjs/helper-wasm-bytecode": 1.11.6 + "@webassemblyjs/ieee754": 1.11.6 + "@webassemblyjs/leb128": 1.11.6 + "@webassemblyjs/utf8": 1.11.6 + checksum: a645a2eecbea24833c3260a249704a7f554ef4a94c6000984728e94bb2bc9140a68dfd6fd21d5e0bbb09f6dfc98e083a45760a83ae0417b41a0196ff6d45a23a + languageName: node + linkType: hard + "@webassemblyjs/wasm-opt@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/wasm-opt@npm:1.11.1" @@ -12983,6 +13150,18 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/wasm-opt@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-opt@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": 1.11.6 + "@webassemblyjs/helper-buffer": 1.11.6 + "@webassemblyjs/wasm-gen": 1.11.6 + "@webassemblyjs/wasm-parser": 1.11.6 + checksum: b4557f195487f8e97336ddf79f7bef40d788239169aac707f6eaa2fa5fe243557c2d74e550a8e57f2788e70c7ae4e7d32f7be16101afe183d597b747a3bdd528 + languageName: node + linkType: hard + "@webassemblyjs/wasm-parser@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/wasm-parser@npm:1.11.1" @@ -12997,6 +13176,20 @@ __metadata: languageName: node linkType: hard +"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-parser@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": 1.11.6 + "@webassemblyjs/helper-api-error": 1.11.6 + "@webassemblyjs/helper-wasm-bytecode": 1.11.6 + "@webassemblyjs/ieee754": 1.11.6 + "@webassemblyjs/leb128": 1.11.6 + "@webassemblyjs/utf8": 1.11.6 + checksum: 8200a8d77c15621724a23fdabe58d5571415cda98a7058f542e670ea965dd75499f5e34a48675184947c66f3df23adf55df060312e6d72d57908e3f049620d8a + languageName: node + linkType: hard + "@webassemblyjs/wast-printer@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/wast-printer@npm:1.11.1" @@ -13007,36 +13200,46 @@ __metadata: languageName: node linkType: hard -"@webpack-cli/configtest@npm:^1.0.4": - version: 1.1.1 - resolution: "@webpack-cli/configtest@npm:1.1.1" +"@webassemblyjs/wast-printer@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/wast-printer@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": 1.11.6 + "@xtuc/long": 4.2.2 + checksum: d2fa6a4c427325ec81463e9c809aa6572af6d47f619f3091bf4c4a6fc34f1da3df7caddaac50b8e7a457f8784c62cd58c6311b6cb69b0162ccd8d4c072f79cf8 + languageName: node + linkType: hard + +"@webpack-cli/configtest@npm:^1.2.0": + version: 1.2.0 + resolution: "@webpack-cli/configtest@npm:1.2.0" peerDependencies: webpack: 4.x.x || 5.x.x webpack-cli: 4.x.x - checksum: c4e7fca21315e487655fbdc7d079092c3f88b274a720d245ca2e13dce7553009fb3f9d82218c33f5c9b208832d72bb4114a9cca97d53b66212eff5da1d3ad44b + checksum: a2726cd9ec601d2b57e5fc15e0ebf5200a8892065e735911269ac2038e62be4bfc176ea1f88c2c46ff09b4d05d4c10ae045e87b3679372483d47da625a327e28 languageName: node linkType: hard -"@webpack-cli/info@npm:^1.3.0": - version: 1.4.1 - resolution: "@webpack-cli/info@npm:1.4.1" +"@webpack-cli/info@npm:^1.5.0": + version: 1.5.0 + resolution: "@webpack-cli/info@npm:1.5.0" dependencies: envinfo: ^7.7.3 peerDependencies: webpack-cli: 4.x.x - checksum: 7a7cac2ba4f2528caa329311599da1685b1bc099bfc5b7210932b7c86024c1277fd7857b08557902b187ea01247a8e8f72f7f5719af72b0c8d97f22087aa0c14 + checksum: 7f56fe037cd7d1fd5c7428588519fbf04a0cad33925ee4202ffbafd00f8ec1f2f67d991245e687d50e0f3e23f7b7814273d56cb9f7da4b05eed47c8d815c6296 languageName: node linkType: hard -"@webpack-cli/serve@npm:^1.5.1": - version: 1.6.1 - resolution: "@webpack-cli/serve@npm:1.6.1" +"@webpack-cli/serve@npm:^1.7.0": + version: 1.7.0 + resolution: "@webpack-cli/serve@npm:1.7.0" peerDependencies: webpack-cli: 4.x.x peerDependenciesMeta: webpack-dev-server: optional: true - checksum: 8b273f906aeffa60c7d5700ae25f98d4b66b7e922cad38acb9575d55ff83872cd20b9894aacfa81c4d54e5b51b16253ae0e70c5e9e0608dc8768276e15c74536 + checksum: d475e8effa23eb7ff9a48b14d4de425989fd82f906ce71c210921cc3852327c22873be00c35e181a25a6bd03d424ae2b83e7f3b3f410ac7ee31b128ab4ac7713 languageName: node linkType: hard @@ -13237,6 +13440,15 @@ __metadata: languageName: node linkType: hard +"acorn-import-assertions@npm:^1.9.0": + version: 1.9.0 + resolution: "acorn-import-assertions@npm:1.9.0" + peerDependencies: + acorn: ^8 + checksum: 944fb2659d0845c467066bdcda2e20c05abe3aaf11972116df457ce2627628a81764d800dd55031ba19de513ee0d43bb771bc679cc0eda66dc8b4fade143bc0c + languageName: node + linkType: hard + "acorn-jsx@npm:^3.0.0": version: 3.0.1 resolution: "acorn-jsx@npm:3.0.1" @@ -13316,7 +13528,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.7.0, acorn@npm:^8.9.0": +"acorn@npm:^8.7.0, acorn@npm:^8.8.2, acorn@npm:^8.9.0": version: 8.10.0 resolution: "acorn@npm:8.10.0" bin: @@ -14096,13 +14308,6 @@ __metadata: languageName: node linkType: hard -"argv@npm:0.0.2": - version: 0.0.2 - resolution: "argv@npm:0.0.2" - checksum: e703f1af475dfd35f4065c21d7324368e3a9f1b5ff63d49c11fd442155aa0fd4f8498b57b535947fac86b79e1c9913cf0324300cbddbdc0af92fcf62eac0f5d2 - languageName: node - linkType: hard - "arr-diff@npm:^2.0.0": version: 2.0.0 resolution: "arr-diff@npm:2.0.0" @@ -14178,7 +14383,7 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.3, array-includes@npm:^3.1.6": +"array-includes@npm:^3.1.6": version: 3.1.6 resolution: "array-includes@npm:3.1.6" dependencies: @@ -14263,7 +14468,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flat@npm:^1.2.4, array.prototype.flat@npm:^1.3.1": +"array.prototype.flat@npm:^1.3.1": version: 1.3.1 resolution: "array.prototype.flat@npm:1.3.1" dependencies: @@ -17245,7 +17450,7 @@ __metadata: languageName: node linkType: hard -"cli-truncate@npm:^2.1.0": +"cli-truncate@npm:2.1.0, cli-truncate@npm:^2.1.0": version: 2.1.0 resolution: "cli-truncate@npm:2.1.0" dependencies: @@ -17419,21 +17624,6 @@ __metadata: languageName: node linkType: hard -"codecov@npm:3.8.3": - version: 3.8.3 - resolution: "codecov@npm:3.8.3" - dependencies: - argv: 0.0.2 - ignore-walk: 3.0.4 - js-yaml: 3.14.1 - teeny-request: 7.1.1 - urlgrey: 1.0.0 - bin: - codecov: bin/codecov - checksum: b7cde26f225930668dce13cb8d1d908187411669debeae6d2e8e561465ca4335575f50a7932256c0fa98e22baf0205f4b2c0225a0fbde02883cc7008ce3e1b9c - languageName: node - linkType: hard - "collect-v8-coverage@npm:^1.0.0": version: 1.0.1 resolution: "collect-v8-coverage@npm:1.0.1" @@ -17519,7 +17709,7 @@ __metadata: languageName: node linkType: hard -"colorette@npm:^1.2.1": +"colorette@npm:^1.4.0": version: 1.4.0 resolution: "colorette@npm:1.4.0" checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3 @@ -17533,6 +17723,13 @@ __metadata: languageName: node linkType: hard +"colorette@npm:^2.0.14": + version: 2.0.20 + resolution: "colorette@npm:2.0.20" + checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d + languageName: node + linkType: hard + "colors@npm:1.0.x": version: 1.0.3 resolution: "colors@npm:1.0.3" @@ -17604,7 +17801,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:8.3.0, commander@npm:^8.1.0": +"commander@npm:8.3.0, commander@npm:^8.1.0, commander@npm:^8.2.0": version: 8.3.0 resolution: "commander@npm:8.3.0" checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0 @@ -17625,13 +17822,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^6.2.0": - version: 6.2.1 - resolution: "commander@npm:6.2.1" - checksum: d7090410c0de6bc5c67d3ca41c41760d6d268f3c799e530aafb73b7437d1826bbf0d2a3edac33f8b57cc9887b4a986dce307fa5557e109be40eadb7c43b21742 - languageName: node - linkType: hard - "commander@npm:^7.0.0, commander@npm:^7.2.0": version: 7.2.0 resolution: "commander@npm:7.2.0" @@ -17646,6 +17836,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^9.2.0": + version: 9.5.0 + resolution: "commander@npm:9.5.0" + checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade + languageName: node + linkType: hard + "commander@npm:~2.1.0": version: 2.1.0 resolution: "commander@npm:2.1.0" @@ -17653,7 +17850,7 @@ __metadata: languageName: node linkType: hard -"comment-json@npm:^4.1.0, comment-json@npm:^4.2.2": +"comment-json@npm:^4.2.2": version: 4.2.2 resolution: "comment-json@npm:4.2.2" dependencies: @@ -17704,6 +17901,13 @@ __metadata: languageName: node linkType: hard +"compare-versions@npm:4.1.4": + version: 4.1.4 + resolution: "compare-versions@npm:4.1.4" + checksum: c1617544b79c2f36a1d543c50efd0da1a994040294c8923218080bc0df46da83ca414e3378282e93cab073744995124946417d130d8987e8efb5d1a73c0c4ba6 + languageName: node + linkType: hard + "component-emitter@npm:^1.2.1, component-emitter@npm:^1.3.0": version: 1.3.0 resolution: "component-emitter@npm:1.3.0" @@ -17778,9 +17982,9 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:6.3.0": - version: 6.3.0 - resolution: "concurrently@npm:6.3.0" +"concurrently@npm:6.5.1": + version: 6.5.1 + resolution: "concurrently@npm:6.5.1" dependencies: chalk: ^4.1.0 date-fns: ^2.16.1 @@ -17792,7 +17996,7 @@ __metadata: yargs: ^16.2.0 bin: concurrently: bin/concurrently.js - checksum: fb68236899259a3b0c05d27db608ee9150f11fc785552c14937e5e1421c9448d03704cdc2acb5f842a91c465d50005b4229f348eb9594d84cbef54e5a93ffde7 + checksum: 3f4d89b464fa5c9fb6f9489b46594c30ba54eff6ff10ab3cb5f30f64b74c83be664623a0f0cc731a3cb3f057a1f4a3292f7d3470c012a292c44aca31f214a3fa languageName: node linkType: hard @@ -18326,15 +18530,15 @@ __metadata: languageName: node linkType: hard -"cpy-cli@npm:4.1.0": - version: 4.1.0 - resolution: "cpy-cli@npm:4.1.0" +"cpy-cli@npm:4.2.0": + version: 4.2.0 + resolution: "cpy-cli@npm:4.2.0" dependencies: cpy: ^9.0.0 meow: ^10.1.2 bin: cpy: cli.js - checksum: ae6f8474bacd888e5a1471a1257108a019f7d2b0c6862eeb40d4d09a5cde99d5112f16a4e6d635952ad6a5da15c0f373ade23d113cf02772fb2216638b8115d3 + checksum: 883b142133fad9b57f10cf36483870c28e99bff34d4c166946e7bc26de1ec2786fca2e5102a061f7ff1fc73e5beaf90191f8a72eabdc3a4c97bd7f93e1fd793e languageName: node linkType: hard @@ -18571,76 +18775,94 @@ __metadata: languageName: node linkType: hard -"cspell-glob@npm:^5.18.5, cspell-glob@npm:^5.6.5": - version: 5.18.5 - resolution: "cspell-glob@npm:5.18.5" +"cspell-gitignore@npm:^5.21.2": + version: 5.21.2 + resolution: "cspell-gitignore@npm:5.21.2" dependencies: - micromatch: ^4.0.4 - checksum: 1170efa2125062b2e375027684de29192b87dd1853640e57c746e6659cda2ffe1b783bd613a394ac1b4a64dcdac198f70984e94e6090c3e8995695328d5d2023 + cspell-glob: ^5.21.2 + find-up: ^5.0.0 + bin: + cspell-gitignore: bin.js + checksum: 0ca01cd220c4d28d3b7ee0e36d1e553a317048c6179e17454b219164a9122fae8fae8afe372c42f545e66b1564fe3b200a4ae2cc7344c6c9d859267c235dd693 + languageName: node + linkType: hard + +"cspell-glob@npm:^5.21.2": + version: 5.21.2 + resolution: "cspell-glob@npm:5.21.2" + dependencies: + micromatch: ^4.0.5 + checksum: 7f7178f6b2a9043babeebc7f708053a55d43cfd17ccf2d3caab8be3306995906393de4ea154dbc1cf5c8efd184de7bace8d59fea5b3fbbe672923d92cf2571d6 languageName: node linkType: hard -"cspell-io@npm:^5.18.5": - version: 5.18.5 - resolution: "cspell-io@npm:5.18.5" - checksum: c950f2ada88732b2c00b5958775854200be40183ab5c4ae119663edd92e0f780342beb9e37ab45947cc94978aec92d4c21c2d8d369aa8ad246e4c2a59f98355d +"cspell-io@npm:^5.21.2": + version: 5.21.2 + resolution: "cspell-io@npm:5.21.2" + checksum: f6f4758f29f40ebe3a965a1b6bdc800bda71d4ac3eb7260b3e59df244a838351defc456d74c453ddd461f4691af2886d7d3145a884fc4b7a11323c49943f7b5f languageName: node linkType: hard -"cspell-lib@npm:^5.6.6": - version: 5.18.5 - resolution: "cspell-lib@npm:5.18.5" +"cspell-lib@npm:^5.21.2": + version: 5.21.2 + resolution: "cspell-lib@npm:5.21.2" dependencies: - "@cspell/cspell-bundled-dicts": ^5.18.5 - "@cspell/cspell-types": ^5.18.5 + "@cspell/cspell-bundled-dicts": ^5.21.2 + "@cspell/cspell-pipe": ^5.21.2 + "@cspell/cspell-types": ^5.21.2 clear-module: ^4.1.2 comment-json: ^4.2.2 configstore: ^5.0.1 cosmiconfig: ^7.0.1 - cspell-glob: ^5.18.5 - cspell-io: ^5.18.5 - cspell-trie-lib: ^5.18.5 - fast-equals: ^3.0.0 + cspell-glob: ^5.21.2 + cspell-io: ^5.21.2 + cspell-trie-lib: ^5.21.2 + fast-equals: ^3.0.2 find-up: ^5.0.0 - fs-extra: ^10.0.0 + fs-extra: ^10.1.0 gensequence: ^3.1.1 import-fresh: ^3.3.0 resolve-from: ^5.0.0 resolve-global: ^1.0.0 + vscode-languageserver-textdocument: ^1.0.4 vscode-uri: ^3.0.3 - checksum: a6d1ff6bc5f0ff71911c85eedb17c7b98b009b35fc922c29323f68c70e3e299f518c2ed44bfcdfc208f3d796d97df4854997f25769c2091e9d6f152f78305b84 + checksum: 96e93dd5c9fb8d0c0c5909e1750bd79a239c669f0802af7f1cac6147e966a4c0ac84eb88701834da9725a7e7bca27581546ac3fbb4be7d537ce63f5d4d98c0ac languageName: node linkType: hard -"cspell-trie-lib@npm:^5.18.5": - version: 5.18.5 - resolution: "cspell-trie-lib@npm:5.18.5" +"cspell-trie-lib@npm:^5.21.2": + version: 5.21.2 + resolution: "cspell-trie-lib@npm:5.21.2" dependencies: - "@cspell/cspell-pipe": ^5.18.5 - fs-extra: ^10.0.0 + "@cspell/cspell-pipe": ^5.21.2 + fs-extra: ^10.1.0 gensequence: ^3.1.1 - checksum: d67644fada05d3fa3557f527bf6e63c0ad3e58ce31e2a8d91f475fbc754911b7e5f0f5222cdbc389a9b41c614300a146c1972cdb6af0269524c8ef096d5d857e + checksum: 2257c56f6206bc8c22473be9fb6f8fe14e2eed396bde76915831b9f86fe32b468ddf936ee0f0d916fbc06efc6a5d616b2c035bb51ccfdc875d9c17d82cb85de2 languageName: node linkType: hard -"cspell@npm:5.6.6": - version: 5.6.6 - resolution: "cspell@npm:5.6.6" +"cspell@npm:5.21.2": + version: 5.21.2 + resolution: "cspell@npm:5.21.2" dependencies: - "@cspell/cspell-types": ^5.6.5 - chalk: ^4.1.1 - commander: ^7.2.0 - comment-json: ^4.1.0 - cspell-glob: ^5.6.5 - cspell-lib: ^5.6.6 - fs-extra: ^10.0.0 + "@cspell/cspell-pipe": ^5.21.2 + chalk: ^4.1.2 + commander: ^9.2.0 + cspell-gitignore: ^5.21.2 + cspell-glob: ^5.21.2 + cspell-lib: ^5.21.2 + fast-json-stable-stringify: ^2.1.0 + file-entry-cache: ^6.0.1 + fs-extra: ^10.1.0 get-stdin: ^8.0.0 - glob: ^7.1.7 - strip-ansi: ^6.0.0 - vscode-uri: ^3.0.2 + glob: ^8.0.3 + imurmurhash: ^0.1.4 + semver: ^7.3.7 + strip-ansi: ^6.0.1 + vscode-uri: ^3.0.3 bin: cspell: bin.js - checksum: d5f3757a2e01eaa9166c833485acb8bf1a7c199fa9d2f01ae3069ebbc41fd2e952691869163f707ea205486d186cd245a48cd14b6b6d1d3f2fc97ed5345d43e3 + checksum: 779dcb4ead9479559956cdc4430d1e96b9fcd1ed0d7ff20f0ecf0f6b19051978ed5eec2b58a5a4685101da7c6c6008f301f6c1f0c6c88dd55868302808991daf languageName: node linkType: hard @@ -18932,7 +19154,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:2.6.9, debug@npm:^2.1.1, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.9": +"debug@npm:2.6.9, debug@npm:^2.1.1, debug@npm:^2.2.0, debug@npm:^2.3.3": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -19166,14 +19388,14 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^2.2.0": - version: 2.2.1 - resolution: "deep-equal@npm:2.2.1" +"deep-equal@npm:^2.2.2": + version: 2.2.2 + resolution: "deep-equal@npm:2.2.2" dependencies: array-buffer-byte-length: ^1.0.0 call-bind: ^1.0.2 es-get-iterator: ^1.1.3 - get-intrinsic: ^1.2.0 + get-intrinsic: ^1.2.1 is-arguments: ^1.1.1 is-array-buffer: ^3.0.2 is-date-object: ^1.0.5 @@ -19188,7 +19410,7 @@ __metadata: which-boxed-primitive: ^1.0.2 which-collection: ^1.0.1 which-typed-array: ^1.1.9 - checksum: 561f0e001a07b2f1b80ff914d0b3d76964bbfc102f34c2128bc8039c0050e63b1a504a8911910e011d8cd1cd4b600a9686c049e327f4ef94420008efc42d25f4 + checksum: eb61c35157b6ecb96a5359b507b083fbff8ddb4c86a78a781ee38485f77a667465e45d63ee2ebd8a00e86d94c80e499906900cd82c2debb400237e1662cd5397 languageName: node linkType: hard @@ -20412,6 +20634,16 @@ __metadata: languageName: node linkType: hard +"enhanced-resolve@npm:^5.15.0": + version: 5.15.0 + resolution: "enhanced-resolve@npm:5.15.0" + dependencies: + graceful-fs: ^4.2.4 + tapable: ^2.2.0 + checksum: fbd8cdc9263be71cc737aa8a7d6c57b43d6aa38f6cc75dde6fcd3598a130cc465f979d2f4d01bb3bf475acb43817749c79f8eef9be048683602ca91ab52e4f11 + languageName: node + linkType: hard + "enquirer@npm:2.3.6, enquirer@npm:^2.3.0, enquirer@npm:^2.3.5, enquirer@npm:^2.3.6": version: 2.3.6 resolution: "enquirer@npm:2.3.6" @@ -20609,10 +20841,10 @@ __metadata: languageName: node linkType: hard -"es-main@npm:1.0.2": - version: 1.0.2 - resolution: "es-main@npm:1.0.2" - checksum: 92bad76e3cf76355d7ce178abfe3e9323c48f554efd4a56c3e5346bee158427f75d593b4ac791618d0df4901e15210c51e4fdbae47057b4cfdef53942a579cc1 +"es-main@npm:1.2.0": + version: 1.2.0 + resolution: "es-main@npm:1.2.0" + checksum: b1feaaa71c0c5b0c494cd7d4f1fdb32fcdc9835b824ca2f61a7fbb899627305d88efef584490c24ebacde79289ac14908823c066176e15a784c49fa924db9b0b languageName: node linkType: hard @@ -20623,6 +20855,13 @@ __metadata: languageName: node linkType: hard +"es-module-lexer@npm:^1.2.1": + version: 1.3.0 + resolution: "es-module-lexer@npm:1.3.0" + checksum: 48fd9f504a9d2a894126f75c8b7ccc6273a289983e9b67255f165bfd9ae765d50100218251e94e702ca567826905ea2f7b3b4a0c4d74d3ce99cce3a2a606a238 + languageName: node + linkType: hard + "es-set-tostringtag@npm:^2.0.1": version: 2.0.1 resolution: "es-set-tostringtag@npm:2.0.1" @@ -21194,28 +21433,6 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:8.3.0": - version: 8.3.0 - resolution: "eslint-config-prettier@npm:8.3.0" - peerDependencies: - eslint: ">=7.0.0" - bin: - eslint-config-prettier: bin/cli.js - checksum: df4cea3032671995bb5ab07e016169072f7fa59f44a53251664d9ca60951b66cdc872683b5c6a3729c91497c11490ca44a79654b395dd6756beb0c3903a37196 - languageName: node - linkType: hard - -"eslint-config-prettier@npm:8.4.0": - version: 8.4.0 - resolution: "eslint-config-prettier@npm:8.4.0" - peerDependencies: - eslint: ">=7.0.0" - bin: - eslint-config-prettier: bin/cli.js - checksum: ee8dc343f1fed15dc0658e190a966cc23644477f2331a7f56ae2bb79dd74892e3cde8ea5c142e7a3329a8291a1de041e13ca96e54d0c85ff4a2aba13390c5f10 - languageName: node - linkType: hard - "eslint-config-prettier@npm:8.9.0": version: 8.9.0 resolution: "eslint-config-prettier@npm:8.9.0" @@ -21273,17 +21490,6 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.5": - version: 0.3.7 - resolution: "eslint-import-resolver-node@npm:0.3.7" - dependencies: - debug: ^3.2.7 - is-core-module: ^2.11.0 - resolve: ^1.22.1 - checksum: 3379aacf1d2c6952c1b9666c6fa5982c3023df695430b0d391c0029f6403a7775414873d90f397e98ba6245372b6c8960e16e74d9e4a3b0c0a4582f3bdbe3d6e - languageName: node - linkType: hard - "eslint-import-resolver-node@npm:^0.3.7": version: 0.3.9 resolution: "eslint-import-resolver-node@npm:0.3.9" @@ -21295,7 +21501,7 @@ __metadata: languageName: node linkType: hard -"eslint-module-utils@npm:^2.0.0, eslint-module-utils@npm:^2.6.2, eslint-module-utils@npm:^2.8.0": +"eslint-module-utils@npm:^2.0.0, eslint-module-utils@npm:^2.8.0": version: 2.8.0 resolution: "eslint-module-utils@npm:2.8.0" dependencies: @@ -21319,34 +21525,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:2.24.0": - version: 2.24.0 - resolution: "eslint-plugin-import@npm:2.24.0" - dependencies: - array-includes: ^3.1.3 - array.prototype.flat: ^1.2.4 - debug: ^2.6.9 - doctrine: ^2.1.0 - eslint-import-resolver-node: ^0.3.5 - eslint-module-utils: ^2.6.2 - find-up: ^2.0.0 - has: ^1.0.3 - is-core-module: ^2.4.0 - minimatch: ^3.0.4 - object.values: ^1.1.3 - pkg-up: ^2.0.0 - read-pkg-up: ^3.0.0 - resolve: ^1.20.0 - tsconfig-paths: ^3.9.0 - peerDependencies: - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 - checksum: 79fb1094197cd1dc720725bd29e5c5fe7d123fd9dd31eb182849993a81a8c18e2bfbc4d267a2caabe02bd4d21aafb1eca1da2f55aca7e5df99fd8ba908e7b869 - languageName: node - linkType: hard - -"eslint-plugin-import@npm:2.28.0": - version: 2.28.0 - resolution: "eslint-plugin-import@npm:2.28.0" +"eslint-plugin-import@npm:2.28.1": + version: 2.28.1 + resolution: "eslint-plugin-import@npm:2.28.1" dependencies: array-includes: ^3.1.6 array.prototype.findlastindex: ^1.2.2 @@ -21357,18 +21538,17 @@ __metadata: eslint-import-resolver-node: ^0.3.7 eslint-module-utils: ^2.8.0 has: ^1.0.3 - is-core-module: ^2.12.1 + is-core-module: ^2.13.0 is-glob: ^4.0.3 minimatch: ^3.1.2 object.fromentries: ^2.0.6 object.groupby: ^1.0.0 object.values: ^1.1.6 - resolve: ^1.22.3 semver: ^6.3.1 tsconfig-paths: ^3.14.2 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: f9eba311b93ca1bb89311856b1f7285bd79e0181d7eb70fe115053ff77e2235fea749b30f538b78927dc65769340b5be61f4c9581d1c82bcdcccb2061f440ad1 + checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf languageName: node linkType: hard @@ -21423,21 +21603,6 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-prettier@npm:3.4.0": - version: 3.4.0 - resolution: "eslint-plugin-prettier@npm:3.4.0" - dependencies: - prettier-linter-helpers: ^1.0.0 - peerDependencies: - eslint: ">=5.0.0" - prettier: ">=1.13.0" - peerDependenciesMeta: - eslint-config-prettier: - optional: true - checksum: 30a07e8d12637d2988e371f6a20ff4c86fd7fdc3596d1d18d62c0367804f38e06a65052d0281234aeb2552e4d1908dcb2de20543413e038251a2717a46400a9d - languageName: node - linkType: hard - "eslint-plugin-prettier@npm:3.4.1": version: 3.4.1 resolution: "eslint-plugin-prettier@npm:3.4.1" @@ -21468,12 +21633,12 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-promise@npm:5.1.0": - version: 5.1.0 - resolution: "eslint-plugin-promise@npm:5.1.0" +"eslint-plugin-promise@npm:5.2.0": + version: 5.2.0 + resolution: "eslint-plugin-promise@npm:5.2.0" peerDependencies: eslint: ^7.0.0 - checksum: e62947aaea6882951a1a9f5fe3e3c7925b8dcc222338f7979bd1495ba0f0dc701820116b108be1e801f6e5156eb9a928142f29c659fd21a5d65a4be495bb327d + checksum: 5d6b2d28408c5afde6386942862427af3d83c9a130eb2555bb54b26a1761914e2c7326aca1be26dd3fee6405e65a2ee9432a4526147e5962545060ea0ef64058 languageName: node linkType: hard @@ -23094,10 +23259,10 @@ __metadata: languageName: node linkType: hard -"fast-equals@npm:^3.0.0": - version: 3.0.0 - resolution: "fast-equals@npm:3.0.0" - checksum: e04cf6082420c62096b461ac63a64bb81befc5175fda0fa5c29984b0a4d65b28e6b5198cb0222392a89df487f67c0c9d6c996e5fe2f44e07f157727d619d986f +"fast-equals@npm:^3.0.2": + version: 3.0.3 + resolution: "fast-equals@npm:3.0.3" + checksum: e7ac0ae5a10289c773f75654ced22563837336bde7ebb595b7d238a20b77008a821c1ca3526a50e96fe0662ced7454cf99b7488bb64506463a4f4729c523ac4c languageName: node linkType: hard @@ -23179,15 +23344,6 @@ __metadata: languageName: node linkType: hard -"fast-url-parser@npm:^1.1.3": - version: 1.1.3 - resolution: "fast-url-parser@npm:1.1.3" - dependencies: - punycode: ^1.3.2 - checksum: 5043d0c4a8d775ff58504d56c096563c11b113e4cb8a2668c6f824a1cd4fb3812e2fdf76537eb24a7ce4ae7def6bd9747da630c617cf2a4b6ce0c42514e4f21c - languageName: node - linkType: hard - "fast-xml-parser@npm:4.2.5": version: 4.2.5 resolution: "fast-xml-parser@npm:4.2.5" @@ -24007,14 +24163,14 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:10.0.0": - version: 10.0.0 - resolution: "fs-extra@npm:10.0.0" +"fs-extra@npm:10.1.0, fs-extra@npm:^10.1.0": + version: 10.1.0 + resolution: "fs-extra@npm:10.1.0" dependencies: graceful-fs: ^4.2.0 jsonfile: ^6.0.1 universalify: ^2.0.0 - checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a + checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50 languageName: node linkType: hard @@ -24042,17 +24198,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^10.1.0": - version: 10.1.0 - resolution: "fs-extra@npm:10.1.0" - dependencies: - graceful-fs: ^4.2.0 - jsonfile: ^6.0.1 - universalify: ^2.0.0 - checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50 - languageName: node - linkType: hard - "fs-extra@npm:^11.1.0": version: 11.1.1 resolution: "fs-extra@npm:11.1.1" @@ -24813,7 +24958,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.2.0, glob@npm:^7.0.0, glob@npm:^7.0.5, glob@npm:^7.0.6, glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7": +"glob@npm:7.2.0, glob@npm:^7.0.0, glob@npm:^7.0.5, glob@npm:^7.0.6, glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.0 resolution: "glob@npm:7.2.0" dependencies: @@ -24827,7 +24972,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:8.1.0, glob@npm:^8.1.0": +"glob@npm:8.1.0, glob@npm:^8.0.3, glob@npm:^8.1.0": version: 8.1.0 resolution: "glob@npm:8.1.0" dependencies: @@ -24965,17 +25110,17 @@ __metadata: languageName: node linkType: hard -"globby@npm:12.0.0": - version: 12.0.0 - resolution: "globby@npm:12.0.0" +"globby@npm:12.2.0": + version: 12.2.0 + resolution: "globby@npm:12.2.0" dependencies: array-union: ^3.0.1 dir-glob: ^3.0.1 fast-glob: ^3.2.7 - ignore: ^5.1.8 + ignore: ^5.1.9 merge2: ^1.4.1 slash: ^4.0.0 - checksum: 0f21f338d65bbf84d58c7caf0db0e2403b1a97f8606e4854eb50fb1b478089a020788a8ff8c386be9c2559df18bd9fe6b99cee572cd84ad5ff9907ca09627ab8 + checksum: 2539379a7fff3473d3e7c68b4540ba38f36970f43f760e36e301515d5cb98a0c5736554957d90390906bee632327beb2f9518d1acd6911f61e436db11b0da5b5 languageName: node linkType: hard @@ -25306,13 +25451,6 @@ __metadata: languageName: node linkType: hard -"grapheme-splitter@npm:^1.0.4": - version: 1.0.4 - resolution: "grapheme-splitter@npm:1.0.4" - checksum: 0c22ec54dee1b05cd480f78cf14f732cb5b108edc073572c4ec205df4cd63f30f8db8025afc5debc8835a8ddeacf648a1c7992fe3dcd6ad38f9a476d84906620 - languageName: node - linkType: hard - "graphemer@npm:^1.4.0": version: 1.4.0 resolution: "graphemer@npm:1.4.0" @@ -25352,18 +25490,6 @@ __metadata: languageName: node linkType: hard -"grpc-tools@npm:1.11.2": - version: 1.11.2 - resolution: "grpc-tools@npm:1.11.2" - dependencies: - "@mapbox/node-pre-gyp": ^1.0.5 - bin: - grpc_tools_node_protoc: bin/protoc.js - grpc_tools_node_protoc_plugin: bin/protoc_plugin.js - checksum: 7df0778edadee09b982f31725f5170ec3679c40213e8c618ee5f5e9ee1062382798b45f2dacac1e63d5012cd2714c5e2904265a7ced64e1736147a17fd111960 - languageName: node - linkType: hard - "grpc-tools@npm:1.12.4": version: 1.12.4 resolution: "grpc-tools@npm:1.12.4" @@ -25390,18 +25516,6 @@ __metadata: languageName: node linkType: hard -"grpc_tools_node_protoc_ts@npm:5.3.1": - version: 5.3.1 - resolution: "grpc_tools_node_protoc_ts@npm:5.3.1" - dependencies: - google-protobuf: 3.15.8 - handlebars: 4.7.7 - bin: - protoc-gen-ts: bin/protoc-gen-ts - checksum: 692318bceaa231fa7d1ba33aa3e3f575220880955480754b73042c6f5315c82c01c7a6e06eaeb1de3e886f993d6512e5da2f114a7f0620b4f2228f2277a5de90 - languageName: node - linkType: hard - "grpc_tools_node_protoc_ts@npm:5.3.3": version: 5.3.3 resolution: "grpc_tools_node_protoc_ts@npm:5.3.3" @@ -26301,12 +26415,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:7.0.1": - version: 7.0.1 - resolution: "husky@npm:7.0.1" +"husky@npm:7.0.4": + version: 7.0.4 + resolution: "husky@npm:7.0.4" bin: husky: lib/bin.js - checksum: b2ea1460f1126ed7161779b1b89f7ec8ae66fb6723e0e9fd47c522f454f4a2ea7e31a21d6ce2eb5d32e9837d232fb0245783425c109df0adab53668f8c8d8fc8 + checksum: c6ec4af63da2c9522da8674a20ad9b48362cc92704896cc8a58c6a2a39d797feb2b806f93fbd83a6d653fbdceb2c3b6e0b602c6b2e8565206ffc2882ef7db9e9 languageName: node linkType: hard @@ -26406,7 +26520,7 @@ __metadata: languageName: node linkType: hard -"ignore-walk@npm:3.0.4, ignore-walk@npm:^3.0.0": +"ignore-walk@npm:^3.0.0": version: 3.0.4 resolution: "ignore-walk@npm:3.0.4" dependencies: @@ -26445,7 +26559,7 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.2.4": +"ignore@npm:^5.1.9, ignore@npm:^5.2.4": version: 5.2.4 resolution: "ignore@npm:5.2.4" checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef @@ -26649,9 +26763,9 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:8.1.2": - version: 8.1.2 - resolution: "inquirer@npm:8.1.2" +"inquirer@npm:8.2.4, inquirer@npm:^8.2.4": + version: 8.2.4 + resolution: "inquirer@npm:8.2.4" dependencies: ansi-escapes: ^4.2.1 chalk: ^4.1.1 @@ -26661,19 +26775,20 @@ __metadata: figures: ^3.0.0 lodash: ^4.17.21 mute-stream: 0.0.8 - ora: ^5.3.0 + ora: ^5.4.1 run-async: ^2.4.0 - rxjs: ^7.2.0 + rxjs: ^7.5.5 string-width: ^4.1.0 strip-ansi: ^6.0.0 through: ^2.3.6 - checksum: fa6caec984d12a89f6bf926c3ee4924beed3dd1ceae66ad8ac287c3ef1b534e31cba86af66950f364305c42eb263c8f4a98c5a27227b3459308c8e3251c6d39a + wrap-ansi: ^7.0.0 + checksum: dfcb6529d3af443dfea2241cb471508091b51f5121a088fdb8728b23ec9b349ef0a5e13a0ef2c8e19457b0bed22f7cbbcd561f7a4529d084c562a58c605e2655 languageName: node linkType: hard -"inquirer@npm:8.2.0": - version: 8.2.0 - resolution: "inquirer@npm:8.2.0" +"inquirer@npm:8.2.5": + version: 8.2.5 + resolution: "inquirer@npm:8.2.5" dependencies: ansi-escapes: ^4.2.1 chalk: ^4.1.1 @@ -26685,17 +26800,18 @@ __metadata: mute-stream: 0.0.8 ora: ^5.4.1 run-async: ^2.4.0 - rxjs: ^7.2.0 + rxjs: ^7.5.5 string-width: ^4.1.0 strip-ansi: ^6.0.0 through: ^2.3.6 - checksum: 861d1a9324ae933b49126b3541d94e4d6a2f2a25411b3f3cc00c34bf1bdab34146362d702cf289efe6d8034900dc5905bcf2ea716092a02b6fc390e5986dd236 + wrap-ansi: ^7.0.0 + checksum: f13ee4c444187786fb393609dedf6b30870115a57b603f2e6424f29a99abc13446fd45ee22461c33c9c40a92a60a8df62d0d6b25d74fc6676fa4cb211de55b55 languageName: node linkType: hard -"inquirer@npm:8.2.4, inquirer@npm:^8.2.4": - version: 8.2.4 - resolution: "inquirer@npm:8.2.4" +"inquirer@npm:8.2.6": + version: 8.2.6 + resolution: "inquirer@npm:8.2.6" dependencies: ansi-escapes: ^4.2.1 chalk: ^4.1.1 @@ -26711,8 +26827,8 @@ __metadata: string-width: ^4.1.0 strip-ansi: ^6.0.0 through: ^2.3.6 - wrap-ansi: ^7.0.0 - checksum: dfcb6529d3af443dfea2241cb471508091b51f5121a088fdb8728b23ec9b349ef0a5e13a0ef2c8e19457b0bed22f7cbbcd561f7a4529d084c562a58c605e2655 + wrap-ansi: ^6.0.1 + checksum: 387ffb0a513559cc7414eb42c57556a60e302f820d6960e89d376d092e257a919961cd485a1b4de693dbb5c0de8bc58320bfd6247dfd827a873aa82a4215a240 languageName: node linkType: hard @@ -27234,7 +27350,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.12.1, is-core-module@npm:^2.13.0": +"is-core-module@npm:^2.13.0": version: 2.13.0 resolution: "is-core-module@npm:2.13.0" dependencies: @@ -27243,21 +27359,21 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.4.0, is-core-module@npm:^2.9.0": - version: 2.12.1 - resolution: "is-core-module@npm:2.12.1" +"is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1": + version: 2.8.1 + resolution: "is-core-module@npm:2.8.1" dependencies: has: ^1.0.3 - checksum: f04ea30533b5e62764e7b2e049d3157dc0abd95ef44275b32489ea2081176ac9746ffb1cdb107445cf1ff0e0dfcad522726ca27c27ece64dadf3795428b8e468 + checksum: 418b7bc10768a73c41c7ef497e293719604007f88934a6ffc5f7c78702791b8528102fb4c9e56d006d69361549b3d9519440214a74aefc7e0b79e5e4411d377f languageName: node linkType: hard -"is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1": - version: 2.8.1 - resolution: "is-core-module@npm:2.8.1" +"is-core-module@npm:^2.9.0": + version: 2.12.1 + resolution: "is-core-module@npm:2.12.1" dependencies: has: ^1.0.3 - checksum: 418b7bc10768a73c41c7ef497e293719604007f88934a6ffc5f7c78702791b8528102fb4c9e56d006d69361549b3d9519440214a74aefc7e0b79e5e4411d377f + checksum: f04ea30533b5e62764e7b2e049d3157dc0abd95ef44275b32489ea2081176ac9746ffb1cdb107445cf1ff0e0dfcad522726ca27c27ece64dadf3795428b8e468 languageName: node linkType: hard @@ -29246,12 +29362,12 @@ __metadata: languageName: node linkType: hard -"json5@npm:2.2.2, json5@npm:^2.1.1, json5@npm:^2.1.2, json5@npm:^2.2.1": - version: 2.2.2 - resolution: "json5@npm:2.2.2" +"json5@npm:2.2.3, json5@npm:^2.2.2, json5@npm:^2.2.3": + version: 2.2.3 + resolution: "json5@npm:2.2.3" bin: json5: lib/cli.js - checksum: 9a878d66b72157b073cf0017f3e5d93ec209fa5943abcb38d37a54b208917c166bd473c26a24695e67a016ce65759aeb89946592991f8f9174fb96c8e2492683 + checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349 languageName: node linkType: hard @@ -29275,12 +29391,12 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.2.2, json5@npm:^2.2.3": - version: 2.2.3 - resolution: "json5@npm:2.2.3" +"json5@npm:^2.1.1, json5@npm:^2.1.2, json5@npm:^2.2.1": + version: 2.2.2 + resolution: "json5@npm:2.2.2" bin: json5: lib/cli.js - checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349 + checksum: 9a878d66b72157b073cf0017f3e5d93ec209fa5943abcb38d37a54b208917c166bd473c26a24695e67a016ce65759aeb89946592991f8f9174fb96c8e2492683 languageName: node linkType: hard @@ -30451,31 +30567,31 @@ __metadata: languageName: node linkType: hard -"lint-staged@npm:11.1.2": - version: 11.1.2 - resolution: "lint-staged@npm:11.1.2" +"lint-staged@npm:11.2.6": + version: 11.2.6 + resolution: "lint-staged@npm:11.2.6" dependencies: - chalk: ^4.1.1 - cli-truncate: ^2.1.0 - commander: ^7.2.0 - cosmiconfig: ^7.0.0 - debug: ^4.3.1 + cli-truncate: 2.1.0 + colorette: ^1.4.0 + commander: ^8.2.0 + cosmiconfig: ^7.0.1 + debug: ^4.3.2 enquirer: ^2.3.6 - execa: ^5.0.0 - listr2: ^3.8.2 - log-symbols: ^4.1.0 + execa: ^5.1.1 + listr2: ^3.12.2 micromatch: ^4.0.4 normalize-path: ^3.0.0 please-upgrade-node: ^3.2.0 string-argv: 0.3.1 - stringify-object: ^3.3.0 + stringify-object: 3.3.0 + supports-color: 8.1.1 bin: lint-staged: bin/lint-staged.js - checksum: 0050d1836dda879c58561fa4efd100f5cd14fcbf8ee3fdeab7e89ec4219c019543bb5bf2442f760557ebe4bb8b7bfc56a9c98b9384acecfe0f8553f091723e36 + checksum: b9071621db351c553579bd18df3d80fb753f851c4f1f72db0aaf12e713eab25b6d8a044dab2957817de7da02054a63f7725a49c763aee09295133f0d554f4d3f languageName: node linkType: hard -"listr2@npm:^3.8.2": +"listr2@npm:^3.12.2": version: 3.14.0 resolution: "listr2@npm:3.14.0" dependencies: @@ -31248,15 +31364,15 @@ __metadata: languageName: node linkType: hard -"make-dir-cli@npm:3.0.0": - version: 3.0.0 - resolution: "make-dir-cli@npm:3.0.0" +"make-dir-cli@npm:3.1.0": + version: 3.1.0 + resolution: "make-dir-cli@npm:3.1.0" dependencies: - make-dir: ^3.1.0 + make-dir: ^4.0.0 meow: ^10.0.0 bin: make-dir: cli.js - checksum: 228de9695d231429f8dd499159256cc3ae41054355eab9345cfbfdbaec2c4ba78c2c5251733eb0555e7c5b112469b83774675bb6dcba6dd69233f9d91f49417b + checksum: 8a5b4cc92efdde9bdc82be5abfaf6819ab862ffd0c0a96788fa3685baff7af23ab4e8a7a9e85cde4a9f585345fcf638da098ecd993f5420b87e1c643e794381d languageName: node linkType: hard @@ -31288,6 +31404,15 @@ __metadata: languageName: node linkType: hard +"make-dir@npm:^4.0.0": + version: 4.0.0 + resolution: "make-dir@npm:4.0.0" + dependencies: + semver: ^7.5.3 + checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a + languageName: node + linkType: hard + "make-error@npm:1.x, make-error@npm:^1, make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" @@ -31808,7 +31933,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^4.0.2": +"micromatch@npm:^4.0.2, micromatch@npm:^4.0.5": version: 4.0.5 resolution: "micromatch@npm:4.0.5" dependencies: @@ -33964,13 +34089,6 @@ __metadata: languageName: node linkType: hard -"object-hash@npm:2.2.0": - version: 2.2.0 - resolution: "object-hash@npm:2.2.0" - checksum: 55ba841e3adce9c4f1b9b46b41983eda40f854e0d01af2802d3ae18a7085a17168d6b81731d43fdf1d6bcbb3c9f9c56d22c8fea992203ad90a38d7d919bc28f1 - languageName: node - linkType: hard - "object-hash@npm:^3.0.0": version: 3.0.0 resolution: "object-hash@npm:3.0.0" @@ -34152,7 +34270,7 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.3, object.values@npm:^1.1.6": +"object.values@npm:^1.1.6": version: 1.1.6 resolution: "object.values@npm:1.1.6" dependencies: @@ -34396,7 +34514,7 @@ __metadata: languageName: node linkType: hard -"ora@npm:5.4.1, ora@npm:^5.3.0, ora@npm:^5.4.1": +"ora@npm:5.4.1, ora@npm:^5.4.1": version: 5.4.1 resolution: "ora@npm:5.4.1" dependencies: @@ -35650,15 +35768,6 @@ __metadata: languageName: node linkType: hard -"pkg-up@npm:^2.0.0": - version: 2.0.0 - resolution: "pkg-up@npm:2.0.0" - dependencies: - find-up: ^2.1.0 - checksum: de4b418175281a082e366ce1a919f032520ee53cf421578b35173f03816f6ec4c19e1552066840bb0988c3e1215859653948efd6ca3507a23f4f44229269500d - languageName: node - linkType: hard - "pkg-up@npm:^3.1.0": version: 3.1.0 resolution: "pkg-up@npm:3.1.0" @@ -36418,24 +36527,6 @@ __metadata: languageName: node linkType: hard -"prettier@npm:2.1.2": - version: 2.1.2 - resolution: "prettier@npm:2.1.2" - bin: - prettier: bin-prettier.js - checksum: 7bc5a2ff5e6caf585b003fbdb1645719d5f5fcd2a03b08bae75a5608a7155fd6f84bda146104b3b6b0d9dc06720ffbfab716eade2eaae771ce4817bcee745928 - languageName: node - linkType: hard - -"prettier@npm:2.5.1": - version: 2.5.1 - resolution: "prettier@npm:2.5.1" - bin: - prettier: bin-prettier.js - checksum: 21b9408476ea1c544b0e45d51ceb94a84789ff92095abb710942d780c862d0daebdb29972d47f6b4d0f7ebbfb0ffbf56cc2cfa3e3e9d1cca54864af185b15b66 - languageName: node - linkType: hard - "prettier@npm:2.8.8, prettier@npm:^2.0.0": version: 2.8.8 resolution: "prettier@npm:2.8.8" @@ -36884,7 +36975,7 @@ __metadata: languageName: node linkType: hard -"punycode@npm:^1.3.2, punycode@npm:^1.4.1": +"punycode@npm:^1.4.1": version: 1.4.1 resolution: "punycode@npm:1.4.1" checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518 @@ -37699,7 +37790,7 @@ __metadata: languageName: node linkType: hard -"regexpp@npm:^3.0.0, regexpp@npm:^3.1.0, regexpp@npm:^3.2.0": +"regexpp@npm:^3.0.0, regexpp@npm:^3.1.0": version: 3.2.0 resolution: "regexpp@npm:3.2.0" checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8 @@ -38235,7 +38326,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.7, resolve@npm:^1.11.1, resolve@npm:^1.22.3, resolve@npm:^1.22.4, resolve@npm:^1.3.3": +"resolve@npm:^1.1.7, resolve@npm:^1.11.1, resolve@npm:^1.22.4, resolve@npm:^1.3.3": version: 1.22.4 resolution: "resolve@npm:1.22.4" dependencies: @@ -38309,7 +38400,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.11.1#~builtin, resolve@patch:resolve@^1.22.3#~builtin, resolve@patch:resolve@^1.22.4#~builtin, resolve@patch:resolve@^1.3.3#~builtin": +"resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.11.1#~builtin, resolve@patch:resolve@^1.22.4#~builtin, resolve@patch:resolve@^1.3.3#~builtin": version: 1.22.4 resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin::version=1.22.4&hash=c3c19d" dependencies: @@ -38405,15 +38496,6 @@ __metadata: languageName: node linkType: hard -"resumer@npm:^0.0.0": - version: 0.0.0 - resolution: "resumer@npm:0.0.0" - dependencies: - through: ~2.3.4 - checksum: 21b1c257aac24840643fae9bc99ca6447a71a0039e7c6dcf64d0ead447ce511eff158d529f1b6258ad12668e66ee3e49ff14932d2b88a3bd578f483e79708104 - languageName: node - linkType: hard - "ret@npm:~0.1.10": version: 0.1.15 resolution: "ret@npm:0.1.15" @@ -38655,16 +38737,16 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:7.4.0": - version: 7.4.0 - resolution: "rxjs@npm:7.4.0" +"rxjs@npm:7.8.0": + version: 7.8.0 + resolution: "rxjs@npm:7.8.0" dependencies: - tslib: ~2.1.0 - checksum: 6b33172a760dcad6882fdc836ee8cf1ebe160dd7eaad95c45a12338ffdaa96eb41e48e6c25bbd3d1fdf45075949ff447954bc17a9d01c688558a67967d09c114 + tslib: ^2.1.0 + checksum: 61b4d4fd323c1043d8d6ceb91f24183b28bcf5def4f01ca111511d5c6b66755bc5578587fe714ef5d67cf4c9f2e26f4490d4e1d8cabf9bd5967687835e9866a2 languageName: node linkType: hard -"rxjs@npm:7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5": +"rxjs@npm:7.8.1, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -38883,6 +38965,17 @@ __metadata: languageName: node linkType: hard +"schema-utils@npm:^3.2.0": + version: 3.3.0 + resolution: "schema-utils@npm:3.3.0" + dependencies: + "@types/json-schema": ^7.0.8 + ajv: ^6.12.5 + ajv-keywords: ^3.5.2 + checksum: ea56971926fac2487f0757da939a871388891bc87c6a82220d125d587b388f1704788f3706e7f63a7b70e49fc2db974c41343528caea60444afd5ce0fe4b85c0 + languageName: node + linkType: hard + "schema-utils@npm:^4.0.0": version: 4.0.0 resolution: "schema-utils@npm:4.0.0" @@ -39116,7 +39209,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.5.0, semver@npm:^7.5.3": +"semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -39275,6 +39368,15 @@ __metadata: languageName: node linkType: hard +"serialize-javascript@npm:^6.0.1": + version: 6.0.1 + resolution: "serialize-javascript@npm:6.0.1" + dependencies: + randombytes: ^2.1.0 + checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f + languageName: node + linkType: hard + "seroval@npm:^0.5.0": version: 0.5.1 resolution: "seroval@npm:0.5.1" @@ -40180,9 +40282,9 @@ __metadata: languageName: node linkType: hard -"sort-package-json@npm:1.53.1": - version: 1.53.1 - resolution: "sort-package-json@npm:1.53.1" +"sort-package-json@npm:1.57.0": + version: 1.57.0 + resolution: "sort-package-json@npm:1.57.0" dependencies: detect-indent: ^6.0.0 detect-newline: 3.1.0 @@ -40192,34 +40294,27 @@ __metadata: sort-object-keys: ^1.1.3 bin: sort-package-json: cli.js - checksum: 3bf0b1a625566eb061d7d811f4d8b1cebc2c4d85dcb746fa2b27d39703d3d78edead1aa990273b02264af0a618aa6e7edbf24621e280f03bb06418cbd1f07889 + checksum: 15758ba6b1033ae136863eabd4b8c8a28e79dd68b71327f6803c2ea740dc149dc9ad708b006d07ee9de56b6dc7cadb7c697801ad50c01348aa91022c6ff6e21d languageName: node linkType: hard -"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.2": +"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2": version: 1.0.2 resolution: "source-map-js@npm:1.0.2" checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c languageName: node linkType: hard -"source-map-js@npm:^0.6.2": - version: 0.6.2 - resolution: "source-map-js@npm:0.6.2" - checksum: 9c8151a29e00fd8d3ba87709fdf9a9ce48313d653f4a29a39b4ae53d346ac79e005de624796ff42eff55cbaf26d2e87f4466001ca87831d400d818c5cf146a0e - languageName: node - linkType: hard - -"source-map-loader@npm:3.0.0": - version: 3.0.0 - resolution: "source-map-loader@npm:3.0.0" +"source-map-loader@npm:3.0.2": + version: 3.0.2 + resolution: "source-map-loader@npm:3.0.2" dependencies: abab: ^2.0.5 - iconv-lite: ^0.6.2 - source-map-js: ^0.6.2 + iconv-lite: ^0.6.3 + source-map-js: ^1.0.1 peerDependencies: webpack: ^5.0.0 - checksum: c4459cef5a43917ca1c7ad53b106ba715d545daae1ace259c867c36b2b2443c3b9eebe8630cac8f193760db39965c22d1b44d8f69e9910b88c8aca1c836757b5 + checksum: d5a4e2ab190c93ae5cba68c247fbaa9fd560333c91060602b634c399a8a4b3205b8c07714c3bcdb0a11c6cc5476c06256bd8e824e71fbbb7981e8fad5cba4a00 languageName: node linkType: hard @@ -40841,15 +40936,6 @@ __metadata: languageName: node linkType: hard -"stream-events@npm:^1.0.5": - version: 1.0.5 - resolution: "stream-events@npm:1.0.5" - dependencies: - stubs: ^3.0.0 - checksum: 969ce82e34bfbef5734629cc06f9d7f3705a9ceb8fcd6a526332f9159f1f8bbfdb1a453f3ced0b728083454f7706adbbe8428bceb788a0287ca48ba2642dc3fc - languageName: node - linkType: hard - "stream-http@npm:^3.2.0": version: 3.2.0 resolution: "stream-http@npm:3.2.0" @@ -41100,7 +41186,7 @@ __metadata: languageName: node linkType: hard -"stringify-object@npm:^3.2.1, stringify-object@npm:^3.3.0": +"stringify-object@npm:3.3.0, stringify-object@npm:^3.2.1": version: 3.3.0 resolution: "stringify-object@npm:3.3.0" dependencies: @@ -41261,13 +41347,6 @@ __metadata: languageName: node linkType: hard -"stubs@npm:^3.0.0": - version: 3.0.0 - resolution: "stubs@npm:3.0.0" - checksum: dec7b82186e3743317616235c59bfb53284acc312cb9f4c3e97e2205c67a5c158b0ca89db5927e52351582e90a2672822eeaec9db396e23e56893d2a8676e024 - languageName: node - linkType: hard - "stylus-lookup@npm:^3.0.1": version: 3.0.2 resolution: "stylus-lookup@npm:3.0.2" @@ -41663,9 +41742,9 @@ __metadata: languageName: node linkType: hard -"tap@npm:16.3.7": - version: 16.3.7 - resolution: "tap@npm:16.3.7" +"tap@npm:16.3.8": + version: 16.3.8 + resolution: "tap@npm:16.3.8" dependencies: "@isaacs/import-jsx": ^4.0.1 "@types/react": ^17.0.52 @@ -41709,7 +41788,7 @@ __metadata: optional: true bin: tap: bin/run.js - checksum: aed5f74698a0d90c5c7e12f07f2b543aa517c4e4f0c54fdbe7a19397448a18bb2ac8a879be923f72ee36aea7fb324c578ed90005ad10cd5aa794018cd002c3f3 + checksum: b63e064f1ea20aa4cbe8cd40fbe780def9757b637caaae8ee24d96b184d8627421045dd56168b21715f6ebff77e88db774cda0b80af113ae33432641aefcbb58 languageName: node linkType: hard @@ -41737,13 +41816,15 @@ __metadata: languageName: node linkType: hard -"tape@npm:5.6.3": - version: 5.6.3 - resolution: "tape@npm:5.6.3" +"tape@npm:5.6.6": + version: 5.6.6 + resolution: "tape@npm:5.6.6" dependencies: + "@ljharb/resumer": ^0.0.1 + "@ljharb/through": ^2.3.9 array.prototype.every: ^1.1.4 call-bind: ^1.0.2 - deep-equal: ^2.2.0 + deep-equal: ^2.2.2 defined: ^1.0.1 dotignore: ^0.1.2 for-each: ^0.3.3 @@ -41753,18 +41834,16 @@ __metadata: has-dynamic-import: ^2.0.1 inherits: ^2.0.4 is-regex: ^1.1.4 - minimist: ^1.2.7 + minimist: ^1.2.8 object-inspect: ^1.12.3 object-is: ^1.1.5 object-keys: ^1.1.1 object.assign: ^4.1.4 resolve: ^2.0.0-next.4 - resumer: ^0.0.0 string.prototype.trim: ^1.2.7 - through: ^2.3.8 bin: tape: bin/tape - checksum: f6ce2bc25a9198e040249441554b5e0b7ffa120eea480945f4e8b9ddf1fceb8ed91a3f9df5e998ab48566ae6c6a1aed30a176a1c57d4bf6ef2f3b2c8e200a989 + checksum: aac4722c7104f8478c8079aa1f441636b720f432074355c2edb1b0c0e2f2822004af2097669186d65ce7c70c57164d85d7da3662338e53515bdb778f5412af30 languageName: node linkType: hard @@ -41888,19 +41967,6 @@ __metadata: languageName: node linkType: hard -"teeny-request@npm:7.1.1": - version: 7.1.1 - resolution: "teeny-request@npm:7.1.1" - dependencies: - http-proxy-agent: ^4.0.0 - https-proxy-agent: ^5.0.0 - node-fetch: ^2.6.1 - stream-events: ^1.0.5 - uuid: ^8.0.0 - checksum: 3ac6ade7d5ea8c96b6a71c8f7b75dd3f0a939b8c25e9c4ef87edf021264ef07417f2df4ca22f0ff72b3fdccb2616a92cdf2008e0819188e79390a3e79b426a46 - languageName: node - linkType: hard - "temp-dir@npm:^1.0.0": version: 1.0.0 resolution: "temp-dir@npm:1.0.0" @@ -41947,6 +42013,28 @@ __metadata: languageName: node linkType: hard +"terser-webpack-plugin@npm:^5.3.7": + version: 5.3.9 + resolution: "terser-webpack-plugin@npm:5.3.9" + dependencies: + "@jridgewell/trace-mapping": ^0.3.17 + jest-worker: ^27.4.5 + schema-utils: ^3.1.1 + serialize-javascript: ^6.0.1 + terser: ^5.16.8 + peerDependencies: + webpack: ^5.1.0 + peerDependenciesMeta: + "@swc/core": + optional: true + esbuild: + optional: true + uglify-js: + optional: true + checksum: 41705713d6f9cb83287936b21e27c658891c78c4392159f5148b5623f0e8c48559869779619b058382a4c9758e7820ea034695e57dc7c474b4962b79f553bc5f + languageName: node + linkType: hard + "terser@npm:5.16.3": version: 5.16.3 resolution: "terser@npm:5.16.3" @@ -41961,6 +42049,20 @@ __metadata: languageName: node linkType: hard +"terser@npm:^5.16.8": + version: 5.19.2 + resolution: "terser@npm:5.19.2" + dependencies: + "@jridgewell/source-map": ^0.3.3 + acorn: ^8.8.2 + commander: ^2.20.0 + source-map-support: ~0.5.20 + bin: + terser: bin/terser + checksum: e059177775b4d4f4cff219ad89293175aefbd1b081252270444dc83e42a2c5f07824eb2a85eae6e22ef6eb7ef04b21af36dd7d1dd7cfb93912310e57d416a205 + languageName: node + linkType: hard + "terser@npm:^5.7.2": version: 5.11.0 resolution: "terser@npm:5.11.0" @@ -42106,7 +42208,7 @@ __metadata: languageName: node linkType: hard -"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8, through@npm:~2.3.4": +"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8": version: 2.3.8 resolution: "through@npm:2.3.8" checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd @@ -42538,9 +42640,9 @@ __metadata: languageName: node linkType: hard -"ts-loader@npm:9.2.5": - version: 9.2.5 - resolution: "ts-loader@npm:9.2.5" +"ts-loader@npm:9.4.4": + version: 9.4.4 + resolution: "ts-loader@npm:9.4.4" dependencies: chalk: ^4.1.0 enhanced-resolve: ^5.0.0 @@ -42549,7 +42651,7 @@ __metadata: peerDependencies: typescript: "*" webpack: ^5.0.0 - checksum: e39fab0caac55dc3c57789ea690aca687d033f0d202e2a27cc37aa0f57f987e7a70d033750d4079253e549fdd5c4379e3b5049c17dd1665ab89263dee06f2d1c + checksum: 8e5e6b839b0edfa40d2156c880d88ccab58226894ea5978221bc48c7db3215e2e856bfd0093f148e925a2befc42d6c94cafa9a994a7da274541efaa916012b63 languageName: node linkType: hard @@ -42707,7 +42809,7 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.2, tsconfig-paths@npm:^3.9.0": +"tsconfig-paths@npm:^3.14.2": version: 3.14.2 resolution: "tsconfig-paths@npm:3.14.2" dependencies: @@ -42779,13 +42881,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:~2.1.0": - version: 2.1.0 - resolution: "tslib@npm:2.1.0" - checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78 - languageName: node - linkType: hard - "tslib@npm:~2.4.0": version: 2.4.1 resolution: "tslib@npm:2.4.1" @@ -43356,6 +43451,15 @@ __metadata: languageName: node linkType: hard +"uid@npm:2.0.1": + version: 2.0.1 + resolution: "uid@npm:2.0.1" + dependencies: + "@lukeed/csprng": ^1.0.0 + checksum: 0a3c697d8dd1f3b647afa35c411b11fd8fa2fb6dbd8a49fe109a4aa5214068c2c58781aa6e4516dfd16f0fc524fb7bba0833e9c1dc1ed3f1965b520349be9ad5 + languageName: node + linkType: hard + "uint8arrays@npm:^2.1.6": version: 2.1.10 resolution: "uint8arrays@npm:2.1.10" @@ -43807,15 +43911,6 @@ __metadata: languageName: node linkType: hard -"urlgrey@npm:1.0.0": - version: 1.0.0 - resolution: "urlgrey@npm:1.0.0" - dependencies: - fast-url-parser: ^1.1.3 - checksum: bc09df2474da59f95c8577746322bfb0f219c3a084722b427a916906ea7dab538fdbaf6a5582f64f617e9405fb1c9cc437ce40ec73abdddf26d7771a3d2f088b - languageName: node - linkType: hard - "use@npm:^3.1.0": version: 3.1.1 resolution: "use@npm:3.1.1" @@ -44004,7 +44099,7 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache@npm:^2.0.3, v8-compile-cache@npm:^2.2.0": +"v8-compile-cache@npm:^2.0.3": version: 2.3.0 resolution: "v8-compile-cache@npm:2.3.0" checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e @@ -44186,6 +44281,13 @@ __metadata: languageName: node linkType: hard +"vscode-languageserver-textdocument@npm:^1.0.4": + version: 1.0.10 + resolution: "vscode-languageserver-textdocument@npm:1.0.10" + checksum: 605ff0662535088567a145b48d28f0c41844d28269fa0b3fca3a1e179dd14baf7181150b274bf3840ef2a043ed8474a9227aaf169a6fae574516349a1b371a18 + languageName: node + linkType: hard + "vscode-oniguruma@npm:^1.7.0": version: 1.7.0 resolution: "vscode-oniguruma@npm:1.7.0" @@ -44200,7 +44302,7 @@ __metadata: languageName: node linkType: hard -"vscode-uri@npm:^3.0.2, vscode-uri@npm:^3.0.3": +"vscode-uri@npm:^3.0.3": version: 3.0.3 resolution: "vscode-uri@npm:3.0.3" checksum: 683bf9de835c3cef0b51c104a4949bf746148ded7c2287ebafcc506d20aa0e90b99385a972dba8132903420dba67fc33a5e146e30212c4a6b3ca5d74d1f95702 @@ -46276,14 +46378,15 @@ __metadata: languageName: node linkType: hard -"webpack-bundle-analyzer@npm:4.4.2": - version: 4.4.2 - resolution: "webpack-bundle-analyzer@npm:4.4.2" +"webpack-bundle-analyzer@npm:4.9.0": + version: 4.9.0 + resolution: "webpack-bundle-analyzer@npm:4.9.0" dependencies: + "@discoveryjs/json-ext": 0.5.7 acorn: ^8.0.4 acorn-walk: ^8.0.0 chalk: ^4.1.0 - commander: ^6.2.0 + commander: ^7.2.0 gzip-size: ^6.0.0 lodash: ^4.17.20 opener: ^1.5.2 @@ -46291,26 +46394,25 @@ __metadata: ws: ^7.3.1 bin: webpack-bundle-analyzer: lib/bin/analyzer.js - checksum: 6d7957a87ee16f6b87e65f85e8b9a40998aefcddf3e15215fd4bc1ddf8c332ab4706f2f4deb0b3a0483eb27d0dae381db1b82b2ec34136e2ad0e651714b260fb + checksum: e439aea4e88e18bfdc16eb69782c1bb17b2e581905a5cfa8d34058dc6677f6e202f896189268e58b49fa14ae12f5ef4c25cdca9f98f3de7e6699ac62def2f0af languageName: node linkType: hard -"webpack-cli@npm:4.7.2": - version: 4.7.2 - resolution: "webpack-cli@npm:4.7.2" +"webpack-cli@npm:4.10.0": + version: 4.10.0 + resolution: "webpack-cli@npm:4.10.0" dependencies: "@discoveryjs/json-ext": ^0.5.0 - "@webpack-cli/configtest": ^1.0.4 - "@webpack-cli/info": ^1.3.0 - "@webpack-cli/serve": ^1.5.1 - colorette: ^1.2.1 + "@webpack-cli/configtest": ^1.2.0 + "@webpack-cli/info": ^1.5.0 + "@webpack-cli/serve": ^1.7.0 + colorette: ^2.0.14 commander: ^7.0.0 - execa: ^5.0.0 + cross-spawn: ^7.0.3 fastest-levenshtein: ^1.0.12 import-local: ^3.0.2 interpret: ^2.2.0 rechoir: ^0.7.0 - v8-compile-cache: ^2.2.0 webpack-merge: ^5.7.3 peerDependencies: webpack: 4.x.x || 5.x.x @@ -46325,7 +46427,7 @@ __metadata: optional: true bin: webpack-cli: bin/cli.js - checksum: 4a7ed6099d2da6d0c6e2d4914d45b53a5200cfc811c38eb622b792a364a2bec8104517bf5c33a616a4f21d17d7041e5ed1075c9a81e1593f09a7971bb3107f1a + checksum: 2ff5355ac348e6b40f2630a203b981728834dca96d6d621be96249764b2d0fc01dd54edfcc37f02214d02935de2cf0eefd6ce689d970d154ef493f01ba922390 languageName: node linkType: hard @@ -46435,9 +46537,9 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5.76.0": - version: 5.76.0 - resolution: "webpack@npm:5.76.0" +"webpack@npm:5.76.1": + version: 5.76.1 + resolution: "webpack@npm:5.76.1" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 @@ -46468,25 +46570,25 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: e897b3b34068222fe910d8894837cbf39f5e66b4772fe8d24dfc0090cd13e19337a3a757a97bc185be6c64d9d5a7b1ae372821b65a6079ce8c7ceba606edb409 + checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2 languageName: node linkType: hard -"webpack@npm:5.76.1": - version: 5.76.1 - resolution: "webpack@npm:5.76.1" +"webpack@npm:5.88.2": + version: 5.88.2 + resolution: "webpack@npm:5.88.2" dependencies: "@types/eslint-scope": ^3.7.3 - "@types/estree": ^0.0.51 - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/wasm-edit": 1.11.1 - "@webassemblyjs/wasm-parser": 1.11.1 + "@types/estree": ^1.0.0 + "@webassemblyjs/ast": ^1.11.5 + "@webassemblyjs/wasm-edit": ^1.11.5 + "@webassemblyjs/wasm-parser": ^1.11.5 acorn: ^8.7.1 - acorn-import-assertions: ^1.7.6 + acorn-import-assertions: ^1.9.0 browserslist: ^4.14.5 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.10.0 - es-module-lexer: ^0.9.0 + enhanced-resolve: ^5.15.0 + es-module-lexer: ^1.2.1 eslint-scope: 5.1.1 events: ^3.2.0 glob-to-regexp: ^0.4.1 @@ -46495,9 +46597,9 @@ __metadata: loader-runner: ^4.2.0 mime-types: ^2.1.27 neo-async: ^2.6.2 - schema-utils: ^3.1.0 + schema-utils: ^3.2.0 tapable: ^2.1.1 - terser-webpack-plugin: ^5.1.3 + terser-webpack-plugin: ^5.3.7 watchpack: ^2.4.0 webpack-sources: ^3.2.3 peerDependenciesMeta: @@ -46505,7 +46607,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2 + checksum: 79476a782da31a21f6dd38fbbd06b68da93baf6a62f0d08ca99222367f3b8668f5a1f2086b7bb78e23172e31fa6df6fa7ab09b25e827866c4fc4dc2b30443ce2 languageName: node linkType: hard @@ -46840,7 +46942,7 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^6.2.0": +"wrap-ansi@npm:^6.0.1, wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" dependencies: From 516dd49fd443fc2d50b003104301b8060327b35a Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Sat, 19 Aug 2023 22:26:19 -0700 Subject: [PATCH 2/5] fix(connector-fabric): runTransactionV1 Open API validation crash The "express-openapi-validator" package was crashing while trying to parse our Fabric connector's Open API spec because of the typo that in the specs the "description" field for some schema elements were named "properties" which is a reserved field in the schema of the specs. Fixing the typo in the spec document made the problem go away. Signed-off-by: Peter Somogyvari --- .../src/main/json/openapi.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json index 183869ac11..9037c59c34 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json @@ -123,11 +123,11 @@ }, "vaultTransitKey": { "$ref": "#/components/schemas/VaultTransitKey", - "properties": "vault key details , if Vault-X.509 identity provider to be used for singing fabric messages" + "description": "vault key details , if Vault-X.509 identity provider to be used for singing fabric messages" }, "webSocketKey": { "$ref": "#/components/schemas/WebSocketKey", - "properties": "web-socket key details , if WS-X.509 identity provider to be used for singing fabric messages" + "description": "web-socket key details , if WS-X.509 identity provider to be used for singing fabric messages" } } }, @@ -878,6 +878,7 @@ "items": { "$ref": "#/components/schemas/FileBase64" }, + "type": "array", "minItems": 1, "maxItems": 65535, "nullable": false From 08afe1a9ed336e5398b6ca44ccfa71c205af5fb5 Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Sat, 19 Aug 2023 22:30:55 -0700 Subject: [PATCH 3/5] test(connector-fabric): fix flaky test 2.2.x deploy-cc-from-javascript Primary changes: --------------- 1. Added robust debug logging to the express middleware of the API server so that problems like this are easier to debug in the future (e.g. trouble with the Open API spec documents themselves) 2. Refactored the ci.yaml document so that there are separate jobs for each tape based Fabric connector integration test. This has reduced (or potentially eliminated) the presence of the flake that we were encountering during the contract deployment test cases. It also has the upside of faster CI because of more parallelism in the CI jobs. 3. Updated the assertions in a couple of test cases where the newer Fabric versions were causing the assertions to fail because the returned JSON response in the example asset transfer chaincode is now referring to the asset owner via a property named "Owner" not "owner" (casing difference) Fixes #1471 Signed-off-by: Peter Somogyvari --- .github/workflows/ci.yaml | 372 +++++++++++++++++- .../install-open-api-validator-middleware.ts | 51 ++- .../run-transaction-with-ws-ids.test.ts | 2 +- .../openapi/openapi-validation.test.ts | 10 +- 4 files changed, 423 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a2c2267e3f..ed1dbe723c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,7 +43,6 @@ jobs: name: tools_ci_sh run: ./tools/ci.sh - yarn_lint: continue-on-error: false env: @@ -781,15 +780,17 @@ jobs: restore-keys: | ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} - run: ./tools/ci.sh - cactus-plugin-ledger-connector-fabric: + + plugin-ledger-connector-fabric-0: continue-on-error: false env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' FULL_BUILD_DISABLED: true JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts JEST_TEST_RUNNER_DISABLED: false - TAPE_TEST_PATTERN: >- - --files={./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v1-4-x/deploy-cc-from-golang-source.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v1-4-x/run-transaction-endpoint-v1.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/add-orgs.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-lock-asset.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/obtain-profiles.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-identities.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/identity-client.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation-go.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts,./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/unit/identity-internal-crypto-utils.test.ts} - TAPE_TEST_RUNNER_DISABLED: false + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true needs: build-dev runs-on: ubuntu-20.04 steps: @@ -808,6 +809,367 @@ jobs: restore-keys: | ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} - run: ./tools/ci.sh + + plugin-ledger-connector-fabric-1: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts + + plugin-ledger-connector-fabric-2: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts + + plugin-ledger-connector-fabric-3: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-lock-asset.test.ts + + plugin-ledger-connector-fabric-4: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts + + plugin-ledger-connector-fabric-5: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation-go.test.ts + + plugin-ledger-connector-fabric-6: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/unit/identity-internal-crypto-utils.test.ts + + plugin-ledger-connector-fabric-7: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/identity-client.test.ts + + plugin-ledger-connector-fabric-8: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-identities.test.ts + + plugin-ledger-connector-fabric-9: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/obtain-profiles.test.ts + + plugin-ledger-connector-fabric-10: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts + + plugin-ledger-connector-fabric-11: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/add-orgs.test.ts + + plugin-ledger-connector-fabric-12: + continue-on-error: false + env: + CACTI_NPM_PACKAGE_NAME: "@hyperledger/cactus-plugin-ledger-connector-fabric" + HFC_LOGGING: '{"debug":"console","info":"console","warn": "console","error":"console"}' + FULL_BUILD_DISABLED: true + JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts + JEST_TEST_RUNNER_DISABLED: true + TAPE_TEST_PATTERN: "" + TAPE_TEST_RUNNER_DISABLED: true + needs: build-dev + runs-on: ubuntu-20.04 + steps: + - name: Use Node.js v16.14.2 + uses: actions/setup-node@v3.6.0 + with: + node-version: v16.14.2 + - uses: actions/checkout@v3.5.2 + + - id: yarn-cache + name: Restore Yarn Cache + uses: actions/cache@v3.3.1 + with: + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + path: ./.yarn/ + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + - run: npm run configure + - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts + cactus-plugin-ledger-connector-fabric-socketio: continue-on-error: false env: diff --git a/packages/cactus-core/src/main/typescript/web-services/install-open-api-validator-middleware.ts b/packages/cactus-core/src/main/typescript/web-services/install-open-api-validator-middleware.ts index 1f7dbdb7f0..bc9a41da37 100644 --- a/packages/cactus-core/src/main/typescript/web-services/install-open-api-validator-middleware.ts +++ b/packages/cactus-core/src/main/typescript/web-services/install-open-api-validator-middleware.ts @@ -2,6 +2,8 @@ import type { Application, NextFunction, Request, Response } from "express"; import * as OpenApiValidator from "express-openapi-validator"; import { OpenAPIV3 } from "express-openapi-validator/dist/framework/types"; +import { error as EovErrors } from "express-openapi-validator"; + import { Checks, LoggerProvider, @@ -62,12 +64,55 @@ export async function installOpenapiValidationMiddleware( res: Response, next: NextFunction, ) => { - if (err) { - res.status(err.status || 500); - res.send(err.errors); + const tag = "[express-openapi-validator-middleware-handler]"; + if (isOpenApiRequestValidationError(err)) { + if (err.status) { + const { errors, status } = err; + log.debug("%s Got valid error, status=%s - %o", tag, status, errors); + res.status(err.status); + res.send(err.errors); + } else { + log.debug("%s Got invalid error - status missing - %o", tag, err); + res.status(500); + res.send(err); + } + } else if (err) { + log.debug("%s Got invalid error - validator crash(?) - %o", tag, err); + res.status(500); + res.send(err); } else { + log.debug("%s Validation Passed OK - %s", tag, req.url); next(); } }, ); } + +/** + * Determines if an error object is an instance of one of the types that are + * designed to be thrown by the "express-openapi-validator" package specifically + * when it finds issues it is designed to find. + * + * In other words, we are detecting if the error was thrown intentionally or if + * the validator had just crashed because of some other issue such as when the + * Open API spec file is invalid. + * + * To give an example to the above, the "properties" key in one of the specs + * was being assigned a string value but according to the meta schema (the + * schema of the Open API spec documents themselves) the "properties" property + * must be defined as an object that lists the properties of a schema element. + * + * The above mistake made by the person who wrote the Open API spec in question + * was causing the "express-openapi-validator" package to crash, throwing errors + * but different ones from the ones that it is "expected" to throw and we could + * not detect this at the time and hence this function was made so that in the + * future, debugging these kind of errors are much easier and can be done based + * on the logs alone (hopefully). + */ +export function isOpenApiRequestValidationError(ex: unknown): boolean { + if (ex) { + return Object.values(EovErrors).some((x) => ex instanceof x); + } else { + return false; + } +} diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts b/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts index fec650479d..131d37ee0a 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts +++ b/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts @@ -318,7 +318,7 @@ test("run-transaction-with-ws-ids", async (t: Test) => { }); t.true(resp.success); const asset = JSON.parse(resp.functionOutput); - t.equal(asset.owner, "client2"); + t.equal(asset.Owner, "client2"); } t.end(); }); diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts b/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts index c224a4e982..1eb7412d2a 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts +++ b/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts @@ -8,6 +8,9 @@ import express from "express"; import bodyParser from "body-parser"; import { Containers, + DEFAULT_FABRIC_2_AIO_FABRIC_VERSION, + DEFAULT_FABRIC_2_AIO_IMAGE_NAME, + DEFAULT_FABRIC_2_AIO_IMAGE_VERSION, FabricTestLedgerV1, pruneDockerAllIfGithubAction, } from "@hyperledger/cactus-test-tooling"; @@ -55,8 +58,9 @@ test(testCase, async (t: Test) => { const ledger = new FabricTestLedgerV1({ emitContainerLogs: true, publishAllPorts: true, - imageName: "ghcr.io/hyperledger/cactus-fabric2-all-in-one", - envVars: new Map([["FABRIC_VERSION", "2.2.0"]]), + imageName: DEFAULT_FABRIC_2_AIO_IMAGE_NAME, + imageVersion: DEFAULT_FABRIC_2_AIO_IMAGE_VERSION, + envVars: new Map([["FABRIC_VERSION", DEFAULT_FABRIC_2_AIO_FABRIC_VERSION]]), logLevel, }); const tearDown = async () => { @@ -65,7 +69,7 @@ test(testCase, async (t: Test) => { }; test.onFinish(tearDown); - await ledger.start(); + await ledger.start({ omitPull: false }); const connectionProfile = await ledger.getConnectionProfileOrg1(); t.ok(connectionProfile, "getConnectionProfileOrg1() out truthy OK"); From 680899780782326cbd2579d792c432151e5abc15 Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Wed, 23 Aug 2023 15:19:18 -0700 Subject: [PATCH 4/5] ci(codegen): ensure yarn_codegen CI job fails when diff is not empty 1. If we run the codegen script and it generates a diff (e.g. changes files that are under version control) that means that we have to send it back to the person who is making the pull request and ask them to include those changes in their commit so that we are adhering to the idea of reproducible builds as much as possible. 2. These (env var) parameters of ./tools/ci.sh are now true by default: - `TOOLS_VALIDATE_BUNDLE_NAMES_DISABLED` - `CUSTOM_CHECKS_DISABLED` - `FULL_BUILD_DISABLED` 3. Refactored the custom-check that verifies the Open API specs' license parameters (`tools/custom-checks/check-open-api-json-specs.ts`) so that it does not fail for missing "identifier" properties UNLESS the spec's version is 3.1.0 or higher. This was necessary because we cannot yet migrate the specs to v3.1.0 due to the generator not supporting it properly (it ends up mangling all of the types in the generated code from their actual type to `any`) 4. Additional logging was also added to the script mentioned in 3) to make it easier in the future to debug what is the problem. 5. Added these environment variables to control the behavior of the `tools/custom-checks/check-open-api-json-specs.ts` script: - `CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_SPEC_VERSION` - `CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_SPDX` - `CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_URL` Related to #2618 Signed-off-by: Peter Somogyvari --- .github/workflows/ci.yaml | 44 +++++++++- tools/ci.sh | 6 +- .../check-open-api-json-specs.ts | 81 ++++++++++++++----- 3 files changed, 107 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ed1dbe723c..e5503c51eb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,7 +73,7 @@ jobs: yarn_codegen: continue-on-error: false env: - DEV_BUILD_DISABLED: false + DEV_BUILD_DISABLED: true FULL_BUILD_DISABLED: true JEST_TEST_RUNNER_DISABLED: true TAPE_TEST_RUNNER_DISABLED: true @@ -98,7 +98,48 @@ jobs: restore-keys: | ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} - run: ./tools/ci.sh + - run: git status --porcelain + - run: git status --porcelain | wc -l - run: yarn codegen + - run: git status --porcelain + - run: git status --porcelain | wc -l + + - name: Set env.GIT_INDEX_FILE_COUNT + id: set_env_git_index_file_count + run: | + echo "GIT_INDEX_FILE_COUNT=$(git status --porcelain | wc -l)" >> $GITHUB_ENV + + - name: Print env.GIT_INDEX_FILE_COUNT + id: print_env_git_index_file_count + run: | + echo "${{ env.GIT_INDEX_FILE_COUNT }}" + + - uses: actions/github-script@v6.4.1 + id: set-result-git_index_file_count + with: + script: | + const { GIT_INDEX_FILE_COUNT } = process.env; + console.log(`env.GIT_INDEX_FILE_COUNT ${GIT_INDEX_FILE_COUNT}`); + return parseInt(GIT_INDEX_FILE_COUNT, 10); + result-encoding: string + + - name: Get result Git Index File Count + id: get_result_git_index_file_count + run: echo "${{steps.set-result-git_index_file_count.outputs.result}}" + + - name: Check CodeGen Side-effects + if: ${{ steps.set-result-git_index_file_count.outputs.result != 0 }} + uses: actions/github-script@v6.4.1 + with: + script: | + const failMsg = "yarn codegen script produced version control " + + "side-effects: source files have been changed by it that are " + + "otherwise are under version control. " + + "This means (99% of the time) that you need to run the " + + "yarn codegen script locally and then include the changes it " + + "makes in your own commit when submitting your pull request."; + core.setFailed(failMsg) + yarn_custom_checks: continue-on-error: false env: @@ -109,6 +150,7 @@ jobs: TOOLS_VALIDATE_BUNDLE_NAMES_DISABLED: true CUSTOM_CHECKS_DISABLED: false CONFIGURE_DISABLED: false + CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_SPEC_VERSION: 3.0.3 needs: build-dev runs-on: ubuntu-20.04 steps: diff --git a/tools/ci.sh b/tools/ci.sh index 8971d1998a..f8dc8264f5 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -132,13 +132,13 @@ function mainTask() npm run configure fi - if [ "${TOOLS_VALIDATE_BUNDLE_NAMES_DISABLED:-false}" = "true" ]; then + if [ "${TOOLS_VALIDATE_BUNDLE_NAMES_DISABLED:-true}" = "true" ]; then echo "$(date +%FT%T%z) [CI] yarn tools:validate-bundle-names disabled. Skipping..." else yarn tools:validate-bundle-names fi - if [ "${CUSTOM_CHECKS_DISABLED:-false}" = "true" ]; then + if [ "${CUSTOM_CHECKS_DISABLED:-true}" = "true" ]; then echo "$(date +%FT%T%z) [CI] yarn custom-checks disabled. Skipping..." else yarn custom-checks @@ -172,7 +172,7 @@ function mainTask() # of providing feedback about failing tests as early as possible we run the # dev:backend build first and then the tests which is the fastest way to get # to a failed test if there was one. - if [ "${FULL_BUILD_DISABLED:-false}" = "true" ]; then + if [ "${FULL_BUILD_DISABLED:-true}" = "true" ]; then echo "$(date +%FT%T%z) [CI] Full build disabled. Skipping..." else yarn run build diff --git a/tools/custom-checks/check-open-api-json-specs.ts b/tools/custom-checks/check-open-api-json-specs.ts index 0d2dcff29a..b8d56c35e0 100644 --- a/tools/custom-checks/check-open-api-json-specs.ts +++ b/tools/custom-checks/check-open-api-json-specs.ts @@ -2,7 +2,6 @@ import fs from "fs-extra"; import path from "path"; import { fileURLToPath } from "url"; import { globby, Options as GlobbyOptions } from "globby"; -// import * as globby from "globby"; import { RuntimeError } from "run-time-error"; import { hasProperty } from "./has-property"; import { isStdLibRecord } from "./is-std-lib-record"; @@ -45,9 +44,63 @@ export async function checkOpenApiJsonSpecs( const DEFAULT_GLOB = "**/src/main/json/openapi.json"; const oasPaths = await globby(DEFAULT_GLOB, globbyOpts); - console.log(`openapi.json paths: (${oasPaths.length}): `); + console.log(`${TAG} openapi.json paths: (${oasPaths.length}): `); // const oasPaths = oasPathsEntries.map((it) => it.path); + const defaultOpenApiSpecVersion = "3.0.3"; + const oasVersion = !!req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_SPEC_VERSION + ? req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_SPEC_VERSION + : defaultOpenApiSpecVersion; + + console.log( + "%s defaultOpenApiSpecVersion=%s", + TAG, + defaultOpenApiSpecVersion, + ); + console.log( + "%s req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_SPEC_VERSION=%s", + TAG, + req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_SPEC_VERSION, + ); + console.log("%s Concluded with oasVersion=%s", TAG, oasVersion); + + // Quick and dirty sem-ver parsing because we don't need to care about + // anything after the minor number) + const [major, minor] = oasVersion.split(".").map((x) => parseInt(x, 10)); + + // License identifier field was added in 3.1.0 so we only need it if the + // spec version is equal or newer than that. + const needsLicenseId = major >= 3 && minor >= 1; + console.log("%s Concluded with needsLicenseId=%s", TAG, needsLicenseId); + + const DEFAULT_LICENSE_SPDX = "Apache-2.0"; + const licenseSpdx = !!req.env + .CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_SPDX + ? req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_SPDX + : DEFAULT_LICENSE_SPDX; + + console.log("%s DEFAULT_LICENSE_SPDX=%s", TAG, DEFAULT_LICENSE_SPDX); + console.log( + "%s req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_SPDX=%s", + TAG, + req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_SPDX, + ); + console.log("%s Concluded with licenseSpdx=%s", TAG, licenseSpdx); + + const DEFAULT_LICENSE_URL = + "https://www.apache.org/licenses/LICENSE-2.0.html"; + const licenseUrl = !!req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_URL + ? req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_URL + : DEFAULT_LICENSE_URL; + + console.log("%s DEFAULT_LICENSE_URL=%s", TAG, DEFAULT_LICENSE_URL); + console.log( + "%s req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_URL=%s", + TAG, + req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_URL, + ); + console.log("%s Concluded with licenseUrl=%s", TAG, licenseUrl); + const errors: string[] = []; const checks = oasPaths.map(async (oasPathRel) => { @@ -68,22 +121,6 @@ export async function checkOpenApiJsonSpecs( return; } - const defaultOpenApiSpecVersion = "3.1.0"; - const oasVersion = - !!req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_SPEC_VERSION || - defaultOpenApiSpecVersion; - - const DEFAULT_LICENSE_SPDX = "Apache-2.0"; - const licenseSpdx = - !!req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_SPDX || - DEFAULT_LICENSE_SPDX; - - const DEFAULT_LICENSE_URL = - "https://www.apache.org/licenses/LICENSE-2.0.html"; - const licenseUrl = - !!req.env.CACTI_CUSTOM_CHECKS_REQUIRED_OPENAPI_LICENSE_URL || - DEFAULT_LICENSE_URL; - if (!hasProperty(oas, "openapi")) { errors.push(`ERROR: ${oasPathRel} "openapi" must equal "${oasVersion}"`); } else if (oas.openapi !== oasVersion) { @@ -95,10 +132,14 @@ export async function checkOpenApiJsonSpecs( } else if (!hasProperty(oas.info, "license")) { errors.push(`ERROR: ${oasPathRel} "info.license" must be an object`); } else { - if (!hasProperty(oas.info.license, "identifier")) { + if (!hasProperty(oas.info.license, "identifier") && needsLicenseId) { const msg = `ERROR: ${oasPathRel} "info.license.identifier" must be set`; errors.push(msg); - } else if (oas.info.license.identifier !== licenseSpdx) { + } else if ( + hasProperty(oas.info.license, "identifier") && + oas.info.license.identifier !== licenseSpdx && + needsLicenseId + ) { const msg = `ERROR: ${oasPathRel} "info.license.identifier" must be ${licenseSpdx}`; errors.push(msg); } From db72c8329e535b645913c6c81c41649a5e2f4ed0 Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Wed, 23 Aug 2023 15:24:56 -0700 Subject: [PATCH 5/5] ci(codegen): fix the yarn codegen job in ci.yaml BREAKING CHANGES: 1. Fabric connector endpoints are using base64 encoding instead of JSON when needing to transfer otherwise binary data (UInt8Array) 2. Same as the above for the Iroha 1 and Iroha 2 connectors. Primary changes: ----------------- 1. Removed the `"identifier": "Apache-2.0",` section from all OpenAPI specification documents (./**/openapi.json) project-wide because the OpenAPI generator is not yet compatible with it and because of that the new property just makes it crash with a false-negative validation error. 2. Downgraded all OpenAPI specification documents version from `v3.1.0` to `v3.0.3` (which is how it used to be) because the generator is not yet compatible with it and it had caused types to be mangled. 3. Eliminated incorrect usage of the "format": "binary" declarations in the OpenAPI specifications where the format was declared as binary but the data was still traveling as JSON strings despite it (divergence between our spec .json files and the implementation under the hood) 4. Updated the tests and their related endpoints to use base64 encoding instead of JSON serializing UInt8Array instances: It is more efficient this way and also has the benefit of honoring the specification. The reason why it's more efficient is because JSON serializing a typed UInt8Array results in an object literal that maps every single byte to a property of said object, roughly tripling the size of the network transfer. It probably also is slower to serialize/deserialize but I haven't actually measured this. 5. All of the packages are now using the OpenAPI generator v6.6.0 instead of some being stuck on v5.2.1. This might cause build issues in kotlin API clients but because we don't have a freeze on breaking changes right now (leading up to v2.0.0) it is the right time to make drastic changes like this. Fixes #2618 Signed-off-by: Peter Somogyvari --- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../client/models/AuthzJwtClaim.kt | 4 +- .../openapitools/client/models/AuthzScope.kt | 4 +- .../openapitools/client/models/Checkpoint.kt | 1 + .../DaoTokenGetAllowanceNotFoundResponse.kt | 1 + .../models/DaoTokenGetAllowanceRequest.kt | 1 + .../models/DaoTokenGetAllowanceResponse.kt | 1 + .../client/models/EnrollAdminInfo.kt | 4 +- .../client/models/EnrollAdminV1Request.kt | 1 + .../client/models/EnrollAdminV1Response.kt | 1 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/FILES | 3 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 22 +- .../openapi/kotlin-client/build.gradle | 11 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../openapitools/client/apis/DefaultApi.kt | 352 +++-- .../client/infrastructure/ApiClient.kt | 113 +- .../client/infrastructure/ApiResponse.kt | 43 + .../infrastructure/BigDecimalAdapter.kt | 2 +- .../infrastructure/BigIntegerAdapter.kt | 2 +- .../client/infrastructure/PartConfig.kt | 11 + .../client/infrastructure/RequestConfig.kt | 1 + .../client/models/BambooHarvest.kt | 9 +- .../openapitools/client/models/Bookshelf.kt | 9 +- .../models/InsertBambooHarvestRequest.kt | 9 +- .../models/InsertBambooHarvestResponse.kt | 9 +- .../client/models/InsertBookshelfRequest.kt | 9 +- .../client/models/InsertBookshelfResponse.kt | 9 +- .../client/models/InsertShipmentRequest.kt | 9 +- .../client/models/InsertShipmentResponse.kt | 9 +- .../models/ListBambooHarvestResponse.kt | 9 +- .../client/models/ListBookshelfResponse.kt | 9 +- .../client/models/ListShipmentResponse.kt | 9 +- .../openapitools/client/models/Shipment.kt | 9 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 112 +- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/FILES | 3 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 22 +- .../openapi/kotlin-client/build.gradle | 11 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../openapitools/client/apis/DefaultApi.kt | 193 ++- .../client/infrastructure/ApiClient.kt | 113 +- .../client/infrastructure/ApiResponse.kt | 43 + .../infrastructure/BigDecimalAdapter.kt | 2 +- .../infrastructure/BigIntegerAdapter.kt | 2 +- .../client/infrastructure/PartConfig.kt | 11 + .../client/infrastructure/RequestConfig.kt | 1 + .../client/models/GetObjectRequestV1.kt | 9 +- .../client/models/GetObjectResponseV1.kt | 9 +- .../client/models/GetObjectV1200Response.kt | 40 + .../client/models/GetObjectV1Request.kt | 35 + .../client/models/HasObjectRequestV1.kt | 9 +- .../client/models/HasObjectResponseV1.kt | 9 +- .../client/models/HasObjectV1200Response.kt | 45 + .../client/models/HasObjectV1Request.kt | 35 + .../client/models/SetObjectRequestV1.kt | 9 +- .../client/models/SetObjectResponseV1.kt | 9 +- .../client/models/SetObjectV1200Response.kt | 35 + .../client/models/SetObjectV1Request.kt | 40 + .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 52 +- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- package.json | 3 +- .../cactus-cmd-api-server/openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../client/models/HealthCheckResponse.kt | 1 + .../openapitools/client/models/MemoryUsage.kt | 1 + .../client/models/WatchHealthcheckV1.kt | 4 +- .../openapi/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../protoc-gen-ts/google/protobuf/empty.ts | 2 +- .../models/health_check_response_pb.ts | 2 +- .../protoc-gen-ts/models/memory_usage_pb.ts | 2 +- .../protoc-gen-ts/services/default_service.ts | 2 +- .../services/default_service_grpc_pb.d.ts | 60 + .../services/default_service_pb.d.ts | 29 + packages/cactus-core-api/openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../openapitools/client/models/CactusNode.kt | 1 + .../client/models/CactusNodeAllOf.kt | 1 + .../client/models/CactusNodeMeta.kt | 1 + ...ensusAlgorithmFamiliesWithOutTxFinality.kt | 4 +- ...onsensusAlgorithmFamiliesWithTxFinality.kt | 4 +- .../client/models/ConsensusAlgorithmFamily.kt | 4 +- .../openapitools/client/models/Consortium.kt | 1 + .../client/models/ConsortiumDatabase.kt | 1 + .../client/models/ConsortiumMember.kt | 1 + .../openapitools/client/models/Constants.kt | 4 +- .../models/DeleteKeychainEntryRequestV1.kt | 1 + .../models/DeleteKeychainEntryResponseV1.kt | 1 + .../models/GetKeychainEntryRequestV1.kt | 1 + .../models/GetKeychainEntryResponseV1.kt | 1 + .../client/models/GetObjectRequestV1.kt | 1 + .../client/models/GetObjectResponseV1.kt | 1 + .../models/HasKeychainEntryRequestV1.kt | 1 + .../models/HasKeychainEntryResponseV1.kt | 1 + .../client/models/HasObjectRequestV1.kt | 1 + .../client/models/HasObjectResponseV1.kt | 1 + .../openapitools/client/models/JWSGeneral.kt | 1 + .../client/models/JWSRecipient.kt | 1 + .../org/openapitools/client/models/Ledger.kt | 1 + .../openapitools/client/models/LedgerType.kt | 4 +- .../client/models/PluginImport.kt | 1 + .../client/models/PluginImportAction.kt | 4 +- .../client/models/PluginImportType.kt | 4 +- .../client/models/PluginInstance.kt | 1 + .../models/SetKeychainEntryRequestV1.kt | 1 + .../models/SetKeychainEntryResponseV1.kt | 1 + .../client/models/SetObjectRequestV1.kt | 1 + .../client/models/SetObjectResponseV1.kt | 1 + .../.openapi-generator/VERSION | 2 +- .../common/protos/common/access_control.ts | 2 +- .../protos/common/access_control_pb.d.ts | 61 + .../weaver/common/protos/common/ack.ts | 2 +- .../weaver/common/protos/common/ack_pb.d.ts | 39 + .../common/protos/common/asset_locks.ts | 2 +- .../common/protos/common/asset_locks_pb.d.ts | 251 +++ .../common/protos/common/asset_transfer.ts | 2 +- .../protos/common/asset_transfer_pb.d.ts | 81 + .../common/protos/common/interop_payload.ts | 2 +- .../protos/common/interop_payload_pb.d.ts | 32 + .../weaver/common/protos/common/membership.ts | 2 +- .../common/protos/common/membership_pb.d.ts | 60 + .../weaver/common/protos/common/proofs.ts | 2 +- .../common/protos/common/proofs_pb.d.ts | 52 + .../weaver/common/protos/common/query.ts | 2 +- .../weaver/common/protos/common/query_pb.d.ts | 53 + .../weaver/common/protos/common/state.ts | 2 +- .../weaver/common/protos/common/state_pb.d.ts | 165 ++ .../protos/common/verification_policy.ts | 2 +- .../protos/common/verification_policy_pb.d.ts | 83 + .../weaver/common/protos/corda/view_data.ts | 2 +- .../common/protos/corda/view_data_pb.d.ts | 62 + .../weaver/common/protos/driver/driver.ts | 2 +- .../common/protos/driver/driver_grpc_pb.d.ts | 43 + .../common/protos/driver/driver_pb.d.ts | 9 + .../weaver/common/protos/networks/networks.ts | 2 +- .../protos/networks/networks_grpc_pb.d.ts | 77 + .../common/protos/networks/networks_pb.d.ts | 114 ++ .../common/protos/relay/datatransfer.ts | 2 +- .../protos/relay/datatransfer_grpc_pb.d.ts | 78 + .../common/protos/relay/datatransfer_pb.d.ts | 10 + .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../client/models/GetConsortiumJwsResponse.kt | 1 + .../models/GetConsortiumJwsResponseJws.kt | 38 + .../client/models/GetNodeJwsResponse.kt | 1 + .../client/models/GetNodeJwsResponseJws.kt | 38 + .../openapitools/client/models/JWSGeneral.kt | 1 + .../client/models/JWSRecipient.kt | 1 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../client/models/GetSingleStatusRequest.kt | 1 + .../client/models/GetStatusRequest.kt | 1 + .../GetStatusRequestWeb3SigningCredential.kt | 44 + .../client/models/InitializeRequest.kt | 1 + .../InitializeRequestWeb3SigningCredential.kt | 44 + .../client/models/InitializeV1200Response.kt | 35 + ...itializeV1200ResponseTransactionReceipt.kt | 66 + .../client/models/InvokeContractV1Response.kt | 1 + .../client/models/NewContractRequest.kt | 1 + .../client/models/NewContractRequestGas.kt | 1 + ...NewContractRequestWeb3SigningCredential.kt | 44 + .../client/models/RefundRequest.kt | 1 + .../client/models/RunTransactionResponse.kt | 1 + .../client/models/Web3SigningCredential.kt | 1 + .../Web3SigningCredentialCactusKeychainRef.kt | 1 + .../models/Web3SigningCredentialNone.kt | 1 + .../Web3SigningCredentialPrivateKeyHex.kt | 1 + .../models/Web3SigningCredentialType.kt | 4 +- .../client/models/Web3TransactionReceipt.kt | 1 + .../client/models/WithdrawRequest.kt | 1 + .../client/models/WithdrawV1200Response.kt | 43 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../models/DeleteKeychainEntryRequestV1.kt | 1 + .../models/DeleteKeychainEntryResponseV1.kt | 1 + .../DeleteKeychainEntryV1200Response.kt | 35 + .../models/DeleteKeychainEntryV1Request.kt | 35 + .../models/GetKeychainEntryRequestV1.kt | 1 + .../models/GetKeychainEntryResponseV1.kt | 1 + .../models/GetKeychainEntryV1200Response.kt | 40 + .../models/GetKeychainEntryV1Request.kt | 35 + .../models/HasKeychainEntryRequestV1.kt | 1 + .../models/HasKeychainEntryResponseV1.kt | 1 + .../models/HasKeychainEntryV1200Response.kt | 45 + .../models/HasKeychainEntryV1Request.kt | 35 + .../models/SetKeychainEntryRequestV1.kt | 1 + .../models/SetKeychainEntryResponseV1.kt | 1 + .../models/SetKeychainEntryV1200Response.kt | 35 + .../models/SetKeychainEntryV1Request.kt | 40 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../models/DeleteKeychainEntryRequestV1.kt | 1 + .../models/DeleteKeychainEntryResponseV1.kt | 1 + .../DeleteKeychainEntryV1200Response.kt | 35 + .../models/DeleteKeychainEntryV1Request.kt | 35 + .../client/models/GetKeychainEntryRequest.kt | 1 + .../client/models/GetKeychainEntryResponse.kt | 1 + .../models/GetKeychainEntryV1200Response.kt | 40 + .../models/GetKeychainEntryV1Request.kt | 35 + .../models/HasKeychainEntryRequestV1.kt | 1 + .../models/HasKeychainEntryResponseV1.kt | 1 + .../models/HasKeychainEntryV1200Response.kt | 45 + .../models/HasKeychainEntryV1Request.kt | 35 + .../client/models/SetKeychainEntryRequest.kt | 1 + .../client/models/SetKeychainEntryResponse.kt | 1 + .../models/SetKeychainEntryV1200Response.kt | 35 + .../models/SetKeychainEntryV1Request.kt | 40 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../models/DeleteKeychainEntryRequestV1.kt | 1 + .../models/DeleteKeychainEntryResponseV1.kt | 1 + .../DeleteKeychainEntryV1200Response.kt | 35 + .../models/DeleteKeychainEntryV1Request.kt | 35 + .../models/GetKeychainEntryRequestV1.kt | 1 + .../models/GetKeychainEntryResponseV1.kt | 1 + .../models/GetKeychainEntryV1200Response.kt | 40 + .../models/GetKeychainEntryV1Request.kt | 35 + .../models/HasKeychainEntryRequestV1.kt | 1 + .../models/HasKeychainEntryResponseV1.kt | 1 + .../models/HasKeychainEntryV1200Response.kt | 45 + .../models/HasKeychainEntryV1Request.kt | 35 + .../models/SetKeychainEntryRequestV1.kt | 1 + .../models/SetKeychainEntryResponseV1.kt | 1 + .../models/SetKeychainEntryV1200Response.kt | 35 + .../models/SetKeychainEntryV1Request.kt | 40 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../models/DeleteKeychainEntryRequestV1.kt | 1 + .../models/DeleteKeychainEntryResponseV1.kt | 1 + .../DeleteKeychainEntryV1200Response.kt | 35 + .../models/DeleteKeychainEntryV1Request.kt | 35 + .../models/GetKeychainEntryRequestV1.kt | 1 + .../models/GetKeychainEntryResponseV1.kt | 1 + .../models/GetKeychainEntryV1200Response.kt | 40 + .../models/GetKeychainEntryV1Request.kt | 35 + .../models/HasKeychainEntryRequestV1.kt | 1 + .../models/HasKeychainEntryResponseV1.kt | 1 + .../models/HasKeychainEntryV1200Response.kt | 45 + .../models/HasKeychainEntryV1Request.kt | 35 + .../models/SetKeychainEntryRequestV1.kt | 1 + .../models/SetKeychainEntryResponseV1.kt | 1 + .../models/SetKeychainEntryV1200Response.kt | 35 + .../models/SetKeychainEntryV1Request.kt | 40 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../client/models/GetKeychainEntryRequest.kt | 1 + .../client/models/GetKeychainEntryResponse.kt | 1 + .../client/models/SetKeychainEntryRequest.kt | 1 + .../client/models/SetKeychainEntryResponse.kt | 1 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../models/DeleteKeychainEntryRequestV1.kt | 1 + .../models/DeleteKeychainEntryResponseV1.kt | 1 + .../client/models/GetKeychainEntryRequest.kt | 1 + .../client/models/GetKeychainEntryResponse.kt | 1 + .../models/GetKeychainEntryV1200Response.kt | 40 + .../models/GetKeychainEntryV1Request.kt | 35 + .../models/HasKeychainEntryRequestV1.kt | 1 + .../models/HasKeychainEntryResponseV1.kt | 1 + .../client/models/SetKeychainEntryRequest.kt | 1 + .../client/models/SetKeychainEntryResponse.kt | 1 + .../models/SetKeychainEntryV1200Response.kt | 35 + .../models/SetKeychainEntryV1Request.kt | 40 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../kotlin-spring/.openapi-generator/FILES | 7 +- .../kotlin-spring/.openapi-generator/VERSION | 2 +- .../kotlin/gen/kotlin-spring/pom.xml | 63 +- .../connector/corda/server/HomeController.kt | 17 + .../corda/server/SpringDocConfiguration.kt | 32 + ...piPluginLedgerConnectorCordaController.kt} | 114 +- .../ApiPluginLedgerConnectorCordaService.kt | 73 + .../ClearMonitorTransactionsV1Request.kt | 11 +- .../ClearMonitorTransactionsV1Response.kt | 8 +- .../server/model/CordaNodeSshCredentials.kt | 17 +- .../corda/server/model/CordaRpcCredentials.kt | 14 +- .../corda/server/model/CordaX500Name.kt | 23 +- .../server/model/CordappDeploymentConfig.kt | 20 +- .../corda/server/model/CordappInfo.kt | 29 +- .../DeployContractJarsBadRequestV1Response.kt | 5 +- .../DeployContractJarsSuccessV1Response.kt | 5 +- .../model/DeployContractJarsV1Request.kt | 8 +- .../server/model/DiagnoseNodeV1Request.kt | 5 +- .../server/model/DiagnoseNodeV1Response.kt | 5 +- .../corda/server/model/FlowInvocationType.kt | 7 +- .../model/GetMonitorTransactionsV1Request.kt | 8 +- .../model/GetMonitorTransactionsV1Response.kt | 16 +- ...etMonitorTransactionsV1ResponseTxInner.kt} | 10 +- .../server/model/InvokeContractV1Request.kt | 15 +- .../server/model/InvokeContractV1Response.kt | 17 +- .../connector/corda/server/model/JarFile.kt | 13 +- .../connector/corda/server/model/JvmObject.kt | 15 +- .../connector/corda/server/model/JvmType.kt | 11 +- .../corda/server/model/JvmTypeKind.kt | 7 +- .../corda/server/model/ListFlowsV1Request.kt | 5 +- .../corda/server/model/ListFlowsV1Response.kt | 5 +- .../corda/server/model/NetworkHostAndPort.kt | 8 +- .../corda/server/model/NodeDiagnosticInfo.kt | 17 +- .../connector/corda/server/model/NodeInfo.kt | 17 +- .../connector/corda/server/model/Party.kt | 8 +- .../connector/corda/server/model/PublicKey.kt | 11 +- .../connector/corda/server/model/SHA256.kt | 11 +- .../server/model/StartMonitorV1Request.kt | 8 +- .../server/model/StartMonitorV1Response.kt | 8 +- .../server/model/StopMonitorV1Request.kt | 8 +- .../server/model/StopMonitorV1Response.kt | 8 +- .../corda/server/model/X500Principal.kt | 8 +- .../src/main/resources/openapi.yaml | 1387 +++++++++++++++++ .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/FILES | 7 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 24 +- .../openapi/kotlin-client/build.gradle | 11 +- .../openapi/kotlin-client/docs/DefaultApi.md | 22 +- .../docs/GetMonitorTransactionsV1Response.md | 2 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 62076 bytes .../gradle/wrapper/gradle-wrapper.properties | 3 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../openapitools/client/apis/DefaultApi.kt | 605 ++++--- .../client/infrastructure/ApiClient.kt | 113 +- .../infrastructure/BigDecimalAdapter.kt | 2 +- .../infrastructure/BigIntegerAdapter.kt | 2 +- .../client/infrastructure/RequestConfig.kt | 1 + .../ClearMonitorTransactionsV1Request.kt | 9 +- .../ClearMonitorTransactionsV1Response.kt | 9 +- .../client/models/CordaNodeSshCredentials.kt | 9 +- .../client/models/CordaRpcCredentials.kt | 9 +- .../client/models/CordaX500Name.kt | 9 +- .../client/models/CordappDeploymentConfig.kt | 9 +- .../openapitools/client/models/CordappInfo.kt | 9 +- .../DeployContractJarsBadRequestV1Response.kt | 9 +- .../DeployContractJarsSuccessV1Response.kt | 9 +- .../models/DeployContractJarsV1Request.kt | 9 +- .../client/models/DiagnoseNodeV1Request.kt | 11 +- .../client/models/DiagnoseNodeV1Response.kt | 9 +- .../client/models/FlowInvocationType.kt | 15 +- .../models/GetMonitorTransactionsV1Request.kt | 9 +- .../GetMonitorTransactionsV1Response.kt | 13 +- ...GetMonitorTransactionsV1ResponseTxInner.kt | 1 + .../client/models/InvokeContractV1Request.kt | 11 +- .../client/models/InvokeContractV1Response.kt | 11 +- .../org/openapitools/client/models/JarFile.kt | 9 +- .../openapitools/client/models/JvmObject.kt | 11 +- .../org/openapitools/client/models/JvmType.kt | 9 +- .../openapitools/client/models/JvmTypeKind.kt | 15 +- .../client/models/ListFlowsV1Request.kt | 9 +- .../client/models/ListFlowsV1Response.kt | 9 +- .../client/models/NetworkHostAndPort.kt | 9 +- .../client/models/NodeDiagnosticInfo.kt | 9 +- .../openapitools/client/models/NodeInfo.kt | 9 +- .../org/openapitools/client/models/Party.kt | 9 +- .../openapitools/client/models/PublicKey.kt | 9 +- .../org/openapitools/client/models/SHA256.kt | 9 +- .../client/models/StartMonitorV1Request.kt | 9 +- .../client/models/StartMonitorV1Response.kt | 9 +- .../client/models/StopMonitorV1Request.kt | 9 +- .../client/models/StopMonitorV1Response.kt | 9 +- .../client/models/X500Principal.kt | 9 +- .../typescript/api-client/corda-api-client.ts | 8 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 328 ++-- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 8 +- .../kotlin-client/.openapi-generator/FILES | 5 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 24 +- .../openapi/kotlin-client/build.gradle | 11 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../openapitools/client/apis/DefaultApi.kt | 367 +++-- .../client/infrastructure/ApiClient.kt | 113 +- .../client/infrastructure/ApiResponse.kt | 43 + .../infrastructure/BigDecimalAdapter.kt | 2 +- .../infrastructure/BigIntegerAdapter.kt | 2 +- .../client/infrastructure/PartConfig.kt | 11 + .../client/infrastructure/RequestConfig.kt | 1 + .../client/models/ChainCodeLanguageRuntime.kt | 15 +- .../ChainCodeLifeCycleCommandResponses.kt | 9 +- .../models/ChainCodeProgrammingLanguage.kt | 15 +- .../client/models/ConnectionProfile.kt | 9 +- .../client/models/ConnectionProfileClient.kt | 9 +- .../models/DefaultEventHandlerStrategy.kt | 15 +- .../DeployContractGoSourceV1501Response.kt | 35 + .../models/DeployContractGoSourceV1Request.kt | 9 +- ...ontractGoSourceV1RequestConstructorArgs.kt | 9 +- .../DeployContractGoSourceV1Response.kt | 9 +- .../client/models/DeployContractV1Request.kt | 9 +- .../client/models/DeployContractV1Response.kt | 9 +- .../models/DeploymentTargetOrgFabric2x.kt | 9 +- .../models/DeploymentTargetOrganization.kt | 9 +- .../client/models/ErrorExceptionResponseV1.kt | 9 +- .../models/FabricContractInvocationType.kt | 15 +- .../client/models/FabricSigningCredential.kt | 9 +- .../models/FabricSigningCredentialType.kt | 15 +- .../openapitools/client/models/FileBase64.kt | 9 +- .../client/models/GatewayDiscoveryOptions.kt | 9 +- .../models/GatewayEventHandlerOptions.kt | 9 +- .../client/models/GatewayOptions.kt | 9 +- .../client/models/GatewayOptionsWallet.kt | 9 +- .../client/models/GetBlockRequestV1.kt | 11 +- .../client/models/GetBlockRequestV1Query.kt | 9 +- .../models/GetBlockRequestV1QueryBlockHash.kt | 11 +- .../models/GetBlockResponseDecodedV1.kt | 9 +- .../models/GetBlockResponseEncodedV1.kt | 11 +- .../client/models/GetBlockResponseV1.kt | 11 +- .../models/GetTransactionReceiptResponse.kt | 9 +- .../client/models/RunTransactionRequest.kt | 11 +- .../client/models/RunTransactionResponse.kt | 9 +- .../client/models/SSHExecCommandResponse.kt | 9 +- .../models/TransactReceiptBlockMetaData.kt | 9 +- .../TransactReceiptTransactionCreator.kt | 9 +- .../TransactReceiptTransactionEndorsement.kt | 9 +- .../client/models/VaultTransitKey.kt | 9 +- .../WatchBlocksCactusErrorResponseV1.kt | 9 +- .../WatchBlocksCactusTransactionsEventV1.kt | 9 +- ...WatchBlocksCactusTransactionsResponseV1.kt | 9 +- .../models/WatchBlocksFilteredResponseV1.kt | 11 +- .../models/WatchBlocksFullResponseV1.kt | 11 +- .../models/WatchBlocksListenerTypeV1.kt | 15 +- .../client/models/WatchBlocksOptionsV1.kt | 9 +- .../models/WatchBlocksPrivateResponseV1.kt | 11 +- .../client/models/WatchBlocksResponseV1.kt | 15 +- .../client/models/WatchBlocksV1.kt | 15 +- .../client/models/WebSocketKey.kt | 9 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 511 +++--- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- .../plugin-ledger-connector-fabric.ts | 13 +- .../fabric-v2-2-x/get-block.test.ts | 27 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 19 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 382 ++--- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- .../plugin-ledger-connector-iroha.ts | 25 +- .../generate-transaction-endpoint.ts | 5 +- ...nerate-and-send-signed-transaction.test.ts | 10 +- .../iroha-socketio-endpoint.test.ts | 20 +- .../openapi/openapi-validation.test.ts | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 12 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 251 +-- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- .../plugin-ledger-connector-iroha2.ts | 34 +- .../web-services/watch-blocks-v1-endpoint.ts | 7 +- ...nerate-and-send-signed-transaction.test.ts | 45 +- .../iroha2-monitoring-endpoints.test.ts | 10 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 454 +++--- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../kotlin-client/.openapi-generator/VERSION | 2 +- .../generated/openapi/kotlin-client/README.md | 9 +- .../generated/openapi/kotlin-client/gradlew | 276 ++-- .../openapi/kotlin-client/gradlew.bat | 15 +- .../client/infrastructure/ApiClient.kt | 4 +- .../client/models/AssetProfile.kt | 1 + .../client/models/ClientV1Request.kt | 1 + ...ientV1RequestClientGatewayConfiguration.kt | 1 + .../client/models/CommitFinalV1Request.kt | 1 + .../client/models/CommitFinalV1Response.kt | 1 + .../models/CommitPreparationV1Request.kt | 1 + .../models/CommitPreparationV1Response.kt | 1 + .../client/models/CredentialProfile.kt | 4 +- .../org/openapitools/client/models/History.kt | 1 + .../client/models/LockEvidenceV1Request.kt | 1 + .../client/models/LockEvidenceV1Response.kt | 1 + .../client/models/OdapLocalLog.kt | 1 + .../openapitools/client/models/OdapMessage.kt | 3 + .../models/OdapMessageActionResponse.kt | 2 + .../client/models/PayloadProfile.kt | 1 + .../client/models/RecoverSuccessV1Message.kt | 1 + .../models/RecoverUpdateAckV1Message.kt | 1 + .../client/models/RecoverUpdateV1Message.kt | 1 + .../client/models/RecoverV1Message.kt | 1 + .../client/models/RollbackAckV1Message.kt | 1 + .../client/models/RollbackV1Message.kt | 1 + .../openapitools/client/models/SessionData.kt | 2 + .../models/TransferCommenceV1Request.kt | 1 + .../models/TransferCommenceV1Response.kt | 1 + .../models/TransferCompleteV1Request.kt | 1 + .../models/TransferInitializationV1Request.kt | 2 + .../TransferInitializationV1Response.kt | 2 + .../.openapi-generator/VERSION | 2 +- .../openapitools.json | 2 +- .../package.json | 2 + .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 57 +- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- .../openapitools.json | 2 +- .../src/main/json/openapi.json | 4 +- .../.openapi-generator/VERSION | 2 +- .../generated/openapi/typescript-axios/api.ts | 8 +- .../openapi/typescript-axios/base.ts | 9 +- .../openapi/typescript-axios/common.ts | 46 +- yarn.lock | 157 +- 600 files changed, 12118 insertions(+), 4920 deletions(-) create mode 100644 examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt create mode 100644 examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1200Response.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1Request.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1200Response.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1Request.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1200Response.kt create mode 100644 extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1Request.kt create mode 100644 packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_grpc_pb.d.ts create mode 100644 packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_grpc_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_grpc_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_grpc_pb.d.ts create mode 100644 packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_pb.d.ts create mode 100644 packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponseJws.kt create mode 100644 packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponseJws.kt create mode 100644 packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequestWeb3SigningCredential.kt create mode 100644 packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequestWeb3SigningCredential.kt create mode 100644 packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200Response.kt create mode 100644 packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200ResponseTransactionReceipt.kt create mode 100644 packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestWeb3SigningCredential.kt create mode 100644 packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt create mode 100644 packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt create mode 100644 packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/HomeController.kt create mode 100644 packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/SpringDocConfiguration.kt rename packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/{ApiPluginLedgerConnectorCorda.kt => ApiPluginLedgerConnectorCordaController.kt} (52%) rename packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/{GetMonitorTransactionsV1ResponseTx.kt => GetMonitorTransactionsV1ResponseTxInner.kt} (60%) create mode 100644 packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/resources/openapi.yaml create mode 100644 packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt create mode 100644 packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt create mode 100644 packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1501Response.kt diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/openapitools.json b/examples/cactus-example-carbon-accounting-business-logic-plugin/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/openapitools.json +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/json/openapi.json b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/json/openapi.json index 0b195d483a..4c319404e5 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/json/openapi.json +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Example - Carbon Accounting App", "description": "Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved.", "version": "0.2.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md index 8dd7afe77b..9f37798fee 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -48,7 +48,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**enrollAdminV1**](docs/DefaultApi.md#enrolladminv1) | **POST** /api/v1/utilityemissionchannel/registerEnroll/admin | Registers an admin account within the Fabric organization specified. - + ## Documentation for Models - [org.openapitools.client.models.AuthzJwtClaim](docs/AuthzJwtClaim.md) @@ -62,7 +62,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.EnrollAdminV1Response](docs/EnrollAdminV1Response.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzJwtClaim.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzJwtClaim.kt index 9912d13e9f..2db76c4d5a 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzJwtClaim.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzJwtClaim.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Stores global constants related to the authorization of the application. Specifically enumerates the claims to validate for as per RFC 7519, section 4.1. See: https://tools.ietf.org/html/rfc7519#section-4.1 @@ -24,13 +25,14 @@ import com.squareup.moshi.Json * Values: iss */ +@JsonClass(generateAdapter = false) enum class AuthzJwtClaim(val value: kotlin.String) { @Json(name = "Hyperledger Labs - Carbon Accounting Tool") iss("Hyperledger Labs - Carbon Accounting Tool"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzScope.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzScope.kt index 59dad5a032..f661a3b52d 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzScope.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AuthzScope.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: GroupAdmin,GroupUser */ +@JsonClass(generateAdapter = false) enum class AuthzScope(val value: kotlin.String) { @Json(name = "group:admin") @@ -33,7 +35,7 @@ enum class AuthzScope(val value: kotlin.String) { GroupUser("group:user"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Checkpoint.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Checkpoint.kt index 09ef10e250..d6b8aaafb8 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Checkpoint.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Checkpoint.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceNotFoundResponse.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceNotFoundResponse.kt index 58ec7f2709..0f72c44658 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceNotFoundResponse.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceNotFoundResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceRequest.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceRequest.kt index f99c232f22..5439d83eec 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceRequest.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceRequest.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceResponse.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceResponse.kt index 9a64bcd543..b19f4d525e 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceResponse.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DaoTokenGetAllowanceResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminInfo.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminInfo.kt index fc7f152377..2acbe7efd2 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminInfo.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminInfo.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: SUCCESSFULLY_ENROLLED_ADMIN,ORG_ADMIN_REGISTERED */ +@JsonClass(generateAdapter = false) enum class EnrollAdminInfo(val value: kotlin.String) { @Json(name = "Successfully enrolled admin user and imported it into the wallet") @@ -33,7 +35,7 @@ enum class EnrollAdminInfo(val value: kotlin.String) { ORG_ADMIN_REGISTERED("ORG ADMIN REGISTERED"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Request.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Request.kt index 3e5537e942..4ad4f4b408 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Request.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Request.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Response.kt b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Response.kt index ffaed858f7..1288bf1e82 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Response.kt +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/EnrollAdminV1Response.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/openapitools.json b/examples/cactus-example-supply-chain-business-logic-plugin/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/openapitools.json +++ b/examples/cactus-example-supply-chain-business-logic-plugin/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/json/openapi.json b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/json/openapi.json index 406c5f6d11..11356ed628 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/json/openapi.json +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Example - Supply Chain App", "description": "Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved.", "version": "0.2.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES index 29f08ead37..606a65a9a2 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES @@ -6,7 +6,7 @@ settings.gradle src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt -src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt +src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt @@ -14,6 +14,7 @@ src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md index 47c7be8921..3bb7dd5803 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -1,9 +1,18 @@ # org.openapitools.client - Kotlin client library for Hyperledger Cactus Example - Supply Chain App +Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. + +## Overview +This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client. + +- API version: 0.2.0 +- Package version: +- Build package: org.openapitools.codegen.languages.KotlinClientCodegen + ## Requires -* Kotlin 1.4.30 -* Gradle 6.8.3 +* Kotlin 1.7.21 +* Gradle 7.5 ## Build @@ -28,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -43,7 +52,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**listShipmentV1**](docs/DefaultApi.md#listshipmentv1) | **GET** /api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/list-shipment | Lists all the Shipments entities stored on the ledger. - + ## Documentation for Models - [org.openapitools.client.models.BambooHarvest](docs/BambooHarvest.md) @@ -60,7 +69,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.Shipment](docs/Shipment.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/build.gradle b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/build.gradle index 3de8b45b13..66a3c68b89 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/build.gradle +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/build.gradle @@ -2,12 +2,12 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.3' + gradleVersion = '7.5' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.7.21' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -18,6 +18,7 @@ buildscript { } apply plugin: 'kotlin' +apply plugin: 'maven-publish' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -30,8 +31,8 @@ test { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "com.squareup.moshi:moshi-kotlin:1.12.0" - implementation "com.squareup.moshi:moshi-adapters:1.12.0" - implementation "com.squareup.okhttp3:okhttp:4.9.1" + implementation "com.squareup.moshi:moshi-kotlin:1.13.0" + implementation "com.squareup.moshi:moshi-adapters:1.13.0" + implementation "com.squareup.okhttp3:okhttp:4.10.0" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt index ea93a3be4a..80450629dd 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -20,6 +15,10 @@ package org.openapitools.client.apis +import java.io.IOException +import okhttp3.OkHttpClient +import okhttp3.HttpUrl + import org.openapitools.client.models.InsertBambooHarvestRequest import org.openapitools.client.models.InsertBambooHarvestResponse import org.openapitools.client.models.InsertBookshelfRequest @@ -30,43 +29,45 @@ import org.openapitools.client.models.ListBambooHarvestResponse import org.openapitools.client.models.ListBookshelfResponse import org.openapitools.client.models.ListShipmentResponse +import com.squareup.moshi.Json + import org.openapitools.client.infrastructure.ApiClient +import org.openapitools.client.infrastructure.ApiResponse import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap +import org.openapitools.client.infrastructure.PartConfig import org.openapitools.client.infrastructure.RequestConfig import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { +class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://localhost") + System.getProperties().getProperty(ApiClient.baseUrlKey, "http://localhost") } } /** - * Inserts the provided BambooHarvest entity to the ledger. - * - * @param insertBambooHarvestRequest (optional) - * @return InsertBambooHarvestResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Inserts the provided BambooHarvest entity to the ledger. + * + * @param insertBambooHarvestRequest (optional) + * @return InsertBambooHarvestResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun insertBambooHarvestV1(insertBambooHarvestRequest: InsertBambooHarvestRequest?) : InsertBambooHarvestResponse { - val localVariableConfig = insertBambooHarvestV1RequestConfig(insertBambooHarvestRequest = insertBambooHarvestRequest) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun insertBambooHarvestV1(insertBambooHarvestRequest: InsertBambooHarvestRequest? = null) : InsertBambooHarvestResponse { + val localVarResponse = insertBambooHarvestV1WithHttpInfo(insertBambooHarvestRequest = insertBambooHarvestRequest) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as InsertBambooHarvestResponse @@ -84,42 +85,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation insertBambooHarvestV1 - * - * @param insertBambooHarvestRequest (optional) - * @return RequestConfig - */ + * Inserts the provided BambooHarvest entity to the ledger. + * + * @param insertBambooHarvestRequest (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun insertBambooHarvestV1WithHttpInfo(insertBambooHarvestRequest: InsertBambooHarvestRequest?) : ApiResponse { + val localVariableConfig = insertBambooHarvestV1RequestConfig(insertBambooHarvestRequest = insertBambooHarvestRequest) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation insertBambooHarvestV1 + * + * @param insertBambooHarvestRequest (optional) + * @return RequestConfig + */ fun insertBambooHarvestV1RequestConfig(insertBambooHarvestRequest: InsertBambooHarvestRequest?) : RequestConfig { val localVariableBody = insertBambooHarvestRequest val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/insert-bamboo-harvest", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Inserts the provided Bookshelf entity to the ledger. - * - * @param insertBookshelfRequest (optional) - * @return InsertBookshelfResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Inserts the provided Bookshelf entity to the ledger. + * + * @param insertBookshelfRequest (optional) + * @return InsertBookshelfResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun insertBookshelfV1(insertBookshelfRequest: InsertBookshelfRequest?) : InsertBookshelfResponse { - val localVariableConfig = insertBookshelfV1RequestConfig(insertBookshelfRequest = insertBookshelfRequest) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun insertBookshelfV1(insertBookshelfRequest: InsertBookshelfRequest? = null) : InsertBookshelfResponse { + val localVarResponse = insertBookshelfV1WithHttpInfo(insertBookshelfRequest = insertBookshelfRequest) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as InsertBookshelfResponse @@ -137,42 +157,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation insertBookshelfV1 - * - * @param insertBookshelfRequest (optional) - * @return RequestConfig - */ + * Inserts the provided Bookshelf entity to the ledger. + * + * @param insertBookshelfRequest (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun insertBookshelfV1WithHttpInfo(insertBookshelfRequest: InsertBookshelfRequest?) : ApiResponse { + val localVariableConfig = insertBookshelfV1RequestConfig(insertBookshelfRequest = insertBookshelfRequest) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation insertBookshelfV1 + * + * @param insertBookshelfRequest (optional) + * @return RequestConfig + */ fun insertBookshelfV1RequestConfig(insertBookshelfRequest: InsertBookshelfRequest?) : RequestConfig { val localVariableBody = insertBookshelfRequest val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/insert-bookshelf", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Inserts the provided Shipment entity to the ledger. - * - * @param insertShipmentRequest (optional) - * @return InsertShipmentResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Inserts the provided Shipment entity to the ledger. + * + * @param insertShipmentRequest (optional) + * @return InsertShipmentResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun insertShipmentV1(insertShipmentRequest: InsertShipmentRequest?) : InsertShipmentResponse { - val localVariableConfig = insertShipmentV1RequestConfig(insertShipmentRequest = insertShipmentRequest) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun insertShipmentV1(insertShipmentRequest: InsertShipmentRequest? = null) : InsertShipmentResponse { + val localVarResponse = insertShipmentV1WithHttpInfo(insertShipmentRequest = insertShipmentRequest) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as InsertShipmentResponse @@ -190,41 +229,60 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation insertShipmentV1 - * - * @param insertShipmentRequest (optional) - * @return RequestConfig - */ + * Inserts the provided Shipment entity to the ledger. + * + * @param insertShipmentRequest (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun insertShipmentV1WithHttpInfo(insertShipmentRequest: InsertShipmentRequest?) : ApiResponse { + val localVariableConfig = insertShipmentV1RequestConfig(insertShipmentRequest = insertShipmentRequest) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation insertShipmentV1 + * + * @param insertShipmentRequest (optional) + * @return RequestConfig + */ fun insertShipmentV1RequestConfig(insertShipmentRequest: InsertShipmentRequest?) : RequestConfig { val localVariableBody = insertShipmentRequest val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/insert-shipment", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Lists all the BambooHarvest entities stored on the ledger. - * - * @return ListBambooHarvestResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Lists all the BambooHarvest entities stored on the ledger. + * + * @return ListBambooHarvestResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun listBambooHarvestV1() : ListBambooHarvestResponse { - val localVariableConfig = listBambooHarvestV1RequestConfig() - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = listBambooHarvestV1WithHttpInfo() return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as ListBambooHarvestResponse @@ -242,40 +300,57 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation listBambooHarvestV1 - * - * @return RequestConfig - */ + * Lists all the BambooHarvest entities stored on the ledger. + * + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun listBambooHarvestV1WithHttpInfo() : ApiResponse { + val localVariableConfig = listBambooHarvestV1RequestConfig() + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation listBambooHarvestV1 + * + * @return RequestConfig + */ fun listBambooHarvestV1RequestConfig() : RequestConfig { val localVariableBody = null val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.GET, path = "/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/list-bamboo-harvest", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Lists all the Bookshelf entities stored on the ledger. - * - * @return ListBookshelfResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Lists all the Bookshelf entities stored on the ledger. + * + * @return ListBookshelfResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun listBookshelfV1() : ListBookshelfResponse { - val localVariableConfig = listBookshelfV1RequestConfig() - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = listBookshelfV1WithHttpInfo() return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as ListBookshelfResponse @@ -293,40 +368,57 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation listBookshelfV1 - * - * @return RequestConfig - */ + * Lists all the Bookshelf entities stored on the ledger. + * + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun listBookshelfV1WithHttpInfo() : ApiResponse { + val localVariableConfig = listBookshelfV1RequestConfig() + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation listBookshelfV1 + * + * @return RequestConfig + */ fun listBookshelfV1RequestConfig() : RequestConfig { val localVariableBody = null val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.GET, path = "/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/list-bookshelf", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Lists all the Shipments entities stored on the ledger. - * - * @return ListShipmentResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Lists all the Shipments entities stored on the ledger. + * + * @return ListShipmentResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun listShipmentV1() : ListShipmentResponse { - val localVariableConfig = listShipmentV1RequestConfig() - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = listShipmentV1WithHttpInfo() return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as ListShipmentResponse @@ -344,22 +436,44 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation listShipmentV1 - * - * @return RequestConfig - */ + * Lists all the Shipments entities stored on the ledger. + * + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun listShipmentV1WithHttpInfo() : ApiResponse { + val localVariableConfig = listShipmentV1RequestConfig() + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation listShipmentV1 + * + * @return RequestConfig + */ fun listShipmentV1RequestConfig() : RequestConfig { val localVariableBody = null val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.GET, path = "/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/list-shipment", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } + + private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String = + HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0] } diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b359be1e41..ea4b7b6593 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -10,21 +10,26 @@ import okhttp3.ResponseBody import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.Headers +import okhttp3.Headers.Companion.toHeaders import okhttp3.MultipartBody +import okhttp3.Call +import okhttp3.Callback +import okhttp3.Response +import okhttp3.internal.EMPTY_REQUEST import java.io.BufferedWriter import java.io.File import java.io.FileWriter +import java.io.IOException import java.net.URLConnection import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime import java.time.OffsetDateTime import java.time.OffsetTime -import java.util.Date import java.util.Locale import com.squareup.moshi.adapter -open class ApiClient(val baseUrl: String) { +open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) { companion object { protected const val ContentType = "Content-Type" protected const val Accept = "Accept" @@ -39,9 +44,10 @@ open class ApiClient(val baseUrl: String) { var username: String? = null var password: String? = null var accessToken: String? = null + const val baseUrlKey = "org.openapitools.client.baseUrl" @JvmStatic - val client: OkHttpClient by lazy { + val defaultClient: OkHttpClient by lazy { builder.build() } @@ -60,48 +66,50 @@ open class ApiClient(val baseUrl: String) { return contentType ?: "application/octet-stream" } - protected inline fun requestBody(content: T, mediaType: String = JsonMediaType): RequestBody = + protected inline fun requestBody(content: T, mediaType: String?): RequestBody = when { - content is File -> content.asRequestBody(mediaType.toMediaTypeOrNull()) - mediaType == FormDataMediaType -> { + content is File -> content.asRequestBody((mediaType ?: guessContentTypeFromFile(content)).toMediaTypeOrNull()) + mediaType == FormDataMediaType -> MultipartBody.Builder() .setType(MultipartBody.FORM) .apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - if (value is File) { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"; filename=\"${value.name}\"" + (content as Map>).forEach { (name, part) -> + if (part.body is File) { + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"") + val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull() + addPart( + partHeaders.toHeaders(), + part.body.asRequestBody(fileMediaType) ) - val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull() - addPart(partHeaders, value.asRequestBody(fileMediaType)) } else { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"" - ) + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"") addPart( - partHeaders, - parameterToString(value).toRequestBody(null) + partHeaders.toHeaders(), + parameterToString(part.body).toRequestBody(null) ) } } }.build() - } mediaType == FormUrlEncMediaType -> { FormBody.Builder().apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - add(key, parameterToString(value)) + (content as Map>).forEach { (name, part) -> + add(name, parameterToString(part.body)) } }.build() } - mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody( - mediaType.toMediaTypeOrNull() - ) + mediaType == null || mediaType.startsWith("application/") && mediaType.endsWith("json") -> + if (content == null) { + EMPTY_REQUEST + } else { + Serializer.moshi.adapter(T::class.java).toJson(content) + .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull()) + } mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.") // TODO: this should be extended with other serializers else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.") @@ -112,31 +120,35 @@ open class ApiClient(val baseUrl: String) { if(body == null) { return null } + if (T::class.java == File::class.java) { + // return tempFile + // Attention: if you are developing an android app that supports API Level 25 and bellow, please check flag supportAndroidApiLevel25AndBelow in https://openapi-generator.tech/docs/generators/kotlin#config-options + val tempFile = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() + tempFile.deleteOnExit() + body.byteStream().use { inputStream -> + tempFile.outputStream().use { tempFileOutputStream -> + inputStream.copyTo(tempFileOutputStream) + } + } + return tempFile as T + } val bodyContent = body.string() if (bodyContent.isEmpty()) { return null } - if (T::class.java == File::class.java) { - // return tempfile - val f = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() - f.deleteOnExit() - val out = BufferedWriter(FileWriter(f)) - out.write(bodyContent) - out.close() - return f as T - } - return when(mediaType) { - JsonMediaType -> Serializer.moshi.adapter().fromJson(bodyContent) + return when { + mediaType==null || (mediaType.startsWith("application/") && mediaType.endsWith("json")) -> + Serializer.moshi.adapter().fromJson(bodyContent) else -> throw UnsupportedOperationException("responseBody currently only supports JSON body.") } } - protected inline fun request(requestConfig: RequestConfig): ApiInfrastructureResponse { + protected inline fun request(requestConfig: RequestConfig): ApiResponse { val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.") val url = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) + .addEncodedPathSegments(requestConfig.path.trimStart('/')) .apply { requestConfig.query.forEach { query -> query.value.forEach { queryValue -> @@ -146,7 +158,7 @@ open class ApiClient(val baseUrl: String) { }.build() // take content-type/accept from spec or set to default (application/json) if not defined - if (requestConfig.headers[ContentType].isNullOrEmpty()) { + if (requestConfig.body != null && requestConfig.headers[ContentType].isNullOrEmpty()) { requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { @@ -154,16 +166,16 @@ open class ApiClient(val baseUrl: String) { } val headers = requestConfig.headers - if(headers[ContentType] ?: "" == "") { - throw kotlin.IllegalStateException("Missing Content-Type header. This is required.") - } - - if(headers[Accept] ?: "" == "") { + if (headers[Accept].isNullOrEmpty()) { throw kotlin.IllegalStateException("Missing Accept header. This is required.") } - // TODO: support multiple contentType options here. - val contentType = (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + val contentType = if (headers[ContentType] != null) { + // TODO: support multiple contentType options here. + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) + } else { + null + } val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType)) @@ -178,7 +190,8 @@ open class ApiClient(val baseUrl: String) { }.build() val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { @@ -215,7 +228,7 @@ open class ApiClient(val baseUrl: String) { null -> "" is Array<*> -> toMultiValue(value, "csv").toString() is Iterable<*> -> toMultiValue(value, "csv").toString() - is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> + is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime -> parseDateToQueryString(value) else -> value.toString() } diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt new file mode 100644 index 0000000000..cf2cfaa95d --- /dev/null +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt @@ -0,0 +1,43 @@ +package org.openapitools.client.infrastructure + +enum class ResponseType { + Success, Informational, Redirection, ClientError, ServerError +} + +interface Response + +abstract class ApiResponse(val responseType: ResponseType): Response { + abstract val statusCode: Int + abstract val headers: Map> +} + +class Success( + val data: T, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +): ApiResponse(ResponseType.Success) + +class Informational( + val statusText: String, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Informational) + +class Redirection( + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Redirection) + +class ClientError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.ClientError) + +class ServerError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> +): ApiResponse(ResponseType.ServerError) diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt index fb2c972cf8..064b57fc6b 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt @@ -14,4 +14,4 @@ class BigDecimalAdapter { fun fromJson(value: String): BigDecimal { return BigDecimal(value) } -} \ No newline at end of file +} diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt index 4b6963110c..7df6057b45 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt @@ -14,4 +14,4 @@ class BigIntegerAdapter { fun fromJson(value: String): BigInteger { return BigInteger(value) } -} \ No newline at end of file +} diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt new file mode 100644 index 0000000000..be00e38fba --- /dev/null +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -0,0 +1,11 @@ +package org.openapitools.client.infrastructure + +/** + * Defines a config object for a given part of a multi-part request. + * NOTE: Headers is a Map because rfc2616 defines + * multi-valued headers as csv-only. + */ +data class PartConfig( + val headers: MutableMap = mutableMapOf(), + val body: T? = null +) diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt index 7e948e1dd0..625a19002b 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt @@ -13,5 +13,6 @@ data class RequestConfig( val path: String, val headers: MutableMap = mutableMapOf(), val query: MutableMap> = mutableMapOf(), + val requiresAuthentication: Boolean, val body: T? = null ) \ No newline at end of file diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/BambooHarvest.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/BambooHarvest.kt index ca59f9113b..93ac39b7a4 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/BambooHarvest.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/BambooHarvest.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -33,6 +29,7 @@ import com.squareup.moshi.Json * @param harvester */ + data class BambooHarvest ( @Json(name = "id") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Bookshelf.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Bookshelf.kt index ae72c75e08..c6596aa707 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Bookshelf.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Bookshelf.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param bambooHarvestId The foreign key ID referencing the bamboo harvest that yielded the wood material for the construction of the bookshelf. */ + data class Bookshelf ( @Json(name = "id") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestRequest.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestRequest.kt index 55d74e36da..a942094fe0 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestRequest.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestRequest.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.BambooHarvest import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param bambooHarvest */ + data class InsertBambooHarvestRequest ( @Json(name = "bambooHarvest") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestResponse.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestResponse.kt index 908a487889..76044c5e94 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestResponse.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBambooHarvestResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param transactionReceipt */ + data class InsertBambooHarvestResponse ( @Json(name = "callOutput") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfRequest.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfRequest.kt index f3c7ecbca5..072a79bbba 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfRequest.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfRequest.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Bookshelf import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param bookshelf */ + data class InsertBookshelfRequest ( @Json(name = "bookshelf") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfResponse.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfResponse.kt index 92476e28fe..46fb7ee45d 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfResponse.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertBookshelfResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param transactionReceipt */ + data class InsertBookshelfResponse ( @Json(name = "callOutput") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentRequest.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentRequest.kt index 2f3aa03aa7..0e01864f59 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentRequest.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentRequest.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Shipment import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param shipment */ + data class InsertShipmentRequest ( @Json(name = "shipment") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentResponse.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentResponse.kt index 8948581ca3..856f7d15ef 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentResponse.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InsertShipmentResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param transactionReceipt */ + data class InsertShipmentResponse ( @Json(name = "callOutput") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBambooHarvestResponse.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBambooHarvestResponse.kt index 9b9994c642..a3793a98e1 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBambooHarvestResponse.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBambooHarvestResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.BambooHarvest import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param `data` */ + data class ListBambooHarvestResponse ( @Json(name = "data") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBookshelfResponse.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBookshelfResponse.kt index 313dda5048..5ad2189cf7 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBookshelfResponse.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListBookshelfResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Bookshelf import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param `data` */ + data class ListBookshelfResponse ( @Json(name = "data") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListShipmentResponse.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListShipmentResponse.kt index b247355923..8376cd8f4f 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListShipmentResponse.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListShipmentResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Shipment import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param `data` */ + data class ListShipmentResponse ( @Json(name = "data") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Shipment.kt b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Shipment.kt index 8cf952819f..d1f2066c3a 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Shipment.kt +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Shipment.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Example - Supply Chain App - * - * Demonstrates how a business use case can be satisfied with Cactus when multiple distinct ledgers are involved. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param bookshelfId The foreign key ID referencing the bookshelfId that will go in the shipment. */ + data class Shipment ( @Json(name = "id") diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/api.ts b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/api.ts index 68fadfc4d2..c4ccf6a8e7 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * @@ -32,31 +34,31 @@ export interface BambooHarvest { * @type {string} * @memberof BambooHarvest */ - id: string; + 'id': string; /** * * @type {string} * @memberof BambooHarvest */ - location: string; + 'location': string; /** * * @type {string} * @memberof BambooHarvest */ - startedAt: string; + 'startedAt': string; /** * * @type {string} * @memberof BambooHarvest */ - endedAt: string; + 'endedAt': string; /** * * @type {string} * @memberof BambooHarvest */ - harvester: string; + 'harvester': string; } /** * @@ -69,19 +71,19 @@ export interface Bookshelf { * @type {string} * @memberof Bookshelf */ - id: string; + 'id': string; /** * The number of shelves the bookshelf comes with. * @type {number} * @memberof Bookshelf */ - shelfCount: number; + 'shelfCount': number; /** * The foreign key ID referencing the bamboo harvest that yielded the wood material for the construction of the bookshelf. * @type {string} * @memberof Bookshelf */ - bambooHarvestId: string; + 'bambooHarvestId': string; } /** * @@ -94,7 +96,7 @@ export interface InsertBambooHarvestRequest { * @type {BambooHarvest} * @memberof InsertBambooHarvestRequest */ - bambooHarvest: BambooHarvest; + 'bambooHarvest': BambooHarvest; } /** * @@ -104,16 +106,16 @@ export interface InsertBambooHarvestRequest { export interface InsertBambooHarvestResponse { /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof InsertBambooHarvestResponse */ - callOutput?: { [key: string]: object; }; + 'callOutput'?: { [key: string]: any; }; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof InsertBambooHarvestResponse */ - transactionReceipt?: { [key: string]: object; }; + 'transactionReceipt'?: { [key: string]: any; }; } /** * @@ -126,7 +128,7 @@ export interface InsertBookshelfRequest { * @type {Bookshelf} * @memberof InsertBookshelfRequest */ - bookshelf: Bookshelf; + 'bookshelf': Bookshelf; } /** * @@ -136,16 +138,16 @@ export interface InsertBookshelfRequest { export interface InsertBookshelfResponse { /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof InsertBookshelfResponse */ - callOutput?: { [key: string]: object; }; + 'callOutput'?: { [key: string]: any; }; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof InsertBookshelfResponse */ - transactionReceipt?: { [key: string]: object; }; + 'transactionReceipt'?: { [key: string]: any; }; } /** * @@ -158,7 +160,7 @@ export interface InsertShipmentRequest { * @type {Shipment} * @memberof InsertShipmentRequest */ - shipment: Shipment; + 'shipment': Shipment; } /** * @@ -168,16 +170,16 @@ export interface InsertShipmentRequest { export interface InsertShipmentResponse { /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof InsertShipmentResponse */ - callOutput?: { [key: string]: object; }; + 'callOutput'?: { [key: string]: any; }; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof InsertShipmentResponse */ - transactionReceipt?: { [key: string]: object; }; + 'transactionReceipt'?: { [key: string]: any; }; } /** * @@ -190,7 +192,7 @@ export interface ListBambooHarvestResponse { * @type {Array} * @memberof ListBambooHarvestResponse */ - data: Array; + 'data': Array; } /** * @@ -203,7 +205,7 @@ export interface ListBookshelfResponse { * @type {Array} * @memberof ListBookshelfResponse */ - data: Array; + 'data': Array; } /** * @@ -216,7 +218,7 @@ export interface ListShipmentResponse { * @type {Array} * @memberof ListShipmentResponse */ - data: Array; + 'data': Array; } /** * @@ -229,13 +231,13 @@ export interface Shipment { * @type {string} * @memberof Shipment */ - id: string; + 'id': string; /** * The foreign key ID referencing the bookshelfId that will go in the shipment. * @type {string} * @memberof Shipment */ - bookshelfId: string; + 'bookshelfId': string; } /** @@ -251,7 +253,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - insertBambooHarvestV1: async (insertBambooHarvestRequest?: InsertBambooHarvestRequest, options: any = {}): Promise => { + insertBambooHarvestV1: async (insertBambooHarvestRequest?: InsertBambooHarvestRequest, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/insert-bamboo-harvest`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -268,7 +270,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(insertBambooHarvestRequest, localVarRequestOptions, configuration) @@ -285,7 +287,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - insertBookshelfV1: async (insertBookshelfRequest?: InsertBookshelfRequest, options: any = {}): Promise => { + insertBookshelfV1: async (insertBookshelfRequest?: InsertBookshelfRequest, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/insert-bookshelf`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -302,7 +304,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(insertBookshelfRequest, localVarRequestOptions, configuration) @@ -319,7 +321,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - insertShipmentV1: async (insertShipmentRequest?: InsertShipmentRequest, options: any = {}): Promise => { + insertShipmentV1: async (insertShipmentRequest?: InsertShipmentRequest, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/insert-shipment`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -336,7 +338,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(insertShipmentRequest, localVarRequestOptions, configuration) @@ -352,7 +354,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listBambooHarvestV1: async (options: any = {}): Promise => { + listBambooHarvestV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/list-bamboo-harvest`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -367,7 +369,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -382,7 +384,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listBookshelfV1: async (options: any = {}): Promise => { + listBookshelfV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/list-bookshelf`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -397,7 +399,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -412,7 +414,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listShipmentV1: async (options: any = {}): Promise => { + listShipmentV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-example-supply-chain-backend/list-shipment`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -427,7 +429,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -453,7 +455,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async insertBambooHarvestV1(insertBambooHarvestRequest?: InsertBambooHarvestRequest, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async insertBambooHarvestV1(insertBambooHarvestRequest?: InsertBambooHarvestRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.insertBambooHarvestV1(insertBambooHarvestRequest, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -464,7 +466,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async insertBookshelfV1(insertBookshelfRequest?: InsertBookshelfRequest, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async insertBookshelfV1(insertBookshelfRequest?: InsertBookshelfRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.insertBookshelfV1(insertBookshelfRequest, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -475,7 +477,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async insertShipmentV1(insertShipmentRequest?: InsertShipmentRequest, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async insertShipmentV1(insertShipmentRequest?: InsertShipmentRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.insertShipmentV1(insertShipmentRequest, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -485,7 +487,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listBambooHarvestV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async listBambooHarvestV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.listBambooHarvestV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -495,7 +497,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listBookshelfV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async listBookshelfV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.listBookshelfV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -505,7 +507,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listShipmentV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async listShipmentV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.listShipmentV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -594,7 +596,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public insertBambooHarvestV1(insertBambooHarvestRequest?: InsertBambooHarvestRequest, options?: any) { + public insertBambooHarvestV1(insertBambooHarvestRequest?: InsertBambooHarvestRequest, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).insertBambooHarvestV1(insertBambooHarvestRequest, options).then((request) => request(this.axios, this.basePath)); } @@ -606,7 +608,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public insertBookshelfV1(insertBookshelfRequest?: InsertBookshelfRequest, options?: any) { + public insertBookshelfV1(insertBookshelfRequest?: InsertBookshelfRequest, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).insertBookshelfV1(insertBookshelfRequest, options).then((request) => request(this.axios, this.basePath)); } @@ -618,7 +620,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public insertShipmentV1(insertShipmentRequest?: InsertShipmentRequest, options?: any) { + public insertShipmentV1(insertShipmentRequest?: InsertShipmentRequest, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).insertShipmentV1(insertShipmentRequest, options).then((request) => request(this.axios, this.basePath)); } @@ -629,7 +631,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public listBambooHarvestV1(options?: any) { + public listBambooHarvestV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).listBambooHarvestV1(options).then((request) => request(this.axios, this.basePath)); } @@ -640,7 +642,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public listBookshelfV1(options?: any) { + public listBookshelfV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).listBookshelfV1(options).then((request) => request(this.axios, this.basePath)); } @@ -651,7 +653,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public listShipmentV1(options?: any) { + public listShipmentV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).listShipmentV1(options).then((request) => request(this.axios, this.basePath)); } } diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/base.ts b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/base.ts index d0b8d5515d..ca6c6fc4e7 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/common.ts b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/common.ts index 85e875dcfa..1d2a8abad6 100644 --- a/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/examples/cactus-example-supply-chain-business-logic-plugin/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/extensions/cactus-plugin-htlc-coordinator-besu/openapitools.json b/extensions/cactus-plugin-htlc-coordinator-besu/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/extensions/cactus-plugin-htlc-coordinator-besu/openapitools.json +++ b/extensions/cactus-plugin-htlc-coordinator-besu/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/extensions/cactus-plugin-htlc-coordinator-besu/src/main/json/openapi.json b/extensions/cactus-plugin-htlc-coordinator-besu/src/main/json/openapi.json index 8a9b910136..15f4126db3 100644 --- a/extensions/cactus-plugin-htlc-coordinator-besu/src/main/json/openapi.json +++ b/extensions/cactus-plugin-htlc-coordinator-besu/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - HTLC Coordinator", "description": "Can exchange assets between networks", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/extensions/cactus-plugin-htlc-coordinator-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/extensions/cactus-plugin-htlc-coordinator-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/extensions/cactus-plugin-htlc-coordinator-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/extensions/cactus-plugin-htlc-coordinator-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/extensions/cactus-plugin-object-store-ipfs/openapitools.json b/extensions/cactus-plugin-object-store-ipfs/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/extensions/cactus-plugin-object-store-ipfs/openapitools.json +++ b/extensions/cactus-plugin-object-store-ipfs/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/json/openapi.json b/extensions/cactus-plugin-object-store-ipfs/src/main/json/openapi.json index 2a3925eeea..16be9112ea 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/json/openapi.json +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Object Store - IPFS ", "description": "Contains/describes the Hyperledger Cactus Object Store IPFS plugin.", "version": "0.2.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES index 7be61df292..cf478b0562 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES @@ -6,7 +6,7 @@ settings.gradle src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt -src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt +src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt @@ -14,6 +14,7 @@ src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/README.md b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/README.md index 439eb8b61c..2bafb91b15 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -1,9 +1,18 @@ # org.openapitools.client - Kotlin client library for Hyperledger Cactus Plugin - Object Store - IPFS +Contains/describes the Hyperledger Cactus Object Store IPFS plugin. + +## Overview +This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client. + +- API version: 0.2.0 +- Package version: +- Build package: org.openapitools.codegen.languages.KotlinClientCodegen + ## Requires -* Kotlin 1.4.30 -* Gradle 6.8.3 +* Kotlin 1.7.21 +* Gradle 7.5 ## Build @@ -28,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *https://www.cactus.stream* @@ -40,7 +49,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**setObjectV1**](docs/DefaultApi.md#setobjectv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-object-store-ipfs/set-object | Sets an object in the object store under the specified key. - + ## Documentation for Models - [org.openapitools.client.models.GetObjectRequestV1](docs/GetObjectRequestV1.md) @@ -51,7 +60,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetObjectResponseV1](docs/SetObjectResponseV1.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/build.gradle b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/build.gradle index 3de8b45b13..66a3c68b89 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/build.gradle +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/build.gradle @@ -2,12 +2,12 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.3' + gradleVersion = '7.5' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.7.21' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -18,6 +18,7 @@ buildscript { } apply plugin: 'kotlin' +apply plugin: 'maven-publish' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -30,8 +31,8 @@ test { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "com.squareup.moshi:moshi-kotlin:1.12.0" - implementation "com.squareup.moshi:moshi-adapters:1.12.0" - implementation "com.squareup.okhttp3:okhttp:4.9.1" + implementation "com.squareup.moshi:moshi-kotlin:1.13.0" + implementation "com.squareup.moshi:moshi-adapters:1.13.0" + implementation "com.squareup.okhttp3:okhttp:4.10.0" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt index b2973ce23f..d29c346801 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Object Store - IPFS - * - * Contains/describes the Hyperledger Cactus Object Store IPFS plugin. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -20,6 +15,10 @@ package org.openapitools.client.apis +import java.io.IOException +import okhttp3.OkHttpClient +import okhttp3.HttpUrl + import org.openapitools.client.models.GetObjectRequestV1 import org.openapitools.client.models.GetObjectResponseV1 import org.openapitools.client.models.HasObjectRequestV1 @@ -27,43 +26,45 @@ import org.openapitools.client.models.HasObjectResponseV1 import org.openapitools.client.models.SetObjectRequestV1 import org.openapitools.client.models.SetObjectResponseV1 +import com.squareup.moshi.Json + import org.openapitools.client.infrastructure.ApiClient +import org.openapitools.client.infrastructure.ApiResponse import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap +import org.openapitools.client.infrastructure.PartConfig import org.openapitools.client.infrastructure.RequestConfig import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { +class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty("org.openapitools.client.baseUrl", "https://www.cactus.stream") + System.getProperties().getProperty(ApiClient.baseUrlKey, "https://www.cactus.stream") } } /** - * Retrieves an object from the object store. - * - * @param getObjectRequestV1 Request body to obtain an object via its key. - * @return GetObjectResponseV1 - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Retrieves an object from the object store. + * + * @param getObjectRequestV1 Request body to obtain an object via its key. + * @return GetObjectResponseV1 + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun getObjectV1(getObjectRequestV1: GetObjectRequestV1) : GetObjectResponseV1 { - val localVariableConfig = getObjectV1RequestConfig(getObjectRequestV1 = getObjectRequestV1) - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = getObjectV1WithHttpInfo(getObjectRequestV1 = getObjectRequestV1) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as GetObjectResponseV1 @@ -81,42 +82,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation getObjectV1 - * - * @param getObjectRequestV1 Request body to obtain an object via its key. - * @return RequestConfig - */ + * Retrieves an object from the object store. + * + * @param getObjectRequestV1 Request body to obtain an object via its key. + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun getObjectV1WithHttpInfo(getObjectRequestV1: GetObjectRequestV1) : ApiResponse { + val localVariableConfig = getObjectV1RequestConfig(getObjectRequestV1 = getObjectRequestV1) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation getObjectV1 + * + * @param getObjectRequestV1 Request body to obtain an object via its key. + * @return RequestConfig + */ fun getObjectV1RequestConfig(getObjectRequestV1: GetObjectRequestV1) : RequestConfig { val localVariableBody = getObjectRequestV1 val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-object-store-ipfs/get-object", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Checks the presence of an object in the object store. - * - * @param hasObjectRequestV1 Request body to check presence of an object under a key. - * @return HasObjectResponseV1 - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Checks the presence of an object in the object store. + * + * @param hasObjectRequestV1 Request body to check presence of an object under a key. + * @return HasObjectResponseV1 + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun hasObjectV1(hasObjectRequestV1: HasObjectRequestV1) : HasObjectResponseV1 { - val localVariableConfig = hasObjectV1RequestConfig(hasObjectRequestV1 = hasObjectRequestV1) - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = hasObjectV1WithHttpInfo(hasObjectRequestV1 = hasObjectRequestV1) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as HasObjectResponseV1 @@ -134,42 +154,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation hasObjectV1 - * - * @param hasObjectRequestV1 Request body to check presence of an object under a key. - * @return RequestConfig - */ + * Checks the presence of an object in the object store. + * + * @param hasObjectRequestV1 Request body to check presence of an object under a key. + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun hasObjectV1WithHttpInfo(hasObjectRequestV1: HasObjectRequestV1) : ApiResponse { + val localVariableConfig = hasObjectV1RequestConfig(hasObjectRequestV1 = hasObjectRequestV1) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation hasObjectV1 + * + * @param hasObjectRequestV1 Request body to check presence of an object under a key. + * @return RequestConfig + */ fun hasObjectV1RequestConfig(hasObjectRequestV1: HasObjectRequestV1) : RequestConfig { val localVariableBody = hasObjectRequestV1 val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-object-store-ipfs/has-object", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Sets an object in the object store under the specified key. - * - * @param setObjectRequestV1 Request body to set an object under a key. - * @return SetObjectResponseV1 - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Sets an object in the object store under the specified key. + * + * @param setObjectRequestV1 Request body to set an object under a key. + * @return SetObjectResponseV1 + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun setObjectV1(setObjectRequestV1: SetObjectRequestV1) : SetObjectResponseV1 { - val localVariableConfig = setObjectV1RequestConfig(setObjectRequestV1 = setObjectRequestV1) - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = setObjectV1WithHttpInfo(setObjectRequestV1 = setObjectRequestV1) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as SetObjectResponseV1 @@ -187,23 +226,47 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation setObjectV1 - * - * @param setObjectRequestV1 Request body to set an object under a key. - * @return RequestConfig - */ + * Sets an object in the object store under the specified key. + * + * @param setObjectRequestV1 Request body to set an object under a key. + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun setObjectV1WithHttpInfo(setObjectRequestV1: SetObjectRequestV1) : ApiResponse { + val localVariableConfig = setObjectV1RequestConfig(setObjectRequestV1 = setObjectRequestV1) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation setObjectV1 + * + * @param setObjectRequestV1 Request body to set an object under a key. + * @return RequestConfig + */ fun setObjectV1RequestConfig(setObjectRequestV1: SetObjectRequestV1) : RequestConfig { val localVariableBody = setObjectRequestV1 val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-object-store-ipfs/set-object", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } + + private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String = + HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0] } diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b359be1e41..ea4b7b6593 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -10,21 +10,26 @@ import okhttp3.ResponseBody import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.Headers +import okhttp3.Headers.Companion.toHeaders import okhttp3.MultipartBody +import okhttp3.Call +import okhttp3.Callback +import okhttp3.Response +import okhttp3.internal.EMPTY_REQUEST import java.io.BufferedWriter import java.io.File import java.io.FileWriter +import java.io.IOException import java.net.URLConnection import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime import java.time.OffsetDateTime import java.time.OffsetTime -import java.util.Date import java.util.Locale import com.squareup.moshi.adapter -open class ApiClient(val baseUrl: String) { +open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) { companion object { protected const val ContentType = "Content-Type" protected const val Accept = "Accept" @@ -39,9 +44,10 @@ open class ApiClient(val baseUrl: String) { var username: String? = null var password: String? = null var accessToken: String? = null + const val baseUrlKey = "org.openapitools.client.baseUrl" @JvmStatic - val client: OkHttpClient by lazy { + val defaultClient: OkHttpClient by lazy { builder.build() } @@ -60,48 +66,50 @@ open class ApiClient(val baseUrl: String) { return contentType ?: "application/octet-stream" } - protected inline fun requestBody(content: T, mediaType: String = JsonMediaType): RequestBody = + protected inline fun requestBody(content: T, mediaType: String?): RequestBody = when { - content is File -> content.asRequestBody(mediaType.toMediaTypeOrNull()) - mediaType == FormDataMediaType -> { + content is File -> content.asRequestBody((mediaType ?: guessContentTypeFromFile(content)).toMediaTypeOrNull()) + mediaType == FormDataMediaType -> MultipartBody.Builder() .setType(MultipartBody.FORM) .apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - if (value is File) { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"; filename=\"${value.name}\"" + (content as Map>).forEach { (name, part) -> + if (part.body is File) { + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"") + val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull() + addPart( + partHeaders.toHeaders(), + part.body.asRequestBody(fileMediaType) ) - val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull() - addPart(partHeaders, value.asRequestBody(fileMediaType)) } else { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"" - ) + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"") addPart( - partHeaders, - parameterToString(value).toRequestBody(null) + partHeaders.toHeaders(), + parameterToString(part.body).toRequestBody(null) ) } } }.build() - } mediaType == FormUrlEncMediaType -> { FormBody.Builder().apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - add(key, parameterToString(value)) + (content as Map>).forEach { (name, part) -> + add(name, parameterToString(part.body)) } }.build() } - mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody( - mediaType.toMediaTypeOrNull() - ) + mediaType == null || mediaType.startsWith("application/") && mediaType.endsWith("json") -> + if (content == null) { + EMPTY_REQUEST + } else { + Serializer.moshi.adapter(T::class.java).toJson(content) + .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull()) + } mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.") // TODO: this should be extended with other serializers else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.") @@ -112,31 +120,35 @@ open class ApiClient(val baseUrl: String) { if(body == null) { return null } + if (T::class.java == File::class.java) { + // return tempFile + // Attention: if you are developing an android app that supports API Level 25 and bellow, please check flag supportAndroidApiLevel25AndBelow in https://openapi-generator.tech/docs/generators/kotlin#config-options + val tempFile = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() + tempFile.deleteOnExit() + body.byteStream().use { inputStream -> + tempFile.outputStream().use { tempFileOutputStream -> + inputStream.copyTo(tempFileOutputStream) + } + } + return tempFile as T + } val bodyContent = body.string() if (bodyContent.isEmpty()) { return null } - if (T::class.java == File::class.java) { - // return tempfile - val f = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() - f.deleteOnExit() - val out = BufferedWriter(FileWriter(f)) - out.write(bodyContent) - out.close() - return f as T - } - return when(mediaType) { - JsonMediaType -> Serializer.moshi.adapter().fromJson(bodyContent) + return when { + mediaType==null || (mediaType.startsWith("application/") && mediaType.endsWith("json")) -> + Serializer.moshi.adapter().fromJson(bodyContent) else -> throw UnsupportedOperationException("responseBody currently only supports JSON body.") } } - protected inline fun request(requestConfig: RequestConfig): ApiInfrastructureResponse { + protected inline fun request(requestConfig: RequestConfig): ApiResponse { val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.") val url = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) + .addEncodedPathSegments(requestConfig.path.trimStart('/')) .apply { requestConfig.query.forEach { query -> query.value.forEach { queryValue -> @@ -146,7 +158,7 @@ open class ApiClient(val baseUrl: String) { }.build() // take content-type/accept from spec or set to default (application/json) if not defined - if (requestConfig.headers[ContentType].isNullOrEmpty()) { + if (requestConfig.body != null && requestConfig.headers[ContentType].isNullOrEmpty()) { requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { @@ -154,16 +166,16 @@ open class ApiClient(val baseUrl: String) { } val headers = requestConfig.headers - if(headers[ContentType] ?: "" == "") { - throw kotlin.IllegalStateException("Missing Content-Type header. This is required.") - } - - if(headers[Accept] ?: "" == "") { + if (headers[Accept].isNullOrEmpty()) { throw kotlin.IllegalStateException("Missing Accept header. This is required.") } - // TODO: support multiple contentType options here. - val contentType = (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + val contentType = if (headers[ContentType] != null) { + // TODO: support multiple contentType options here. + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) + } else { + null + } val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType)) @@ -178,7 +190,8 @@ open class ApiClient(val baseUrl: String) { }.build() val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { @@ -215,7 +228,7 @@ open class ApiClient(val baseUrl: String) { null -> "" is Array<*> -> toMultiValue(value, "csv").toString() is Iterable<*> -> toMultiValue(value, "csv").toString() - is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> + is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime -> parseDateToQueryString(value) else -> value.toString() } diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt new file mode 100644 index 0000000000..cf2cfaa95d --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt @@ -0,0 +1,43 @@ +package org.openapitools.client.infrastructure + +enum class ResponseType { + Success, Informational, Redirection, ClientError, ServerError +} + +interface Response + +abstract class ApiResponse(val responseType: ResponseType): Response { + abstract val statusCode: Int + abstract val headers: Map> +} + +class Success( + val data: T, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +): ApiResponse(ResponseType.Success) + +class Informational( + val statusText: String, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Informational) + +class Redirection( + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Redirection) + +class ClientError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.ClientError) + +class ServerError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> +): ApiResponse(ResponseType.ServerError) diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt index fb2c972cf8..064b57fc6b 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt @@ -14,4 +14,4 @@ class BigDecimalAdapter { fun fromJson(value: String): BigDecimal { return BigDecimal(value) } -} \ No newline at end of file +} diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt index 4b6963110c..7df6057b45 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt @@ -14,4 +14,4 @@ class BigIntegerAdapter { fun fromJson(value: String): BigInteger { return BigInteger(value) } -} \ No newline at end of file +} diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt new file mode 100644 index 0000000000..be00e38fba --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -0,0 +1,11 @@ +package org.openapitools.client.infrastructure + +/** + * Defines a config object for a given part of a multi-part request. + * NOTE: Headers is a Map because rfc2616 defines + * multi-valued headers as csv-only. + */ +data class PartConfig( + val headers: MutableMap = mutableMapOf(), + val body: T? = null +) diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt index 7e948e1dd0..625a19002b 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt @@ -13,5 +13,6 @@ data class RequestConfig( val path: String, val headers: MutableMap = mutableMapOf(), val query: MutableMap> = mutableMapOf(), + val requiresAuthentication: Boolean, val body: T? = null ) \ No newline at end of file diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt index 99eb95bcd2..fa3bf67f10 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Object Store - IPFS - * - * Contains/describes the Hyperledger Cactus Object Store IPFS plugin. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param key The key for the entry to get from the object store. */ + data class GetObjectRequestV1 ( /* The key for the entry to get from the object store. */ diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt index 45bc3f6f4f..fb0e6004f8 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Object Store - IPFS - * - * Contains/describes the Hyperledger Cactus Object Store IPFS plugin. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param `value` The value associated with the requested key in the object store as a string. */ + data class GetObjectResponseV1 ( /* The key that was used to retrieve the value from the object store. */ diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1200Response.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1200Response.kt new file mode 100644 index 0000000000..4cd2f5bc92 --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1200Response.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to retrieve the value from the object store. + * @param `value` The value associated with the requested key in the object store as a string. + */ + + +data class GetObjectV1200Response ( + + /* The key that was used to retrieve the value from the object store. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value associated with the requested key in the object store as a string. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1Request.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1Request.kt new file mode 100644 index 0000000000..001fc1f1fe --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to get from the object store. + */ + + +data class GetObjectV1Request ( + + /* The key for the entry to get from the object store. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt index c9c492f9a4..616e39804b 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Object Store - IPFS - * - * Contains/describes the Hyperledger Cactus Object Store IPFS plugin. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param key The key to check for presence in the object store. */ + data class HasObjectRequestV1 ( /* The key to check for presence in the object store. */ diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt index e2e6ad4bbe..f71878ed6d 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Object Store - IPFS - * - * Contains/describes the Hyperledger Cactus Object Store IPFS plugin. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param isPresent The boolean true or false indicating the presence or absence of an object under 'key'. */ + data class HasObjectResponseV1 ( /* The key that was used to check the presence of the value in the object store. */ diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1200Response.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1200Response.kt new file mode 100644 index 0000000000..13d90483a2 --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1200Response.kt @@ -0,0 +1,45 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to check the presence of the value in the object store. + * @param checkedAt Date and time encoded as JSON when the presence check was performed by the plugin backend. + * @param isPresent The boolean true or false indicating the presence or absence of an object under 'key'. + */ + + +data class HasObjectV1200Response ( + + /* The key that was used to check the presence of the value in the object store. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* Date and time encoded as JSON when the presence check was performed by the plugin backend. */ + @Json(name = "checkedAt") + val checkedAt: kotlin.Any?, + + /* The boolean true or false indicating the presence or absence of an object under 'key'. */ + @Json(name = "isPresent") + val isPresent: kotlin.Any? + +) + diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1Request.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1Request.kt new file mode 100644 index 0000000000..26f3addc31 --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key to check for presence in the object store. + */ + + +data class HasObjectV1Request ( + + /* The key to check for presence in the object store. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt index 610860e172..605a55c895 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Object Store - IPFS - * - * Contains/describes the Hyperledger Cactus Object Store IPFS plugin. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param `value` The value that will be associated with the key in the object store. */ + data class SetObjectRequestV1 ( /* The key for the entry to set in the object store. */ diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt index d0c58b78c3..a9f3681a38 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Object Store - IPFS - * - * Contains/describes the Hyperledger Cactus Object Store IPFS plugin. - * - * The version of the OpenAPI document: 0.2.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param key The key that was used to set the value in the object store. */ + data class SetObjectResponseV1 ( /* The key that was used to set the value in the object store. */ diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1200Response.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1200Response.kt new file mode 100644 index 0000000000..54d0ae942c --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to set the value in the object store. + */ + + +data class SetObjectV1200Response ( + + /* The key that was used to set the value in the object store. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1Request.kt b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1Request.kt new file mode 100644 index 0000000000..010f24e33b --- /dev/null +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectV1Request.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to set in the object store. + * @param `value` The value that will be associated with the key in the object store. + */ + + +data class SetObjectV1Request ( + + /* The key for the entry to set in the object store. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value that will be associated with the key in the object store. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/api.ts b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/api.ts index e9d396d72f..492414ac84 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * @@ -32,7 +34,7 @@ export interface GetObjectRequestV1 { * @type {string} * @memberof GetObjectRequestV1 */ - key: string; + 'key': string; } /** * @@ -45,13 +47,13 @@ export interface GetObjectResponseV1 { * @type {string} * @memberof GetObjectResponseV1 */ - key: string; + 'key': string; /** * The value associated with the requested key in the object store as a string. * @type {string} * @memberof GetObjectResponseV1 */ - value: string; + 'value': string; } /** * @@ -64,7 +66,7 @@ export interface HasObjectRequestV1 { * @type {string} * @memberof HasObjectRequestV1 */ - key: string; + 'key': string; } /** * @@ -77,19 +79,19 @@ export interface HasObjectResponseV1 { * @type {string} * @memberof HasObjectResponseV1 */ - key: string; + 'key': string; /** * Date and time encoded as JSON when the presence check was performed by the plugin backend. * @type {string} * @memberof HasObjectResponseV1 */ - checkedAt: string; + 'checkedAt': string; /** * The boolean true or false indicating the presence or absence of an object under \'key\'. * @type {boolean} * @memberof HasObjectResponseV1 */ - isPresent: boolean; + 'isPresent': boolean; } /** * @@ -102,13 +104,13 @@ export interface SetObjectRequestV1 { * @type {string} * @memberof SetObjectRequestV1 */ - key: string; + 'key': string; /** * The value that will be associated with the key in the object store. * @type {string} * @memberof SetObjectRequestV1 */ - value: string; + 'value': string; } /** * @@ -121,7 +123,7 @@ export interface SetObjectResponseV1 { * @type {string} * @memberof SetObjectResponseV1 */ - key: string; + 'key': string; } /** @@ -137,7 +139,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getObjectV1: async (getObjectRequestV1: GetObjectRequestV1, options: any = {}): Promise => { + getObjectV1: async (getObjectRequestV1: GetObjectRequestV1, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'getObjectRequestV1' is not null or undefined assertParamExists('getObjectV1', 'getObjectRequestV1', getObjectRequestV1) const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-object-store-ipfs/get-object`; @@ -156,7 +158,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(getObjectRequestV1, localVarRequestOptions, configuration) @@ -173,7 +175,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - hasObjectV1: async (hasObjectRequestV1: HasObjectRequestV1, options: any = {}): Promise => { + hasObjectV1: async (hasObjectRequestV1: HasObjectRequestV1, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'hasObjectRequestV1' is not null or undefined assertParamExists('hasObjectV1', 'hasObjectRequestV1', hasObjectRequestV1) const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-object-store-ipfs/has-object`; @@ -192,7 +194,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(hasObjectRequestV1, localVarRequestOptions, configuration) @@ -209,7 +211,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - setObjectV1: async (setObjectRequestV1: SetObjectRequestV1, options: any = {}): Promise => { + setObjectV1: async (setObjectRequestV1: SetObjectRequestV1, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'setObjectRequestV1' is not null or undefined assertParamExists('setObjectV1', 'setObjectRequestV1', setObjectRequestV1) const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-object-store-ipfs/set-object`; @@ -228,7 +230,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(setObjectRequestV1, localVarRequestOptions, configuration) @@ -255,7 +257,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getObjectV1(getObjectRequestV1: GetObjectRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getObjectV1(getObjectRequestV1: GetObjectRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getObjectV1(getObjectRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -266,7 +268,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async hasObjectV1(hasObjectRequestV1: HasObjectRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async hasObjectV1(hasObjectRequestV1: HasObjectRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.hasObjectV1(hasObjectRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -277,7 +279,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async setObjectV1(setObjectRequestV1: SetObjectRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async setObjectV1(setObjectRequestV1: SetObjectRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.setObjectV1(setObjectRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -339,7 +341,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getObjectV1(getObjectRequestV1: GetObjectRequestV1, options?: any) { + public getObjectV1(getObjectRequestV1: GetObjectRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getObjectV1(getObjectRequestV1, options).then((request) => request(this.axios, this.basePath)); } @@ -351,7 +353,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public hasObjectV1(hasObjectRequestV1: HasObjectRequestV1, options?: any) { + public hasObjectV1(hasObjectRequestV1: HasObjectRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).hasObjectV1(hasObjectRequestV1, options).then((request) => request(this.axios, this.basePath)); } @@ -363,7 +365,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public setObjectV1(setObjectRequestV1: SetObjectRequestV1, options?: any) { + public setObjectV1(setObjectRequestV1: SetObjectRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).setObjectV1(setObjectRequestV1, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/base.ts b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/base.ts index 577679776f..b865475d6a 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "https://www.cactus.stream".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/common.ts b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/common.ts index 3d021dc716..1a1eb23694 100644 --- a/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/extensions/cactus-plugin-object-store-ipfs/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/package.json b/package.json index 6e8826eddc..4982800986 100644 --- a/package.json +++ b/package.json @@ -52,8 +52,7 @@ "codegen:cleanup": "rm --force --verbose ./openapitools.json", "codegen:lerna": "lerna run codegen", "codegen:warmup-mkdir": "make-dir ./node_modules/@openapitools/openapi-generator-cli/versions/", - "codegen:warmup-v5.2.1": "nwget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar -O ./node_modules/@openapitools/openapi-generator-cli/versions/5.2.1.jar", - "codegen:warmup-v6.3.0": "nwget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar -O ./node_modules/@openapitools/openapi-generator-cli/versions/6.3.0.jar", + "codegen:warmup-v6.6.0": "nwget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.6.0.jar -O ./node_modules/@openapitools/openapi-generator-cli/versions/6.6.0.jar", "watch-other": "lerna run --parallel watch", "watch-tsc": "tsc --build --watch", "watch": "run-p -r watch-*", diff --git a/packages/cactus-cmd-api-server/openapitools.json b/packages/cactus-cmd-api-server/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-cmd-api-server/openapitools.json +++ b/packages/cactus-cmd-api-server/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-cmd-api-server/src/main/json/openapi.json b/packages/cactus-cmd-api-server/src/main/json/openapi.json index c3306f768f..53aea86c24 100644 --- a/packages/cactus-cmd-api-server/src/main/json/openapi.json +++ b/packages/cactus-cmd-api-server/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus API", "description": "Interact with a Cactus deployment through HTTP.", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/README.md index 82e7e96d21..139873331a 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -48,7 +48,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**getPrometheusMetricsV1**](docs/DefaultApi.md#getprometheusmetricsv1) | **GET** /api/v1/api-server/get-prometheus-exporter-metrics | Get the Prometheus Metrics - + ## Documentation for Models - [org.openapitools.client.models.HealthCheckResponse](docs/HealthCheckResponse.md) @@ -56,7 +56,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.WatchHealthcheckV1](docs/WatchHealthcheckV1.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HealthCheckResponse.kt b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HealthCheckResponse.kt index 395ee1db0c..26d140fb39 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HealthCheckResponse.kt +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HealthCheckResponse.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.MemoryUsage import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/MemoryUsage.kt b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/MemoryUsage.kt index 4cc9572408..ea7bf0f581 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/MemoryUsage.kt +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/MemoryUsage.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchHealthcheckV1.kt b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchHealthcheckV1.kt index 78ebf05433..c835f948f7 100644 --- a/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchHealthcheckV1.kt +++ b/packages/cactus-cmd-api-server/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchHealthcheckV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: Subscribe,Next,Unsubscribe,Error,Complete */ +@JsonClass(generateAdapter = false) enum class WatchHealthcheckV1(val value: kotlin.String) { @Json(name = "org.hyperledger.cactus.api.async.besu.WatchHealthcheckV1.Subscribe") @@ -42,7 +44,7 @@ enum class WatchHealthcheckV1(val value: kotlin.String) { Complete("org.hyperledger.cactus.api.async.besu.WatchHealthcheckV1.Complete"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-cmd-api-server/src/main/proto/generated/openapi/.openapi-generator/VERSION b/packages/cactus-cmd-api-server/src/main/proto/generated/openapi/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-cmd-api-server/src/main/proto/generated/openapi/.openapi-generator/VERSION +++ b/packages/cactus-cmd-api-server/src/main/proto/generated/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-cmd-api-server/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-cmd-api-server/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-cmd-api-server/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-cmd-api-server/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/google/protobuf/empty.ts b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/google/protobuf/empty.ts index 816aa0ee9a..7b5a551bf9 100644 --- a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/google/protobuf/empty.ts +++ b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/google/protobuf/empty.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: google/protobuf/empty.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/health_check_response_pb.ts b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/health_check_response_pb.ts index 6c2e650c09..4a63d95a8d 100644 --- a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/health_check_response_pb.ts +++ b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/health_check_response_pb.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: models/health_check_response_pb.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as dependency_1 from "./memory_usage_pb"; diff --git a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/memory_usage_pb.ts b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/memory_usage_pb.ts index 298cf4d997..8bc33418f4 100644 --- a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/memory_usage_pb.ts +++ b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/models/memory_usage_pb.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: models/memory_usage_pb.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service.ts b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service.ts index eba680b169..5e9c1b4cb5 100644 --- a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service.ts +++ b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: services/default_service.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as dependency_1 from "./../google/protobuf/empty"; diff --git a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_grpc_pb.d.ts b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_grpc_pb.d.ts new file mode 100644 index 0000000000..e09bbd86da --- /dev/null +++ b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_grpc_pb.d.ts @@ -0,0 +1,60 @@ +// package: org.hyperledger.cactus.cmd_api_server +// file: services/default_service.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as grpc from "@grpc/grpc-js"; +import * as services_default_service_pb from "../services/default_service_pb"; +import * as google_protobuf_empty_pb from "google-protobuf/google/protobuf/empty_pb"; +import * as models_health_check_response_pb_pb from "../models/health_check_response_pb_pb"; + +interface IDefaultServiceService extends grpc.ServiceDefinition { + getHealthCheckV1: IDefaultServiceService_IGetHealthCheckV1; + getPrometheusMetricsV1: IDefaultServiceService_IGetPrometheusMetricsV1; +} + +interface IDefaultServiceService_IGetHealthCheckV1 extends grpc.MethodDefinition { + path: "/org.hyperledger.cactus.cmd_api_server.DefaultService/GetHealthCheckV1"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} +interface IDefaultServiceService_IGetPrometheusMetricsV1 extends grpc.MethodDefinition { + path: "/org.hyperledger.cactus.cmd_api_server.DefaultService/GetPrometheusMetricsV1"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} + +export const DefaultServiceService: IDefaultServiceService; + +export interface IDefaultServiceServer extends grpc.UntypedServiceImplementation { + getHealthCheckV1: grpc.handleUnaryCall; + getPrometheusMetricsV1: grpc.handleUnaryCall; +} + +export interface IDefaultServiceClient { + getHealthCheckV1(request: google_protobuf_empty_pb.Empty, callback: (error: grpc.ServiceError | null, response: models_health_check_response_pb_pb.HealthCheckResponsePB) => void): grpc.ClientUnaryCall; + getHealthCheckV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: models_health_check_response_pb_pb.HealthCheckResponsePB) => void): grpc.ClientUnaryCall; + getHealthCheckV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: models_health_check_response_pb_pb.HealthCheckResponsePB) => void): grpc.ClientUnaryCall; + getPrometheusMetricsV1(request: google_protobuf_empty_pb.Empty, callback: (error: grpc.ServiceError | null, response: services_default_service_pb.GetPrometheusMetricsV1Response) => void): grpc.ClientUnaryCall; + getPrometheusMetricsV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: services_default_service_pb.GetPrometheusMetricsV1Response) => void): grpc.ClientUnaryCall; + getPrometheusMetricsV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: services_default_service_pb.GetPrometheusMetricsV1Response) => void): grpc.ClientUnaryCall; +} + +export class DefaultServiceClient extends grpc.Client implements IDefaultServiceClient { + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); + public getHealthCheckV1(request: google_protobuf_empty_pb.Empty, callback: (error: grpc.ServiceError | null, response: models_health_check_response_pb_pb.HealthCheckResponsePB) => void): grpc.ClientUnaryCall; + public getHealthCheckV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: models_health_check_response_pb_pb.HealthCheckResponsePB) => void): grpc.ClientUnaryCall; + public getHealthCheckV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: models_health_check_response_pb_pb.HealthCheckResponsePB) => void): grpc.ClientUnaryCall; + public getPrometheusMetricsV1(request: google_protobuf_empty_pb.Empty, callback: (error: grpc.ServiceError | null, response: services_default_service_pb.GetPrometheusMetricsV1Response) => void): grpc.ClientUnaryCall; + public getPrometheusMetricsV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: services_default_service_pb.GetPrometheusMetricsV1Response) => void): grpc.ClientUnaryCall; + public getPrometheusMetricsV1(request: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: services_default_service_pb.GetPrometheusMetricsV1Response) => void): grpc.ClientUnaryCall; +} diff --git a/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_pb.d.ts b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_pb.d.ts new file mode 100644 index 0000000000..24d7c00395 --- /dev/null +++ b/packages/cactus-cmd-api-server/src/main/typescript/generated/proto/protoc-gen-ts/services/default_service_pb.d.ts @@ -0,0 +1,29 @@ +// package: org.hyperledger.cactus.cmd_api_server +// file: services/default_service.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; +import * as google_protobuf_empty_pb from "google-protobuf/google/protobuf/empty_pb"; +import * as models_health_check_response_pb_pb from "../models/health_check_response_pb_pb"; + +export class GetPrometheusMetricsV1Response extends jspb.Message { + getData(): string; + setData(value: string): GetPrometheusMetricsV1Response; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): GetPrometheusMetricsV1Response.AsObject; + static toObject(includeInstance: boolean, msg: GetPrometheusMetricsV1Response): GetPrometheusMetricsV1Response.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: GetPrometheusMetricsV1Response, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): GetPrometheusMetricsV1Response; + static deserializeBinaryFromReader(message: GetPrometheusMetricsV1Response, reader: jspb.BinaryReader): GetPrometheusMetricsV1Response; +} + +export namespace GetPrometheusMetricsV1Response { + export type AsObject = { + data: string, + } +} diff --git a/packages/cactus-core-api/openapitools.json b/packages/cactus-core-api/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-core-api/openapitools.json +++ b/packages/cactus-core-api/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-core-api/src/main/json/openapi.json b/packages/cactus-core-api/src/main/json/openapi.json index fd7fbe05d6..034e577aca 100644 --- a/packages/cactus-core-api/src/main/json/openapi.json +++ b/packages/cactus-core-api/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Core API", "description": "Contains/describes the core API types for Cactus. Does not describe actual endpoints on its own as this is left to the implementing plugins who can import and re-use commonly needed type definitions from this specification. One example of said commonly used type definitions would be the types related to consortium management, cactus nodes, ledgers, etc..", "version": "0.2.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/README.md index c102e2b51c..c416448ec8 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -46,7 +46,7 @@ Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- - + ## Documentation for Models - [org.openapitools.client.models.CactusNode](docs/CactusNode.md) @@ -83,7 +83,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetObjectResponseV1](docs/SetObjectResponseV1.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNode.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNode.kt index 4f9aeca4d8..020128ccb6 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNode.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNode.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * A Cactus node can be a single server, or a set of servers behind a load balancer acting as one. diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeAllOf.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeAllOf.kt index c95e11a81c..895eb1c8a6 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeAllOf.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeAllOf.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeMeta.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeMeta.kt index 906806ba7d..ec9d921ad1 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeMeta.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CactusNodeMeta.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * A Cactus node meta information diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithOutTxFinality.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithOutTxFinality.kt index a008ba206f..fd10c20c69 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithOutTxFinality.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithOutTxFinality.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Enumerates a list of consensus algorithm families that do not provide immediate finality @@ -24,13 +25,14 @@ import com.squareup.moshi.Json * Values: WORK */ +@JsonClass(generateAdapter = false) enum class ConsensusAlgorithmFamiliesWithOutTxFinality(val value: kotlin.String) { @Json(name = "org.hyperledger.cactus.consensusalgorithm.PROOF_OF_WORK") WORK("org.hyperledger.cactus.consensusalgorithm.PROOF_OF_WORK"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithTxFinality.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithTxFinality.kt index b94a5cce53..f8092e0523 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithTxFinality.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamiliesWithTxFinality.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Enumerates a list of consensus algorithm families that provide immediate finality @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: aUTHORITY,sTAKE */ +@JsonClass(generateAdapter = false) enum class ConsensusAlgorithmFamiliesWithTxFinality(val value: kotlin.String) { @Json(name = "org.hyperledger.cactus.consensusalgorithm.PROOF_OF_AUTHORITY") @@ -33,7 +35,7 @@ enum class ConsensusAlgorithmFamiliesWithTxFinality(val value: kotlin.String) { sTAKE("org.hyperledger.cactus.consensusalgorithm.PROOF_OF_STAKE"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamily.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamily.kt index 47a1aa755f..aa86a664a7 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamily.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsensusAlgorithmFamily.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Enumerates a list of consensus algorithm families in existence. Does not intend to be an exhaustive list, just a practical one, meaning that we only include items here that are relevant to Hyperledger Cactus in fulfilling its own duties. This can be extended later as more sophisticated features of Cactus get implemented. This enum is meant to be first and foremost a useful abstraction for achieving practical tasks, not an encyclopedia and therefore we ask of everyone that this to be extended only in ways that serve a practical purpose for the runtime behavior of Cactus or Cactus plugins in general. The bottom line is that we can accept this enum being not 100% accurate as long as it 100% satisfies what it was designed to do. @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: aUTHORITY,sTAKE,wORK */ +@JsonClass(generateAdapter = false) enum class ConsensusAlgorithmFamily(val value: kotlin.String) { @Json(name = "org.hyperledger.cactus.consensusalgorithm.PROOF_OF_AUTHORITY") @@ -36,7 +38,7 @@ enum class ConsensusAlgorithmFamily(val value: kotlin.String) { wORK("org.hyperledger.cactus.consensusalgorithm.PROOF_OF_WORK"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Consortium.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Consortium.kt index ed9b6db5c9..b2007bc170 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Consortium.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Consortium.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumDatabase.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumDatabase.kt index 16d6618457..0d1eb9120d 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumDatabase.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumDatabase.kt @@ -22,6 +22,7 @@ import org.openapitools.client.models.Ledger import org.openapitools.client.models.PluginInstance import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumMember.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumMember.kt index ce80b41053..9eb9403f1d 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumMember.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConsortiumMember.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Constants.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Constants.kt index 45ccad4e63..a4e3e5abab 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Constants.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Constants.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,13 +25,14 @@ import com.squareup.moshi.Json * Values: SocketIoConnectionPathV1 */ +@JsonClass(generateAdapter = false) enum class Constants(val value: kotlin.String) { @Json(name = "/api/v1/async/socket-io/connect") SocketIoConnectionPathV1("/api/v1/async/socket-io/connect"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt index 058005f566..58a98174cf 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt index ac544c44ef..7b8b874e3d 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt index 82f324d68f..ea1d0da587 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt index 294cc6d743..21b9a38b46 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt index 595921a80d..fa3bf67f10 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt index 45643c183d..fb0e6004f8 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt index 4f7b976c95..c3055c3414 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt index 34f773aea5..6345c51831 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt index 0f4ec48ad8..616e39804b 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt index 29c3602a4a..f71878ed6d 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt index e32c81a50f..f32650672e 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.JWSRecipient import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt index 9b428d7dd8..7bf5dd698e 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * A JSON Web Signature. See: https://tools.ietf.org/html/rfc7515 for info about standard. diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Ledger.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Ledger.kt index dde4711b4d..55c44b1d91 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Ledger.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Ledger.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.LedgerType import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LedgerType.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LedgerType.kt index 4d40727ed4..c52055dea9 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LedgerType.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LedgerType.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Enumerates the different ledger vendors and their major versions encoded within the name of the LedgerType. For example \"BESU_1X\" involves all of the [1.0.0;2.0.0) where 1.0.0 is included and anything up until, but not 2.0.0. See: https://stackoverflow.com/a/4396303/698470 for further explanation. @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: bESU1X,bESU2X,bURROW0X,cORDA4X,fABRIC14X,fABRIC2,qUORUM2X,sAWTOOTH1X */ +@JsonClass(generateAdapter = false) enum class LedgerType(val value: kotlin.String) { @Json(name = "BESU_1X") @@ -51,7 +53,7 @@ enum class LedgerType(val value: kotlin.String) { sAWTOOTH1X("SAWTOOTH_1X"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImport.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImport.kt index 4e0bbc6ecf..d246f35db2 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImport.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImport.kt @@ -19,6 +19,7 @@ import org.openapitools.client.models.PluginImportAction import org.openapitools.client.models.PluginImportType import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportAction.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportAction.kt index ecfa75c92e..0c292d029c 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportAction.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportAction.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: iNSTANTIATE,iNSTALL */ +@JsonClass(generateAdapter = false) enum class PluginImportAction(val value: kotlin.String) { @Json(name = "org.hyperledger.cactus.plugin_import_action.INSTANTIATE") @@ -33,7 +35,7 @@ enum class PluginImportAction(val value: kotlin.String) { iNSTALL("org.hyperledger.cactus.plugin_import_action.INSTALL"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportType.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportType.kt index df3c6dd342..f639474153 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportType.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginImportType.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: lOCAL,rEMOTE */ +@JsonClass(generateAdapter = false) enum class PluginImportType(val value: kotlin.String) { @Json(name = "org.hyperledger.cactus.plugin_import_type.LOCAL") @@ -33,7 +35,7 @@ enum class PluginImportType(val value: kotlin.String) { rEMOTE("org.hyperledger.cactus.plugin_import_type.REMOTE"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginInstance.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginInstance.kt index 742d41f98b..5b40ac29bc 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginInstance.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PluginInstance.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt index b02d8928b9..d016fc72e6 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt index 32c97773c4..3f7624cd59 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt index 106f5d227c..605a55c895 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt index 35dd54d5d0..a9f3681a38 100644 --- a/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt +++ b/packages/cactus-core-api/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetObjectResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-core-api/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-core-api/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-core-api/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control.ts index 1337c00c1c..a4c8da728f 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/access_control.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control_pb.d.ts new file mode 100644 index 0000000000..dc150aa131 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/access_control_pb.d.ts @@ -0,0 +1,61 @@ +// package: common.access_control +// file: common/access_control.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class AccessControlPolicy extends jspb.Message { + getSecuritydomain(): string; + setSecuritydomain(value: string): AccessControlPolicy; + clearRulesList(): void; + getRulesList(): Array; + setRulesList(value: Array): AccessControlPolicy; + addRules(value?: Rule, index?: number): Rule; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AccessControlPolicy.AsObject; + static toObject(includeInstance: boolean, msg: AccessControlPolicy): AccessControlPolicy.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AccessControlPolicy, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AccessControlPolicy; + static deserializeBinaryFromReader(message: AccessControlPolicy, reader: jspb.BinaryReader): AccessControlPolicy; +} + +export namespace AccessControlPolicy { + export type AsObject = { + securitydomain: string, + rulesList: Array, + } +} + +export class Rule extends jspb.Message { + getPrincipal(): string; + setPrincipal(value: string): Rule; + getPrincipaltype(): string; + setPrincipaltype(value: string): Rule; + getResource(): string; + setResource(value: string): Rule; + getRead(): boolean; + setRead(value: boolean): Rule; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Rule.AsObject; + static toObject(includeInstance: boolean, msg: Rule): Rule.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Rule, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Rule; + static deserializeBinaryFromReader(message: Rule, reader: jspb.BinaryReader): Rule; +} + +export namespace Rule { + export type AsObject = { + principal: string, + principaltype: string, + resource: string, + read: boolean, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack.ts index 46f487d70d..144ab0f362 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/ack.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack_pb.d.ts new file mode 100644 index 0000000000..d5a335abaf --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/ack_pb.d.ts @@ -0,0 +1,39 @@ +// package: common.ack +// file: common/ack.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class Ack extends jspb.Message { + getStatus(): Ack.STATUS; + setStatus(value: Ack.STATUS): Ack; + getRequestId(): string; + setRequestId(value: string): Ack; + getMessage(): string; + setMessage(value: string): Ack; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Ack.AsObject; + static toObject(includeInstance: boolean, msg: Ack): Ack.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Ack, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Ack; + static deserializeBinaryFromReader(message: Ack, reader: jspb.BinaryReader): Ack; +} + +export namespace Ack { + export type AsObject = { + status: Ack.STATUS, + requestId: string, + message: string, + } + + export enum STATUS { + OK = 0, + ERROR = 1, + } + +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks.ts index 8be853c848..8f5ccbdfd7 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/asset_locks.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks_pb.d.ts new file mode 100644 index 0000000000..c444aec097 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_locks_pb.d.ts @@ -0,0 +1,251 @@ +// package: common.asset_locks +// file: common/asset_locks.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class AssetLock extends jspb.Message { + getLockmechanism(): LockMechanism; + setLockmechanism(value: LockMechanism): AssetLock; + getLockinfo(): Uint8Array | string; + getLockinfo_asU8(): Uint8Array; + getLockinfo_asB64(): string; + setLockinfo(value: Uint8Array | string): AssetLock; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetLock.AsObject; + static toObject(includeInstance: boolean, msg: AssetLock): AssetLock.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetLock, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetLock; + static deserializeBinaryFromReader(message: AssetLock, reader: jspb.BinaryReader): AssetLock; +} + +export namespace AssetLock { + export type AsObject = { + lockmechanism: LockMechanism, + lockinfo: Uint8Array | string, + } +} + +export class AssetClaim extends jspb.Message { + getLockmechanism(): LockMechanism; + setLockmechanism(value: LockMechanism): AssetClaim; + getClaiminfo(): Uint8Array | string; + getClaiminfo_asU8(): Uint8Array; + getClaiminfo_asB64(): string; + setClaiminfo(value: Uint8Array | string): AssetClaim; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetClaim.AsObject; + static toObject(includeInstance: boolean, msg: AssetClaim): AssetClaim.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetClaim, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetClaim; + static deserializeBinaryFromReader(message: AssetClaim, reader: jspb.BinaryReader): AssetClaim; +} + +export namespace AssetClaim { + export type AsObject = { + lockmechanism: LockMechanism, + claiminfo: Uint8Array | string, + } +} + +export class AssetLockHTLC extends jspb.Message { + getHashbase64(): Uint8Array | string; + getHashbase64_asU8(): Uint8Array; + getHashbase64_asB64(): string; + setHashbase64(value: Uint8Array | string): AssetLockHTLC; + getExpirytimesecs(): number; + setExpirytimesecs(value: number): AssetLockHTLC; + getTimespec(): AssetLockHTLC.TimeSpec; + setTimespec(value: AssetLockHTLC.TimeSpec): AssetLockHTLC; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetLockHTLC.AsObject; + static toObject(includeInstance: boolean, msg: AssetLockHTLC): AssetLockHTLC.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetLockHTLC, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetLockHTLC; + static deserializeBinaryFromReader(message: AssetLockHTLC, reader: jspb.BinaryReader): AssetLockHTLC; +} + +export namespace AssetLockHTLC { + export type AsObject = { + hashbase64: Uint8Array | string, + expirytimesecs: number, + timespec: AssetLockHTLC.TimeSpec, + } + + export enum TimeSpec { + EPOCH = 0, + DURATION = 1, + } + +} + +export class AssetClaimHTLC extends jspb.Message { + getHashpreimagebase64(): Uint8Array | string; + getHashpreimagebase64_asU8(): Uint8Array; + getHashpreimagebase64_asB64(): string; + setHashpreimagebase64(value: Uint8Array | string): AssetClaimHTLC; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetClaimHTLC.AsObject; + static toObject(includeInstance: boolean, msg: AssetClaimHTLC): AssetClaimHTLC.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetClaimHTLC, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetClaimHTLC; + static deserializeBinaryFromReader(message: AssetClaimHTLC, reader: jspb.BinaryReader): AssetClaimHTLC; +} + +export namespace AssetClaimHTLC { + export type AsObject = { + hashpreimagebase64: Uint8Array | string, + } +} + +export class AssetExchangeAgreement extends jspb.Message { + getType(): string; + setType(value: string): AssetExchangeAgreement; + getId(): string; + setId(value: string): AssetExchangeAgreement; + getLocker(): string; + setLocker(value: string): AssetExchangeAgreement; + getRecipient(): string; + setRecipient(value: string): AssetExchangeAgreement; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetExchangeAgreement.AsObject; + static toObject(includeInstance: boolean, msg: AssetExchangeAgreement): AssetExchangeAgreement.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetExchangeAgreement, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetExchangeAgreement; + static deserializeBinaryFromReader(message: AssetExchangeAgreement, reader: jspb.BinaryReader): AssetExchangeAgreement; +} + +export namespace AssetExchangeAgreement { + export type AsObject = { + type: string, + id: string, + locker: string, + recipient: string, + } +} + +export class FungibleAssetExchangeAgreement extends jspb.Message { + getType(): string; + setType(value: string): FungibleAssetExchangeAgreement; + getNumunits(): number; + setNumunits(value: number): FungibleAssetExchangeAgreement; + getLocker(): string; + setLocker(value: string): FungibleAssetExchangeAgreement; + getRecipient(): string; + setRecipient(value: string): FungibleAssetExchangeAgreement; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): FungibleAssetExchangeAgreement.AsObject; + static toObject(includeInstance: boolean, msg: FungibleAssetExchangeAgreement): FungibleAssetExchangeAgreement.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: FungibleAssetExchangeAgreement, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): FungibleAssetExchangeAgreement; + static deserializeBinaryFromReader(message: FungibleAssetExchangeAgreement, reader: jspb.BinaryReader): FungibleAssetExchangeAgreement; +} + +export namespace FungibleAssetExchangeAgreement { + export type AsObject = { + type: string, + numunits: number, + locker: string, + recipient: string, + } +} + +export class AssetContractHTLC extends jspb.Message { + getContractid(): string; + setContractid(value: string): AssetContractHTLC; + + hasAgreement(): boolean; + clearAgreement(): void; + getAgreement(): AssetExchangeAgreement | undefined; + setAgreement(value?: AssetExchangeAgreement): AssetContractHTLC; + + hasLock(): boolean; + clearLock(): void; + getLock(): AssetLockHTLC | undefined; + setLock(value?: AssetLockHTLC): AssetContractHTLC; + + hasClaim(): boolean; + clearClaim(): void; + getClaim(): AssetClaimHTLC | undefined; + setClaim(value?: AssetClaimHTLC): AssetContractHTLC; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetContractHTLC.AsObject; + static toObject(includeInstance: boolean, msg: AssetContractHTLC): AssetContractHTLC.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetContractHTLC, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetContractHTLC; + static deserializeBinaryFromReader(message: AssetContractHTLC, reader: jspb.BinaryReader): AssetContractHTLC; +} + +export namespace AssetContractHTLC { + export type AsObject = { + contractid: string, + agreement?: AssetExchangeAgreement.AsObject, + lock?: AssetLockHTLC.AsObject, + claim?: AssetClaimHTLC.AsObject, + } +} + +export class FungibleAssetContractHTLC extends jspb.Message { + getContractid(): string; + setContractid(value: string): FungibleAssetContractHTLC; + + hasAgreement(): boolean; + clearAgreement(): void; + getAgreement(): FungibleAssetExchangeAgreement | undefined; + setAgreement(value?: FungibleAssetExchangeAgreement): FungibleAssetContractHTLC; + + hasLock(): boolean; + clearLock(): void; + getLock(): AssetLockHTLC | undefined; + setLock(value?: AssetLockHTLC): FungibleAssetContractHTLC; + + hasClaim(): boolean; + clearClaim(): void; + getClaim(): AssetClaimHTLC | undefined; + setClaim(value?: AssetClaimHTLC): FungibleAssetContractHTLC; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): FungibleAssetContractHTLC.AsObject; + static toObject(includeInstance: boolean, msg: FungibleAssetContractHTLC): FungibleAssetContractHTLC.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: FungibleAssetContractHTLC, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): FungibleAssetContractHTLC; + static deserializeBinaryFromReader(message: FungibleAssetContractHTLC, reader: jspb.BinaryReader): FungibleAssetContractHTLC; +} + +export namespace FungibleAssetContractHTLC { + export type AsObject = { + contractid: string, + agreement?: FungibleAssetExchangeAgreement.AsObject, + lock?: AssetLockHTLC.AsObject, + claim?: AssetClaimHTLC.AsObject, + } +} + +export enum LockMechanism { + HTLC = 0, +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer.ts index 86ba680098..89e97f81b5 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/asset_transfer.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer_pb.d.ts new file mode 100644 index 0000000000..9aec5590b9 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/asset_transfer_pb.d.ts @@ -0,0 +1,81 @@ +// package: common.asset_transfer +// file: common/asset_transfer.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class AssetPledge extends jspb.Message { + getAssetdetails(): Uint8Array | string; + getAssetdetails_asU8(): Uint8Array; + getAssetdetails_asB64(): string; + setAssetdetails(value: Uint8Array | string): AssetPledge; + getLocalnetworkid(): string; + setLocalnetworkid(value: string): AssetPledge; + getRemotenetworkid(): string; + setRemotenetworkid(value: string): AssetPledge; + getRecipient(): string; + setRecipient(value: string): AssetPledge; + getExpirytimesecs(): number; + setExpirytimesecs(value: number): AssetPledge; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetPledge.AsObject; + static toObject(includeInstance: boolean, msg: AssetPledge): AssetPledge.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetPledge, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetPledge; + static deserializeBinaryFromReader(message: AssetPledge, reader: jspb.BinaryReader): AssetPledge; +} + +export namespace AssetPledge { + export type AsObject = { + assetdetails: Uint8Array | string, + localnetworkid: string, + remotenetworkid: string, + recipient: string, + expirytimesecs: number, + } +} + +export class AssetClaimStatus extends jspb.Message { + getAssetdetails(): Uint8Array | string; + getAssetdetails_asU8(): Uint8Array; + getAssetdetails_asB64(): string; + setAssetdetails(value: Uint8Array | string): AssetClaimStatus; + getLocalnetworkid(): string; + setLocalnetworkid(value: string): AssetClaimStatus; + getRemotenetworkid(): string; + setRemotenetworkid(value: string): AssetClaimStatus; + getRecipient(): string; + setRecipient(value: string): AssetClaimStatus; + getClaimstatus(): boolean; + setClaimstatus(value: boolean): AssetClaimStatus; + getExpirytimesecs(): number; + setExpirytimesecs(value: number): AssetClaimStatus; + getExpirationstatus(): boolean; + setExpirationstatus(value: boolean): AssetClaimStatus; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): AssetClaimStatus.AsObject; + static toObject(includeInstance: boolean, msg: AssetClaimStatus): AssetClaimStatus.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: AssetClaimStatus, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): AssetClaimStatus; + static deserializeBinaryFromReader(message: AssetClaimStatus, reader: jspb.BinaryReader): AssetClaimStatus; +} + +export namespace AssetClaimStatus { + export type AsObject = { + assetdetails: Uint8Array | string, + localnetworkid: string, + remotenetworkid: string, + recipient: string, + claimstatus: boolean, + expirytimesecs: number, + expirationstatus: boolean, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload.ts index 1b4aa5f50f..d168da87a5 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/interop_payload.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload_pb.d.ts new file mode 100644 index 0000000000..bc230f2a13 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/interop_payload_pb.d.ts @@ -0,0 +1,32 @@ +// package: common.interop_payload +// file: common/interop_payload.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class InteropPayload extends jspb.Message { + getPayload(): Uint8Array | string; + getPayload_asU8(): Uint8Array; + getPayload_asB64(): string; + setPayload(value: Uint8Array | string): InteropPayload; + getAddress(): string; + setAddress(value: string): InteropPayload; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): InteropPayload.AsObject; + static toObject(includeInstance: boolean, msg: InteropPayload): InteropPayload.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: InteropPayload, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): InteropPayload; + static deserializeBinaryFromReader(message: InteropPayload, reader: jspb.BinaryReader): InteropPayload; +} + +export namespace InteropPayload { + export type AsObject = { + payload: Uint8Array | string, + address: string, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership.ts index 1f57e731ff..6d1bd77e76 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/membership.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership_pb.d.ts new file mode 100644 index 0000000000..4cb1e86bb5 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/membership_pb.d.ts @@ -0,0 +1,60 @@ +// package: common.membership +// file: common/membership.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class Membership extends jspb.Message { + getSecuritydomain(): string; + setSecuritydomain(value: string): Membership; + + getMembersMap(): jspb.Map; + clearMembersMap(): void; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Membership.AsObject; + static toObject(includeInstance: boolean, msg: Membership): Membership.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Membership, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Membership; + static deserializeBinaryFromReader(message: Membership, reader: jspb.BinaryReader): Membership; +} + +export namespace Membership { + export type AsObject = { + securitydomain: string, + + membersMap: Array<[string, Member.AsObject]>, + } +} + +export class Member extends jspb.Message { + getValue(): string; + setValue(value: string): Member; + getType(): string; + setType(value: string): Member; + clearChainList(): void; + getChainList(): Array; + setChainList(value: Array): Member; + addChain(value: string, index?: number): string; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Member.AsObject; + static toObject(includeInstance: boolean, msg: Member): Member.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Member, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Member; + static deserializeBinaryFromReader(message: Member, reader: jspb.BinaryReader): Member; +} + +export namespace Member { + export type AsObject = { + value: string, + type: string, + chainList: Array, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs.ts index 15579d9091..d1f6b499c2 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/proofs.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs_pb.d.ts new file mode 100644 index 0000000000..f3394c8182 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/proofs_pb.d.ts @@ -0,0 +1,52 @@ +// package: common.proofs +// file: common/proofs.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class Proof extends jspb.Message { + getSignature(): string; + setSignature(value: string): Proof; + getCertificate(): string; + setCertificate(value: string): Proof; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Proof.AsObject; + static toObject(includeInstance: boolean, msg: Proof): Proof.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Proof, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Proof; + static deserializeBinaryFromReader(message: Proof, reader: jspb.BinaryReader): Proof; +} + +export namespace Proof { + export type AsObject = { + signature: string, + certificate: string, + } +} + +export class Proofs extends jspb.Message { + clearProofsList(): void; + getProofsList(): Array; + setProofsList(value: Array): Proofs; + addProofs(value?: Proof, index?: number): Proof; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Proofs.AsObject; + static toObject(includeInstance: boolean, msg: Proofs): Proofs.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Proofs, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Proofs; + static deserializeBinaryFromReader(message: Proofs, reader: jspb.BinaryReader): Proofs; +} + +export namespace Proofs { + export type AsObject = { + proofsList: Array, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query.ts index 0b7e92b4ba..003834a79a 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/query.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query_pb.d.ts new file mode 100644 index 0000000000..0e982f9126 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/query_pb.d.ts @@ -0,0 +1,53 @@ +// package: common.query +// file: common/query.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class Query extends jspb.Message { + clearPolicyList(): void; + getPolicyList(): Array; + setPolicyList(value: Array): Query; + addPolicy(value: string, index?: number): string; + getAddress(): string; + setAddress(value: string): Query; + getRequestingRelay(): string; + setRequestingRelay(value: string): Query; + getRequestingNetwork(): string; + setRequestingNetwork(value: string): Query; + getCertificate(): string; + setCertificate(value: string): Query; + getRequestorSignature(): string; + setRequestorSignature(value: string): Query; + getNonce(): string; + setNonce(value: string): Query; + getRequestId(): string; + setRequestId(value: string): Query; + getRequestingOrg(): string; + setRequestingOrg(value: string): Query; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Query.AsObject; + static toObject(includeInstance: boolean, msg: Query): Query.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Query, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Query; + static deserializeBinaryFromReader(message: Query, reader: jspb.BinaryReader): Query; +} + +export namespace Query { + export type AsObject = { + policyList: Array, + address: string, + requestingRelay: string, + requestingNetwork: string, + certificate: string, + requestorSignature: string, + nonce: string, + requestId: string, + requestingOrg: string, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state.ts index 52bfd202f5..fb59f4e656 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/state.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state_pb.d.ts new file mode 100644 index 0000000000..3433b8b260 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/state_pb.d.ts @@ -0,0 +1,165 @@ +// package: common.state +// file: common/state.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class Meta extends jspb.Message { + getProtocol(): Meta.Protocol; + setProtocol(value: Meta.Protocol): Meta; + getTimestamp(): string; + setTimestamp(value: string): Meta; + getProofType(): string; + setProofType(value: string): Meta; + getSerializationFormat(): string; + setSerializationFormat(value: string): Meta; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Meta.AsObject; + static toObject(includeInstance: boolean, msg: Meta): Meta.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Meta, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Meta; + static deserializeBinaryFromReader(message: Meta, reader: jspb.BinaryReader): Meta; +} + +export namespace Meta { + export type AsObject = { + protocol: Meta.Protocol, + timestamp: string, + proofType: string, + serializationFormat: string, + } + + export enum Protocol { + BITCOIN = 0, + ETHEREUM = 1, + FABRIC = 3, + CORDA = 4, + } + +} + +export class View extends jspb.Message { + + hasMeta(): boolean; + clearMeta(): void; + getMeta(): Meta | undefined; + setMeta(value?: Meta): View; + getData(): Uint8Array | string; + getData_asU8(): Uint8Array; + getData_asB64(): string; + setData(value: Uint8Array | string): View; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): View.AsObject; + static toObject(includeInstance: boolean, msg: View): View.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: View, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): View; + static deserializeBinaryFromReader(message: View, reader: jspb.BinaryReader): View; +} + +export namespace View { + export type AsObject = { + meta?: Meta.AsObject, + data: Uint8Array | string, + } +} + +export class ViewPayload extends jspb.Message { + getRequestId(): string; + setRequestId(value: string): ViewPayload; + + hasView(): boolean; + clearView(): void; + getView(): View | undefined; + setView(value?: View): ViewPayload; + + hasError(): boolean; + clearError(): void; + getError(): string; + setError(value: string): ViewPayload; + + getStateCase(): ViewPayload.StateCase; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): ViewPayload.AsObject; + static toObject(includeInstance: boolean, msg: ViewPayload): ViewPayload.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: ViewPayload, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): ViewPayload; + static deserializeBinaryFromReader(message: ViewPayload, reader: jspb.BinaryReader): ViewPayload; +} + +export namespace ViewPayload { + export type AsObject = { + requestId: string, + view?: View.AsObject, + error: string, + } + + export enum StateCase { + STATE_NOT_SET = 0, + VIEW = 2, + ERROR = 3, + } + +} + +export class RequestState extends jspb.Message { + getRequestId(): string; + setRequestId(value: string): RequestState; + getStatus(): RequestState.STATUS; + setStatus(value: RequestState.STATUS): RequestState; + + hasView(): boolean; + clearView(): void; + getView(): View | undefined; + setView(value?: View): RequestState; + + hasError(): boolean; + clearError(): void; + getError(): string; + setError(value: string): RequestState; + + getStateCase(): RequestState.StateCase; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): RequestState.AsObject; + static toObject(includeInstance: boolean, msg: RequestState): RequestState.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: RequestState, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): RequestState; + static deserializeBinaryFromReader(message: RequestState, reader: jspb.BinaryReader): RequestState; +} + +export namespace RequestState { + export type AsObject = { + requestId: string, + status: RequestState.STATUS, + view?: View.AsObject, + error: string, + } + + export enum STATUS { + PENDING_ACK = 0, + PENDING = 1, + ERROR = 2, + COMPLETED = 3, + } + + + export enum StateCase { + STATE_NOT_SET = 0, + VIEW = 3, + ERROR = 4, + } + +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy.ts index e273a5a805..78d69e2e1a 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: common/verification_policy.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy_pb.d.ts new file mode 100644 index 0000000000..63293ad4ba --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/common/verification_policy_pb.d.ts @@ -0,0 +1,83 @@ +// package: common.verification_policy +// file: common/verification_policy.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class VerificationPolicy extends jspb.Message { + getSecuritydomain(): string; + setSecuritydomain(value: string): VerificationPolicy; + clearIdentifiersList(): void; + getIdentifiersList(): Array; + setIdentifiersList(value: Array): VerificationPolicy; + addIdentifiers(value?: Identifier, index?: number): Identifier; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): VerificationPolicy.AsObject; + static toObject(includeInstance: boolean, msg: VerificationPolicy): VerificationPolicy.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: VerificationPolicy, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): VerificationPolicy; + static deserializeBinaryFromReader(message: VerificationPolicy, reader: jspb.BinaryReader): VerificationPolicy; +} + +export namespace VerificationPolicy { + export type AsObject = { + securitydomain: string, + identifiersList: Array, + } +} + +export class Policy extends jspb.Message { + getType(): string; + setType(value: string): Policy; + clearCriteriaList(): void; + getCriteriaList(): Array; + setCriteriaList(value: Array): Policy; + addCriteria(value: string, index?: number): string; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Policy.AsObject; + static toObject(includeInstance: boolean, msg: Policy): Policy.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Policy, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Policy; + static deserializeBinaryFromReader(message: Policy, reader: jspb.BinaryReader): Policy; +} + +export namespace Policy { + export type AsObject = { + type: string, + criteriaList: Array, + } +} + +export class Identifier extends jspb.Message { + getPattern(): string; + setPattern(value: string): Identifier; + + hasPolicy(): boolean; + clearPolicy(): void; + getPolicy(): Policy | undefined; + setPolicy(value?: Policy): Identifier; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Identifier.AsObject; + static toObject(includeInstance: boolean, msg: Identifier): Identifier.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Identifier, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Identifier; + static deserializeBinaryFromReader(message: Identifier, reader: jspb.BinaryReader): Identifier; +} + +export namespace Identifier { + export type AsObject = { + pattern: string, + policy?: Policy.AsObject, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data.ts index 652874d1cf..6a193f0ddc 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: corda/view_data.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as pb_1 from "google-protobuf"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data_pb.d.ts new file mode 100644 index 0000000000..9a9856f389 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/corda/view_data_pb.d.ts @@ -0,0 +1,62 @@ +// package: corda +// file: corda/view_data.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; + +export class ViewData extends jspb.Message { + clearNotarizationsList(): void; + getNotarizationsList(): Array; + setNotarizationsList(value: Array): ViewData; + addNotarizations(value?: ViewData.Notarization, index?: number): ViewData.Notarization; + getPayload(): Uint8Array | string; + getPayload_asU8(): Uint8Array; + getPayload_asB64(): string; + setPayload(value: Uint8Array | string): ViewData; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): ViewData.AsObject; + static toObject(includeInstance: boolean, msg: ViewData): ViewData.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: ViewData, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): ViewData; + static deserializeBinaryFromReader(message: ViewData, reader: jspb.BinaryReader): ViewData; +} + +export namespace ViewData { + export type AsObject = { + notarizationsList: Array, + payload: Uint8Array | string, + } + + + export class Notarization extends jspb.Message { + getSignature(): string; + setSignature(value: string): Notarization; + getCertificate(): string; + setCertificate(value: string): Notarization; + getId(): string; + setId(value: string): Notarization; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): Notarization.AsObject; + static toObject(includeInstance: boolean, msg: Notarization): Notarization.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: Notarization, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): Notarization; + static deserializeBinaryFromReader(message: Notarization, reader: jspb.BinaryReader): Notarization; + } + + export namespace Notarization { + export type AsObject = { + signature: string, + certificate: string, + id: string, + } + } + +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver.ts index 9b2b6dff00..397327df44 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: driver/driver.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as dependency_1 from "./../common/ack"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_grpc_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_grpc_pb.d.ts new file mode 100644 index 0000000000..4b59a1fed7 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_grpc_pb.d.ts @@ -0,0 +1,43 @@ +// package: driver.driver +// file: driver/driver.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as grpc from "@grpc/grpc-js"; +import * as driver_driver_pb from "../driver/driver_pb"; +import * as common_ack_pb from "../common/ack_pb"; +import * as common_query_pb from "../common/query_pb"; + +interface IDriverCommunicationService extends grpc.ServiceDefinition { + requestDriverState: IDriverCommunicationService_IRequestDriverState; +} + +interface IDriverCommunicationService_IRequestDriverState extends grpc.MethodDefinition { + path: "/driver.driver.DriverCommunication/RequestDriverState"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} + +export const DriverCommunicationService: IDriverCommunicationService; + +export interface IDriverCommunicationServer extends grpc.UntypedServiceImplementation { + requestDriverState: grpc.handleUnaryCall; +} + +export interface IDriverCommunicationClient { + requestDriverState(request: common_query_pb.Query, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + requestDriverState(request: common_query_pb.Query, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + requestDriverState(request: common_query_pb.Query, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; +} + +export class DriverCommunicationClient extends grpc.Client implements IDriverCommunicationClient { + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); + public requestDriverState(request: common_query_pb.Query, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public requestDriverState(request: common_query_pb.Query, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public requestDriverState(request: common_query_pb.Query, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_pb.d.ts new file mode 100644 index 0000000000..0442b15d50 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/driver/driver_pb.d.ts @@ -0,0 +1,9 @@ +// package: driver.driver +// file: driver/driver.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; +import * as common_ack_pb from "../common/ack_pb"; +import * as common_query_pb from "../common/query_pb"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks.ts index ba40c8a756..e4f5edb6ae 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: networks/networks.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as dependency_1 from "./../common/ack"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_grpc_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_grpc_pb.d.ts new file mode 100644 index 0000000000..f149f4f8ee --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_grpc_pb.d.ts @@ -0,0 +1,77 @@ +// package: networks.networks +// file: networks/networks.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as grpc from "@grpc/grpc-js"; +import * as networks_networks_pb from "../networks/networks_pb"; +import * as common_ack_pb from "../common/ack_pb"; +import * as common_state_pb from "../common/state_pb"; + +interface INetworkService extends grpc.ServiceDefinition { + requestState: INetworkService_IRequestState; + getState: INetworkService_IGetState; + requestDatabase: INetworkService_IRequestDatabase; +} + +interface INetworkService_IRequestState extends grpc.MethodDefinition { + path: "/networks.networks.Network/RequestState"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} +interface INetworkService_IGetState extends grpc.MethodDefinition { + path: "/networks.networks.Network/GetState"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} +interface INetworkService_IRequestDatabase extends grpc.MethodDefinition { + path: "/networks.networks.Network/RequestDatabase"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} + +export const NetworkService: INetworkService; + +export interface INetworkServer extends grpc.UntypedServiceImplementation { + requestState: grpc.handleUnaryCall; + getState: grpc.handleUnaryCall; + requestDatabase: grpc.handleUnaryCall; +} + +export interface INetworkClient { + requestState(request: networks_networks_pb.NetworkQuery, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + requestState(request: networks_networks_pb.NetworkQuery, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + requestState(request: networks_networks_pb.NetworkQuery, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + getState(request: networks_networks_pb.GetStateMessage, callback: (error: grpc.ServiceError | null, response: common_state_pb.RequestState) => void): grpc.ClientUnaryCall; + getState(request: networks_networks_pb.GetStateMessage, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_state_pb.RequestState) => void): grpc.ClientUnaryCall; + getState(request: networks_networks_pb.GetStateMessage, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_state_pb.RequestState) => void): grpc.ClientUnaryCall; + requestDatabase(request: networks_networks_pb.DbName, callback: (error: grpc.ServiceError | null, response: networks_networks_pb.RelayDatabase) => void): grpc.ClientUnaryCall; + requestDatabase(request: networks_networks_pb.DbName, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: networks_networks_pb.RelayDatabase) => void): grpc.ClientUnaryCall; + requestDatabase(request: networks_networks_pb.DbName, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: networks_networks_pb.RelayDatabase) => void): grpc.ClientUnaryCall; +} + +export class NetworkClient extends grpc.Client implements INetworkClient { + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); + public requestState(request: networks_networks_pb.NetworkQuery, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public requestState(request: networks_networks_pb.NetworkQuery, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public requestState(request: networks_networks_pb.NetworkQuery, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public getState(request: networks_networks_pb.GetStateMessage, callback: (error: grpc.ServiceError | null, response: common_state_pb.RequestState) => void): grpc.ClientUnaryCall; + public getState(request: networks_networks_pb.GetStateMessage, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_state_pb.RequestState) => void): grpc.ClientUnaryCall; + public getState(request: networks_networks_pb.GetStateMessage, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_state_pb.RequestState) => void): grpc.ClientUnaryCall; + public requestDatabase(request: networks_networks_pb.DbName, callback: (error: grpc.ServiceError | null, response: networks_networks_pb.RelayDatabase) => void): grpc.ClientUnaryCall; + public requestDatabase(request: networks_networks_pb.DbName, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: networks_networks_pb.RelayDatabase) => void): grpc.ClientUnaryCall; + public requestDatabase(request: networks_networks_pb.DbName, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: networks_networks_pb.RelayDatabase) => void): grpc.ClientUnaryCall; +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_pb.d.ts new file mode 100644 index 0000000000..b56b025100 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/networks/networks_pb.d.ts @@ -0,0 +1,114 @@ +// package: networks.networks +// file: networks/networks.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; +import * as common_ack_pb from "../common/ack_pb"; +import * as common_state_pb from "../common/state_pb"; + +export class DbName extends jspb.Message { + getName(): string; + setName(value: string): DbName; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): DbName.AsObject; + static toObject(includeInstance: boolean, msg: DbName): DbName.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: DbName, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): DbName; + static deserializeBinaryFromReader(message: DbName, reader: jspb.BinaryReader): DbName; +} + +export namespace DbName { + export type AsObject = { + name: string, + } +} + +export class RelayDatabase extends jspb.Message { + + getPairsMap(): jspb.Map; + clearPairsMap(): void; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): RelayDatabase.AsObject; + static toObject(includeInstance: boolean, msg: RelayDatabase): RelayDatabase.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: RelayDatabase, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): RelayDatabase; + static deserializeBinaryFromReader(message: RelayDatabase, reader: jspb.BinaryReader): RelayDatabase; +} + +export namespace RelayDatabase { + export type AsObject = { + + pairsMap: Array<[string, string]>, + } +} + +export class GetStateMessage extends jspb.Message { + getRequestId(): string; + setRequestId(value: string): GetStateMessage; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): GetStateMessage.AsObject; + static toObject(includeInstance: boolean, msg: GetStateMessage): GetStateMessage.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: GetStateMessage, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): GetStateMessage; + static deserializeBinaryFromReader(message: GetStateMessage, reader: jspb.BinaryReader): GetStateMessage; +} + +export namespace GetStateMessage { + export type AsObject = { + requestId: string, + } +} + +export class NetworkQuery extends jspb.Message { + clearPolicyList(): void; + getPolicyList(): Array; + setPolicyList(value: Array): NetworkQuery; + addPolicy(value: string, index?: number): string; + getAddress(): string; + setAddress(value: string): NetworkQuery; + getRequestingRelay(): string; + setRequestingRelay(value: string): NetworkQuery; + getRequestingNetwork(): string; + setRequestingNetwork(value: string): NetworkQuery; + getCertificate(): string; + setCertificate(value: string): NetworkQuery; + getRequestorSignature(): string; + setRequestorSignature(value: string): NetworkQuery; + getNonce(): string; + setNonce(value: string): NetworkQuery; + getRequestingOrg(): string; + setRequestingOrg(value: string): NetworkQuery; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): NetworkQuery.AsObject; + static toObject(includeInstance: boolean, msg: NetworkQuery): NetworkQuery.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: NetworkQuery, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): NetworkQuery; + static deserializeBinaryFromReader(message: NetworkQuery, reader: jspb.BinaryReader): NetworkQuery; +} + +export namespace NetworkQuery { + export type AsObject = { + policyList: Array, + address: string, + requestingRelay: string, + requestingNetwork: string, + certificate: string, + requestorSignature: string, + nonce: string, + requestingOrg: string, + } +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer.ts index 6600cc88d3..27c2e188a8 100644 --- a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer.ts +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer.ts @@ -1,6 +1,6 @@ /** * Generated by the protoc-gen-ts. DO NOT EDIT! - * compiler version: 3.15.6 + * compiler version: 3.19.1 * source: relay/datatransfer.proto * git: https://github.com/thesayyn/protoc-gen-ts */ import * as dependency_1 from "./../common/ack"; diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_grpc_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_grpc_pb.d.ts new file mode 100644 index 0000000000..150b8c5162 --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_grpc_pb.d.ts @@ -0,0 +1,78 @@ +// package: relay.datatransfer +// file: relay/datatransfer.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as grpc from "@grpc/grpc-js"; +import * as relay_datatransfer_pb from "../relay/datatransfer_pb"; +import * as common_ack_pb from "../common/ack_pb"; +import * as common_state_pb from "../common/state_pb"; +import * as common_query_pb from "../common/query_pb"; + +interface IDataTransferService extends grpc.ServiceDefinition { + requestState: IDataTransferService_IRequestState; + sendState: IDataTransferService_ISendState; + sendDriverState: IDataTransferService_ISendDriverState; +} + +interface IDataTransferService_IRequestState extends grpc.MethodDefinition { + path: "/relay.datatransfer.DataTransfer/RequestState"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} +interface IDataTransferService_ISendState extends grpc.MethodDefinition { + path: "/relay.datatransfer.DataTransfer/SendState"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} +interface IDataTransferService_ISendDriverState extends grpc.MethodDefinition { + path: "/relay.datatransfer.DataTransfer/SendDriverState"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} + +export const DataTransferService: IDataTransferService; + +export interface IDataTransferServer extends grpc.UntypedServiceImplementation { + requestState: grpc.handleUnaryCall; + sendState: grpc.handleUnaryCall; + sendDriverState: grpc.handleUnaryCall; +} + +export interface IDataTransferClient { + requestState(request: common_query_pb.Query, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + requestState(request: common_query_pb.Query, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + requestState(request: common_query_pb.Query, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + sendState(request: common_state_pb.ViewPayload, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + sendState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + sendState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + sendDriverState(request: common_state_pb.ViewPayload, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + sendDriverState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + sendDriverState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; +} + +export class DataTransferClient extends grpc.Client implements IDataTransferClient { + constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial); + public requestState(request: common_query_pb.Query, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public requestState(request: common_query_pb.Query, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public requestState(request: common_query_pb.Query, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public sendState(request: common_state_pb.ViewPayload, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public sendState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public sendState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public sendDriverState(request: common_state_pb.ViewPayload, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public sendDriverState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; + public sendDriverState(request: common_state_pb.ViewPayload, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: common_ack_pb.Ack) => void): grpc.ClientUnaryCall; +} diff --git a/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_pb.d.ts b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_pb.d.ts new file mode 100644 index 0000000000..84a0744faf --- /dev/null +++ b/packages/cactus-core-api/src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/relay/datatransfer_pb.d.ts @@ -0,0 +1,10 @@ +// package: relay.datatransfer +// file: relay/datatransfer.proto + +/* tslint:disable */ +/* eslint-disable */ + +import * as jspb from "google-protobuf"; +import * as common_ack_pb from "../common/ack_pb"; +import * as common_state_pb from "../common/state_pb"; +import * as common_query_pb from "../common/query_pb"; diff --git a/packages/cactus-plugin-consortium-manual/openapitools.json b/packages/cactus-plugin-consortium-manual/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-consortium-manual/openapitools.json +++ b/packages/cactus-plugin-consortium-manual/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-consortium-manual/src/main/json/openapi.json b/packages/cactus-plugin-consortium-manual/src/main/json/openapi.json index 5fe3974ddd..771a028cbb 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/json/openapi.json +++ b/packages/cactus-plugin-consortium-manual/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Consortium Web Service", "description": "Manage a Cactus consortium through the APIs. Needs administrative privileges.", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/README.md index ca25788b96..94f4087ca4 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -49,7 +49,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**getPrometheusMetricsV1**](docs/DefaultApi.md#getprometheusmetricsv1) | **GET** /api/v1/plugins/@hyperledger/cactus-plugin-consortium-manual/get-prometheus-exporter-metrics | Get the Prometheus Metrics - + ## Documentation for Models - [org.openapitools.client.models.GetConsortiumJwsResponse](docs/GetConsortiumJwsResponse.md) @@ -58,7 +58,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.JWSRecipient](docs/JWSRecipient.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponse.kt b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponse.kt index b0f7ac97d8..eb880bcea1 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponse.kt +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponse.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.JWSGeneral import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponseJws.kt b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponseJws.kt new file mode 100644 index 0000000000..2ee2a869f6 --- /dev/null +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetConsortiumJwsResponseJws.kt @@ -0,0 +1,38 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * The JSON Web Signature of the Cactus consortium. + * + * @param payload + * @param signatures + */ + + +data class GetConsortiumJwsResponseJws ( + + @Json(name = "payload") + val payload: kotlin.Any?, + + @Json(name = "signatures") + val signatures: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponse.kt b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponse.kt index d3d1ba5388..c1d327a7d7 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponse.kt +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponse.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.JWSGeneral import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponseJws.kt b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponseJws.kt new file mode 100644 index 0000000000..e3b7778c80 --- /dev/null +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetNodeJwsResponseJws.kt @@ -0,0 +1,38 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * The JSON Web Signature of the Cactus node. + * + * @param payload + * @param signatures + */ + + +data class GetNodeJwsResponseJws ( + + @Json(name = "payload") + val payload: kotlin.Any?, + + @Json(name = "signatures") + val signatures: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt index e32c81a50f..f32650672e 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSGeneral.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.JWSRecipient import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt index 9b428d7dd8..7bf5dd698e 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt +++ b/packages/cactus-plugin-consortium-manual/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JWSRecipient.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * A JSON Web Signature. See: https://tools.ietf.org/html/rfc7515 for info about standard. diff --git a/packages/cactus-plugin-consortium-manual/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-consortium-manual/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-consortium-manual/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-consortium-manual/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/openapitools.json b/packages/cactus-plugin-htlc-eth-besu-erc20/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/openapitools.json +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/json/openapi.json b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/json/openapi.json index 33fc673a9c..b9aa09c7be 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/json/openapi.json +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - HTLC ETH BESU ERC20", "description": "Allows Cactus nodes to interact with HTLC contracts with ERC-20 Tokens", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/README.md index 72162de4b4..cd91589465 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -52,7 +52,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**withdrawV1**](docs/DefaultApi.md#withdrawv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-htlc-eth-besu-erc20/withdraw | Withdraw a hashtimelock contract - + ## Documentation for Models - [org.openapitools.client.models.GetSingleStatusRequest](docs/GetSingleStatusRequest.md) @@ -72,7 +72,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.WithdrawRequest](docs/WithdrawRequest.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetSingleStatusRequest.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetSingleStatusRequest.kt index 124d2ffd51..94e845f65f 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetSingleStatusRequest.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetSingleStatusRequest.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3SigningCredential import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Defines the parameters for retrieving the single status of the HTLC swap. diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequest.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequest.kt index 490a0e67da..ac525f7f63 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequest.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequest.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3SigningCredential import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Defines the parameters for retrieving the status of the HTLC swap. diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequestWeb3SigningCredential.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequestWeb3SigningCredential.kt new file mode 100644 index 0000000000..269d02247a --- /dev/null +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetStatusRequestWeb3SigningCredential.kt @@ -0,0 +1,44 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param type + */ + + +interface GetStatusRequestWeb3SigningCredential { + + @Json(name = "type") + val type: GetStatusRequestWeb3SigningCredential.Type? + /** + * + * + * Values: cACTUSKEYCHAINREF,gETHKEYCHAINPASSWORD,pRIVATEKEYHEX,nONE + */ + enum class Type(val value: kotlin.Any) { + @Json(name = ""CACTUS_KEYCHAIN_REF"") cACTUSKEYCHAINREF("CACTUS_KEYCHAIN_REF"), + @Json(name = ""GETH_KEYCHAIN_PASSWORD"") gETHKEYCHAINPASSWORD("GETH_KEYCHAIN_PASSWORD"), + @Json(name = ""PRIVATE_KEY_HEX"") pRIVATEKEYHEX("PRIVATE_KEY_HEX"), + @Json(name = ""NONE"") nONE("NONE"); + } +} + diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequest.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequest.kt index a92e00b10b..afd51e1efd 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequest.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequest.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3SigningCredential import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequestWeb3SigningCredential.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequestWeb3SigningCredential.kt new file mode 100644 index 0000000000..b622ffd5d7 --- /dev/null +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeRequestWeb3SigningCredential.kt @@ -0,0 +1,44 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * Web3SigningCredential + * + * @param type + */ + + +interface InitializeRequestWeb3SigningCredential { + + @Json(name = "type") + val type: InitializeRequestWeb3SigningCredential.Type? + /** + * + * + * Values: cACTUSKEYCHAINREF,gETHKEYCHAINPASSWORD,pRIVATEKEYHEX,nONE + */ + enum class Type(val value: kotlin.Any) { + @Json(name = ""CACTUS_KEYCHAIN_REF"") cACTUSKEYCHAINREF("CACTUS_KEYCHAIN_REF"), + @Json(name = ""GETH_KEYCHAIN_PASSWORD"") gETHKEYCHAINPASSWORD("GETH_KEYCHAIN_PASSWORD"), + @Json(name = ""PRIVATE_KEY_HEX"") pRIVATEKEYHEX("PRIVATE_KEY_HEX"), + @Json(name = ""NONE"") nONE("NONE"); + } +} + diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200Response.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200Response.kt new file mode 100644 index 0000000000..208f09d936 --- /dev/null +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + +import org.openapitools.client.models.InitializeV1200ResponseTransactionReceipt + +import com.squareup.moshi.Json + +/** + * + * + * @param transactionReceipt + */ + + +data class InitializeV1200Response ( + + @Json(name = "transactionReceipt") + val transactionReceipt: InitializeV1200ResponseTransactionReceipt + +) + diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200ResponseTransactionReceipt.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200ResponseTransactionReceipt.kt new file mode 100644 index 0000000000..422ce1d5ee --- /dev/null +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InitializeV1200ResponseTransactionReceipt.kt @@ -0,0 +1,66 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param status + * @param transactionHash + * @param transactionIndex + * @param blockHash + * @param blockNumber + * @param gasUsed + * @param from + * @param to + * @param contractAddress + */ + + +data class InitializeV1200ResponseTransactionReceipt ( + + @Json(name = "status") + val status: kotlin.Any?, + + @Json(name = "transactionHash") + val transactionHash: kotlin.Any?, + + @Json(name = "transactionIndex") + val transactionIndex: kotlin.Any?, + + @Json(name = "blockHash") + val blockHash: kotlin.Any?, + + @Json(name = "blockNumber") + val blockNumber: kotlin.Any?, + + @Json(name = "gasUsed") + val gasUsed: kotlin.Any?, + + @Json(name = "from") + val from: kotlin.Any?, + + @Json(name = "to") + val to: kotlin.Any?, + + @Json(name = "contractAddress") + val contractAddress: kotlin.Any? = null + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt index 91566772d7..3f1e8f0809 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3TransactionReceipt import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequest.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequest.kt index 083917f9f1..a79468f052 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequest.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequest.kt @@ -19,6 +19,7 @@ import org.openapitools.client.models.NewContractRequestGas import org.openapitools.client.models.Web3SigningCredential import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestGas.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestGas.kt index c1670c37e9..b9a366ff96 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestGas.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestGas.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestWeb3SigningCredential.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestWeb3SigningCredential.kt new file mode 100644 index 0000000000..11fc3a8858 --- /dev/null +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NewContractRequestWeb3SigningCredential.kt @@ -0,0 +1,44 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * Web3SigningCredentialType + * + * @param type + */ + + +interface NewContractRequestWeb3SigningCredential { + + @Json(name = "type") + val type: NewContractRequestWeb3SigningCredential.Type? + /** + * + * + * Values: cACTUSKEYCHAINREF,gETHKEYCHAINPASSWORD,pRIVATEKEYHEX,nONE + */ + enum class Type(val value: kotlin.Any) { + @Json(name = ""CACTUS_KEYCHAIN_REF"") cACTUSKEYCHAINREF("CACTUS_KEYCHAIN_REF"), + @Json(name = ""GETH_KEYCHAIN_PASSWORD"") gETHKEYCHAINPASSWORD("GETH_KEYCHAIN_PASSWORD"), + @Json(name = ""PRIVATE_KEY_HEX"") pRIVATEKEYHEX("PRIVATE_KEY_HEX"), + @Json(name = ""NONE"") nONE("NONE"); + } +} + diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RefundRequest.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RefundRequest.kt index 4dff58326f..26407cf3d1 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RefundRequest.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RefundRequest.kt @@ -19,6 +19,7 @@ import org.openapitools.client.models.NewContractRequestGas import org.openapitools.client.models.Web3SigningCredential import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt index daa4e5221f..974fdbfa87 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3TransactionReceipt import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredential.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredential.kt index 71ca15c9cd..da22e7b4c9 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredential.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredential.kt @@ -21,6 +21,7 @@ import org.openapitools.client.models.Web3SigningCredentialPrivateKeyHex import org.openapitools.client.models.Web3SigningCredentialType import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialCactusKeychainRef.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialCactusKeychainRef.kt index 3987b37f83..f296adb562 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialCactusKeychainRef.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialCactusKeychainRef.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3SigningCredentialType import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialNone.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialNone.kt index 053a688144..2a0f6f06a9 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialNone.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialNone.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3SigningCredentialType import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Using this denotes that there is no signing required because the transaction is pre-signed. diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialPrivateKeyHex.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialPrivateKeyHex.kt index 1e9c7bb2e3..8766b02b38 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialPrivateKeyHex.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialPrivateKeyHex.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.Web3SigningCredentialType import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialType.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialType.kt index 5665050205..72e9a59036 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialType.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3SigningCredentialType.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: cACTUSKEYCHAINREF,gETHKEYCHAINPASSWORD,pRIVATEKEYHEX,nONE */ +@JsonClass(generateAdapter = false) enum class Web3SigningCredentialType(val value: kotlin.String) { @Json(name = "CACTUS_KEYCHAIN_REF") @@ -39,7 +41,7 @@ enum class Web3SigningCredentialType(val value: kotlin.String) { nONE("NONE"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3TransactionReceipt.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3TransactionReceipt.kt index 8440e4aaaf..f42923843d 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3TransactionReceipt.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Web3TransactionReceipt.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawRequest.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawRequest.kt index f7a90a077b..16e6944543 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawRequest.kt +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawRequest.kt @@ -19,6 +19,7 @@ import org.openapitools.client.models.NewContractRequestGas import org.openapitools.client.models.Web3SigningCredential import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawV1200Response.kt b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawV1200Response.kt new file mode 100644 index 0000000000..504e887e1a --- /dev/null +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WithdrawV1200Response.kt @@ -0,0 +1,43 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + +import org.openapitools.client.models.InitializeV1200ResponseTransactionReceipt + +import com.squareup.moshi.Json + +/** + * + * + * @param success + * @param transactionReceipt + * @param callOutput + */ + + +data class WithdrawV1200Response ( + + @Json(name = "success") + val success: kotlin.Any?, + + @Json(name = "transactionReceipt") + val transactionReceipt: InitializeV1200ResponseTransactionReceipt? = null, + + @Json(name = "callOutput") + val callOutput: kotlin.Any? = null + +) + diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-htlc-eth-besu/openapitools.json b/packages/cactus-plugin-htlc-eth-besu/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-htlc-eth-besu/openapitools.json +++ b/packages/cactus-plugin-htlc-eth-besu/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-htlc-eth-besu/src/main/json/openapi.json b/packages/cactus-plugin-htlc-eth-besu/src/main/json/openapi.json index 5c3d5b296c..f55635c338 100644 --- a/packages/cactus-plugin-htlc-eth-besu/src/main/json/openapi.json +++ b/packages/cactus-plugin-htlc-eth-besu/src/main/json/openapi.json @@ -1,11 +1,11 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - HTLC-ETH Besu", "version": "1.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-htlc-eth-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-htlc-eth-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-htlc-eth-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-htlc-eth-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-aws-sm/openapitools.json b/packages/cactus-plugin-keychain-aws-sm/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-keychain-aws-sm/openapitools.json +++ b/packages/cactus-plugin-keychain-aws-sm/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/json/openapi.json b/packages/cactus-plugin-keychain-aws-sm/src/main/json/openapi.json index 853d4775c9..2c950ef2f6 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/json/openapi.json +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus - Keychain API", "description": "Contains/describes the Keychain API types/paths for Hyperledger Cactus.", "version": "0.3.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md index 8f6055b7e4..39c0b5fa98 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -51,7 +51,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**setKeychainEntryV1**](docs/DefaultApi.md#setkeychainentryv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-keychain-aws-sm/set-keychain-entry | Sets a value under a key on the keychain backend. - + ## Documentation for Models - [org.openapitools.client.models.DeleteKeychainEntryRequestV1](docs/DeleteKeychainEntryRequestV1.md) @@ -64,7 +64,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetKeychainEntryResponseV1](docs/SetKeychainEntryResponseV1.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt index 058005f566..58a98174cf 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt index ac544c44ef..7b8b874e3d 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..45f12af72b --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was deleted from the keychain. + */ + + +data class DeleteKeychainEntryV1200Response ( + + /* The key that was deleted from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt new file mode 100644 index 0000000000..62cb060ede --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to check the presence of on the keychain. + */ + + +data class DeleteKeychainEntryV1Request ( + + /* The key for the entry to check the presence of on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt index 82f324d68f..ea1d0da587 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt index 294cc6d743..21b9a38b46 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..fec44a9820 --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to retrieve the value from the keychain. + * @param `value` The value associated with the requested key on the keychain. + */ + + +data class GetKeychainEntryV1200Response ( + + /* The key that was used to retrieve the value from the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value associated with the requested key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..a25c8b7964 --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to get from the keychain. + */ + + +data class GetKeychainEntryV1Request ( + + /* The key for the entry to get from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt index 4f7b976c95..c3055c3414 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt index 34f773aea5..6345c51831 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..3c4033810d --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt @@ -0,0 +1,45 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to check the presence of the value in the entry store. + * @param checkedAt Date and time encoded as JSON when the presence check was performed by the plugin backend. + * @param isPresent The boolean true or false indicating the presence or absence of an entry under 'key'. + */ + + +data class HasKeychainEntryV1200Response ( + + /* The key that was used to check the presence of the value in the entry store. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* Date and time encoded as JSON when the presence check was performed by the plugin backend. */ + @Json(name = "checkedAt") + val checkedAt: kotlin.Any?, + + /* The boolean true or false indicating the presence or absence of an entry under 'key'. */ + @Json(name = "isPresent") + val isPresent: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt new file mode 100644 index 0000000000..070ebe1e8c --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key to check for presence in the keychain. + */ + + +data class HasKeychainEntryV1Request ( + + /* The key to check for presence in the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt index b02d8928b9..d016fc72e6 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt index 32c97773c4..3f7624cd59 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..657cf31c72 --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to set the value on the keychain. + */ + + +data class SetKeychainEntryV1200Response ( + + /* The key that was used to set the value on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..6f66b56500 --- /dev/null +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to set on the keychain. + * @param `value` The value that will be associated with the key on the keychain. + */ + + +data class SetKeychainEntryV1Request ( + + /* The key for the entry to set on the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value that will be associated with the key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-aws-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-aws-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-aws-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-aws-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-azure-kv/openapitools.json b/packages/cactus-plugin-keychain-azure-kv/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-keychain-azure-kv/openapitools.json +++ b/packages/cactus-plugin-keychain-azure-kv/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/json/openapi.json b/packages/cactus-plugin-keychain-azure-kv/src/main/json/openapi.json index 0ea58ca2c6..58ef156cde 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/json/openapi.json +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus - Keychain API", "description": "Contains/describes the Keychain API types/paths for Hyperledger Cactus.", "version": "0.3.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/README.md index d3c3b496d9..87b1845e54 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -50,7 +50,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**setKeychainEntryV1**](docs/DefaultApi.md#setkeychainentryv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-keychain-azure-kv/set-keychain-entry | Sets a value under a key on the keychain backend. - + ## Documentation for Models - [org.openapitools.client.models.DeleteKeychainEntryRequestV1](docs/DeleteKeychainEntryRequestV1.md) @@ -63,7 +63,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetKeychainEntryResponse](docs/SetKeychainEntryResponse.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt index 058005f566..58a98174cf 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt index ac544c44ef..7b8b874e3d 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..45f12af72b --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was deleted from the keychain. + */ + + +data class DeleteKeychainEntryV1200Response ( + + /* The key that was deleted from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt new file mode 100644 index 0000000000..fd2ec33a6a --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to check the presence of on the keychain. + */ + + +data class DeleteKeychainEntryV1Request ( + + /* The key for the entry to check the presence of on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt index f3033d77f5..e40ba72fb5 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt index 9bdb563426..91b92b3f6d 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..fec44a9820 --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to retrieve the value from the keychain. + * @param `value` The value associated with the requested key on the keychain. + */ + + +data class GetKeychainEntryV1200Response ( + + /* The key that was used to retrieve the value from the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value associated with the requested key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..e1fc60c694 --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to get from the keychain. + */ + + +data class GetKeychainEntryV1Request ( + + /* The key for the entry to get from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt index 4f7b976c95..c3055c3414 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt index 34f773aea5..6345c51831 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..3c4033810d --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt @@ -0,0 +1,45 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to check the presence of the value in the entry store. + * @param checkedAt Date and time encoded as JSON when the presence check was performed by the plugin backend. + * @param isPresent The boolean true or false indicating the presence or absence of an entry under 'key'. + */ + + +data class HasKeychainEntryV1200Response ( + + /* The key that was used to check the presence of the value in the entry store. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* Date and time encoded as JSON when the presence check was performed by the plugin backend. */ + @Json(name = "checkedAt") + val checkedAt: kotlin.Any?, + + /* The boolean true or false indicating the presence or absence of an entry under 'key'. */ + @Json(name = "isPresent") + val isPresent: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt new file mode 100644 index 0000000000..6a2d89856c --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key to check for presence in the keychain. + */ + + +data class HasKeychainEntryV1Request ( + + /* The key to check for presence in the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt index 7ec6af0d92..b0b685e857 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt index 14e5d43237..329b850d2e 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..657cf31c72 --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to set the value on the keychain. + */ + + +data class SetKeychainEntryV1200Response ( + + /* The key that was used to set the value on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..c17cb389b1 --- /dev/null +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to set on the keychain. + * @param `value` The value that will be associated with the key on the keychain. + */ + + +data class SetKeychainEntryV1Request ( + + /* The key for the entry to set on the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value that will be associated with the key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-azure-kv/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-azure-kv/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-azure-kv/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-azure-kv/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-google-sm/openapitools.json b/packages/cactus-plugin-keychain-google-sm/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-keychain-google-sm/openapitools.json +++ b/packages/cactus-plugin-keychain-google-sm/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/json/openapi.json b/packages/cactus-plugin-keychain-google-sm/src/main/json/openapi.json index 950d80e95f..535ff2c9fa 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/json/openapi.json +++ b/packages/cactus-plugin-keychain-google-sm/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus - Keychain API", "description": "Contains/describes the Keychain API types/paths for Hyperledger Cactus.", "version": "0.3.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md index 86dd4bee2e..c2f8634099 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -50,7 +50,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**setKeychainEntryV1**](docs/DefaultApi.md#setkeychainentryv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-keychain-google-sm/set-keychain-entry | Sets a value under a key on the keychain backend. - + ## Documentation for Models - [org.openapitools.client.models.DeleteKeychainEntryRequestV1](docs/DeleteKeychainEntryRequestV1.md) @@ -63,7 +63,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetKeychainEntryResponseV1](docs/SetKeychainEntryResponseV1.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt index 058005f566..58a98174cf 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt index ac544c44ef..7b8b874e3d 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..45f12af72b --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was deleted from the keychain. + */ + + +data class DeleteKeychainEntryV1200Response ( + + /* The key that was deleted from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt new file mode 100644 index 0000000000..62cb060ede --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to check the presence of on the keychain. + */ + + +data class DeleteKeychainEntryV1Request ( + + /* The key for the entry to check the presence of on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt index 82f324d68f..ea1d0da587 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt index 294cc6d743..21b9a38b46 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..fec44a9820 --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to retrieve the value from the keychain. + * @param `value` The value associated with the requested key on the keychain. + */ + + +data class GetKeychainEntryV1200Response ( + + /* The key that was used to retrieve the value from the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value associated with the requested key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..a25c8b7964 --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to get from the keychain. + */ + + +data class GetKeychainEntryV1Request ( + + /* The key for the entry to get from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt index 4f7b976c95..c3055c3414 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt index 34f773aea5..6345c51831 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..3c4033810d --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt @@ -0,0 +1,45 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to check the presence of the value in the entry store. + * @param checkedAt Date and time encoded as JSON when the presence check was performed by the plugin backend. + * @param isPresent The boolean true or false indicating the presence or absence of an entry under 'key'. + */ + + +data class HasKeychainEntryV1200Response ( + + /* The key that was used to check the presence of the value in the entry store. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* Date and time encoded as JSON when the presence check was performed by the plugin backend. */ + @Json(name = "checkedAt") + val checkedAt: kotlin.Any?, + + /* The boolean true or false indicating the presence or absence of an entry under 'key'. */ + @Json(name = "isPresent") + val isPresent: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt new file mode 100644 index 0000000000..070ebe1e8c --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key to check for presence in the keychain. + */ + + +data class HasKeychainEntryV1Request ( + + /* The key to check for presence in the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt index b02d8928b9..d016fc72e6 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt index 32c97773c4..3f7624cd59 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..657cf31c72 --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to set the value on the keychain. + */ + + +data class SetKeychainEntryV1200Response ( + + /* The key that was used to set the value on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..6f66b56500 --- /dev/null +++ b/packages/cactus-plugin-keychain-google-sm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to set on the keychain. + * @param `value` The value that will be associated with the key on the keychain. + */ + + +data class SetKeychainEntryV1Request ( + + /* The key for the entry to set on the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value that will be associated with the key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-google-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-google-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-google-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-google-sm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-memory-wasm/openapitools.json b/packages/cactus-plugin-keychain-memory-wasm/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/openapitools.json +++ b/packages/cactus-plugin-keychain-memory-wasm/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/json/openapi.json b/packages/cactus-plugin-keychain-memory-wasm/src/main/json/openapi.json index c5089ffdb1..c23c255a04 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/json/openapi.json +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Keychain Memory WASM", "description": "Contains/describes the Hyperledger Cactus Keychain Memory WASM plugin which is designed to help with testing and development and is implemented in Rust instead of Typescript.", "version": "1.0.0-rc.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/README.md index 9a6d80dc51..d4bb9eb6d1 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -50,7 +50,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**setKeychainEntryV1**](docs/DefaultApi.md#setkeychainentryv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-keychain-memory-wasm/set-keychain-entry | Sets a value under a key on the keychain backend. - + ## Documentation for Models - [org.openapitools.client.models.DeleteKeychainEntryRequestV1](docs/DeleteKeychainEntryRequestV1.md) @@ -63,7 +63,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetKeychainEntryResponseV1](docs/SetKeychainEntryResponseV1.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt index 058005f566..58a98174cf 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt index ac544c44ef..7b8b874e3d 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..45f12af72b --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was deleted from the keychain. + */ + + +data class DeleteKeychainEntryV1200Response ( + + /* The key that was deleted from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt new file mode 100644 index 0000000000..62cb060ede --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to check the presence of on the keychain. + */ + + +data class DeleteKeychainEntryV1Request ( + + /* The key for the entry to check the presence of on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt index 82f324d68f..ea1d0da587 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt index 294cc6d743..21b9a38b46 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..fec44a9820 --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to retrieve the value from the keychain. + * @param `value` The value associated with the requested key on the keychain. + */ + + +data class GetKeychainEntryV1200Response ( + + /* The key that was used to retrieve the value from the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value associated with the requested key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..a25c8b7964 --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to get from the keychain. + */ + + +data class GetKeychainEntryV1Request ( + + /* The key for the entry to get from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt index 4f7b976c95..c3055c3414 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt index 34f773aea5..6345c51831 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..3c4033810d --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1200Response.kt @@ -0,0 +1,45 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to check the presence of the value in the entry store. + * @param checkedAt Date and time encoded as JSON when the presence check was performed by the plugin backend. + * @param isPresent The boolean true or false indicating the presence or absence of an entry under 'key'. + */ + + +data class HasKeychainEntryV1200Response ( + + /* The key that was used to check the presence of the value in the entry store. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* Date and time encoded as JSON when the presence check was performed by the plugin backend. */ + @Json(name = "checkedAt") + val checkedAt: kotlin.Any?, + + /* The boolean true or false indicating the presence or absence of an entry under 'key'. */ + @Json(name = "isPresent") + val isPresent: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt new file mode 100644 index 0000000000..070ebe1e8c --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key to check for presence in the keychain. + */ + + +data class HasKeychainEntryV1Request ( + + /* The key to check for presence in the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt index b02d8928b9..d016fc72e6 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt index 32c97773c4..3f7624cd59 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..657cf31c72 --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to set the value on the keychain. + */ + + +data class SetKeychainEntryV1200Response ( + + /* The key that was used to set the value on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..6f66b56500 --- /dev/null +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to set on the keychain. + * @param `value` The value that will be associated with the key on the keychain. + */ + + +data class SetKeychainEntryV1Request ( + + /* The key for the entry to set on the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value that will be associated with the key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) : kotlin.collections.HashMap() + diff --git a/packages/cactus-plugin-keychain-memory-wasm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-memory-wasm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-memory-wasm/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-memory/openapitools.json b/packages/cactus-plugin-keychain-memory/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-keychain-memory/openapitools.json +++ b/packages/cactus-plugin-keychain-memory/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-keychain-memory/src/main/json/openapi.json b/packages/cactus-plugin-keychain-memory/src/main/json/openapi.json index 7e563fc610..ab4d47babf 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/json/openapi.json +++ b/packages/cactus-plugin-keychain-memory/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Keychain Memory ", "description": "Contains/describes the Hyperledger Cactus Keychain Memory plugin.", "version": "0.2.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/README.md index 348dcb7263..07292bb507 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -47,7 +47,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**getPrometheusMetricsV1**](docs/DefaultApi.md#getprometheusmetricsv1) | **GET** /api/v1/plugins/@hyperledger/cactus-plugin-keychain-memory/get-prometheus-exporter-metrics | Get the Prometheus Metrics - + ## Documentation for Models - [org.openapitools.client.models.GetKeychainEntryRequest](docs/GetKeychainEntryRequest.md) @@ -56,7 +56,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetKeychainEntryResponse](docs/SetKeychainEntryResponse.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt index f3033d77f5..e40ba72fb5 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt index 9bdb563426..91b92b3f6d 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt index 7ec6af0d92..b0b685e857 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt index 14e5d43237..329b850d2e 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt +++ b/packages/cactus-plugin-keychain-memory/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-memory/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-memory/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-memory/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-memory/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-vault/openapitools.json b/packages/cactus-plugin-keychain-vault/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-keychain-vault/openapitools.json +++ b/packages/cactus-plugin-keychain-vault/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-keychain-vault/src/main/json/openapi.json b/packages/cactus-plugin-keychain-vault/src/main/json/openapi.json index 78ba24dfc7..48a2eb9bcb 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/json/openapi.json +++ b/packages/cactus-plugin-keychain-vault/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus - Keychain API", "description": "Contains/describes the Keychain API types/paths for Hyperledger Cactus.", "version": "0.3.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/README.md index a449863351..abab94eda3 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -51,7 +51,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**setKeychainEntryV1**](docs/DefaultApi.md#setkeychainentryv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-keychain-vault/set-keychain-entry | Sets a value under a key on the keychain backend. - + ## Documentation for Models - [org.openapitools.client.models.DeleteKeychainEntryRequestV1](docs/DeleteKeychainEntryRequestV1.md) @@ -64,7 +64,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.SetKeychainEntryResponse](docs/SetKeychainEntryResponse.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt index ba98475cd6..5b316bb583 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt index 986811776c..a9a375194b 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeleteKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt index f3033d77f5..e40ba72fb5 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryRequest.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt index 9bdb563426..91b92b3f6d 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..fec44a9820 --- /dev/null +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1200Response.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to retrieve the value from the keychain. + * @param `value` The value associated with the requested key on the keychain. + */ + + +data class GetKeychainEntryV1200Response ( + + /* The key that was used to retrieve the value from the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value associated with the requested key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..e1fc60c694 --- /dev/null +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetKeychainEntryV1Request.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to get from the keychain. + */ + + +data class GetKeychainEntryV1Request ( + + /* The key for the entry to get from the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt index 4f7b976c95..c3055c3414 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryRequestV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt index 97148e92af..a6d9980be8 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasKeychainEntryResponseV1.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt index 7ec6af0d92..b0b685e857 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryRequest.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt index 14e5d43237..329b850d2e 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt new file mode 100644 index 0000000000..657cf31c72 --- /dev/null +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1200Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key that was used to set the value on the keychain. + */ + + +data class SetKeychainEntryV1200Response ( + + /* The key that was used to set the value on the keychain. */ + @Json(name = "key") + val key: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt new file mode 100644 index 0000000000..c17cb389b1 --- /dev/null +++ b/packages/cactus-plugin-keychain-vault/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SetKeychainEntryV1Request.kt @@ -0,0 +1,40 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json + +/** + * + * + * @param key The key for the entry to set on the keychain. + * @param `value` The value that will be associated with the key on the keychain. + */ + + +data class SetKeychainEntryV1Request ( + + /* The key for the entry to set on the keychain. */ + @Json(name = "key") + val key: kotlin.Any?, + + /* The value that will be associated with the key on the keychain. */ + @Json(name = "value") + val `value`: kotlin.Any? + +) + diff --git a/packages/cactus-plugin-keychain-vault/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-keychain-vault/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-keychain-vault/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-keychain-vault/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-besu/openapitools.json b/packages/cactus-plugin-ledger-connector-besu/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-besu/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-besu/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-besu/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-besu/src/main/json/openapi.json index 10684741eb..741d568064 100644 --- a/packages/cactus-plugin-ledger-connector-besu/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-besu/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Connector Besu", "description": "Can perform basic tasks on a Besu ledger", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-corda/openapitools.json b/packages/cactus-plugin-ledger-connector-corda/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-corda/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-corda/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/FILES b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/FILES index 8bd804e7e6..64a8f4a148 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/FILES +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/FILES @@ -1,7 +1,9 @@ README.md pom.xml settings.gradle -src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCorda.kt +src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/HomeController.kt +src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/SpringDocConfiguration.kt +src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaController.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaService.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiUtil.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Request.kt @@ -19,7 +21,7 @@ src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/mode src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/FlowInvocationType.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Request.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Response.kt -src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTx.kt +src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTxInner.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Request.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Response.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JarFile.kt @@ -40,3 +42,4 @@ src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/mode src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Response.kt src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/X500Principal.kt src/main/resources/application.yaml +src/main/resources/openapi.yaml diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/pom.xml b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/pom.xml index 293145393c..572087265d 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/pom.xml +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/pom.xml @@ -6,14 +6,18 @@ cactus-connector-corda-server 0.3.0 - 1.3.30 - 1.2.0 - 1.3.2 + 1.6.8 + 3.0.2 + 2.1.0 + 1.6.21 + + 1.6.21 + UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -82,11 +86,18 @@ spring-boot-starter-web + + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi.version} + + com.google.code.findbugs jsr305 - 3.0.2 + ${findbugs-jsr305.version} com.fasterxml.jackson.dataformat @@ -106,50 +117,20 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation.version} provided org.jetbrains.kotlin kotlin-test-junit5 - 1.3.31 + ${kotlin-test-junit5.version} test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/HomeController.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/HomeController.kt new file mode 100644 index 0000000000..7262726110 --- /dev/null +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/HomeController.kt @@ -0,0 +1,17 @@ +package org.hyperledger.cactus.plugin.ledger.connector.corda.server + +import org.springframework.context.annotation.Bean +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.ResponseBody +import org.springframework.web.bind.annotation.GetMapping + +/** + * Home redirection to OpenAPI api documentation + */ +@Controller +class HomeController { + + @RequestMapping("/") + fun index(): String = "redirect:swagger-ui.html" +} diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/SpringDocConfiguration.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/SpringDocConfiguration.kt new file mode 100644 index 0000000000..db59d1a5ca --- /dev/null +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/SpringDocConfiguration.kt @@ -0,0 +1,32 @@ +package org.hyperledger.cactus.plugin.ledger.connector.corda.server + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +import io.swagger.v3.oas.models.OpenAPI +import io.swagger.v3.oas.models.info.Info +import io.swagger.v3.oas.models.info.Contact +import io.swagger.v3.oas.models.info.License +import io.swagger.v3.oas.models.Components +import io.swagger.v3.oas.models.security.SecurityScheme + +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@Configuration +class SpringDocConfiguration { + + @Bean + fun apiInfo(): OpenAPI { + return OpenAPI() + .info( + Info() + .title("Hyperledger Cactus Plugin - Connector Corda") + .description("Can perform basic tasks on a Corda ledger") + .license( + License() + .name("Apache-2.0") + .url("https://www.apache.org/licenses/LICENSE-2.0.html") + ) + .version("0.3.0") + ) + } +} diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCorda.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaController.kt similarity index 52% rename from packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCorda.kt rename to packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaController.kt index 49252a9558..41f830d388 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCorda.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaController.kt @@ -18,6 +18,11 @@ import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.StartMo import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.StartMonitorV1Response import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.StopMonitorV1Request import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.StopMonitorV1Response +import io.swagger.v3.oas.annotations.* +import io.swagger.v3.oas.annotations.enums.* +import io.swagger.v3.oas.annotations.media.* +import io.swagger.v3.oas.annotations.responses.* +import io.swagger.v3.oas.annotations.security.* import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -30,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired import javax.validation.Valid import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull @@ -44,55 +50,82 @@ import kotlin.collections.Map @RequestMapping("\${api.base-path:}") class ApiPluginLedgerConnectorCordaController(@Autowired(required = true) val service: ApiPluginLedgerConnectorCordaService) { - + @Operation( + summary = "Clear transactions from internal store so they'll not be available by GetMonitorTransactionsV1 anymore.", + operationId = "clearMonitorTransactionsV1", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = ClearMonitorTransactionsV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.DELETE], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/clear-monitor-transactions"], produces = ["application/json"], consumes = ["application/json"] ) - fun clearMonitorTransactionsV1( @Valid @RequestBody(required = false) clearMonitorTransactionsV1Request: ClearMonitorTransactionsV1Request? -): ResponseEntity { + fun clearMonitorTransactionsV1(@Parameter(description = "") @Valid @RequestBody(required = false) clearMonitorTransactionsV1Request: ClearMonitorTransactionsV1Request?): ResponseEntity { return ResponseEntity(service.clearMonitorTransactionsV1(clearMonitorTransactionsV1Request), HttpStatus.valueOf(200)) } - + @Operation( + summary = "Deploys a set of jar files (Cordapps, e.g. the contracts in Corda speak).", + operationId = "deployContractJarsV1", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = DeployContractJarsSuccessV1Response::class))]), + ApiResponse(responseCode = "400", description = "Bad Request", content = [Content(schema = Schema(implementation = DeployContractJarsBadRequestV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/deploy-contract-jars"], produces = ["application/json"], consumes = ["application/json"] ) - fun deployContractJarsV1( @Valid @RequestBody(required = false) deployContractJarsV1Request: DeployContractJarsV1Request? -): ResponseEntity { + fun deployContractJarsV1(@Parameter(description = "") @Valid @RequestBody(required = false) deployContractJarsV1Request: DeployContractJarsV1Request?): ResponseEntity { return ResponseEntity(service.deployContractJarsV1(deployContractJarsV1Request), HttpStatus.valueOf(200)) } - + @Operation( + summary = "", + operationId = "diagnoseNodeV1", + description = """Responds with diagnostic information about the Corda node""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = DiagnoseNodeV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/diagnose-node"], produces = ["application/json"], consumes = ["application/json"] ) - fun diagnoseNodeV1( @Valid @RequestBody(required = false) diagnoseNodeV1Request: DiagnoseNodeV1Request? -): ResponseEntity { + fun diagnoseNodeV1(@Parameter(description = "") @Valid @RequestBody(required = false) diagnoseNodeV1Request: DiagnoseNodeV1Request?): ResponseEntity { return ResponseEntity(service.diagnoseNodeV1(diagnoseNodeV1Request), HttpStatus.valueOf(200)) } - + @Operation( + summary = "Get transactions for monitored state classes.", + operationId = "getMonitorTransactionsV1", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = GetMonitorTransactionsV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-monitor-transactions"], produces = ["application/json"], consumes = ["application/json"] ) - fun getMonitorTransactionsV1( @Valid @RequestBody(required = false) getMonitorTransactionsV1Request: GetMonitorTransactionsV1Request? -): ResponseEntity { + fun getMonitorTransactionsV1(@Parameter(description = "") @Valid @RequestBody(required = false) getMonitorTransactionsV1Request: GetMonitorTransactionsV1Request?): ResponseEntity { return ResponseEntity(service.getMonitorTransactionsV1(getMonitorTransactionsV1Request), HttpStatus.valueOf(200)) } - + @Operation( + summary = "Get the Prometheus Metrics", + operationId = "getPrometheusMetricsV1", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = kotlin.String::class))]) ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-prometheus-exporter-metrics"], @@ -102,63 +135,88 @@ class ApiPluginLedgerConnectorCordaController(@Autowired(required = true) val se return ResponseEntity(service.getPrometheusMetricsV1(), HttpStatus.valueOf(200)) } - + @Operation( + summary = "Invokes a contract on a Corda ledger (e.g. a flow)", + operationId = "invokeContractV1", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = InvokeContractV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/invoke-contract"], produces = ["application/json"], consumes = ["application/json"] ) - fun invokeContractV1( @Valid @RequestBody(required = false) invokeContractV1Request: InvokeContractV1Request? -): ResponseEntity { + fun invokeContractV1(@Parameter(description = "") @Valid @RequestBody(required = false) invokeContractV1Request: InvokeContractV1Request?): ResponseEntity { return ResponseEntity(service.invokeContractV1(invokeContractV1Request), HttpStatus.valueOf(200)) } - + @Operation( + summary = "", + operationId = "listFlowsV1", + description = """Responds with a list of the flows on the Corda node.""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = ListFlowsV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/list-flows"], produces = ["application/json"], consumes = ["application/json"] ) - fun listFlowsV1( @Valid @RequestBody(required = false) listFlowsV1Request: ListFlowsV1Request? -): ResponseEntity { + fun listFlowsV1(@Parameter(description = "") @Valid @RequestBody(required = false) listFlowsV1Request: ListFlowsV1Request?): ResponseEntity { return ResponseEntity(service.listFlowsV1(listFlowsV1Request), HttpStatus.valueOf(200)) } - + @Operation( + summary = "", + operationId = "networkMapV1", + description = """Responds with a snapshot of the network map as provided by the Corda RPC call: net.corda.core.messaging.CordaRPCOps public abstract fun networkMapSnapshot(): List""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = NodeInfo::class))]) ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/network-map"], produces = ["application/json"], consumes = ["application/json"] ) - fun networkMapV1( @Valid @RequestBody(required = false) body: kotlin.Any? -): ResponseEntity> { + fun networkMapV1(@Parameter(description = "") @Valid @RequestBody(required = false) body: kotlin.Any?): ResponseEntity> { return ResponseEntity(service.networkMapV1(body), HttpStatus.valueOf(200)) } - + @Operation( + summary = "Start monitoring corda changes (transactions) of given state class", + operationId = "startMonitorV1", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = StartMonitorV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/start-monitor"], produces = ["application/json"], consumes = ["application/json"] ) - fun startMonitorV1( @Valid @RequestBody(required = false) startMonitorV1Request: StartMonitorV1Request? -): ResponseEntity { + fun startMonitorV1(@Parameter(description = "") @Valid @RequestBody(required = false) startMonitorV1Request: StartMonitorV1Request?): ResponseEntity { return ResponseEntity(service.startMonitorV1(startMonitorV1Request), HttpStatus.valueOf(200)) } - + @Operation( + summary = "Stop monitoring corda changes (transactions) of given state class", + operationId = "stopMonitorV1", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "OK", content = [Content(schema = Schema(implementation = StopMonitorV1Response::class))]) ] + ) @RequestMapping( method = [RequestMethod.DELETE], value = ["/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor"], produces = ["application/json"], consumes = ["application/json"] ) - fun stopMonitorV1( @Valid @RequestBody(required = false) stopMonitorV1Request: StopMonitorV1Request? -): ResponseEntity { + fun stopMonitorV1(@Parameter(description = "") @Valid @RequestBody(required = false) stopMonitorV1Request: StopMonitorV1Request?): ResponseEntity { return ResponseEntity(service.stopMonitorV1(stopMonitorV1Request), HttpStatus.valueOf(200)) } } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaService.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaService.kt index 4c987f50a0..9a9aeb8fd4 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaService.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/api/ApiPluginLedgerConnectorCordaService.kt @@ -21,23 +21,96 @@ import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.StopMon interface ApiPluginLedgerConnectorCordaService { + /** + * DELETE /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/clear-monitor-transactions : Clear transactions from internal store so they'll not be available by GetMonitorTransactionsV1 anymore. + * + * @param clearMonitorTransactionsV1Request (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#clearMonitorTransactionsV1 + */ fun clearMonitorTransactionsV1(clearMonitorTransactionsV1Request: ClearMonitorTransactionsV1Request?): ClearMonitorTransactionsV1Response + /** + * POST /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/deploy-contract-jars : Deploys a set of jar files (Cordapps, e.g. the contracts in Corda speak). + * + * @param deployContractJarsV1Request (optional) + * @return OK (status code 200) + * or Bad Request (status code 400) + * @see ApiPluginLedgerConnectorCorda#deployContractJarsV1 + */ fun deployContractJarsV1(deployContractJarsV1Request: DeployContractJarsV1Request?): DeployContractJarsSuccessV1Response + /** + * POST /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/diagnose-node + * Responds with diagnostic information about the Corda node + * + * @param diagnoseNodeV1Request (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#diagnoseNodeV1 + */ fun diagnoseNodeV1(diagnoseNodeV1Request: DiagnoseNodeV1Request?): DiagnoseNodeV1Response + /** + * GET /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-monitor-transactions : Get transactions for monitored state classes. + * + * @param getMonitorTransactionsV1Request (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#getMonitorTransactionsV1 + */ fun getMonitorTransactionsV1(getMonitorTransactionsV1Request: GetMonitorTransactionsV1Request?): GetMonitorTransactionsV1Response + /** + * GET /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-prometheus-exporter-metrics : Get the Prometheus Metrics + * + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#getPrometheusMetricsV1 + */ fun getPrometheusMetricsV1(): kotlin.String + /** + * POST /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/invoke-contract : Invokes a contract on a Corda ledger (e.g. a flow) + * + * @param invokeContractV1Request (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#invokeContractV1 + */ fun invokeContractV1(invokeContractV1Request: InvokeContractV1Request?): InvokeContractV1Response + /** + * POST /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/list-flows + * Responds with a list of the flows on the Corda node. + * + * @param listFlowsV1Request (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#listFlowsV1 + */ fun listFlowsV1(listFlowsV1Request: ListFlowsV1Request?): ListFlowsV1Response + /** + * POST /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/network-map + * Responds with a snapshot of the network map as provided by the Corda RPC call: net.corda.core.messaging.CordaRPCOps public abstract fun networkMapSnapshot(): List<NodeInfo> + * + * @param body (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#networkMapV1 + */ fun networkMapV1(body: kotlin.Any?): List + /** + * POST /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/start-monitor : Start monitoring corda changes (transactions) of given state class + * + * @param startMonitorV1Request (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#startMonitorV1 + */ fun startMonitorV1(startMonitorV1Request: StartMonitorV1Request?): StartMonitorV1Response + /** + * DELETE /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor : Stop monitoring corda changes (transactions) of given state class + * + * @param stopMonitorV1Request (optional) + * @return OK (status code 200) + * @see ApiPluginLedgerConnectorCorda#stopMonitorV1 + */ fun stopMonitorV1(stopMonitorV1Request: StopMonitorV1Request?): StopMonitorV1Response } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Request.kt index d25c3e40c9..4764d1b157 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Request.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -20,12 +22,15 @@ import javax.validation.Valid data class ClearMonitorTransactionsV1Request( @get:Size(min=1,max=1024) - @field:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, + @Schema(example = "frond_v1_x_7Hdg6s", required = true, description = "ID of a client application that wants to monitor the state changes") + @get:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, @get:Size(min=1,max=1024) - @field:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String, + @Schema(example = "net.corda.samples.example.states.IOUState", required = true, description = "The fully qualified name of the Corda state to monitor") + @get:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String, - @field:JsonProperty("txIndexes", required = true) val txIndexes: kotlin.collections.List = arrayListOf() + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("txIndexes", required = true) val txIndexes: kotlin.collections.List = arrayListOf() ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Response.kt index 3d22addb69..c549441c7b 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ClearMonitorTransactionsV1Response.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -18,9 +20,11 @@ import javax.validation.Valid */ data class ClearMonitorTransactionsV1Response( - @field:JsonProperty("success", required = true) val success: kotlin.Boolean, + @Schema(example = "null", required = true, description = "Flag set to true if operation completed correctly.") + @get:JsonProperty("success", required = true) val success: kotlin.Boolean, - @field:JsonProperty("msg", required = true) val msg: kotlin.String + @Schema(example = "null", required = true, description = "Message describing operation status or any errors that occurred.") + @get:JsonProperty("msg", required = true) val msg: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaNodeSshCredentials.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaNodeSshCredentials.kt index 2382e7f695..e43284b105 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaNodeSshCredentials.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaNodeSshCredentials.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -22,20 +24,25 @@ import javax.validation.Valid data class CordaNodeSshCredentials( @get:Size(min=1,max=65535) - @field:JsonProperty("hostKeyEntry", required = true) val hostKeyEntry: kotlin.String, + @Schema(example = "localhost ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmhSBtMctNa4hsZt8QGlsYSE5/gMkjeand69Vj4ir13", required = true, description = "") + @get:JsonProperty("hostKeyEntry", required = true) val hostKeyEntry: kotlin.String, @get:Size(min=1,max=32) - @field:JsonProperty("username", required = true) val username: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("username", required = true) val username: kotlin.String, @get:Size(min=1,max=4096) - @field:JsonProperty("password", required = true) val password: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("password", required = true) val password: kotlin.String, @get:Size(min=1,max=4096) - @field:JsonProperty("hostname", required = true) val hostname: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("hostname", required = true) val hostname: kotlin.String, @get:Min(1) @get:Max(65535) - @field:JsonProperty("port", required = true) val port: kotlin.Int + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("port", required = true) val port: kotlin.Int ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaRpcCredentials.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaRpcCredentials.kt index 18a44e48f1..748f90d22d 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaRpcCredentials.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaRpcCredentials.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -21,17 +23,21 @@ import javax.validation.Valid data class CordaRpcCredentials( @get:Size(min=1,max=65535) - @field:JsonProperty("hostname", required = true) val hostname: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("hostname", required = true) val hostname: kotlin.String, @get:Min(1) @get:Max(65535) - @field:JsonProperty("port", required = true) val port: kotlin.Int, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("port", required = true) val port: kotlin.Int, @get:Size(min=1,max=1024) - @field:JsonProperty("username", required = true) val username: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("username", required = true) val username: kotlin.String, @get:Size(min=1,max=65535) - @field:JsonProperty("password", required = true) val password: kotlin.String + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("password", required = true) val password: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaX500Name.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaX500Name.kt index 794d04dbaa..30001d2e9d 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaX500Name.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordaX500Name.kt @@ -5,12 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.X500Principal import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -24,20 +26,27 @@ import javax.validation.Valid */ data class CordaX500Name( - @field:JsonProperty("organisation", required = true) val organisation: kotlin.String, + @Schema(example = "PartyA", required = true, description = "") + @get:JsonProperty("organisation", required = true) val organisation: kotlin.String, - @field:JsonProperty("locality", required = true) val locality: kotlin.String, + @Schema(example = "London", required = true, description = "") + @get:JsonProperty("locality", required = true) val locality: kotlin.String, - @field:JsonProperty("country", required = true) val country: kotlin.String, + @Schema(example = "GB", required = true, description = "") + @get:JsonProperty("country", required = true) val country: kotlin.String, @field:Valid - @field:JsonProperty("x500Principal", required = true) val x500Principal: X500Principal, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("x500Principal", required = true) val x500Principal: X500Principal, - @field:JsonProperty("commonName") val commonName: kotlin.String? = null, + @Schema(example = "null", description = "") + @get:JsonProperty("commonName") val commonName: kotlin.String? = null, - @field:JsonProperty("organisationUnit") val organisationUnit: kotlin.String? = null, + @Schema(example = "null", description = "") + @get:JsonProperty("organisationUnit") val organisationUnit: kotlin.String? = null, - @field:JsonProperty("state") val state: kotlin.String? = null + @Schema(example = "null", description = "") + @get:JsonProperty("state") val state: kotlin.String? = null ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappDeploymentConfig.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappDeploymentConfig.kt index 2f154ff425..5f3932c48f 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappDeploymentConfig.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappDeploymentConfig.kt @@ -6,12 +6,14 @@ import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.CordaNo import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.CordaRpcCredentials import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -25,22 +27,28 @@ import javax.validation.Valid data class CordappDeploymentConfig( @field:Valid - @field:JsonProperty("sshCredentials", required = true) val sshCredentials: CordaNodeSshCredentials, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("sshCredentials", required = true) val sshCredentials: CordaNodeSshCredentials, @field:Valid - @field:JsonProperty("rpcCredentials", required = true) val rpcCredentials: CordaRpcCredentials, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("rpcCredentials", required = true) val rpcCredentials: CordaRpcCredentials, @get:Size(min=1,max=65535) - @field:JsonProperty("cordaNodeStartCmd", required = true) val cordaNodeStartCmd: kotlin.String, + @Schema(example = "./build/nodes/runNodes", required = true, description = "The shell command to execute in order to start back up a Corda node after having placed new jars in the cordapp directory of said node.") + @get:JsonProperty("cordaNodeStartCmd", required = true) val cordaNodeStartCmd: kotlin.String, @get:Size(min=1,max=2048) - @field:JsonProperty("cordappDir", required = true) val cordappDir: kotlin.String, + @Schema(example = "null", required = true, description = "The absolute file system path where the Corda Node is expecting deployed Cordapp jar files to be placed.") + @get:JsonProperty("cordappDir", required = true) val cordappDir: kotlin.String, @get:Size(min=1,max=2048) - @field:JsonProperty("cordaJarPath", required = true) val cordaJarPath: kotlin.String, + @Schema(example = "null", required = true, description = "The absolute file system path where the corda.jar file of the node can be found. This is used to execute database schema migrations where applicable (H2 database in use in development environments).") + @get:JsonProperty("cordaJarPath", required = true) val cordaJarPath: kotlin.String, @get:Size(min=1,max=2048) - @field:JsonProperty("nodeBaseDirPath", required = true) val nodeBaseDirPath: kotlin.String + @Schema(example = "null", required = true, description = "The absolute file system path where the base directory of the Corda node can be found. This is used to pass in to corda.jar when being invoked for certain tasks such as executing database schema migrations for a deployed contract.") + @get:JsonProperty("nodeBaseDirPath", required = true) val nodeBaseDirPath: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappInfo.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappInfo.kt index 31254d2b70..1f54772686 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappInfo.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/CordappInfo.kt @@ -5,12 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.SHA256 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * A CordappInfo describes a single CorDapp currently installed on the node @@ -27,23 +29,32 @@ import javax.validation.Valid data class CordappInfo( @field:Valid - @field:JsonProperty("jarHash", required = true) val jarHash: SHA256, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("jarHash", required = true) val jarHash: SHA256, - @field:JsonProperty("licence", required = true) val licence: kotlin.String, + @Schema(example = "null", required = true, description = "The name of the licence this CorDapp is released under") + @get:JsonProperty("licence", required = true) val licence: kotlin.String, - @field:JsonProperty("minimumPlatformVersion", required = true) val minimumPlatformVersion: kotlin.Int, + @Schema(example = "null", required = true, description = "The minimum platform version the node must be at for the CorDapp to run") + @get:JsonProperty("minimumPlatformVersion", required = true) val minimumPlatformVersion: kotlin.Int, - @field:JsonProperty("name", required = true) val name: kotlin.String, + @Schema(example = "null", required = true, description = "The name of the JAR file that defines the CorDapp") + @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonProperty("shortName", required = true) val shortName: kotlin.String, + @Schema(example = "null", required = true, description = "The name of the CorDapp") + @get:JsonProperty("shortName", required = true) val shortName: kotlin.String, - @field:JsonProperty("targetPlatformVersion", required = true) val targetPlatformVersion: kotlin.Int, + @Schema(example = "null", required = true, description = "The target platform version this CorDapp has been tested against") + @get:JsonProperty("targetPlatformVersion", required = true) val targetPlatformVersion: kotlin.Int, - @field:JsonProperty("type", required = true) val type: kotlin.String, + @Schema(example = "null", required = true, description = "A description of what sort of CorDapp this is - either a contract, workflow, or a combination.") + @get:JsonProperty("type", required = true) val type: kotlin.String, - @field:JsonProperty("vendor", required = true) val vendor: kotlin.String, + @Schema(example = "null", required = true, description = "The vendor of this CorDapp") + @get:JsonProperty("vendor", required = true) val vendor: kotlin.String, - @field:JsonProperty("version", required = true) val version: kotlin.String + @Schema(example = "null", required = true, description = "The version of this CorDapp") + @get:JsonProperty("version", required = true) val version: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsBadRequestV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsBadRequestV1Response.kt index 44a43fd809..9e822d7220 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsBadRequestV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsBadRequestV1Response.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -17,7 +19,8 @@ import javax.validation.Valid */ data class DeployContractJarsBadRequestV1Response( - @field:JsonProperty("errors", required = true) val errors: kotlin.collections.List + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("errors", required = true) val errors: kotlin.collections.List ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsSuccessV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsSuccessV1Response.kt index 37df9195c6..44db5977ea 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsSuccessV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsSuccessV1Response.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -17,7 +19,8 @@ import javax.validation.Valid */ data class DeployContractJarsSuccessV1Response( - @field:JsonProperty("deployedJarFiles", required = true) val deployedJarFiles: kotlin.collections.List + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("deployedJarFiles", required = true) val deployedJarFiles: kotlin.collections.List ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsV1Request.kt index 3031a01b25..d1d5224cf3 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DeployContractJarsV1Request.kt @@ -6,12 +6,14 @@ import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.Cordapp import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.JarFile import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -21,10 +23,12 @@ import javax.validation.Valid data class DeployContractJarsV1Request( @field:Valid - @field:JsonProperty("cordappDeploymentConfigs", required = true) val cordappDeploymentConfigs: kotlin.collections.List = arrayListOf(), + @Schema(example = "null", required = true, description = "The list of deployment configurations pointing to the nodes where the provided cordapp jar files are to be deployed .") + @get:JsonProperty("cordappDeploymentConfigs", required = true) val cordappDeploymentConfigs: kotlin.collections.List = arrayListOf(), @field:Valid - @field:JsonProperty("jarFiles", required = true) val jarFiles: kotlin.collections.List + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("jarFiles", required = true) val jarFiles: kotlin.collections.List ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Request.kt index f32c3cefc9..0c1f49f9bb 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Request.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -18,7 +20,8 @@ import javax.validation.Valid data class DiagnoseNodeV1Request( @get:Size(min=0,max=1024) - @field:JsonProperty("nodeIds") val nodeIds: kotlin.collections.List? = arrayListOf() + @Schema(example = "null", description = "Optional property specifying which Corda Node should be the one being diagnosed in case the Connector has multiple connections established for different nodes (which is not yet a supported feature, but we want to keep this possibility open for the future).") + @get:JsonProperty("nodeIds") val nodeIds: kotlin.collections.List? = arrayListOf() ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Response.kt index ff24a5f8f3..9a8dba5380 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/DiagnoseNodeV1Response.kt @@ -5,12 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.NodeDiagnosticInfo import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -19,7 +21,8 @@ import javax.validation.Valid data class DiagnoseNodeV1Response( @field:Valid - @field:JsonProperty("nodeDiagnosticInfo", required = true) val nodeDiagnosticInfo: NodeDiagnosticInfo + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("nodeDiagnosticInfo", required = true) val nodeDiagnosticInfo: NodeDiagnosticInfo ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/FlowInvocationType.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/FlowInvocationType.kt index 8168c7de61..990b398d95 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/FlowInvocationType.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/FlowInvocationType.kt @@ -1,15 +1,18 @@ package org.hyperledger.cactus.plugin.ledger.connector.corda.server.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * Determines which flow starting method will be used on the back-end when invoking the flow. Based on the value here the plugin back-end might invoke the rpc.startFlowDynamic() method or the rpc.startTrackedFlowDynamic() method. Streamed responses are aggregated and returned in a single response to HTTP callers who are not equipped to handle streams like WebSocket/gRPC/etc. do. @@ -18,8 +21,6 @@ import javax.validation.Valid enum class FlowInvocationType(val value: kotlin.String) { @JsonProperty("TRACKED_FLOW_DYNAMIC") TRACKED_FLOW_DYNAMIC("TRACKED_FLOW_DYNAMIC"), - - @JsonProperty("FLOW_DYNAMIC") FLOW_DYNAMIC("FLOW_DYNAMIC"); - + @JsonProperty("FLOW_DYNAMIC") FLOW_DYNAMIC("FLOW_DYNAMIC") } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Request.kt index 1990872221..df641538de 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Request.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -19,10 +21,12 @@ import javax.validation.Valid data class GetMonitorTransactionsV1Request( @get:Size(min=1,max=1024) - @field:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, + @Schema(example = "frond_v1_x_7Hdg6s", required = true, description = "ID of a client application that wants to monitor the state changes") + @get:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, @get:Size(min=1,max=1024) - @field:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String + @Schema(example = "net.corda.samples.example.states.IOUState", required = true, description = "The fully qualified name of the Corda state to monitor") + @get:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Response.kt index 0afb325eb9..d2d27d8b05 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1Response.kt @@ -2,15 +2,17 @@ package org.hyperledger.cactus.plugin.ledger.connector.corda.server.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.GetMonitorTransactionsV1ResponseTx +import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.GetMonitorTransactionsV1ResponseTxInner import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -21,15 +23,19 @@ import javax.validation.Valid */ data class GetMonitorTransactionsV1Response( - @field:JsonProperty("success", required = true) val success: kotlin.Boolean, + @Schema(example = "null", required = true, description = "Flag set to true if operation completed correctly.") + @get:JsonProperty("success", required = true) val success: kotlin.Boolean, - @field:JsonProperty("msg", required = true) val msg: kotlin.String, + @Schema(example = "null", required = true, description = "Message describing operation status or any errors that occurred.") + @get:JsonProperty("msg", required = true) val msg: kotlin.String, @get:Size(min=1,max=1024) - @field:JsonProperty("stateFullClassName") val stateFullClassName: kotlin.String? = null, + @Schema(example = "net.corda.samples.example.states.IOUState", description = "The fully qualified name of the Corda state to monitor") + @get:JsonProperty("stateFullClassName") val stateFullClassName: kotlin.String? = null, @field:Valid - @field:JsonProperty("tx") val tx: kotlin.collections.List? = arrayListOf() + @Schema(example = "null", description = "") + @get:JsonProperty("tx") val tx: kotlin.collections.List? = arrayListOf() ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTx.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTxInner.kt similarity index 60% rename from packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTx.kt rename to packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTxInner.kt index f92c0490c5..198bb53fab 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTx.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/GetMonitorTransactionsV1ResponseTxInner.kt @@ -4,23 +4,27 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * * @param index * @param `data` */ -data class GetMonitorTransactionsV1ResponseTx( +data class GetMonitorTransactionsV1ResponseTxInner( - @field:JsonProperty("index") val index: kotlin.String? = null, + @Schema(example = "null", description = "") + @get:JsonProperty("index") val index: kotlin.String? = null, - @field:JsonProperty("data") val `data`: kotlin.String? = null + @Schema(example = "null", description = "") + @get:JsonProperty("data") val `data`: kotlin.String? = null ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Request.kt index c888572a93..04b6cbef4c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Request.kt @@ -2,16 +2,19 @@ package org.hyperledger.cactus.plugin.ledger.connector.corda.server.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.FlowInvocationType import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.JvmObject import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -23,16 +26,20 @@ import javax.validation.Valid data class InvokeContractV1Request( @get:Size(min=1,max=1024) - @field:JsonProperty("flowFullClassName", required = true) val flowFullClassName: kotlin.String, + @Schema(example = "net.corda.samples.obligation.flows.IOUIssueFlow", required = true, description = "The fully qualified name of the Corda flow to invoke") + @get:JsonProperty("flowFullClassName", required = true) val flowFullClassName: kotlin.String, @field:Valid - @field:JsonProperty("flowInvocationType", required = true) val flowInvocationType: FlowInvocationType, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("flowInvocationType", required = true) val flowInvocationType: FlowInvocationType, @field:Valid - @field:JsonProperty("params", required = true) val params: kotlin.collections.List = arrayListOf(), + @Schema(example = "null", required = true, description = "The list of arguments to pass in to the contract method being invoked.") + @get:JsonProperty("params", required = true) val params: kotlin.collections.List = arrayListOf(), @get:Min(0) - @field:JsonProperty("timeoutMs") val timeoutMs: kotlin.Int? = 60000 + @Schema(example = "null", description = "The amount of milliseconds to wait for a transaction receipt beforegiving up and crashing.") + @get:JsonProperty("timeoutMs") val timeoutMs: kotlin.Int? = 60000 ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Response.kt index 9029a3a134..fafa71bc35 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/InvokeContractV1Response.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -21,17 +23,22 @@ import javax.validation.Valid */ data class InvokeContractV1Response( - @field:JsonProperty("success", required = true) val success: kotlin.Boolean, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("success", required = true) val success: kotlin.Boolean, @field:Valid - @field:JsonProperty("callOutput", required = true) val callOutput: kotlin.Any, + @Schema(example = "null", required = true, description = "Data returned from the JVM when no transaction is running") + @get:JsonProperty("callOutput", required = true) val callOutput: kotlin.Any, - @field:JsonProperty("flowId", required = true) val flowId: kotlin.String, + @Schema(example = "null", required = true, description = "The id for the flow handle") + @get:JsonProperty("flowId", required = true) val flowId: kotlin.String, @get:Size(min=1,max=1024) - @field:JsonProperty("transactionId") val transactionId: kotlin.String? = null, + @Schema(example = "null", description = "The net.corda.core.flows.StateMachineRunId value returned by the flow execution.") + @get:JsonProperty("transactionId") val transactionId: kotlin.String? = null, - @field:JsonProperty("progress") val progress: kotlin.collections.List? = arrayListOf() + @Schema(example = "null", description = "An array of strings representing the aggregated stream of progress updates provided by a *tracked* flow invocation. If the flow invocation was not tracked, this array is still returned, but as empty.") + @get:JsonProperty("progress") val progress: kotlin.collections.List? = arrayListOf() ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JarFile.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JarFile.kt index b55bd99ee2..96a8d0a641 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JarFile.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JarFile.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -20,13 +22,16 @@ import javax.validation.Valid data class JarFile( @get:Size(min=1,max=255) - @field:JsonProperty("filename", required = true) val filename: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("filename", required = true) val filename: kotlin.String, - @field:JsonProperty("hasDbMigrations", required = true) val hasDbMigrations: kotlin.Boolean, + @Schema(example = "null", required = true, description = "Indicates whether the cordapp jar in question contains any embedded migrations that Cactus can/should execute between copying the jar into the cordapp directory and starting the node back up.") + @get:JsonProperty("hasDbMigrations", required = true) val hasDbMigrations: kotlin.Boolean, @get:Size(min=1,max=1073741824) - @field:JsonProperty("contentBase64", required = true) val contentBase64: kotlin.String -) : kotlin.collections.HashMap(){ + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("contentBase64", required = true) val contentBase64: kotlin.String +) : kotlin.collections.HashMap{ } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmObject.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmObject.kt index 5a588a1862..2f18036e2c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmObject.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmObject.kt @@ -2,16 +2,19 @@ package org.hyperledger.cactus.plugin.ledger.connector.corda.server.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.JvmType import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.JvmTypeKind import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * Can represent JVM primitive and reference types as well. The jvmTypeKind field indicates which one is being stored. If the jvmTypeKind field is set to REFERENCE then the jvmCtorArgs array is expected to be filled, otherwise (e.g. PRIMITIVE jvmTypeKind) it is expected that the primitiveValue property is filled with a primitive data type supported by the JSON standard such as strings, booleans, numbers, etc. @@ -23,16 +26,20 @@ import javax.validation.Valid data class JvmObject( @field:Valid - @field:JsonProperty("jvmTypeKind", required = true) val jvmTypeKind: JvmTypeKind, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("jvmTypeKind", required = true) val jvmTypeKind: JvmTypeKind, @field:Valid - @field:JsonProperty("jvmType", required = true) val jvmType: JvmType, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("jvmType", required = true) val jvmType: JvmType, @field:Valid - @field:JsonProperty("primitiveValue") val primitiveValue: kotlin.Any? = null, + @Schema(example = "null", description = "") + @get:JsonProperty("primitiveValue") val primitiveValue: kotlin.Any? = null, @field:Valid - @field:JsonProperty("jvmCtorArgs") val jvmCtorArgs: kotlin.collections.List? = arrayListOf() + @Schema(example = "null", description = "") + @get:JsonProperty("jvmCtorArgs") val jvmCtorArgs: kotlin.collections.List? = arrayListOf() ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmType.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmType.kt index 97545ef80c..d760b5774c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmType.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmType.kt @@ -5,12 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.JvmObject import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * Represents a reference to a JVM type (such as a Java class) @@ -21,13 +23,16 @@ import javax.validation.Valid data class JvmType( @get:Size(min=1,max=65535) - @field:JsonProperty("fqClassName", required = true) val fqClassName: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("fqClassName", required = true) val fqClassName: kotlin.String, @get:Size(min=1,max=65535) - @field:JsonProperty("constructorName") val constructorName: kotlin.String? = null, + @Schema(example = "null", description = "This parameter is used to specify that the function used to construct this JvmType is not a constructor function but instead is a factory function. Setting this parameter will cause the plugin to look up methods of the class denoted by fqClassName instead of its constructors.") + @get:JsonProperty("constructorName") val constructorName: kotlin.String? = null, @field:Valid - @field:JsonProperty("invocationTarget") val invocationTarget: JvmObject? = null + @Schema(example = "null", description = "") + @get:JsonProperty("invocationTarget") val invocationTarget: JvmObject? = null ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmTypeKind.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmTypeKind.kt index 887d256cf9..1d02060288 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmTypeKind.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/JvmTypeKind.kt @@ -1,15 +1,18 @@ package org.hyperledger.cactus.plugin.ledger.connector.corda.server.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -18,8 +21,6 @@ import javax.validation.Valid enum class JvmTypeKind(val value: kotlin.String) { @JsonProperty("PRIMITIVE") PRIMITIVE("PRIMITIVE"), - - @JsonProperty("REFERENCE") REFERENCE("REFERENCE"); - + @JsonProperty("REFERENCE") REFERENCE("REFERENCE") } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Request.kt index 9ed5bf3fbf..3c83e38380 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Request.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -17,7 +19,8 @@ import javax.validation.Valid */ data class ListFlowsV1Request( - @field:JsonProperty("filter") val filter: kotlin.String? = null + @Schema(example = "null", description = "") + @get:JsonProperty("filter") val filter: kotlin.String? = null ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Response.kt index 283533d4ca..a3fd13044b 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/ListFlowsV1Response.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -17,7 +19,8 @@ import javax.validation.Valid */ data class ListFlowsV1Response( - @field:JsonProperty("flowNames", required = true) val flowNames: kotlin.collections.List = arrayListOf() + @Schema(example = "[\"net.corda.core.flows.ContractUpgradeFlow$Authorise\",\"net.corda.core.flows.ContractUpgradeFlow$Deauthorise\",\"net.corda.core.flows.ContractUpgradeFlow$Initiate\",\"net.corda.finance.flows.CashExitFlow\",\"net.corda.finance.flows.CashIssueAndPaymentFlow\",\"net.corda.finance.flows.CashIssueFlow\",\"net.corda.finance.flows.CashPaymentFlow\",\"net.corda.finance.internal.CashConfigDataFlow\",\"net.corda.samples.obligation.flows.IOUIssueFlow\",\"net.corda.samples.obligation.flows.IOUSettleFlow\",\"net.corda.samples.obligation.flows.IOUTransferFlow\",\"net.corda.samples.obligation.flows.SelfIssueCashFlow\"]", required = true, description = "An array of strings storing the names of the flows as returned by the flowList Corda RPC.") + @get:JsonProperty("flowNames", required = true) val flowNames: kotlin.collections.List = arrayListOf() ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NetworkHostAndPort.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NetworkHostAndPort.kt index 89d50d3afc..a41cc33dc2 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NetworkHostAndPort.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NetworkHostAndPort.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -18,9 +20,11 @@ import javax.validation.Valid */ data class NetworkHostAndPort( - @field:JsonProperty("host", required = true) val host: kotlin.String, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("host", required = true) val host: kotlin.String, - @field:JsonProperty("port", required = true) val port: java.math.BigDecimal + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("port", required = true) val port: java.math.BigDecimal ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeDiagnosticInfo.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeDiagnosticInfo.kt index 15b1fe90ff..8744b1c65a 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeDiagnosticInfo.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeDiagnosticInfo.kt @@ -5,12 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.CordappInfo import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * A NodeDiagnosticInfo holds information about the current node version. @@ -24,15 +26,20 @@ data class NodeDiagnosticInfo( @field:Valid @get:Size(min=0,max=4096) - @field:JsonProperty("cordapps", required = true) val cordapps: kotlin.collections.List, + @Schema(example = "null", required = true, description = "A list of CorDapps currently installed on this node") + @get:JsonProperty("cordapps", required = true) val cordapps: kotlin.collections.List, - @field:JsonProperty("platformVersion", required = true) val platformVersion: kotlin.Int, + @Schema(example = "null", required = true, description = "The platform version of this node. This number represents a released API version, and should be used to make functionality decisions (e.g. enabling an app feature only if an underlying platform feature exists)") + @get:JsonProperty("platformVersion", required = true) val platformVersion: kotlin.Int, - @field:JsonProperty("revision", required = true) val revision: kotlin.String, + @Schema(example = "null", required = true, description = "The git commit hash this node was built from") + @get:JsonProperty("revision", required = true) val revision: kotlin.String, - @field:JsonProperty("vendor", required = true) val vendor: kotlin.String, + @Schema(example = "null", required = true, description = "The vendor of this node") + @get:JsonProperty("vendor", required = true) val vendor: kotlin.String, - @field:JsonProperty("version", required = true) val version: kotlin.String + @Schema(example = "null", required = true, description = "The current node version string, e.g. 4.3, 4.4-SNAPSHOT. Note that this string is effectively freeform, and so should only be used for providing diagnostic information. It should not be used to make functionality decisions (the platformVersion is a better fit for this).") + @get:JsonProperty("version", required = true) val version: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeInfo.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeInfo.kt index 43e93d628c..e839c210da 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeInfo.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/NodeInfo.kt @@ -6,12 +6,14 @@ import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.Network import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.Party import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -24,17 +26,22 @@ import javax.validation.Valid data class NodeInfo( @field:Valid - @field:JsonProperty("addresses", required = true) val addresses: kotlin.collections.List, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("addresses", required = true) val addresses: kotlin.collections.List, - @field:JsonProperty("platformVersion", required = true) val platformVersion: kotlin.Int, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("platformVersion", required = true) val platformVersion: kotlin.Int, - @field:JsonProperty("serial", required = true) val serial: java.math.BigDecimal, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("serial", required = true) val serial: java.math.BigDecimal, @field:Valid - @field:JsonProperty("legalIdentities", required = true) val legalIdentities: kotlin.collections.List, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("legalIdentities", required = true) val legalIdentities: kotlin.collections.List, @field:Valid - @field:JsonProperty("legalIdentitiesAndCerts", required = true) val legalIdentitiesAndCerts: kotlin.collections.List + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("legalIdentitiesAndCerts", required = true) val legalIdentitiesAndCerts: kotlin.collections.List ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/Party.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/Party.kt index 8451bf7997..5a120eb4d0 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/Party.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/Party.kt @@ -6,12 +6,14 @@ import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.CordaX5 import org.hyperledger.cactus.plugin.ledger.connector.corda.server.model.PublicKey import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -21,10 +23,12 @@ import javax.validation.Valid data class Party( @field:Valid - @field:JsonProperty("name", required = true) val name: CordaX500Name, + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("name", required = true) val name: CordaX500Name, @field:Valid - @field:JsonProperty("owningKey", required = true) val owningKey: PublicKey + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("owningKey", required = true) val owningKey: PublicKey ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/PublicKey.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/PublicKey.kt index 40332471d6..a2ff65965e 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/PublicKey.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/PublicKey.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * An instance of a java.security.PublicKey (which is an interface) implementation such as org.hyperledger.cactus.plugin.ledger.connector.corda.server.impl.PublicKeyImpl @@ -19,11 +21,14 @@ import javax.validation.Valid */ data class PublicKey( - @field:JsonProperty("algorithm", required = true) val algorithm: kotlin.String, + @Schema(example = "EdDSA", required = true, description = "") + @get:JsonProperty("algorithm", required = true) val algorithm: kotlin.String, - @field:JsonProperty("format", required = true) val format: kotlin.String, + @Schema(example = "X.509", required = true, description = "") + @get:JsonProperty("format", required = true) val format: kotlin.String, - @field:JsonProperty("encoded", required = true) val encoded: kotlin.String + @Schema(example = "MCowBQYDK2VwAyEAac1p4wLsAh70VJOcudQppu7NnKxyoKxVN0DbfTxF+54=", required = true, description = "") + @get:JsonProperty("encoded", required = true) val encoded: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/SHA256.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/SHA256.kt index 1f041f0361..f326aac946 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/SHA256.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/SHA256.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * SHA-256 is part of the SHA-2 hash function family. Generated hash is fixed size, 256-bits (32-bytes). @@ -19,11 +21,14 @@ import javax.validation.Valid */ data class SHA256( - @field:JsonProperty("bytes", required = true) val bytes: kotlin.String, + @Schema(example = "Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc=", required = true, description = "") + @get:JsonProperty("bytes", required = true) val bytes: kotlin.String, - @field:JsonProperty("offset", required = true) val offset: kotlin.Int, + @Schema(example = "0", required = true, description = "") + @get:JsonProperty("offset", required = true) val offset: kotlin.Int, - @field:JsonProperty("size", required = true) val propertySize: kotlin.Int + @Schema(example = "32", required = true, description = "") + @get:JsonProperty("size", required = true) val propertySize: kotlin.Int ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Request.kt index 3955d04202..41b18d278d 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Request.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -19,10 +21,12 @@ import javax.validation.Valid data class StartMonitorV1Request( @get:Size(min=1,max=1024) - @field:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, + @Schema(example = "frond_v1_x_7Hdg6s", required = true, description = "ID of a client application that wants to monitor the state changes") + @get:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, @get:Size(min=1,max=1024) - @field:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String + @Schema(example = "net.corda.samples.example.states.IOUState", required = true, description = "The fully qualified name of the Corda state to monitor") + @get:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Response.kt index c320125102..a4e32a15f3 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StartMonitorV1Response.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -18,9 +20,11 @@ import javax.validation.Valid */ data class StartMonitorV1Response( - @field:JsonProperty("success", required = true) val success: kotlin.Boolean, + @Schema(example = "null", required = true, description = "Flag set to true if monitoring started correctly.") + @get:JsonProperty("success", required = true) val success: kotlin.Boolean, - @field:JsonProperty("msg", required = true) val msg: kotlin.String + @Schema(example = "null", required = true, description = "Message describing operation status or any errors that occurred.") + @get:JsonProperty("msg", required = true) val msg: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Request.kt index 95aaa62bb2..968318cd8e 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Request.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -19,10 +21,12 @@ import javax.validation.Valid data class StopMonitorV1Request( @get:Size(min=1,max=1024) - @field:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, + @Schema(example = "frond_v1_x_7Hdg6s", required = true, description = "ID of a client application that wants to monitor the state changes") + @get:JsonProperty("clientAppId", required = true) val clientAppId: kotlin.String, @get:Size(min=1,max=1024) - @field:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String + @Schema(example = "net.corda.samples.example.states.IOUState", required = true, description = "The fully qualified name of the Corda state to monitor") + @get:JsonProperty("stateFullClassName", required = true) val stateFullClassName: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Response.kt index 7c0413fac4..fcf3152d49 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/StopMonitorV1Response.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -18,9 +20,11 @@ import javax.validation.Valid */ data class StopMonitorV1Response( - @field:JsonProperty("success", required = true) val success: kotlin.Boolean, + @Schema(example = "null", required = true, description = "Flag set to true if operation completed correctly.") + @get:JsonProperty("success", required = true) val success: kotlin.Boolean, - @field:JsonProperty("msg", required = true) val msg: kotlin.String + @Schema(example = "null", required = true, description = "Message describing operation status or any errors that occurred.") + @get:JsonProperty("msg", required = true) val msg: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/X500Principal.kt b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/X500Principal.kt index b38eac5bcd..8e91ee5ff6 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/X500Principal.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/kotlin/org/hyperledger/cactus/plugin/ledger/connector/corda/server/model/X500Principal.kt @@ -4,12 +4,14 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -18,9 +20,11 @@ import javax.validation.Valid */ data class X500Principal( - @field:JsonProperty("name", required = true) val name: kotlin.String, + @Schema(example = "O=PartyA,L=London,C=GB", required = true, description = "") + @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonProperty("encoded", required = true) val encoded: kotlin.String + @Schema(example = "MC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QQ==", required = true, description = "Base64 encoded public key") + @get:JsonProperty("encoded", required = true) val encoded: kotlin.String ) { } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/resources/openapi.yaml b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/resources/openapi.yaml new file mode 100644 index 0000000000..d0c7c0815d --- /dev/null +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/src/main/resources/openapi.yaml @@ -0,0 +1,1387 @@ +openapi: 3.0.3 +info: + description: Can perform basic tasks on a Corda ledger + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: Hyperledger Cactus Plugin - Connector Corda + version: 0.3.0 +servers: +- url: / +paths: + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/deploy-contract-jars: + post: + operationId: deployContractJarsV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/DeployContractJarsV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/DeployContractJarsSuccessV1Response' + description: OK + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/DeployContractJarsBadRequestV1Response' + description: Bad Request + summary: "Deploys a set of jar files (Cordapps, e.g. the contracts in Corda\ + \ speak)." + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/deploy-contract-jars + verbLowerCase: post + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/invoke-contract: + post: + operationId: invokeContractV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/InvokeContractV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/InvokeContractV1Response' + description: OK + summary: Invokes a contract on a Corda ledger (e.g. a flow) + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/invoke-contract + verbLowerCase: post + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/start-monitor: + post: + operationId: startMonitorV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/StartMonitorV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/StartMonitorV1Response' + description: OK + summary: Start monitoring corda changes (transactions) of given state class + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/start-monitor + verbLowerCase: post + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-monitor-transactions: + get: + operationId: GetMonitorTransactionsV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/GetMonitorTransactionsV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/GetMonitorTransactionsV1Response' + description: OK + summary: Get transactions for monitored state classes. + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-monitor-transactions + verbLowerCase: get + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/clear-monitor-transactions: + delete: + operationId: ClearMonitorTransactionsV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/ClearMonitorTransactionsV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ClearMonitorTransactionsV1Response' + description: OK + summary: Clear transactions from internal store so they'll not be available + by GetMonitorTransactionsV1 anymore. + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/clear-monitor-transactions + verbLowerCase: delete + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor: + delete: + operationId: stopMonitorV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/StopMonitorV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/StopMonitorV1Response' + description: OK + summary: Stop monitoring corda changes (transactions) of given state class + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor + verbLowerCase: delete + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/network-map: + post: + description: "Responds with a snapshot of the network map as provided by the\ + \ Corda RPC call: net.corda.core.messaging.CordaRPCOps public abstract fun\ + \ networkMapSnapshot(): List" + operationId: networkMapV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/NetworkMapV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/NetworkMapV1Response' + description: OK + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/network-map + verbLowerCase: post + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/list-flows: + post: + description: Responds with a list of the flows on the Corda node. + operationId: listFlowsV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/ListFlowsV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ListFlowsV1Response' + description: OK + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/list-flows + verbLowerCase: post + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/diagnose-node: + post: + description: Responds with diagnostic information about the Corda node + operationId: diagnoseNodeV1 + parameters: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/DiagnoseNodeV1Request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/DiagnoseNodeV1Response' + description: OK + x-hyperledger-cactus: + http: + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/diagnose-node + verbLowerCase: post + /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-prometheus-exporter-metrics: + get: + operationId: getPrometheusMetricsV1 + parameters: [] + responses: + "200": + content: + text/plain: + schema: + $ref: '#/components/schemas/PrometheusExporterMetricsResponse' + description: OK + summary: Get the Prometheus Metrics + x-hyperledger-cactus: + http: + verbLowerCase: get + path: /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-prometheus-exporter-metrics +components: + schemas: + SHA256: + description: "SHA-256 is part of the SHA-2 hash function family. Generated hash\ + \ is fixed size, 256-bits (32-bytes)." + example: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + externalDocs: + description: Official Corda documentation of the SHA256 class. + url: https://api.corda.net/api/corda-os/4.6/html/api/kotlin/corda/net.corda.core.crypto/-secure-hash/-s-h-a256/index.html + properties: + bytes: + example: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + type: string + offset: + example: 0 + type: integer + size: + example: 32 + type: integer + required: + - bytes + - offset + - size + type: object + CordappInfo: + description: A CordappInfo describes a single CorDapp currently installed on + the node + example: + licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + externalDocs: + description: Official Corda Documentation of the class CordappInfo + url: https://api.corda.net/api/corda-os/4.6/html/api/kotlin/corda/net.corda.core.cordapp/-cordapp-info/index.html + properties: + jarHash: + $ref: '#/components/schemas/SHA256' + licence: + description: The name of the licence this CorDapp is released under + type: string + minimumPlatformVersion: + description: The minimum platform version the node must be at for the CorDapp + to run + type: integer + name: + description: The name of the JAR file that defines the CorDapp + type: string + shortName: + description: The name of the CorDapp + type: string + targetPlatformVersion: + description: The target platform version this CorDapp has been tested against + type: integer + type: + description: "A description of what sort of CorDapp this is - either a contract,\ + \ workflow, or a combination." + type: string + vendor: + description: The vendor of this CorDapp + type: string + version: + description: The version of this CorDapp + type: string + required: + - jarHash + - licence + - minimumPlatformVersion + - name + - shortName + - targetPlatformVersion + - type + - vendor + - version + type: object + NodeDiagnosticInfo: + description: A NodeDiagnosticInfo holds information about the current node version. + example: + vendor: vendor + platformVersion: 1 + version: version + cordapps: + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + revision: revision + externalDocs: + description: Official Corda Documentation of the class NodeDiagnosticInfo + url: https://api.corda.net/api/corda-os/4.6/html/api/kotlin/corda/net.corda.core.node/-node-diagnostic-info/index.html + properties: + cordapps: + description: A list of CorDapps currently installed on this node + items: + $ref: '#/components/schemas/CordappInfo' + maxItems: 4096 + minItems: 0 + type: array + platformVersion: + description: "The platform version of this node. This number represents\ + \ a released API version, and should be used to make functionality decisions\ + \ (e.g. enabling an app feature only if an underlying platform feature\ + \ exists)" + type: integer + revision: + description: The git commit hash this node was built from + type: string + vendor: + description: The vendor of this node + type: string + version: + description: "The current node version string, e.g. 4.3, 4.4-SNAPSHOT. Note\ + \ that this string is effectively freeform, and so should only be used\ + \ for providing diagnostic information. It should not be used to make\ + \ functionality decisions (the platformVersion is a better fit for this)." + type: string + required: + - cordapps + - platformVersion + - revision + - vendor + - version + type: object + FlowInvocationType: + description: Determines which flow starting method will be used on the back-end + when invoking the flow. Based on the value here the plugin back-end might + invoke the rpc.startFlowDynamic() method or the rpc.startTrackedFlowDynamic() + method. Streamed responses are aggregated and returned in a single response + to HTTP callers who are not equipped to handle streams like WebSocket/gRPC/etc. + do. + enum: + - TRACKED_FLOW_DYNAMIC + - FLOW_DYNAMIC + nullable: false + type: string + JarFile: + additionalProperties: true + example: + filename: filename + contentBase64: contentBase64 + hasDbMigrations: true + properties: + filename: + maxLength: 255 + minLength: 1 + nullable: false + type: string + hasDbMigrations: + description: Indicates whether the cordapp jar in question contains any + embedded migrations that Cactus can/should execute between copying the + jar into the cordapp directory and starting the node back up. + nullable: false + type: boolean + contentBase64: + format: base64 + maxLength: 1073741824 + minLength: 1 + nullable: false + type: string + required: + - contentBase64 + - filename + - hasDbMigrations + type: object + JvmType: + description: Represents a reference to a JVM type (such as a Java class) + example: + constructorName: constructorName + invocationTarget: null + fqClassName: fqClassName + properties: + fqClassName: + maxLength: 65535 + minLength: 1 + nullable: false + type: string + constructorName: + description: This parameter is used to specify that the function used to + construct this JvmType is not a constructor function but instead is a + factory function. Setting this parameter will cause the plugin to look + up methods of the class denoted by fqClassName instead of its constructors. + maxLength: 65535 + minLength: 1 + nullable: false + type: string + invocationTarget: + $ref: '#/components/schemas/JvmObject' + required: + - fqClassName + type: object + JvmTypeKind: + enum: + - PRIMITIVE + - REFERENCE + nullable: false + type: string + JvmObject: + description: "Can represent JVM primitive and reference types as well. The jvmTypeKind\ + \ field indicates which one is being stored. If the jvmTypeKind field is set\ + \ to REFERENCE then the jvmCtorArgs array is expected to be filled, otherwise\ + \ (e.g. PRIMITIVE jvmTypeKind) it is expected that the primitiveValue property\ + \ is filled with a primitive data type supported by the JSON standard such\ + \ as strings, booleans, numbers, etc." + example: + jvmCtorArgs: + - null + - null + jvmType: + constructorName: constructorName + invocationTarget: null + fqClassName: fqClassName + primitiveValue: "{}" + jvmTypeKind: null + properties: + jvmTypeKind: + $ref: '#/components/schemas/JvmTypeKind' + primitiveValue: + type: object + jvmCtorArgs: + default: [] + items: + $ref: '#/components/schemas/JvmObject' + maxLength: 1024 + minLength: 0 + nullable: false + type: array + jvmType: + $ref: '#/components/schemas/JvmType' + required: + - jvmType + - jvmTypeKind + type: object + CordappDeploymentConfig: + example: + cordaJarPath: cordaJarPath + cordaNodeStartCmd: ./build/nodes/runNodes + cordappDir: cordappDir + nodeBaseDirPath: nodeBaseDirPath + rpcCredentials: + hostname: hostname + password: password + port: 39501 + username: username + sshCredentials: + password: password + hostname: hostname + port: 5249 + hostKeyEntry: localhost ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmhSBtMctNa4hsZt8QGlsYSE5/gMkjeand69Vj4ir13 + username: username + properties: + sshCredentials: + $ref: '#/components/schemas/CordaNodeSshCredentials' + rpcCredentials: + $ref: '#/components/schemas/CordaRpcCredentials' + cordaNodeStartCmd: + description: The shell command to execute in order to start back up a Corda + node after having placed new jars in the cordapp directory of said node. + example: ./build/nodes/runNodes + maxLength: 65535 + minLength: 1 + nullable: false + type: string + cordappDir: + description: The absolute file system path where the Corda Node is expecting + deployed Cordapp jar files to be placed. + maxLength: 2048 + minLength: 1 + nullable: false + type: string + cordaJarPath: + description: The absolute file system path where the corda.jar file of the + node can be found. This is used to execute database schema migrations + where applicable (H2 database in use in development environments). + maxLength: 2048 + minLength: 1 + nullable: false + type: string + nodeBaseDirPath: + description: The absolute file system path where the base directory of the + Corda node can be found. This is used to pass in to corda.jar when being + invoked for certain tasks such as executing database schema migrations + for a deployed contract. + maxLength: 2048 + minLength: 1 + nullable: false + type: string + required: + - cordaJarPath + - cordaNodeStartCmd + - cordappDir + - nodeBaseDirPath + - rpcCredentials + - sshCredentials + type: object + CordaRpcCredentials: + example: + hostname: hostname + password: password + port: 39501 + username: username + properties: + hostname: + maxLength: 65535 + minLength: 1 + nullable: false + type: string + port: + maximum: 65535 + minimum: 1 + nullable: false + type: integer + username: + maxLength: 1024 + minLength: 1 + nullable: false + type: string + password: + maxLength: 65535 + minLength: 1 + nullable: false + type: string + required: + - hostname + - password + - port + - username + type: object + CordaNodeSshCredentials: + example: + password: password + hostname: hostname + port: 5249 + hostKeyEntry: localhost ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmhSBtMctNa4hsZt8QGlsYSE5/gMkjeand69Vj4ir13 + username: username + properties: + hostKeyEntry: + example: localhost ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmhSBtMctNa4hsZt8QGlsYSE5/gMkjeand69Vj4ir13 + maxLength: 65535 + minLength: 1 + nullable: false + type: string + username: + maxLength: 32 + minLength: 1 + nullable: false + type: string + password: + maxLength: 4096 + minLength: 1 + nullable: false + type: string + hostname: + maxLength: 4096 + minLength: 1 + nullable: false + type: string + port: + maximum: 65535 + minimum: 1 + nullable: false + type: integer + required: + - hostKeyEntry + - hostname + - password + - port + - username + type: object + DeployContractJarsV1Request: + additionalProperties: false + example: + jarFiles: + - filename: filename + contentBase64: contentBase64 + hasDbMigrations: true + - filename: filename + contentBase64: contentBase64 + hasDbMigrations: true + cordappDeploymentConfigs: + - cordaJarPath: cordaJarPath + cordaNodeStartCmd: ./build/nodes/runNodes + cordappDir: cordappDir + nodeBaseDirPath: nodeBaseDirPath + rpcCredentials: + hostname: hostname + password: password + port: 39501 + username: username + sshCredentials: + password: password + hostname: hostname + port: 5249 + hostKeyEntry: localhost ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmhSBtMctNa4hsZt8QGlsYSE5/gMkjeand69Vj4ir13 + username: username + - cordaJarPath: cordaJarPath + cordaNodeStartCmd: ./build/nodes/runNodes + cordappDir: cordappDir + nodeBaseDirPath: nodeBaseDirPath + rpcCredentials: + hostname: hostname + password: password + port: 39501 + username: username + sshCredentials: + password: password + hostname: hostname + port: 5249 + hostKeyEntry: localhost ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmhSBtMctNa4hsZt8QGlsYSE5/gMkjeand69Vj4ir13 + username: username + properties: + cordappDeploymentConfigs: + default: [] + description: The list of deployment configurations pointing to the nodes + where the provided cordapp jar files are to be deployed . + items: + $ref: '#/components/schemas/CordappDeploymentConfig' + maxLength: 1024 + minLength: 0 + type: array + jarFiles: + items: + $ref: '#/components/schemas/JarFile' + nullable: false + type: array + required: + - cordappDeploymentConfigs + - jarFiles + type: object + DeployContractJarsSuccessV1Response: + example: + deployedJarFiles: + - deployedJarFiles + - deployedJarFiles + properties: + deployedJarFiles: + items: + minItems: 1 + nullable: false + type: string + type: array + required: + - deployedJarFiles + type: object + DeployContractJarsBadRequestV1Response: + properties: + errors: + items: + maxItems: 2048 + maxLength: 65535 + minItems: 1 + minLength: 1 + type: string + type: array + required: + - errors + type: object + InvokeContractV1Request: + additionalProperties: false + example: + flowInvocationType: null + timeoutMs: 0 + flowFullClassName: net.corda.samples.obligation.flows.IOUIssueFlow + params: + - jvmCtorArgs: + - null + - null + jvmType: + constructorName: constructorName + invocationTarget: null + fqClassName: fqClassName + primitiveValue: "{}" + jvmTypeKind: null + - jvmCtorArgs: + - null + - null + jvmType: + constructorName: constructorName + invocationTarget: null + fqClassName: fqClassName + primitiveValue: "{}" + jvmTypeKind: null + properties: + flowFullClassName: + description: The fully qualified name of the Corda flow to invoke + example: net.corda.samples.obligation.flows.IOUIssueFlow + maxLength: 1024 + minLength: 1 + nullable: false + type: string + flowInvocationType: + $ref: '#/components/schemas/FlowInvocationType' + params: + default: [] + description: The list of arguments to pass in to the contract method being + invoked. + items: + $ref: '#/components/schemas/JvmObject' + nullable: false + type: array + timeoutMs: + default: 60000 + description: The amount of milliseconds to wait for a transaction receipt + beforegiving up and crashing. + minimum: 0 + nullable: false + type: integer + required: + - flowFullClassName + - flowInvocationType + - params + - signingCredential + type: object + InvokeContractV1Response: + example: + callOutput: "{}" + success: true + progress: + - progress + - progress + flowId: flowId + transactionId: transactionId + properties: + success: + nullable: false + type: boolean + callOutput: + description: Data returned from the JVM when no transaction is running + type: object + transactionId: + description: The net.corda.core.flows.StateMachineRunId value returned by + the flow execution. + maxLength: 1024 + minLength: 1 + nullable: false + type: string + progress: + default: [] + description: "An array of strings representing the aggregated stream of\ + \ progress updates provided by a *tracked* flow invocation. If the flow\ + \ invocation was not tracked, this array is still returned, but as empty." + items: + minItems: 0 + type: string + type: array + flowId: + description: The id for the flow handle + type: string + required: + - callOutput + - flowId + - success + type: object + StartMonitorV1Request: + additionalProperties: false + example: + stateFullClassName: net.corda.samples.example.states.IOUState + clientAppId: frond_v1_x_7Hdg6s + properties: + clientAppId: + description: ID of a client application that wants to monitor the state + changes + example: frond_v1_x_7Hdg6s + maxLength: 1024 + minLength: 1 + nullable: false + type: string + stateFullClassName: + description: The fully qualified name of the Corda state to monitor + example: net.corda.samples.example.states.IOUState + maxLength: 1024 + minLength: 1 + nullable: false + type: string + required: + - clientAppId + - stateFullClassName + type: object + StartMonitorV1Response: + example: + msg: msg + success: true + properties: + success: + description: Flag set to true if monitoring started correctly. + nullable: false + type: boolean + msg: + description: Message describing operation status or any errors that occurred. + nullable: false + type: string + required: + - msg + - success + type: object + GetMonitorTransactionsV1Request: + additionalProperties: false + example: + stateFullClassName: net.corda.samples.example.states.IOUState + clientAppId: frond_v1_x_7Hdg6s + properties: + clientAppId: + description: ID of a client application that wants to monitor the state + changes + example: frond_v1_x_7Hdg6s + maxLength: 1024 + minLength: 1 + nullable: false + type: string + stateFullClassName: + description: The fully qualified name of the Corda state to monitor + example: net.corda.samples.example.states.IOUState + maxLength: 1024 + minLength: 1 + nullable: false + type: string + required: + - clientAppId + - stateFullClassName + type: object + GetMonitorTransactionsV1Response: + example: + msg: msg + tx: + - data: data + index: index + - data: data + index: index + success: true + stateFullClassName: net.corda.samples.example.states.IOUState + properties: + success: + description: Flag set to true if operation completed correctly. + nullable: false + type: boolean + msg: + description: Message describing operation status or any errors that occurred. + nullable: false + type: string + stateFullClassName: + description: The fully qualified name of the Corda state to monitor + example: net.corda.samples.example.states.IOUState + maxLength: 1024 + minLength: 1 + nullable: false + type: string + tx: + default: [] + items: + $ref: '#/components/schemas/GetMonitorTransactionsV1Response_tx_inner' + type: array + required: + - msg + - success + type: object + ClearMonitorTransactionsV1Request: + additionalProperties: false + example: + txIndexes: + - txIndexes + - txIndexes + stateFullClassName: net.corda.samples.example.states.IOUState + clientAppId: frond_v1_x_7Hdg6s + properties: + clientAppId: + description: ID of a client application that wants to monitor the state + changes + example: frond_v1_x_7Hdg6s + maxLength: 1024 + minLength: 1 + nullable: false + type: string + stateFullClassName: + description: The fully qualified name of the Corda state to monitor + example: net.corda.samples.example.states.IOUState + maxLength: 1024 + minLength: 1 + nullable: false + type: string + txIndexes: + default: [] + items: + type: string + type: array + required: + - clientAppId + - stateFullClassName + - txIndexes + type: object + ClearMonitorTransactionsV1Response: + additionalProperties: false + example: + msg: msg + success: true + properties: + success: + description: Flag set to true if operation completed correctly. + nullable: false + type: boolean + msg: + description: Message describing operation status or any errors that occurred. + nullable: false + type: string + required: + - msg + - success + type: object + StopMonitorV1Request: + additionalProperties: false + example: + stateFullClassName: net.corda.samples.example.states.IOUState + clientAppId: frond_v1_x_7Hdg6s + properties: + clientAppId: + description: ID of a client application that wants to monitor the state + changes + example: frond_v1_x_7Hdg6s + maxLength: 1024 + minLength: 1 + nullable: false + type: string + stateFullClassName: + description: The fully qualified name of the Corda state to monitor + example: net.corda.samples.example.states.IOUState + maxLength: 1024 + minLength: 1 + nullable: false + type: string + required: + - clientAppId + - stateFullClassName + type: object + StopMonitorV1Response: + example: + msg: msg + success: true + properties: + success: + description: Flag set to true if operation completed correctly. + nullable: false + type: boolean + msg: + description: Message describing operation status or any errors that occurred. + nullable: false + type: string + required: + - msg + - success + type: object + ListFlowsV1Request: + additionalProperties: false + example: + filter: filter + properties: + filter: + type: string + type: object + ListFlowsV1Response: + example: + flowNames: + - net.corda.core.flows.ContractUpgradeFlow$Authorise + - net.corda.core.flows.ContractUpgradeFlow$Deauthorise + - net.corda.core.flows.ContractUpgradeFlow$Initiate + - net.corda.finance.flows.CashExitFlow + - net.corda.finance.flows.CashIssueAndPaymentFlow + - net.corda.finance.flows.CashIssueFlow + - net.corda.finance.flows.CashPaymentFlow + - net.corda.finance.internal.CashConfigDataFlow + - net.corda.samples.obligation.flows.IOUIssueFlow + - net.corda.samples.obligation.flows.IOUSettleFlow + - net.corda.samples.obligation.flows.IOUTransferFlow + - net.corda.samples.obligation.flows.SelfIssueCashFlow + properties: + flowNames: + default: [] + description: An array of strings storing the names of the flows as returned + by the flowList Corda RPC. + example: + - net.corda.core.flows.ContractUpgradeFlow$Authorise + - net.corda.core.flows.ContractUpgradeFlow$Deauthorise + - net.corda.core.flows.ContractUpgradeFlow$Initiate + - net.corda.finance.flows.CashExitFlow + - net.corda.finance.flows.CashIssueAndPaymentFlow + - net.corda.finance.flows.CashIssueFlow + - net.corda.finance.flows.CashPaymentFlow + - net.corda.finance.internal.CashConfigDataFlow + - net.corda.samples.obligation.flows.IOUIssueFlow + - net.corda.samples.obligation.flows.IOUSettleFlow + - net.corda.samples.obligation.flows.IOUTransferFlow + - net.corda.samples.obligation.flows.SelfIssueCashFlow + items: + minItems: 0 + type: string + type: array + required: + - flowNames + type: object + NetworkHostAndPort: + example: + port: 0.8008281904610115 + host: host + properties: + host: + type: string + port: + type: number + required: + - host + - port + type: object + PartyAndCertificate: + type: object + PublicKey: + description: An instance of a java.security.PublicKey (which is an interface) + implementation such as org.hyperledger.cactus.plugin.ledger.connector.corda.server.impl.PublicKeyImpl + example: + format: X.509 + algorithm: EdDSA + encoded: MCowBQYDK2VwAyEAac1p4wLsAh70VJOcudQppu7NnKxyoKxVN0DbfTxF+54= + properties: + algorithm: + example: EdDSA + type: string + format: + example: X.509 + type: string + encoded: + example: MCowBQYDK2VwAyEAac1p4wLsAh70VJOcudQppu7NnKxyoKxVN0DbfTxF+54= + type: string + required: + - algorithm + - encoded + - format + type: object + X500Principal: + example: + name: "O=PartyA,L=London,C=GB" + encoded: MC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QQ== + properties: + name: + example: "O=PartyA,L=London,C=GB" + type: string + encoded: + description: Base64 encoded public key + example: MC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QQ== + type: string + required: + - encoded + - name + type: object + CordaX500Name: + example: + commonName: commonName + country: GB + organisationUnit: organisationUnit + locality: London + x500Principal: + name: "O=PartyA,L=London,C=GB" + encoded: MC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QQ== + organisation: PartyA + state: state + properties: + commonName: + type: string + organisationUnit: + type: string + organisation: + example: PartyA + type: string + locality: + example: London + type: string + state: + type: string + country: + example: GB + type: string + x500Principal: + $ref: '#/components/schemas/X500Principal' + required: + - country + - locality + - organisation + - x500Principal + type: object + Party: + example: + owningKey: + format: X.509 + algorithm: EdDSA + encoded: MCowBQYDK2VwAyEAac1p4wLsAh70VJOcudQppu7NnKxyoKxVN0DbfTxF+54= + name: + commonName: commonName + country: GB + organisationUnit: organisationUnit + locality: London + x500Principal: + name: "O=PartyA,L=London,C=GB" + encoded: MC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QQ== + organisation: PartyA + state: state + properties: + name: + $ref: '#/components/schemas/CordaX500Name' + owningKey: + $ref: '#/components/schemas/PublicKey' + required: + - name + - owningKey + type: object + NodeInfo: + example: + legalIdentities: + - owningKey: + format: X.509 + algorithm: EdDSA + encoded: MCowBQYDK2VwAyEAac1p4wLsAh70VJOcudQppu7NnKxyoKxVN0DbfTxF+54= + name: + commonName: commonName + country: GB + organisationUnit: organisationUnit + locality: London + x500Principal: + name: "O=PartyA,L=London,C=GB" + encoded: MC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QQ== + organisation: PartyA + state: state + - owningKey: + format: X.509 + algorithm: EdDSA + encoded: MCowBQYDK2VwAyEAac1p4wLsAh70VJOcudQppu7NnKxyoKxVN0DbfTxF+54= + name: + commonName: commonName + country: GB + organisationUnit: organisationUnit + locality: London + x500Principal: + name: "O=PartyA,L=London,C=GB" + encoded: MC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QQ== + organisation: PartyA + state: state + addresses: + - port: 0.8008281904610115 + host: host + - port: 0.8008281904610115 + host: host + serial: 1.4658129805029452 + platformVersion: 6 + legalIdentitiesAndCerts: + - null + - null + properties: + addresses: + items: + $ref: '#/components/schemas/NetworkHostAndPort' + type: array + platformVersion: + type: integer + serial: + type: number + legalIdentities: + items: + $ref: '#/components/schemas/Party' + type: array + legalIdentitiesAndCerts: + items: + $ref: '#/components/schemas/PartyAndCertificate' + type: array + required: + - addresses + - legalIdentities + - legalIdentitiesAndCerts + - platformVersion + - serial + type: object + NetworkMapV1Request: + type: object + NetworkMapV1Response: + items: + $ref: '#/components/schemas/NodeInfo' + maxItems: 2048 + minItems: 1 + nullable: false + type: array + DiagnoseNodeV1Request: + additionalProperties: false + example: + nodeIds: + - nodeIds + - nodeIds + - nodeIds + - nodeIds + - nodeIds + properties: + nodeIds: + default: [] + description: "Optional property specifying which Corda Node should be the\ + \ one being diagnosed in case the Connector has multiple connections established\ + \ for different nodes (which is not yet a supported feature, but we want\ + \ to keep this possibility open for the future)." + items: + nullable: false + type: string + maxItems: 1024 + minItems: 0 + type: array + type: object + DiagnoseNodeV1Response: + example: + nodeDiagnosticInfo: + vendor: vendor + platformVersion: 1 + version: version + cordapps: + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + - licence: licence + targetPlatformVersion: 6 + vendor: vendor + name: name + jarHash: + offset: 0 + size: 32 + bytes: Vf9MllnrC7vrWxrlDE94OzPMZW7At1HhTETL/XjiAmc= + shortName: shortName + type: type + version: version + minimumPlatformVersion: 0 + revision: revision + properties: + nodeDiagnosticInfo: + $ref: '#/components/schemas/NodeDiagnosticInfo' + required: + - nodeDiagnosticInfo + type: object + PrometheusExporterMetricsResponse: + nullable: false + type: string + GetMonitorTransactionsV1Response_tx_inner: + example: + data: data + index: index + properties: + index: + type: string + data: + minItems: 0 + type: string + type: object diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json index 2c36393a82..478e1bd3d6 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Connector Corda", "description": "Can perform basic tasks on a Corda ledger", "version": "0.3.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES index 3b099a4f68..935e06c407 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES @@ -16,7 +16,7 @@ docs/DiagnoseNodeV1Response.md docs/FlowInvocationType.md docs/GetMonitorTransactionsV1Request.md docs/GetMonitorTransactionsV1Response.md -docs/GetMonitorTransactionsV1ResponseTx.md +docs/GetMonitorTransactionsV1ResponseTxInner.md docs/InvokeContractV1Request.md docs/InvokeContractV1Response.md docs/JarFile.md @@ -44,7 +44,7 @@ settings.gradle src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt -src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt +src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt @@ -52,6 +52,7 @@ src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt @@ -73,7 +74,7 @@ src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Response.kt src/main/kotlin/org/openapitools/client/models/FlowInvocationType.kt src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Request.kt src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Response.kt -src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1ResponseTx.kt +src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1ResponseTxInner.kt src/main/kotlin/org/openapitools/client/models/InvokeContractV1Request.kt src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt src/main/kotlin/org/openapitools/client/models/JarFile.kt diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/README.md index 1ea566bdad..bc506f6c6a 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -1,9 +1,18 @@ # org.openapitools.client - Kotlin client library for Hyperledger Cactus Plugin - Connector Corda +Can perform basic tasks on a Corda ledger + +## Overview +This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client. + +- API version: 0.3.0 +- Package version: +- Build package: org.openapitools.codegen.languages.KotlinClientCodegen + ## Requires -* Kotlin 1.4.30 -* Gradle 6.8.3 +* Kotlin 1.7.21 +* Gradle 7.5 ## Build @@ -28,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -47,7 +56,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**stopMonitorV1**](docs/DefaultApi.md#stopmonitorv1) | **DELETE** /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor | Stop monitoring corda changes (transactions) of given state class - + ## Documentation for Models - [org.openapitools.client.models.ClearMonitorTransactionsV1Request](docs/ClearMonitorTransactionsV1Request.md) @@ -65,7 +74,7 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.FlowInvocationType](docs/FlowInvocationType.md) - [org.openapitools.client.models.GetMonitorTransactionsV1Request](docs/GetMonitorTransactionsV1Request.md) - [org.openapitools.client.models.GetMonitorTransactionsV1Response](docs/GetMonitorTransactionsV1Response.md) - - [org.openapitools.client.models.GetMonitorTransactionsV1ResponseTx](docs/GetMonitorTransactionsV1ResponseTx.md) + - [org.openapitools.client.models.GetMonitorTransactionsV1ResponseTxInner](docs/GetMonitorTransactionsV1ResponseTxInner.md) - [org.openapitools.client.models.InvokeContractV1Request](docs/InvokeContractV1Request.md) - [org.openapitools.client.models.InvokeContractV1Response](docs/InvokeContractV1Response.md) - [org.openapitools.client.models.JarFile](docs/JarFile.md) @@ -87,7 +96,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.X500Principal](docs/X500Principal.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/build.gradle b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/build.gradle index 3de8b45b13..66a3c68b89 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/build.gradle +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/build.gradle @@ -2,12 +2,12 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.3' + gradleVersion = '7.5' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.7.21' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -18,6 +18,7 @@ buildscript { } apply plugin: 'kotlin' +apply plugin: 'maven-publish' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -30,8 +31,8 @@ test { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "com.squareup.moshi:moshi-kotlin:1.12.0" - implementation "com.squareup.moshi:moshi-adapters:1.12.0" - implementation "com.squareup.okhttp3:okhttp:4.9.1" + implementation "com.squareup.moshi:moshi-kotlin:1.13.0" + implementation "com.squareup.moshi:moshi-adapters:1.13.0" + implementation "com.squareup.okhttp3:okhttp:4.10.0" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/DefaultApi.md b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/DefaultApi.md index 3a66874e7f..ead1f1e7bd 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/DefaultApi.md +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/DefaultApi.md @@ -16,7 +16,7 @@ Method | HTTP request | Description [**stopMonitorV1**](DefaultApi.md#stopMonitorV1) | **DELETE** /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor | Stop monitoring corda changes (transactions) of given state class - + # **clearMonitorTransactionsV1** > ClearMonitorTransactionsV1Response clearMonitorTransactionsV1(clearMonitorTransactionsV1Request) @@ -61,7 +61,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **deployContractJarsV1** > DeployContractJarsSuccessV1Response deployContractJarsV1(deployContractJarsV1Request) @@ -106,7 +106,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **diagnoseNodeV1** > DiagnoseNodeV1Response diagnoseNodeV1(diagnoseNodeV1Request) @@ -153,7 +153,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **getMonitorTransactionsV1** > GetMonitorTransactionsV1Response getMonitorTransactionsV1(getMonitorTransactionsV1Request) @@ -198,7 +198,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **getPrometheusMetricsV1** > kotlin.String getPrometheusMetricsV1() @@ -237,9 +237,9 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: text/plain + - **Accept**: Not defined - + # **invokeContractV1** > InvokeContractV1Response invokeContractV1(invokeContractV1Request) @@ -284,7 +284,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **listFlowsV1** > ListFlowsV1Response listFlowsV1(listFlowsV1Request) @@ -331,7 +331,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **networkMapV1** > kotlin.collections.List<NodeInfo> networkMapV1(body) @@ -378,7 +378,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **startMonitorV1** > StartMonitorV1Response startMonitorV1(startMonitorV1Request) @@ -423,7 +423,7 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json - + # **stopMonitorV1** > StopMonitorV1Response stopMonitorV1(stopMonitorV1Request) diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/GetMonitorTransactionsV1Response.md b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/GetMonitorTransactionsV1Response.md index 0cb77b1b6f..4074ea8a77 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/GetMonitorTransactionsV1Response.md +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/docs/GetMonitorTransactionsV1Response.md @@ -7,7 +7,7 @@ Name | Type | Description | Notes **success** | **kotlin.Boolean** | Flag set to true if operation completed correctly. | **msg** | **kotlin.String** | Message describing operation status or any errors that occurred. | **stateFullClassName** | **kotlin.String** | The fully qualified name of the Corda state to monitor | [optional] -**tx** | [**kotlin.collections.List<GetMonitorTransactionsV1ResponseTx>**](GetMonitorTransactionsV1ResponseTx.md) | | [optional] +**tx** | [**kotlin.collections.List<GetMonitorTransactionsV1ResponseTxInner>**](GetMonitorTransactionsV1ResponseTxInner.md) | | [optional] diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradle/wrapper/gradle-wrapper.jar b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..c1962a79e29d3e0ab67b14947c167a862655af9b 100644 GIT binary patch delta 42507 zcmaI-V{j&6*EI~swr$(S#I|kQ&KYN7+qQMaww+8g(Zn_;dFMf0&wW*W_5J8Nc6G0= z{&^pq_qDT|L!0|fPjEFxmq!UgZw|# zCg%Tnm;wPxh>ZaP0t538Bmxp~y6!~{2LfV<4FW=!Qe=jea=7T7(@>WNI71qi|2~Fud_Kes>`?_XEIU~Bjw9}Pz0-wkP*b5sy}0%Dd42CUvwfb)1|u4J1Yf1a6lUqrFW1Esajt?}`3! z?vIAPb-^qcpvDxa{H;c(duM~meZU^*uZbpbG(HR`L@g}LjND&%fa>1_XEam-N0gFj zl+FPA1=mNH(NOiu*H?6q^O_#wRP*yUKUhrn`!7DSJSk*J{*QRim+K3GUw(!C6<+;6 zNL=#*b)BLv0F(Ral@6oH!~76`I&vmc>!`29d<7g}!el4-`98LM$?^z!g`RX$YmlDZ zpHB*>;R`9nG5O6VGkfI<8MfV}2i6^tRCE<6(m9?h(8m#LjD(4}OOyW;5($^;v3Aab z1w2bLP&P7|>JBpwrwd_l>y9x5xUV$ocI94~cy%Zx04QxznFo!6CHBe7sQ8yW>@q*k z1>+%C7*6Qj)8SS?AP6yvunr4awoB)@$96Sc!sy+ajBSo7q97bl^u zH76=8pCEaR$k}O~v#DN!k?`dTR@rBNDQlMTUb77;n6u;NI>aypX&nss(?tsrq)>ldjT11|RyX>gjMxgg=D8}9BLduYT37v!D= z+Nqe>=(VNz&~7}feB@BxOl{genYPQ%C(SB)d{s@6wk%qbDCFjaTFzuX0@se|SvPf~-m5`|IX)xvEQKe!6!(YkR&HI^y zPQ~LT_ow9)E~jmIoyc%qg#;yJuMC{|u1{lTbWKDc!HP4+x*bmpJ6`-DLLQ4AuI;N( zAmGP0wihVXl|CP$n8=DQwu4zV0(X3)CdVg=u<9)^g7}bngqKn|kdBbuKA7=aD$nkf zHn4pEKtlGb6O#1vr!eWfZQmE|BZA>DrWS|5o`)6P8&K#U`oyD&9#&C(fI* z%qfp%7xzO$C`vi3z`a-%wVJ9rto-L&b|n^Pbmgje9t=&fAv*ksDAhW`v3Q3(H9*>k z&t@D=@>==cs5EL+6@Cwvt|5w&jHa>1K#59$pTm4%0^$%CFI9p^77(tOsY!E@f>I%W z8fHNy8cOhU{3#XHRzJsfTRkzgcf5fe%0YnvbGj6G9Iagxm39Co5ysI3x88C!qkomH z%{Ya*SQy1=%DAjnt0rDTHH5Z70Z0jF2vO20Qnh5qKW>c`Shs$QPubxh;vPq$Qliqy z>Q!5|Q2^R7kv9#^u=TFEInNIibFaTx4x2>Bo>p<$@#L{2KigLyziKKfP*a`!N{-O7 zjm?ETo(nLpU-L$~6kw}RYqUeg_x!rlX5-|Sl>#RBn!sFUiN(wv4tX}00IIB+8wccK zd!9>`kfnL{)Bb!*5Cww-!@tTSneo^x5b;=8+i**d2r zH0qa0ms9bo+EfLOD!pZa1MS!*E2m;U+OS80|6nIJx6qd?P_ZBxu$NrHXU0ucA$?t+ z(+%4VPT5@IJRrWI?y!u@A(44+*h8_W^OroGmx{SP-pl;8IFvl%A(2(F?1_i4m4$dO zuZcgqo(gPBMbzqdyPx;>Pv|(UBP`zqS%q!dZ1X>p(;;g1>SgvD&Xy`gGHO_V$WuHD zF=Wde*guFo*fc_-0ahk5^A$!s@D+cGE5_W%6`5aaA1Jta*Jlw^l!)l^|B{DkyG1_or!0+)`#YugeZYT zWToN#A^pd*hnZd-p{|*B;ou1SHu{{{py0sl{xqHtyPp!KfIE=1Y^4n|befpjf*>d2 zjQhVSl{h$&OXu+KY`4Tn?^E+7u7wQBn1r{Gt=3Qv?3MXY>(b735XAZ7gtXvw$Ahji zdc=>MR*i*ireN@TX@#QJqZC-E7A{b7Y%owh&8@5R=-*?o3@Ka3b!qrijl~*>)ws3x zb=hG!Fq%+I0GO~44cuD1@pDbaN-m}1;NOK@QJmluMB~3)YIDTNeInVdv!BI@v78-B z4~JWOVOO;iMmK^mH-5%6!R`PPL4iN>e}$NBz=3D{MrhyPv>sL1h{|b#?=a?ew0gZB zA`*!1jn^u;@kLS^Z&TDJ-e11P5j2R3EPSvdq7ps3!f?)SjfJavaNabO=Wp@-$vw31@4`}#dJAQ3!^ zYmYlVI(k{`bBT4baTk|o@xqhGm(c$glxlemfobyh5<9_e4{cNztgGV45>{0&$2 ztOZe@>c}t+{|+-c)|l#FzSFrhsi{2sDZG)&06m^YM&)XfT~vBe=F|`vZDr77T^g9= z-~D9<7owY#TN3_|1w&c`;-RvppA~mmu`Y9t!E37RIB4Iw(=)kFeZ2haet}g*K)a z07)xx_6&9tS-EI(Co3CaeQlI>S*6vqG0jO@u@E{5mD#pJ=9%ZNT;E$mXjajeXgf6s z`LKc|EF7?dLvw3grnM6nyvY#BzPfXDQxSB}kVR4p7C@foCG}XD)rp*G{tHNHsJ+;7 z+A(p(xf9H0Joh6U0ocfc$MOV5C1CbFKpF?n-C;8ok-g2Kx@(MeaKXO8L93Jl_Ci9- zRVTfB(wnpbQqTUGR<4P(n0s@Jg?00i6r zwj}GY3OOb7AoJM-ss-UnQEQmxQu?T~z3Qy{7wp@Drp)oMhCcepAKD~B!WoSqr@GRg znpwu4U@A74PLOqwtfe?mUsYq(QIpR+?ezGvHu7m00ana-QvoLoe4McMR$wu^y0drmT6`B3`S&fgcNWL6>){C^j6PS@u@0~hP9k0a#VnHQ9j zJeOO&mM`JMg@-WVq@MQ!mHe=Et?e=RxMJ|Qpqb^0)6DBi$^G<)Fb8y10DGjk!yfmR zC4D8>VUd3p7odScgXnLuc-VbKo}}-D!Qi)TEH>w&_QX$q(1~kEzYXA}tS@4S=h^1x{6z1bS#KqjGS}T>0>xUh-{PQDkiT5{}oLvSz~7D zhBH?y#pKzJ&L@;IqA%Q#*G-}iJc=&K8OUmb)47Y$$lQ+lh||Rp1j;|~bUKt;Y2wQ` zF8D8#@7D+2t}jOMK#}fhxloW0>A4g$8Ctr;`srtu@SY`o{ht{9PmlvWj0;kBq7?w` zl_Wx15W)1$LD6Jm;RLU_{wqFFdGa{igjJX zW?8iF&1b7+3_Tob4*1r{neaV5T-E_r`J^7psPTXp6K{^)fZCZv{l{vEdD`K7%YfPR zgtu(D^b*R3p&ho2_$4v3CBQKUPIJe4fS!>5A%DK|c`{17zPnF}Ns8@N96=N=1!-jQ z2knJ_UcXU`mOs3xba@z;98U$D-JG#zxi3lPkaTEZbC5~^7 zD?1(IyZW##v}>gHokVNX>YJa*7p@Y6-+>ZmRzI8esk)wjk2M8h25vf%^Z4DySs`+3 z9WAHwIwGMtd}z~w!&G#@yh_00-XHcVx*4+2TD*GmMMSZ2jfhU|cl0LG9FvK!zTfj!a*@!kJWDb1wxO7f+=2Hpi-!`5EbzkPY4}ZpzgU_86nY z4JwUcRJ;Td5&nXbnBJg4Lo%uMuX6r-9w><9A-4B_t_71lJWjJ7ux7+TOp zh-07z8v{{{jD>CuEhc{ zKy^zKr!QVs)#)?hk&^Y#(uJ4`@~ zdpTh;Tkoe`#m$10O@$u?^yLQ0@}&H~0+BD+y%+ea<(KgH+Zi^9n>WQF!%~H{b}DNa zhm>YS7$q*QKB6h^I!}GfEZlgtayO|MV2p2k7R1qIJKY7EcnW6#N=i`@Cx^f%-VfpL z^SY!U-!Myhjn1+9rm7d6uWSuYRhw>Gbv8fm@XAeHLIU#5v`w)}jT+EkMvNNLXmhI^ZOvu65gXj$$wAXBt<}QSI`0a@fax@sLoO#5k;=}pDSRPINlt+2rcT?-L|NWphcPN@QESL|z0hX;o( z^@ez41mt$*G^ckSrW}1j5uBnmfaguMQf|Vuit$DOxz91-P;H7|pB1}lCgw1KSZjtK zf@{%QBgYhOQsOWn-*Si_J|bjvk<1hh!sLi zem+rVx8+sUCMEkku}A4|urY{gX50fQe(k2IxN65=7xNswS#xj`8EHurut0+BU)t@G$PIj$oWLBco=KoM{uLusOeWfW~3oVCzDowb^0#S zX=P|);8O)L28-(5yXo0G* zT64`IBBqXIN8ZPyL&N38X<4_?@0jC}4~_05HCrRi zTIVw4VgF8^F!j2K$t%2HxJSnB8{RwP<2$BnM5dNZw09Y$O`ib+Z8S$S@Ku}cBbQ-tt`7HhB!AcR3vt@WN%TDS@a&D;%xJ8^`Avy7HndT(#SRhl5Ug%l;YWmfs2 zlzwrB@Op#P>+cXt_W@6QCmnP=Z`;5L!8kz%!Sl#DTRo4F)oxQ$(2I?sL{Oh`#Lxq& z>;sVE{RrV;1!*2etq4TCpa*IZ(#jdTxM1!#`DEn0&6j90;rIV(qyDFo-8$T&$$^1@ z-2CgHN~Sag5~djML#L=EGXh%vYFFx2K~@*TkjeI&7cq~u+N@AfDV$5G4t=x|p8sy% znsJN*jD9a*8?oFCzFsKVWt&W znI=c)=QH3?;Zk8$v5@92r4OYNE7s;Smu~L~Hr76u*6JZDcnstFEeMEYdy8K`nIqLw zEjTo1^QI1nh{Jl3*m?@TnEsI;?O0gKZ|_4*Uhn;z7OLi|OSFyP`XdC+&|QGDH8L8R zz~qI{2K_m#8+_-9QL9gR%Z=s&!BSXY5r=u!LeU?dL)G-)az`7JD4DIiCufq z!B1;az9{3w2!9Mef4=soP1YRB(Q2Cox!<)d{84+G9Ioh17cM`^Q7+=v7_ zO_s1FH6CXvO{@z}%@-%jCuqv23QYWq zITm>t()|?w-k6U3Em$xJF>Tj>i%?Gsw31f(A|u0Zn+_(>PLRo0q?t001*Keowaqma$Bn)wqdiq0tv-jy9UTl9 z!(GRPP#2eQ9z85tQ@n3@XG{hNs<$#-r;|ycL1mlnLhKmiK2fa%WrB08w$(} zlcNzGUyXZz+`$P12cYGfFAB@Pri4{MVAySNGPJC>A*K*~z^ibbD4(`Wb9i*KR{?nA zuVGq882kz?2G-DIdMWccbouIvNN43o5Y+m`S_pRxlj#91KQ=l@oOdk518@)Oe_BOB ziVL7e5s0ACy6MlZQVJ+6^}+YbqgXRt+aU>e^A%I7`A zJeEdyo<8sVil3`eBtN~kCX4!Ubsb_op384Rw=A6lL{D>P;d92|ZCduU$W zG1>ZM$mFu?D>4|TT~Y|j2nR?n(I}b*gomU7MFy!xAn=&36!~D+ZlW$k)U_bC6l8vB z{nb;gtMNEr2`l5Tw&|>{xmwehRbQUmlGjq>^5MSOC>x(_=|6C~+zo_eJ_s84g`~C` z8L`ug%j%)-wqmk{$BO1Fx?{6x`-xVbLrI|S48u%&IwlFpOkVyQa|A#^fTeAKapgGd zLX+|7UqlYAHTW6g{`{s9texNi8DCuz!Cy(`PVIkho}5E z4-$yM#G zFx#ds)mzjt2uI-1g({%XAv-*unxg}x&PI|u;>V%OC3nPV)YzS1Q%J_^B9Eu37PYn3+`r-TpioHUyGE3=?p3oWY>S0vwy zKg=1EGAZ)7#2kvFyQHMpY~n2OU_A6Do!8uKjJWDP-Qeu=JmCSrWWB8JtuFh&u=*NC zD0y&qmtk4Lyn&0Tx>lz0rlOMl?45CkSC$}H#Hiy$vWiYQSu-ynt0 z>^kaI?K47E9Bu;yu6p_4XQs##f7T)EkY`2L_Udmec|VDi88NB6tEflNT_?9zA4s0f zuF&^p{VL;DqYocYXk{9lg;|y+%%r&z_el>FPh0Hapi?ZN@Wm?oTY-uvrqgPIuy1{c zQ)<18L$(Mh&LDhz_DUHSLjrn$nHrU$Op9dJ=Z(pE0D}dHSy!ev9A_M9Sz3=patGUu z7R20*4q&{~ymYAQFa?OU_9I<@-^3?k{yC3|7ZVB#w^CU&Dhm@Dto>R#m4bN*jNPnY zJ<%WLp&xFB!F z%an`Q$Un&Tj#QoX53Z)aMDRW$QG;@nbVI>_F8=Hc25fEK#0b@ly9oO#{Fyfc6)AU zPl-p(sotQ-yaB`IhY)e z0mrvQQ?5ft>!B(I#l5VPt7W}kjuE|YL3b8=VzhaCfqi&01PSL9HQlUo z5dxobF5BE-*;zLo{*$t-VWqZVH`JC&L`e1Ng;l}-ICL){wH3O9p1_R9q(m*fqyL95%N666x(VGIx>F2MYw;#anbL%Zn`Hc+p-o`JT}o;B zU~)ueHcA0P^K)t&&bL)`YovD5Bl;borkOnwS3*lgq|kkl8oJf1JrBpYPCAM-oZKgW zWD-mlj!2uS4K^Uki7|idMP$o?pl)>0nFt#U$w_9!XYP&{{1F>K(ihXWbi~wp6X{$4 zrq9G-zyD62o9v!$%3$=5$n;@TW@;MGvHIY=cQTHgdFNoh^0%qM19oO9` zm9#wrZ0>o*GGn^rf%MXhE|-YoLL@(lWu60>yMD(ely55KoUfVnU1>?v^D?S%t~1z_ zb}7zFOAx|Rc;t@d#sdO#mt4??>Hc_Z4~0Za5Xxy=X2Q>yABS5-bIJh?t2FM05kh;n zRj;^)AMbcxE+i0F_!TBaTDSp2`E2rkv@tP~qO z5fd53IC(`+0t>q`aVRc^1C8@N((U3Bv6t91#7J*s7|_$6x8g`XWWb+t7*@bo)B-E$ z00;HK*H{*nC&1!VAL%_(m0)GgQZnk4z&lZt;0RZM+Q&wqUR9M0RJv5^tmi2fk_UX> zwZ^X+7z?5*^&S+-Eg7R>UR^|4a>e-;*`KCR^)&b2X2#hlthx^rt|bOBr%wOvlL*Zz zhTZ>CZ1uks%l&^>imY5s%hvDKcdu;3xsOEpcVup#KBR%Rqfu_3u0FkpBin{{ed+A^_6VzZKC% zP`;jhuhI^!?NCu9Bp8;67^P4FA=b65tYn#mIG;{7%*VIB>)V8q#G}-=M$!;y3jQF( zQ#{>_Fs(90GFDcWR()@lmRrIAz!wxtq*VY;P*qCiT9T+rW*LR0`*u*7iDqO(F^UE0 zpJX7t=?Uld`fU*DSSX*EC%`8M@F#t`x2p{cGG5EbSo(E#;!aQ%i*PWd8!nk%Sgb|0$$S0prU7sj| zYe#oFP`TqAw4t+I!-KHqfE#bSCJN2T2j!Q@wYd;yV)fP{Jhgq-C*T6kNjY!&O|(N2 zdX3ER?_&fvB_Sd*ZgSFI*V^sR{in|N>)8eds}lb#%wmQS0x^2TOTKNTK zkFsAO%csA9eSdBsG(O76(^_Spenxv|?wXJ-BS&cUs&XSGMj`9vGa9ei4sr52l~KICms)!aR#u z!^#=6SVBuFC$r^Ot3Mq(f{?Vjt?9P~kBA{ebUOIv zqo?vYkw3GRKa^(=gf{Z!36pK;2GlDV;)T+GMBCs{eS6a*k^_Kn(h8|2s_5YuOE&md zY(=fX5)aTT_Mae8PBc*CeKL)i!LC4`6UyW-jxh4RRiT+Wnmb~<%lHVJ7y30 z0yt?>ZaCk~Ob-lNVYS_(2Y@~xW-q{QEY)`i)t>NF)Vw`g>IPK<4U(MYQ85}nt0mIq zSHvu;nGl6f(aa zeCjik$3+o7oeFC!jfF-3rX3vy{M*LLaHE7!ZRb}y2*Vy*ZTaoU058Vx&J7P5cGZ{c zp-t32#zRL{#Fwie((V9^U-?@w0b33ly~E`DF$)j4vDp{8fvcz@#;A^U*Kdq1$1#HA zY&r1`XwS+(zvfN$edzRp{w~#U5j#m#&OF)`iILa*SCmr4bdcUvhCBUdXkU+W!lVhehtZXEKdR%M0ioNc_g; z5UV!n&_``AL%IN%E+aXNf70&y-dy6V%Q|^G^xFuwA6swcdp_JJf`Z$C%W40M0FxHx z@oJdbY{EbhlQu)dV$F(a=J~hM0;LN> z2j;cZe1zjK^L}>iLa&NYlSIQRIHvG2>z`yP4CFbPg3tgdr15|0JL^cse1h8)q~0Wz zA?4m384w}rV_f47B@qCw5CE^Snfbw~tKvqzFutNj;Z5yDw}VcxG6!AByuph`DN4<+ zE*^!qR|c4edIgE_hU2X_%SJ99Sf+U(Ww?_Ux8`;HMM=?%55!H{9%8)bNzxnQaa5Zn zxCe^m%MzWsFKw6`nKXK@vg>io?OgNJglSEbTgep^&Mw{{fampFC&$y8n+t3*HcO^^ zL0V|RXUBnJf1(2;X@6-s3lE*#ku)y@6+LtBX~{5HMR&u(te~v3$z*Z9k^b9FYZ1l> zAXC0;g#iXmOU4+1inJK;ZvH@plW`Q6&?c3gyg_TS#gQ<3IhO8?9e9pfIUl=SPs#5T z?p^DHaNz-B3jwETDtrp*lxP1(-g%!npRGMW;1`&4PZ56+9hlgMMh93Zu8@W(5)s1IL0#q8+}JZz^~k*L-a z8LA80x1p?-hd*irQ@_0jIH#+mEJDCK?rZ)s?3fv8WS5w#Rt}vLI-J>E*^O&yaY;fF zw)Bv0uOE{T>^QdT(IeUMq)NAo?1b+=B?aY*bWQFcswNoksAZ7|4b>OtPK8_cj7_(9 zE&$hYEfN06goJstFN=GA$q()b7s;7NSJ)(3tFMkZ!jDWcq0&S ze!-rZo==4guM?sHAmn=1Q-Gfpcvfz0RNBz9h**BsG571$Gg!=&;1tblpZGult^F|F4J6~N5brY_~?7XR41@64J(|7nKwC8 z?d7Q|qB;wy$kgG?8+a*AmeJE{zDruZOWt91z*@9J;zO=2h0@nqE=~Cy`u3(lvghCk z>}CMyf4j$4+IR5IzuIi~uT3fZpWiG%gBENZz7agPY){TYijoY_Oiz$)hSH!8;bC#gg5g07lPMqy*-&sAq#>4}B{R{WS2p#Hgy0rvd zF~aLhzy>+%XQo8)8l9%~s8Fb@$a0 z)Gz>{YM6U>=d2==Hg!3fF~e+8$OP*n4JE3I%jV7Tn`{y(RoU{(tXhieDwNBZ7DZGN zd{|3xsYQRkcK*yyVy3Wb!GrYpJ`J9E2Z=Wc-fXVHpP@OL!EMUeyMQ_ z*ZT8+U_6V$2anDl=@+W>9)>z1CZ}jRRny_FNm}QtM|28ISU8;fjkpGAa3iLc@+_7T zQUW-z>*FPZ&KJoOf8u{|pd^TM>M&-uQlPNg4Y9Hlz>kGy{ zM3UO;T>(g`~`I!btKVG+<(^K$)>RI?QWI>DAGmtL~t2mpog` zr+9=cu1)X`S~D2#ZAy1?K@ZKEH*VNRiO&WeX4fj=7W&$e*jiq8izMc-I@5B?ccdGy zM5oo*YOXlc*3=ucyI4F`YfLj$qXS;ko#6C|DoudklQ1`@8)PY_0xIz=K~QThw3o7LOZ9)7uTZKtP6R~H95jVFkyGn zp@+*EFSj9&c-c_kB-+=YIJC@C&GOy_JH{wp!jeWZomLr(RV;XfCjT&2}nwTt0lr7Wm~#+f!!B*M)X=hG6t` z%v{dOWHsm!-cIisXLhrkctDj2igFR!8Se7nNP?Fl~IaUegOn-XOSR;B)lEPp1x0Yqr79J-?qOZm~PBX{>tv)(>hv_(y!{Q}`K zyiyx#ixEA&p4ZtYB4vcTOa-adL|TMCr53(xoISNW22(61CC#4gLWscR)y-yW4m8dqUjXIfMz9Sk0%uJu>iLsI=U^iK zF_oC3X2ffgbpoZlD1s zr^362^BBr>aoos{lpT&rgf1I{zG;-2ewXF5w@ zjeGQ)Sza8gn;bPVJtx|R{gNgtfaFg?n3%zrH_6(ZFBwc*7)kgnvmv zVU^inVlQ2z!LsS{5bm9WSsm$KY9{GkGIZ4<2Y?=j$h2qdGq7zS(J^htELTM%#fkns zQpc|pQ%`($?Z?ki+Y?K=RJu|f@lDBRr2?#+Yh=}ad4tYu9Tx*sbc+h z6XbMf)#(sJ`_kLQ){csm4h>}{U^05|IriDw0w{4G9Z-i3UuPD}(}>$a_?$i~iQ`9p z*#LohG^ZHj9TeVQ5l+!zhoHWUDCgGjVO5G88%IvIC6U<-(2JDY)3#iS%-=IBjl=RO z0TGv4A+gN*{kPRmgj$-B6EEi;Rfd~mh@%n_0;Ebym7$W1F&`44Xo$Wl1?)62DLb2y z$vSh~zJoLK0AxJ4?Sdn_f!d;?=b!{|F@Qw;R{;z}S-}YzN2(d+!-MGLDTCJneSB+K@c@aZIed z+JlF@(p`1#pG|Yv?sKikMI?Bia6GSV&j@xMpTVk)g>dEeLR4bCrOYd%wTvh=?0}BZ zI%b;MOMR0I3wM(wHJ{uL-i6i5>+MDF`*$tnQ)TaZ4I`v>_j{gmsl-PJSX(HZQzI>- zL*BiW^3TkYxmNL7EQ~cCtm$EOo{Fl*HIZ<@ameK>q=mOByM_6M+*B;-_Qpp*?Lx@D zrCUx{S9hgqoU2t_i)|OAkR~1+7J$F=&%jB-57b5 zoo7+W>9F1`4}FEuok#aMTozn~04e)6o>R+ED%3<=*ag{sDfk1!R4Lwcs{dvkoUWo* zv|z=++@Hyr-!^fQeEe$=t3q#QIt_g?l{`5@-m27O&BWFeN`iKC!?V?5MS%GqSmlw5 zkg8tqNw{Zr08*7_UE8tj;=v=UcBCg(llIUlF^-Umoy%qvAMZVLhab4Zbq8^lFS>i2 z40y~PMh<|h+eSO7$iKbCH_`dm`ywE`e{;sXD@LwjD81w=+1Jtqc;0ansDGn~vAc*A zJan4R#_CAjmPC5gFvM;qr2;&KCte@(L+UC$0_? zx18oT)|WSH$9qRLms4(+*nI$wjkn&(gJ&P(4=%r4CLs_l7v^n5=-&VzIGvB$G_TvL z7D&s%@J(Qf;Bfi4!7JXDoln!A0^F#bke)=2n!YQFE^<#oMW%PH#54nxnSC(?`07@u zAJ4bPvw{81@r~oQ)Zhfihm|^OhP{68gw1LAuJR{EGZLwmGsqYyLe16aZNz~pZxE^n zWn|(we%SO0UszJe&OIRd{1`rexRTB*YkntmvHMu1fWN;G+RT%@0ox3JWy!^3$CWuU zK#<3RTamPEUg1E^kEL(w@Zr%I47Q$ZP&}q^`(!R>FH|OtD5p6HBT%B|je~ekKSRe( z>9E+X)4I9slp|*CSTQlVZvIMUQQ=ntt)KFb^QzL_&}~Ec5_*8*w@^l6ZyW>`v3Z3l?Hp_-k9xD+e|D)!0kxF8N!m7mJ z95vZvgCPec3CVq8b%TtXoDP|kD&h7ot$mu+0wwcrI3ED!`ov9>fzSZb8_fE21yCgZ zu)LO`ygd4^6ic$JkFzk*?*~QsA@0VEUTD@Kyk(j!lX+FF9K}P&lsg4~_^y%0#8$r~ zu`0Ye9p;x=naAi`G$OJ*N!-geL)&N4F5W*PZ31ylEhn0rsWU>)&%aG9w|U;c`$BKn zxGN@{XifknGyUVqXO1cX34+JLJ`?=$Xo$Rcp4J;)7%d#J_XV5*mns;|UI?82wx@iu zQSruusFH`&Jd77G0+;0$orvlmn}CqOrhRKHDGXKX(fW!+gHLZ^j9(J_P6}eAj71U7 zEC2Rsj9vJ3w)Y1PbOpkRa>9XC-D6Epa85|ZmJR?JgUx+eEzh#<0fXParq!98=WFj% zsod^o7zl=RbhKNRXMuo@M-)rg^C^3jp^at;C=EJux~sv>9qL`?>zL!oM>K0}W(T$; zAa|$(Wq=o{nHge0Z+f5BeZIsbHJR}KEc_dPQ0S2eubOsOeh3Z26B~NIBr~Vt`vQ?q z1UbO=gw{FFn8uf*)y`XU*hDD&&nu2vLiJ*R6ia?gpHdZLin;Lo70mFxC$lAYD!~B3 zfg|Rfwgyti=fBk33=kYUriC7+2n=F8`N=hPv z@=SbHPP!Tsh&iD_AZ}2W(^Q;ZivuhrZ!<4zo*>n?X6%6AZR7YRTW_g!n$SeAfdD)S z0yC#(X%)`fvu!a^c-N1NOzBVONSvH0d49nwZ4YJIZ)8M|+x?V|=hW>g=bS+_GOM#bqtUX+^Cw$$m22c{4v;H;I33CimngADxWw_(d8y&j9}1$w!al zw^mNI4;0Q7G(NDRG^6@nDm4;EdrB}g1K z(*KQZJ_Sr`%CI8Uo8eTM)DeVR;s#6Be22MiRLtG{eA(GvANwE)r~ojy0885+Z$mC+ zwSw)24DA^ioo8!Z^+;|MQ`Pzm_16-KrArICzew_Tgbp00E zsYTE)m0FfZTMo+&)wwFq-$1xl({))g15@Q0{WWVXwTxe7wWr`q7A^DG9OsZ)?xpkC zBGoEp_D5)2V*1qI(goC74{vp$Csov0eozw*rY7tQMS#&~<0h-!_q;ll*9WL-HEP7G zQOyOG?irY9{=&T)`>xFEd_N=^z0jmY z2=$J@=7NFL&sk{HKrlw|8$}=Y$wRDe2D2pRTV$+B;>E#dxV1pk(L^%M7T292dV^Gl z*em^Zm-ak+X6o)b`;Mk7Q@?Pz@ihB}gAeU?t(M-1D^FLVxo3F$1`EGDdU*bgYl^>5 z_WjnR$2s1UDbNo}|GS~pvN?hP^G_ILcZ}QeJp%{+Pc;O$u>8NoL%WMh|4TgdPdAT` z@;`@M7R(;*HunEhLl40H|MA?$(cQw;(d0kC|Ll_XbYofv{u_Vc{F|Op{r`JW*Tz}R z-o}~9%-+P!EnHpBYgrQGi>jG?RMQ(qb*Q8Yk4Oe1QI{l~0>A+&YHg$7of$?|8WY9N zBW5v~HdcC8p7Ry;itIjI>~7-vOReiB;rxtn69RiiBqpmfp>xlRxCHR^_mDE^;k7oULp}AGXV^a23^+);aeDBLTsFyKl5jFZd>YcV z;4zFMAGJu`O^m9n)cz1o)2KHmU`3dCEQ;kisNsGJd z*i}Ns&tHG~qLlSX(lwgz{*5U6SQ~>^u;csdOjW6?I_#{R|0vpFq!(X0W-hiGrC!g4 zNEC56U-E(TX-l$LkGtflsc$T1s@#bxPArlK0-nkn77wp89x`~TA_=gG%foEIXpwAP zu3eOOX4H_3>qAP^(Bt!5dksp7j3km531V=Qjx`!w(cK+3_fZDX#x=KrZ14P83?y}csGox!p(+<}L1uLJxtyH-DpGWR|mp`@8T zMR!0Cb%-&^ae_MSVOtwADUXyAkZW*E0+0*F0zxMlyiGDe!Ink0J&w74X*;B={5nx6 z#<|ZNNE?36%!``OFcB|>>;)fxAdYAaB59Q+Erv1^|B2iY8WpYfsGkbUHVB;qW18O) zItkRpeZw1|!*z{8Di=4_y~-?j(pfh8`G3@mp4$1c_J1rJE0Gmg6d@+;*0U|II0w+oP3d9fXcqs}ZjG;TZIg;t@dfoN#u<}9x zlx-x?%WPM*@AikM^}={#gpWYZKgoRE;zcKS*(wLpBh<4Tta^C8lw;veaLwH*j%gw6 zLDY<5{+v0Rf{$Z97$EpMj%kX(qKO)@SHRgaU}0gJUUr(8lo(z=7s=}$Z0tbWbjD+u zRqy@V3zaZYR4%jEj)p&xz_jq;v}jtz9^G^vwxGLV9oGBmqnPnO2Fz&i*xIEE_P!whS@V z-JHz809rg4hm?z|hvh%yyx$b`u{qY^p$~>G;d-Jp7AZVCgxxALz&AE7Idmu{bjNiXWYVH)@Z^u*@YX+ia}m?gT521=MwVOdPdR7klK*4#9eY zf7KmtasDUG7hj4FzP-V|T zl~%LvkkkRom)Hx_8u=b}ywlKurmUiQ$~I)#a%wgc3qqf@d2;u6I@h!VV-eP;bXo0q z)x~+ae1gLGWcho&mF0d1@gvU#HsCF+NR}pNRNG4aB-}e$i`I$8v5ysRBQI7=m1RE0 zifc372y%5l$&j% z8T2UwYn}HhzzXTT(vs6>!Er%8%_=65@$!nXHLVl_WASujnTU)r!)^|8 zrJhPRJ5;h78?APpkgH}`@6{$jiRd<$f5X*Tv(K&4Tcqu`)zU^~woR_2#gH~C(cr5e8N^r% zsHZJam9^=h5aRcUygf4aX7%DKD%>Hfz~uVyHqj(qLaIv^6Ok*IC@Fj645%shNuZKJ zaAE=yG$3k;_Ob)yY^Yu_a}YaRnn$_{SoMauul-SjC|^-?=D5&K0RE-6lw|=kj{5x= z(A|UT$lYqUa1a#^)St>1NMFQ{EzsQqpx`?Pz-&t}&x^Z30R*=s1Gg}CxpwO!n#x5Y z(RktmhEt8u)UFq6r{CWdwo)~?ONr_`MG_g8XjOO)lQ=RDs2tc8wu5hF?@m+dw8|f} z%Ke_8drJZC$8Cw*fOUqJ_ z(PY}a()TS*jO9e=TXy#ZISA$7k63%_E?zaV#d&6n>}hJmP3N`TFPTbS-bORnmRr9U z=ECQq;2!AhIhm3U?lMu7k>+}VZ#+AZxXbde6T zm8cf>EEl7O*7ox)EGwZXK1bCd>|#>g9f~u23;;hP)4K&;ehnBO79S|dhC$D~42)iJ z(-K+;lWfI47GVS?AC@?yv|3}@lSn=w7j;KyBB`!tt_wz={P5++UvL=X_f4)V&U{V> zq?zPm@?CTifGA~79=a$h#uhjA@n+XxRew0IR=}k-YSx4h7xLd+%yblk3#;yM-Pp1N z%>!@Dy!*;j?GJ|w3uLVy#wDbQRxHXOiiHTnm(l46DzT)}G*zdl00V@D1$;lzEO8ze zf(seZ9r{RWh6&Wcpd^eZ^*)-{Lwt^u?CcDofM>)WfK`ud%hqKNR*xh>uV(h(Y@2XP zGXbpcTP#QPQLY^m%M&UhqqzTVhV)_XVUoT-EnZ=UJ*Gr_g7XeB@bT0)Ys_C4T=4Jw)!uyI&wr!f#01Fw|4Y^)oIp)t{x=@A`VR;T z{U<`ZA)yjGmdOA`syoU!s;J*~>=|$wa*`s#d9xr|R*-*l)llb`n*~`}|4LJasb!J1 z$u;Y`IX3uz!};EpG5F3=lrVI={Now2AH^(R)}K%LEN;9n$bK%+oOp?2Z5%I~&fPa1 zCzo61GXNiuUAlkM0O2oMvms1|!@*-`CexvgLL*|G1VRAll)-URJatB-KGI^=LpGmW zk_ZHmlw?8yZs=6>G|mmo^fS*cvaNDJPt#Ext_}=Mi%Q@O}Y%u4F*` zp4B@fNDTmttF{+0(}8BNsmX%tQ_I*i&HLfFUXCU_Uz`03e4%0R=h$erM$ENSs3pb%O>gNZ)iR-R=o`+H zsrgiY(H^Q#^Mr*SSsH=K3Ty~pCB>iOY(u4=)g!*(=w9)dK7}L!$oQue2Xmnd_keae zX&rKN5H3OI^C|M}7RWga%p2RbAGR3N?$CRfM_GGs2NdeH4+O-bAwl9t&_=PnZ!AY9 z*n|hBej-S<2oqOm?6scL`k##2Zz9*3xf#q54IpD$$~Dt4mb|NaoDm#J8MgyWLVLk! zh@)HXgM69xY`9zJ z4-+vkt(g*a*1kw%OoaeZ`(l|L@$+Lm7{L%`RB_Y_B7_De({g}av2l2O$8|kjyC7fX6KEje3~E<$XoT< zI_w-!k46$Iz-Alc7(+Q9`LO&zIRqx_?ILy0La@e-p(aEz1m#yQRusUq7$1fkoh#WvcLXlRbkpS2dgfDUs$ORPK%%iI6Bl3X#nsIOg4h!CV!vp-tS&)qrY+0p|d_;;AtNy2k05j$~d$yTrHeM=3 zL0XZZ#4bHif5{{%3LU^s6S2t7x3sB37fPxfr;>R%v5N^mH9fVdVaEAX@0XEJT8?oN z(YT0icmvlrz$j>p zVfbgnBTyWF6heNNE`6Z90SEt^j84{>PFdoW2lpKUT}s#WbZGKr7N77Qaqfr?Q^eJU zf)mbl&~MNXt_P57ZuP1jbp;yP(qAm$C!)ST`Y1x094c|{VG7grLba-X^9!oX;P)H` z_-mH1k1#=8$s?RsNW&{=#Vd;YEr#r8H1s!A!k9vD#p%$72^#SuU8e{#Nrq#gq*Bl# zc3JV+4`kyBqwAy1&o^jnASbRBBcl`q(U7{C1&qxO3X!~08D8?`TUm?);;ND zPtHMvMaUS&NGQ$r(kBZ7q0&jpG1hBBKD}w^SOsIJTCucTRlPL7Tx4Mi zB0fZ)-&D0fFQ@(S+`aOwx%2(5XZtR2vb~nTH2?Dc(eydlcH(owbFz_=__}_R;~gKC zd_Qwv7UXx57kl~wz@HpuVhs03n|_GPz{B^7$O6AKatG!ci@;O~et?lQjtvdaAvDth z=IaZF#()X~b-!n2LXFH5HLMAh_H5UfL>!P6%2hei++Vaw@`awco8{#n8*qLzLBKol zG)iTd{WRhn60!9u?=PY1>=lXh%nL=oBSz>Nh#YcD!yH!yRNu~O>rjPIGpR)8iNiMG zdu9B7xkc8a4q-vnE51*|*P5QtCH+Q2LA!<4JImvEqfNTt)tRXn%v%Df*V=;!o_SUv z;Zfn2@L37VQ#>NS)2(o7ctsDx(MHvySk+|+QDd?}91v$}4A0Yr#e;UI?vy%m=35+~ z6aGV=1d5LhIJQgjR@tt+M+fHnZPBgBlGB5RcZVq{C!^BV_gjUhlA%+r(w= zH>>^4K>{RyakjcT*H&cwaeQ1YXl?#$cHQl~<7qt(AHNbVb#92w)^=I)y*fbBu(XN9_X+jgO4-Jr8eAEu+#p~z zdFQ{6h9OniCT18&^|gx-up`2y+Op@@8IVq@@G?u?p6k5$WM(@!JK7K&53B;`W1+5R znNgA1L5MV6y+g*`gZA~++6@;N>`q>8sV1@kII-sc@I>^7v{4{$E#cv^6FZ{h*Fc8^ znt>`Cuc6lGj6NM@q-Dy*`-$A*!{XrG?cs?xYVRO12ZfXPdRa8!!$mZ~xulB-NqXI@ zjDyU`{pe3?fm=7c6Yp&)*cl`gW2Bf;vUDlx^N)ehw>qNw?^-o?votWFOETW_l3=X> zQjWXv%0p2IeZa(%ot~pf(NuCSzGb!DuU9P})1DHE`j>-&m2WnJo$uL$8B|}HgBi@N z1epAPua;G(&IeII8=d!ekPYCVr~lz%fr;(tu2|2=f34{#;q3{&B# z3mA>MphS_h>Y2ioj=!24wQJ(jt$H2;^hw&vFq%ki(RcxR5P_%|anMZjcf!*8YJJ@m zpEbdpAGZ08MQ!#S923l}S6TB7`GP?2Qjv67ELM}C9lJ>Q841e;x0}Tg;YUI{VEat` zv6!9|GLZ0DLz(TE-xCS9|174_lFP-n68h6Z>Heu%OS5Uo;|xJMF@VNp4$DpeY{QGb zyI~b)?I}-!&JeNqSxWa#w{jtK{YWn3f6*nrSGo&Tn@Ik->5SapTGc#}0j136@u{MKHD-I#ukAM|zd8C##GtG?C z)y~-bGgfU%Ei`r(8S1idDrLF9xVb!zu5Cq6yFus*mXe?KhjqL1!i19%Fhx1x87R@q zj{*Fiwlbq?ttt>bFnS4%0uKw8B z#d!oJx~Z z3el~&m%;kYx>I>a=Tk8Z$l2RSEk2<0j}mX0 zYr@`=XEgmn9fje~llnFA=^4#0<8I-?v6Va5-~!3dW|B_AMne1o?QG?Pu@k*Xnp?+; z`JNqde|W5q*dej!&DI^;lY95|`DYkGnCB5B+Uil{J$@MBZb0$}FowHG$x=3#lU5c7 z&BEexoZPC98P-#JSMZrCelzcl{T0F=6b(MGG|#~HjZ856I`N4X-9sHR@&*;1b6CRq zjZL8PY8jogS7ZH2yOYkECK;MlmTP=Z7W{ZKXZ)Qjxj6S4X8E`Rc^--?Z^1hr%EsS6 z!xZ0dj4d$Z5QPy0a617Amx~|DN2L#YFp?U#lS*L;{s^)%U#`50@l%JSAO?Q}<8hzW zJY+0qeKXfRz#Y!*X|(NLWsHiXF;(BS1fBS5!!p32;i5FC58hHkWWK_8I!53|7p9ms z!?3{wv9Oo4NQQix4GQE-7>DT37V6K{%!$dk&%d&L(=U7j=&akhwRo1_yp4qGpSHF# zKA8_b8kD;Q0?4;(Lh~L|=RzU+a;DD%BUO%vVrtJyeVDhX*DOXs>@AK{){ZRap z>7gN0q2AO12Q9C*8vvFWddV!x`Uqk7LFNuQiUwB7&zNC>T>@bM-xl2x4cj-;4<`(R zr;AsNSKlGVY!{n%s0bTRz}|OyQ+rv4hZC#j49S@>No#MThP9|MX*M^8$-6Fm*YKxz z!0{}q8_e+MUf5aekc2of;lj-?8-n|4z`(KF>6SIXG#;BLQsbpO5 z%yT5^Rb{Q*bvmYeG)Q*3tl$XU01aIDyGGj((ZFFEqkjdaPft?xn{l)pN?tX3JgVZ(DI z>@;0HS&p9@E8*cg8c;8ha%zMZC=3(nRGSD$d|gv^7ge^U*C2)}=CkZ)xaVaWXzYL) zloP*54W_t>yUvvWZp>`vv_e5mFCzLhz8{!Q2{G+5AJjwI zq|H40bSB?Sdy2Xj&Za-u=hO>q4!oB6aXL)|yr>2oJo}dIRC7%nIyXyhSH6_&ip>Hf z)IO)i6(pYrWICB0=x}>wyHWNQt6F)e^^>aWZKI7eGtuguDiEI(PkGy>p8+t`#I%^! za_)?f4>|~hl8SEYWqOvGQ7*IK^uct3lyD9>^6w*9nYdjD`7g43)HU1AFHYU zAi_w4r4=O|unYgGW1FR)KsAyy;+eI?hB+t6Zlf^?x$+8d*FuKg%t zkz}8bFR7VUgB)e-vn<9kdfDk_D^Y|4a50^tuY*Q+wYdB!oAW34T>os^ctWqv?ws6BJ~muzrC(9h}$-6z-qITYj&dCuy|At#{0c0O%V zo1Aam9I%Q17YX(z<}%=GdOR=6R=GosS^y@P?V9C?A;MXT(l3~`rP7kR2SqR5Z=mBB z@tomSX0Iyzp1|_n#ThDf9wC#i5dQrfn+x6XM>u6{^}xGVJ5f`2{PC z^!tbv>SMh-gQT5}D~9dN`$zx=`>g=O-AzCCjKX9jP)F$XkOzU<#;BaUPl>9Elj@V< zIFD?Mq7y$If-i8vFa3NL2OF%dSk2&Id4$=(`x?&$QXE?IfOuXmluAz0yignAz{0rK z4}B?!ytHXWCpprlfC$SX(xyr7IAYa=|2#&C$Sg!TC@s9Qu?7eL(KUa(zUyKpr>+-yrBTWR;*X)?)SBZeGFkCZI=1G#-ly|2uVR zgnjvv!#0(Bjo;K&`N56p>`I`nvugWBW!M=rOR`tbLc(MYM3}Uh)kvfC(9{KO{#$$pw%ME>co# zI6v~EC-rMyTJ=v+Q_I$WX!h-o&QRc8_NGge zQ{18rG-mAx@d%^N^O+3!K2dbJ-S7=hak)umvk-$b;##t{DsoqiVC=|BRV}4Og<9ze zR+iG`MO0U-t$Q58NV24;wuu5 z&N1b13Ou_2XuQ%72#Er8YVjs}I_WaN)CKrs-D0(yWU3cifP`0qU=jU#?_==+$}i?e z=iZ9pC+|Y^=!fJZ_e+gnssPv|fv8+KT2mUp6QATp)I0}yl^eMitY|P~ z!I9=dHl%3%+~4p*1kX@JamMU%ar9{Wj(U1il9S8a6+8ae()$ihJ^#yv%~x{ePvV!3 z(266S?##rgxSkZp9d&!!jJPQ>z6%Gh*x*uR7$*4N0~b^-HSi;tGn}wg9|z=Od!u6j zut3MDcCH3cb;zmdBs9^8J0eU??+AaPmKPe0*sJP12~z_fGRp+XLo4vxLB}Bwf=!OA zBcE?7YHZ?W5Lc-B8h{?n#^rtS3%yQsIXnd$uO$*vl=h)%*Z_hYWo#r!C{1E?)S zJ~(63KBY>T=&9n-I9wl2oy*9ah$H;xcQFp;zxA9Oz8A7MVp&5T2!vB%~Yjd6=^s?R)X0e%1 z2%|~e^9k(g_L)mB_ZtigPjwprT!-&sv~_U{4-Qo6tj6*j2(_+xg4~3j(WfU-QZlz=a0~`8VMp%W=?f5< ztpo3XUOKrsBVfD`&VK_p>zA;TI(tViQ-9o(B>s{70mBatp`o(JJ;a-jMiT5nWkSRc zec@Cl1R_P1@DuB4=6i#x3}VVKsfrrcf|6^TFr{s~Eaet|h?n?X&j-m?)7DBaWY%;f z^lQ)lE|7|#KD{L+zB~rdm!l^n?VBWuEcGF;ES*h$wgbCq`Z!bnmKjR=BsA`>;3|+0 zQE}0KY#-M`n?qISoz6pA(UDl$Ja&|ABlKJh7C+%TW}2m3%^+2!>*Q-`b@i;LRw*sf zHykBc)0=~J8r%WywZ*TVtA5u8+GS;$+p?+~EK~-MTReeKoDKw_N!JT?u{ZF;efB_6 zd_C|ymTlK;A6On`mHcLy?|+Ef{86n0{H615E3L~dm)m~x!6C)?wFC*b;KphhJE=i2Lk4V96(gJ^}O z7eLsl@XzbB#&?B0`TxOM4bja%|15_X;@7`dG1b6-m0QECVI>wCqa+5icl}?`&7p^m zneCsqkOBh)MEsv4al!RpiJ5DVfF!juWmI*Ldij( z{0XA;)X8c7lz2lk78aWH)Q|3)!pcME?!!nfjZ%#ypF8F6LX`yRm&yL?eQBu0XYZ|= zo9h+(@AsP*0U+F7ch}X(1y~5IOv78)Kq9mc#!3Ux;D82ban(h`)OhDk0FQnoX^pWg zmN{deK|&um8fdE0Two+D{nDN$??}f4b@m9%WIl_Gbg+LT^q3ZeLofm}bg}BCe^~;8 zI@%;ai&P3*FTb8MXjXc|>a_8< zV&mA3<@z|fuff+hA>{QzfK7<8J`)RrcxC>oeq4O(~1nXP>S5)SFbxjBhAlj%I9QPuZkevK4~Wk!C1=i=4#bzqYu{wpP35rG3|wEb*=&@36eKmutdS_!_o@Ym|QDK%{iwe6szNP_qX!3zoq_Fjxax3 zQZ>t)6%^*w!%f`D0(e+xzbq-L2rKr)TCvyX^7fE;%kz?iU~RGYS8MW6GQX8*uzh&x zYpYJJ60kR>Gbhv3v=XXut1VLpT>T|WSPJ$a4zfI?1}0j|_Rt_|n6KD6tM}kK|Mh@% zR_)@!-R$$h-5h{|6Ii`M5?H?mwFwNFL-ViPf_JOjCWX}80ir|f9hD8d=OQ1tHaN_W zoR-(fsXU^xw%W9M6mlwMJ9?{CALwV_|L6+0^pyInaX5W`->ZlWB(*bqSeigSs&p15 z-K>n;#SXrXSItNQR8D~Us}&##=FE@AvtchrQ36~yEd66vyGCB5QK^3iG9j_`Q?m9veHe7MR#7XD&xF&0XQR7Vc$m`xp2 z@J6w1J_M}Uv2S#zuQ^G@m`ObYO{i6ynyw`^(OS+Q!p)>SqKXyD%uFPkPAf)Cmb@17 zYwte^HT(EXB~NJQ*9E|x7t$J|KRqN%X9OUcN*1L{wwh@Q=^7-sIZmHnENQ_Lm6 zkNwQ2n{l(WbnhN%oHp6cT*H$xY_#7LtcyID>IZN&N3e-uuFX7_Bo1*CXJrX+J_u(6 z&fmT8M}exUf|G`wYUfSh)za4=uTb;!DUeB*#5$N%@ z!iF=-0Vj%h`hrt4gUZ2n0c@mDj|&`_wMiDFk%64BU_8x4r#Z)zS@GbGSWEs>9qzfZ zLjVy~{3dq=jwT?s!R4bown~b)kq~gNvvBOOf^YPg%NgSZIu{fnMkZbh4bcOK4`TKm zVLCc(yPtrnM!SgvqJ8^xS_kzx2CcYqy}@T>0NI?_<*2c_;%^p$`f9ODV!RFtk&$$A z&@cB|^9VTF+_xD*KxQz?s-(jor%zU2!t7y0i1TInr8{2yZrwT$tx*NW_R0_g`(6ODZ{K>Xa^D(IuveHH zoajd6ZB1zDZ^18u|4AO}OiC8K{tdfh{8M)STMzrMn1vNY1N>826flQ#8eC~;@OD3k z8U9ik6XFpVg&9SWiYMk_u*lqASK^B2H8xx={*2<#v&LJn-p#}OP#$>8!{8W0B%9uF z*?VX2e01`ad_BC3FaW`5u*ZpMhNR&JYhqnbxX4S0#XLYbY0TD*8nA+PpG9DNXB%La zUEjWJI{93*0S+Q0Tnr<5?066_h+#bw)lm1*=wH&+=%8_Hq$(aw&;sA)VMwmqtvC9& zRm&&>*iu6CAhFbBD3%sf1uV4cpe{suwds&Fpo&)I3b@zPd!)p~D`F`0nqIJpJqB>9 zosKp(s~&peJ)IPHcv!1KZ8wU842xVk2ZYMa33#$m0DOk2m;R5I<^Ph$Hk2A(sn4Om z9Ws+n!iKp}X2BlozA0>@@klrfj%%T?@8DTg|{(&@JiD3AGN#vH807o7KH$KlAqx6<{KMCA; ze+fLVAHxVv4SXzQ%w5=*X#a7Tem-5 zr?5ElZI8RY$9DCcqS(!NoFQcU{2L9ohprm!sn$OccQxtvdnTG*9-@UTbkLpAQ&`r_ zi$DY5h~)kewqTC3!?S)D^U9-C68<2~>)N=sW#pF5xqXrlv4E-E@tc4)U{?GK^xr>< z3HE>L6;3QUg_i!A=of52K!pF_S^y4E^&hCVByciyPoDV8gs8U`UXs+rR03I41er7y zOjZL{!!)6jv>-9f(F|m;$+axsqH0;I(e*;O3a63HUrEfmV!7F>YU|R<`o;H6tI4YS zr|o7+93trZJa+SCTX&jo;)nJnW~S$(h$74)zIjfDtWzr;!V4|{X7q|xqqZ)_b`9Zsh1ANopVqGVwWO@$8GIqj&IfvcT{PI0A){;&G<$lQ_-c zT_*SX$^nq{vWssi?etxpXt}r5gMN?@E!{AUjrDqk&k`Wd^6q+c1avEN-`wAh9KAs? z>`c9Qyy{`K{l;w7C-<8l$hp5Sd1I-+zP66)$VI1uaQ z(G!J#I}ZfVOK0%#WCkdnj2v=Z775|cz2&C3g})<=J;==4EWOpH^i0OeJOriCpAaDs z+}$SX`9<_3jQoC32L$KTc)ntJ^3!DSmOQL$PJ&?_<1* zd3p<)^%Op|xcaTh5X6JG+_{@9(Gd5#cj=H=ZA3%Z?<~B1$cj62W~FCcwbWQD6!-Kf>J}mrFNm-(se_V%bLD7Agf02F68Pg^9jB0; zXx$ew$)&-%1lU}{!;bppo@yOH)X?3r5jCO>y7yt)=4GgV{A#c$2= zkh`1oX6pHKN_IL#GIoqLj|`K21L9Zv3cSc8CM0Vl*zYRUDuCU6jd-0QXP|V_OyVg`^4OqtjxA@hVw{eKYTmm9A;Dz z`|k;}(y11Rf_u0uU<5OjWTBqmF0=d&fsDW@(|>F*n9J%ihz%Yr3MRwscPG;kVJ8}( z7*lg@5b&IrE)y_^U7Nm-^qFFE-cld{gm8t43*_PrY5?r=m>TXF4syVa?0+4p1*#ZK zoTVS!6BW-GIJiaupJvl`aso}YJt)XpWX2Jk#mRB0=ZB(DDOF592z4Va8eV?@h}j<<+x8vu(l0tu?GQ^Dm6 zpdg87t0NrHpff;Gp)lpSRbV|E{4O}Ip4>K8&6*ZiexpFF;XuA%UkNLUA=5(!^sj;i zpGNy@c%nt%9k?H)D=se=ff2C7-f9TEEt+Jl?Xv;?f6@l+Gtym7w+eb@g5i^ z1L%rqWe3`vszo1}y6)3pWKvm(7>%f1$Gl`o(!=dS?q{|^ih(Dujl{x?lbvG=8by-? zOT8D|UdIc!ft9HE6-d+tnRSX1t=zi2ZXFGq?d_bj?eXT$;&3?q!gVPoUBSaXG(*;ATwj zpxkL&S>~DzZe0o#T7vcO&P63f761*!Xc%?fu3mC1j)Kv62`M63n?}wY!>;{jrU;C17Cbnygrv#^9Hr}wZmj{Zvi|g7GHvE}3X||glVE!AJgu~I9YC}-EQ=N6 zCy-iXqe&y3%u+8Inn9JKFEZ}Vt#sG;U@}{sZUJ_>gaGSN^*vq4eqI}bZ@dTWE3v%O zbnXIzPc{~_F_zzY7W9!T5Wg@K_8aX->ttv2p#|b624H_n@cKfT5M!JWEPNdc@e}?7 ztH&b7^vdw59u#NH!2W7~31B%*0dvy}*7O%z?_g&+74xFv64@*9 zWz2+xPc6f8$T2oyF_|&RXY~F|^BiVyT(iFwc+HvrB-mUhi24{n`iT*wTs`=OVI|!J z`BhWc$?mY*w&a*}4fox0dJPwUtmucL;*?@YiOP&-=4uq4`l{$R0oeWd1JXlBPCu9CO{ewm ztD3xWsYJCsBpF;I`4Ryn|B%c}X4aCBVK@}4_G92Y@$m6k78h)h{;0taMrZ8b5*Af4 z5JpfU6UGFM$&1~xfF(8t#L^?2bfTc)F&i#e^>F;AyY-+#JX~){2%r-#7 zU#&hnw5QMbZJmnGk1fOZ4q2AV-(V2=`&i#ueWCzYOAYXq z)jtAr1d_Q-fUgH9{GsEwf;vca@{mtNL&@iQBe^6z>+&nd)A@V5S7&!p@`%7DZmZKl!CGy7%3$Z))ds8Z z&85aMsvV|#Y?_}P?H|90DF<;UQs~(l#i-pZBjIerLuO1t4E1BE`(iZLovv8ZdWa)u zR8+%jiMSC+ zt_eFVG{%KN9n%VKq1<|>BsPu;WnTH4wSJ7hQv&bDlmDvaOxkx%uD`x3CYtgKI91KF zQ5()O*cpzC=>N!fzw(Jw`7jUF@EGK@ojdD+QOXdl^j>qukXd2(M(mPb;15b?J4NtG z11_Vy|Aw1#*~@SCwUTvGAW03gw$xIWOqAoU02!AR#x`p{*cQid^pIlswz&mi;(!p> z3}wXFUqE_~d+#J0_&Rze`#Mu};kWHrE0(yZyHg^MIBUVn6xs7UdE~BaqQVeAC*!#m zxw4-6j&z2n4Cock2y0p2Z;RlTb<^NO0pQ4Gfmu>vigkRIG>?77n88NVFkP)O+F-t~ zVJjq><&-HMv`;>bGX>}Gr>J?hk>vdsHciFEPvwyZhar{uJ=FP;u7}ZKV&USAx9hov z5Rp}ztFmL?cla=`pddTAxhn+^uIoTE8f>~Zk4;6H$9$!$-oi)MAIWs2G@b2y00)Iz z6wuo?@Vj$O|VE}6Nev$K_zDg12Q|5b$v zO2L-`qFSjIPNc;vNaDeSg$dUqyqZY-QG!eD15}3S{QDT8OIO+-n#FL3ILu|`zhD5c_ zjgW7B9>(>bq4c19y@tT7>xhsN{iV|)$sF?36OI=}%!WFT6jA2o0=~f|H?UwR)`O8F zG#q1+MTso+zn{DA|880e(fP|;oq|HrG49%3sZdStKP2y#fbE1p-dyQMCD^XN-OZFrM z3Z%2c0`F5jqjm&+?5)_F-)253dmqY=XNxc9rIPfWw|b=RdgpJ1e1+Kv3nU)s#@7Xn z1XsX5T{$|3gU)tukX#c8i4_f_x{@=|ao?Dp<23jMo%iD-quP2;0L&u-1s)&#E0upm z!ZArQmc&^Q_-eDVkvyS*vW;8XKgo6iE9!b$|e%En82_sbr zdy_|(c-6LI({fNR1JpEe3N^H)f1M$wI?RE*BjZ5?-?7Ga%S!aFi>B^Lc|rHf7Fj-` zb+(;aRyrDe8%=&v`%W2U5(w(!i`zYMg<2X_P1H?Z=@kdQNqLVc?{CYrI}>o>P4JRs zcPUtk9YM;`*I?&S9o6?@lIsW0un8+q(9CkdRlFz~SCxpm19l{W`BxfD4Dd;_6fd0U zo%IW1lTUMUmEjjArw3RooP$2a8bU4Mn|X>X==DO%T!Q5Jl=i!wAICv=U2&_58Z5a< zk*^v>=<|Vcm&EkWhb`vp^2y*=at3A>)EvNRNm+iV6^W_YCpRC-xm+sP8^KU; zcEo4@8r9A9;PVB2+}yp_dME!=z0ktw4DPvIn;#2Fykowr`;u?k2rh&<*SqpH7>Yl%jSSrGbSyYIE3mPW;das2Nc{foM7UJ0wLUN^n@ zTp7X2b3!__4EhF0goXP_tdczS*#=^^@ed+RAhRgp1WH-*-x!mgP=(R?NhRO`TD_b1 z-xa&z>VO4Jg&VJS_zHL9uV{@192&czv=@UVImWvw7Y<*@7{^FvHy&7?6m}XC?m90f zU+p#tpt@btcX(JgtjudJFEOzI3MC+qem4$J6iN#X=df-VYIxJtqrzw-V_mHK;6ge& zXSHy$9u8<8E|$pq?XpEw=4yW_Ge#+IM4KW+l2l}@zK{h z=-6E%vPo_-kb4r4>))p(yRYV_Y)X6rEkiiJ*Ln8)Yt9}cTmG8#6t38Ub{m-&(cd*j zG?u8YW;c@`Stj62uP0FLXw{V-aZ(w3(E#$I%tC4PLjULxS(nddcZs<*$Z|>qm-~A7 zp{Ks%diWyZ-yt%7Guny_!xEYoJ8P>;Z_~dg*>=+N6ix}PzcoQy5|@M`W;X+uW5th< zxKFvAw`zm)=4V7`!7Eu$7+PJ3((CPOU`Xn_IlZ)hNj}8!kn4Nc<@7IsdzQ z5q5#=LmU8e*nC4$uuR6lzk(FDIA=zakA60+x?k?K?^jM$I9HCmvQGm)FHQqw>$ENN z#&6yiV7T5nbn>^FOS{_fu6r)Uq+tHbzzzhnN;S`@$V&5xA@aam*V! z(+gtLgC11@0*zMuSqC0-ao>|X8xGL>q7?>!XFg^>ob)>ki$q!qjU(Xy(|rMCs(9tu z>qE5o!ZYakt5m*VXMrF$+Yc;B03^(A9daGeU)uXk{?783*3Sd)EBG6FNIsY5)c(=^ zwi|uzf7e|090s5qK(>-VTum&Q%1o!wr}U7&|8R z>zCY_ZwF0f*@qt-0rOY^U3IL5ZAp<(JROiW!dyY-+ey zlVWXI`h4T$!^`cLPj(ny?(0;^c0SxOOn6>+3ZBZAJ?dbOtHM{ z2Hw3;u?41;nk>8cEKNhA$?gos432-a44Ny-HkV$>?wm%+K)%cuM?=s@+R1YC@J*yJ zplB{g$!eQ;)1)K2_xbG>J@=azv{E^RSRHJDh2kp%9PuoB^G5{%%9k5BUtDpdpn`H3 zM4?#pL5rN?oT@V%JvIg+GaR%R<3z=dL*sRHFqfR7@pZusRvgpf9;T4H1gDoj>f*Oy{ zVrV2Qqa9h;btX=J=G01oSSI0!@haDZOodio6cp7EXWfA4%_hx}EW6+ZFz5#F$zP1s z9u)3-5iPY(?BO-9^m6aIXUKV+ur$81m?-o@_Y2u!dM0gr&Z_Y#lqt7Po$*x{x?s*K zY6jFhZ~uOGwsw1E$=T`##G8g)_@RV>PPq?V1tZ2FIdzpn$Kx7jhtQobJAf^8+A~Cf zX3$KXH@2725$hg+=&n-`Z5K$GkQA#&j+qi665%^MBqv#{T2L~v_toiTmN9a7t;y!x ztYmXp{ccf^>-o;!TjR#M{G8pOF4uGt+0yE_+6BizoMUtOZ*tRsR0mkSjG{#yF!`Ka zr;4~1lARmwKoZ`Xlb_8NH_u9?wKVP5CD4I$NYeme6cjL?Z!nE^Sg3!?bC(Fg_t4_a z4|4e)LR{4b0I_C3gf-JDQT;s3+YuDwV5u6Yl|fIbflu3}+o&|`^l7GL^3v!Py2ISY z^2RM}`CkP!Nh{Tk1e}{Cqy%rgdQ&NK`tK5rKE@YLJ`S@SF`i$Fuyqca-kpZ+@zoE@2>N}&YV->h(JM~U z?#~nQg@~Fe`kEez5QPPWHLtB!I-H>&coyOSyuPjvN`&k`8usa_zltidARG49Uh~2= z$jul&vwEXa2owpTa}>VzBffh;}5t76{qMA6n2u+Jq_Q1<_$a*X3RfY zyLNxG(6xoUwNGWh$ivw3PFP+ZwCF9+fN=BR#!cNy-^5=q3AI{q5$cUTv+%@|dAt=J~(T`&W_% zSU5CdYUcAhQ1UzEi!V!0T>Ex^N3mpc7?Iu2XN*vQ9&clgQ1Ig9p|gw zh)%wlq&T#5&h6~5N}f=}_w)oYvRC^RBNcDD<`h?hsr}xsYdzCo#=D)yd2U~wb!t^N z?&gWigc4V>CHM?uXRh`QK27mvNj7Pp+!SCaHRrRE>Um(1o9^mX!i9MNeinEzP$Q=| zqZmqDAzDx9qCQ__WAR2eyElD)#O??pOwROSYNMNZ+i?|28^*@_wPY#!9oddnn&Ih> z|J~874$v-!!T9H%(H_7kITkFWrve(A_H1LmdRk0?xq>5xBgVkQ5ZG$BkiSF(Zd95Y zQG5D`{1)noeA*ITB~v&%x66y|p|m+aACMPZMeH?;8o@|=M=&3lt-xT2qh51Pp3Mww zTrs)I4~%oFV3(+zV?C7XiCcd2TCt9B8>L05#qv73V=ksRkW%~2YXMusgba(X zOUAO}<7nphPW*c`ZgVCCT(!b_g=P)ueF7%O=sB|Qmf}9>1?ut1R~EtX_7rC$+T%L# zg&@azsjXyx!$nh9coI5__EL$)P<=bi*ZBITRQGeP_Goy!+@col81&1LH@u%t<2p*h zMC!@L9Sw#!OYRKGkT{vd$)*B9xy}+A0QjaXL#MTJE1f(Q#jz2+<68JgU)JzuH0f_u zW;aOb>S0PE+P?72Wxx)mGLep#92z5|Bvo!zZ!FPJ*8#Bcy1S!@7|?X%8z~WI;!!5# zT}!;sUIq%d6f$%EBzjAajelqLZLt}zoH-t#_@#fe}%_o ztXU$2sRuXUdgLl9v3rmzS^Dwhkm3dMBQD6BVX@|THU3TV|LQGAb9Cco~taGUn?IR~&ieDQHv5#Gu0*craL zEF^!4x+)-oyg{I)hb8kmY>GoeA06x#5(dC9$0B0i2fh#Y1V;0f97lpW5(xu)RD_~2 z%f5c)C7YJi$H*mKLEU(E9^9BgY3)>cOeFJ2*%=c^|PA(hxDX)t_?E{dMuy_Qkgn|Gr7{>!LKK zemzcJ$fN4(@BA+~4Y*l#tMRtplp^j5JP~rSH?eJPEzY&<3wcvz#MGPj`~?PobWtIh zh5~ZPZV|yZb6SU(V)&RwCj-&r_@ejIR?rBh3oRc;Lh<0PKAyoyfezEuc+Kb8c5qCe z4=3Oh3^uS0gbuhkj5(AR#c#I9+vBLSRZsFtlxg5lyFIVd8i_+R|H>1tZJ}COr%+2` zQ+H&1DJNd?PHG`;&ck)r1uNEfn?+~%cA5d^ZKxG814TSo$z1P6j07C={#(1yvg(>I ziktX6rzI%XQtgTd)gXi$+OM{1I5~FlbmlGzEaRiKv3z1yjSVd&$p!ivy;C_RdNAJ% z=+*ldLahx{%s;f!-HCo_>O{7PZlBz^5)V0c?`pJZ~{rA^pTmmgE%eygh@S|bHWpVS4HuZtkjJ7tDv%FAw$ zBH^Ee2ZwR88UrxKKD6;R2WPGsAaOZQ!nv!-Em*(LA^^M`7HMl|mrIEcHaxL~=#L%~ z*S(DLfFrs4nlJ+5RF1ex4_?_2#sbB~_0&Kay59zeLv%y2f3U2vUlj+p85@Xx=qgj> zRJW>49%ISxn_RXCQ@u^M`YzF)L1#{p^`TPG#wJlutFHNgc;ZlvvS?4sHKB;F$QpMc zveAvZv+_w+O@DnvQ81Cc+!cMHfoc8jPQFsQy@f-h;(7ZSId*DreNnbBW%93_c&hq~kKW{}3PA5Q9flvrgSxo*cZ zVuX$(!-TetS{!NO^K&Y!3~f42EVr?a=G>sE61zP1#!l)YRpKF_f2`1`*e$94Ton&h zvpryY#YF-GWVN5R{v-3{=0#-mslpI;wrNvgn~emDleVMJ+b4Y82CSCa$W>BnFqKhO z%7Qw_qk)ytO;!AfR^Gsq7oS=xx!SCEXX;S|_3FlG{rm9aYg2I1=YoZ{R;=e6K4~?w zCtAf0#;h>IZ8<$-OA%Uczy%7r8sn!)k>vP{aW=+WgT{iIoM2$SWb2{;c-lM$eF?Da zUCm_bXU5d?JSJ5vn=@Z1Y;NRQSTw^^X4FR{dVZzzJrYV)5n8zAAok<0AXb^iOpC>!x5iZY#*eADu3gF- z%s*PE0Sc0=zF-ohO6NJdvU-Q-WAs_qE8q#zuSVT9&0v)^z| zCA&efg-bmxF{_dj`#RW0R`9WMW7_`X<#qu&hFq=23=vtX52I|v7X4qxmbtDoDbjoU zgd~t3F~kPDn8Edfe=ua=(S6dH=n%j~(Ha*Wt4bK|)qo414KUH!=OqwAZ|Z+xR|oAhc3)&jF` zd6B!`?y#^5ue)5eWJH{($a5CHQbx|i9YGU~j2ei zj?XnY`-raV;`bj5)`uaQBOlhZsg^Cd)!6%XiDCDfBH<(UcYVj0->d7^hQ_!=n(ycI zkt@{U>z8pkbA1v(KLh^$LqQXjcl1)VH;V)W8=omj=&q`aHIVJ3*Ww1>;)(MLOB%|j z@&E@cNsjMw@>pMw@)jQpD=8V>KnN%}qE3MKMT1H__>BW4&K(r%eng+6-}bW|_0s`H zE^+hCNe$~$m->A$X)rrrmio~T2GTK8SED47&KvzS!8P^18H{iN*P4l&K=m}_*7bOF z`tR_JpEfLiJ)%_|Wr_iZ^UoI={D34~JV=g+r-?w5AC|;?Sqh33qLvnmCz!sZM&b)VJGh}$ysTT$0|776A7Lc`MZ_)hNqI#$K zNMvr}Y-Gi-4cZ9qLL4)c9tMckUQH3*848sOJ)1MQ!((POi?<5*Nr>lQJPwI?{s+%b{jLt|Bl9hy z(_KrX7T!Vy9QNm|Ay3cOtfeW7PdiHMx1aa;g`1dXrclPB6%y2XGq<|FZk2y$QZuCP zrjiQ_N?lblPkA1I2yb1 z7)3ju-=ldPH=%CGu(m_Fbx%R%dpLIv%CQ$VgMi!S-R&gs;^oL2JR+J-nMSS5-yc!+ zz%Q(VO@8np4hyc91gW`lj)$%t#SXGYgI7N$Ly>1-iQgd#7CL$m`B_v@HD)*xzu?5q z%Qzhdb56|1oxyfH%!IzQa4C=gy0T`-P;004e1V>4Wvvx!?m&9nw{&J^@rgwTPXUozaEgOtIIo6B1(n-8$wv^cg@)(h&Ek}@t%Wn#5 zkNmg~hV9`M?q;uJFI!idRxS_0cV1^sP|PO|gzT?R#xb84WFfOBIh6-epfkiBBZHQ` z@}spwj;#sHRUPr47iZxi;0|>_6PBxU;3HT^oQnKt&Ug}bwfg%?>Eip7|l{7@cgTe-pvWT_D)wo_)`H&iq63r6JP7n6c};?gY{MzEAHf`0W`w59b=`&RzDAAuO%;y3 zixH0eqZQv35?p3Gy@aQl_~5pgb=H#xCr6681#aN%3Pdn)WnpIS2?q`3qFZ&{Gn*01 zxs!`{JHok>TEJ(%l)2_o^Fuqmf-D6cNIEztiK2<1r^*Kl92HX%`cI`5?Uq0s&0mX( z!_-Zw(bSitP3tzsZRJV|z@PkrVzr7V%VqdK;ae1nAYte;wKf1)YJgK5a zTmdx0xmc+5JJlsIV}ix6`gLI%F(U`4FUwrEo}zIG zD{kuWqT>e*0*wP+i7TT9ZKRq81^b4&Sx&x9F3dPd4VNp0sdcVjMhzmN?tqg)D$Bf> zG<|hL;Gu1K!ig1O=Iaw(=ev4)pDF4k%R-i8!1~x7y@Hv6r@!JH;nL%#FSl`T^uto3 z+3j+z=JPTW_orvsK2^Da6uKF+bT`cGa$ljUbvjbe)`+BwBArV69*?NvwH7_~C#fsl zrkMkVE$+YvS#MPB+HNIY?-e)VHkHem#!rdt4C7mAkWV0|R4bLvAuu+u$XO}3*$gWT zp&LG?RA|c=H86_La+gK?^1_QtL`F_V*Fn$y!|M@jn|?xh`Mi2{(7RKn0du&hxQa~> zK3>XhsTtB3@=J?`MT0Vib8%du6EDD__BX{F7?8c%iIi^y(aZkrAL7$|bmu0d^0M`U zQu3>>Io0T@&c<)Y``*b7mRQN0wP@%uzblZ}X`x>1)$k=WG`2F#A9l^i&tFg3)gFr> z!)@7B=j>>-CQv=$1^K22M|*$v%uSrp^o3o~aALOCK4DGN=p8GZ!)9vzM6zOR0!~VP zJGu+6fJ>+8JJT^+zV0(rux!1lh6A_s`q;1FM^^MI)Lk6X6BBXa+A86KS{r|TOT4}_ z@(ucE&#=hMbqkGlkMpXznu^dlp5LOv@mDpyui9Nu)O${M+xub8E#wGk>+gxH*FLaAxPtd{#Liw zP~#RCq<-RYE7AKz^A^Q|#&(yJI){nM2i1qFN?~OuPe!D$FositJcdBmuxXeMU_MM$ z?*86S_u0a}6G$yr#e>~tw>{YWi<5mPz@Z#rEpT8U(J|skNq5@g-Hn#a^)qTNAbaBE zBkNt0j7i(O-u1%?W!x+N3c9uoxvK4L=JKLY%WH#v{TN()qC&<5-$`u^)8$tUfIw_- zzVhm(tiTUC0+Iun;JnfIq|(D!g_|uXVe9@)I2L1~@t}+ASR%nN?6fG3pyE|Q0<~NghP8QY;Xq^vz$?2)h7=cKC5t&)67f#Ny+W?HJ97gOB$){LY3^WV&}P|iYCIwdW3h~w z#Syy%&R93m`=%~uvpmtKMd#4{(UvYJg!Aa)~B2WXWX_sQ44IKXUHV@7km z6cW!TAw?V=em~3e8Of6k+R%{%t+LxG*z{z>G8)Vmc5DQ6f;lz$7|s<_z{nG2MiW(_GW!T$ADftJ_7+@N$(^ zoW*)rWra-ri-wK20!=Tjd9>1egKZ;MDM={7q=mL(uzuwfC=0t7=kh~c37g;0*Bjri zw<0H*@@`G@;zaW%ck3N|6eQ`c4R#XFF8SC6s*n8<pw|VO z(-c9$q&G#KR(}a{=>jqDZ6H&wd_mg<51nNaIoH`%+_PX^DO2LdwJlLVziaF?m3W1Z zqXHq!mKL;IlQ?BSBK8nL7OH8v@MjF&&lqzZFp2ntbjqHK=?C*j%dt<>J=#M}>@%xY z1{Fgc#$sK1s)AFy$s{d1*J2s<&mYC>)SD7%J7jhgQF0mx$Jj7&mnCWJN>JmL6#Qo3Lm-dwYEbH_jhvRc>X(rCsw`dB zkkSmZV8--ROMO{W=74H4tn397{!_2s0FZH>7l>zoZfgRqU&11Cks?CDkRlZ(|!D zOGgrTs@y2)NoTaDFT+2=QqI5v6gL-755HVfWR?SMJ<$=O!W^W7@VR@R}8uCxAP^BgF0{JIJp_e&6zn1P{a@ zNFnCx{iG4T#HE@SlJgFlX;Yqz%|D^It)Up}R94^pHf#&+(z4n7|=ZG~mNoQo4UUFZ8lG zu|wQ*LtfO7*Y7PaAQ}byYLWTgDIw}V=35l->LTZ_w&<78iKHNv4$c zkW_*9-3O~IQNy^Rf>+(R!I;bN5KbAyaEA^t5P}bum>>rHWonoTZ17q<30P;D6k69R5{Q8sY_)>+*Dmc|S+yxZes;D& zzCsKA?l`2(3z#9jhqtXz`~|OfGs?_?#1qj$uI~OEh2L9VfDh#_I2;%w3Jv$)2L*w- zjpjR8Wfd33p5`9-J%*U&-=Jf=V}Jt0`w=7?tMqTzkTNfzhvA-dy2|`lXMlw$3doR- zcw#|82|s|lGDF}`z$%;Yf5D4|q1W>u-p?ShP{0T9Ij(!}>}kX}|L)TNRP5LBU}kvl zF`|X=V4h68f4Tm*uJ~{7c>#+8e`uxac@ni3ozv<@Yhsd9{YR2AzOjZ$Ao@WK^8sZPXUboZJ1DpVoTN!mfyV` z#_whz=zBSgf6!<)|3&{1$N2X|`L{U6?`HD?r2juR52P~wb0q&H>W8e*pC_K*TV4R7 z1NdZ$5!^C`{?}o7kPQAe7EsdaJ3lq|HUk%hp1MklNJ+=?-y*+5gs^=F4`_C9XTcC!i9J)7uFeUxZZ20Gz zBqVzDfv=9Sdy?`Z0(jUG`#;177iAt0siuAr@p0fF=V2%)e#jp+HWZY^%Fj>#2SU#p AFaQ7m delta 39488 zcmZ6xb8z5I5a%7+wrv|5+qP{xzm09%ww;Y_+s1|)ZIZp`y?g7uySHkpW@@JY`}RzK zdb&SPz=!9+A(iF8A>dL#5ipbR&_Ur+g7$Hfq_qEA{I`P)0RjTzJK9s8@oZSNJx#OA509Y9zh%OH>6op zxKhWkpBVUDBuxk4Z!{xK=&&#b?yPRaZgZ<$uXFQ8`v8b{bRWo5XG>%c=9zyg_xE{-nZF z(&vkEc~x^1Q>B+u23BpCUR!rG?5mo_mqs*cIJ~v$-%@BW-R~Pz)#7mW`cx;C=1te= zDds*RYgMix0)HM@M#$~M?we>D0U?`9mK3uTgj7L+EkLRKPZOajbPw1qJvWo`zmjK% zJ5kEqfvtUoG{i+T#zwEvZu`R!E*k;NH(j&%;nSaSVBqBYnv@E`t2#ue{DpE4z~bDkFu=mOKCD*Kh%BkW?EO!JP2*>8H= z0;>xZ2`5DoHQ&o!(GuU+rr5OV5!+GyVZOSE?TrCMUr-gp(LtyGDeV8Jq75iR4KXAL z2*rQGGNzb#VWs?VApo}3(6w;>5xQ+QGDNb{MFlsB%7CCVw`n$N#?dT5GJ-m^ZZS=g z);fA#T9z!>-qrO9yasiA!@f{%u(d5`c$Nbx$ItvdGBT#U12dZ~`+r^yxc>=#eX;&5 zd6SU@L1!}@hJ?iy%S>gVG{d`_x)(`fAve*KM947LAM;~7O9U{-dt*_s%=HH~TzZK` z6_xA5oDGJc(Nx*UI!Vn4xGDWNq73~hMBq(SHl|`qNRXIJWX1wPNy3XmEubu>IJ)v! zTV1mMW zIlgvBtZ~6;$1>&%C}OV%YtJNs8+-B@53%X^J+M7_3F zFly74WtOfK!%Q`NZP70AN&~dvc&L3QnNF-v+}{j(kU+S0$j{jfgnX|hq67*rZfZw| zvix4@noYIg3Yq>G*R)@PC3T&qXzs3DP1)!4@s3#*upO0ra@{)0ZP8gqXYKe#Kry99 z-K26XqYIqP-#=E6&!bP>3JZ*War%~Z(Rt^=GEuf#)2S?l#vmbZipPXgLz+Bpn9GZD zpTGtJI)Gbaig8qaI)XSAF?>A7mSE&gkI`Tjqg0R=b8VTYzc5+RuZ@azBo=a7gdsMc zo+2010aF*c4Tq2lf%e#P&P!Pag3k-bP%HhW9fUYlRZWDgETs{yDIfvVh`6iEAEHuA2cS^ zufyYrQAYqh(SzJS3<|z`_*s5~8DW1A8BBanKD|$LpmUGRgk)mFZq#pK=KDEM6 z4yc|ede+_Ct3LTkQ|M8<+X*I4STSxKWJ#ziBcZ);YNo&{`QvMQL zI$0}$ySMmlzQxd_eFXWN521U#eZ#nCrG3+$tkw5nzPB_rU-41mnz=H^t9HA$jL}x` zKDoUzsj||Cl^FqAZ%zNNCG4Zd7J4^5R$l-IDVmz^J*A9RS=Xmr_(DCQ1jV2T0Dhp7Z2gRq=p0#QOCF?9n$ z@d5oiL1?IbQ|w=%7ka<`#@#>gpj;=8zc7P{(tsmbD!HoEoL41WSG1xjjfT5JA>cRj z4`#dMo6fiR`#zp-$Sla3q&KCMoY%-(t37(xY|uK<2TSTAV1BjoAMHmp0BX)5}^c-gpc9K{=9t6dsxw z8Y%9n*p-R9S6(3gd|S18WL5lr;p30qwBzi32lY}#uJK%F_LJ!A`T~D*kB;o7V54=Bw0TV>sWtcXRs5r_zdFoX(tG0JQP_B}U8mf&Cb9|vki zAH_yo(+2hX*homZgF0*Fk`n~4*&E0tky_^jS z6YqoHBkZxEj>G@49)zWZDx1ipP+U6%Qlpl=n?PZ6ld@Z==1eL0vNedd`friGY!$@)&7!XOVTo~ANQD(PXRQhi8p z;vK!5H}qTy6Ec`S3^%dUWcTVJhBWH^u>G5?{Z^;Oa1XJ=@L3uO4hvch_<3dlXQ3|m zpz+|FEK?X{AIhVx)D8oeB0gdIPZ^=>#B$y{%r5rP06n4g)I;OBdKP!282a8T2!096 zMpvdfF{B1{2;SVSxb>ock&TbX7eo1I9bT46ECIvk}xFCX1FlJi;H{Ry)U#Ew_w1Yv!egB>6-d zlHNOX$cJ=H7}eB1Ch} z*G~~nU0uUleR8(en&f5|Bsxq8MzHa+Pe&I1tTRM}uO;T<>kgamCxBBRFD)}%a_Sye zVK%DYv58joTUgUN;2!c%)ufoyyC)Z<++kOaXIPJDg+6m01_e$5#JfDD_1m387Piz$ zVyzXMwTFEPFabe>^&dHRrb<_0)&+y|9&O=Tg(qf8RHunr-+B>AGMP59!-I%2l#HFJL! z4I{7;+7h$(8t_g5XwIq4%&e;$Ly>?P_cN&H&_H;pNFAP{UlHKRZlXqEGOcD2cg3Wk zm+GPwbbFG^h2OBn?6)6qcz63M2jJoh)nyM5SJL0|5?^6>PxSGJ+|B=Fr~{>-0AmQC zN8M)BVwAHS;6Tb;h2)kE&iH~mgqBNE?r`k#qYhM)p0v(7lDce(Gh)Lp#>4LpawxEh+VJLRz_6n%#;LPdOiZ?-?QopPOR@$pf0U=MotnQ+ zLX;pV(2mBczLf)x6mtI6^{nnb0ZCeqdc2jimiO)`7S5L5d*s~AL(wwRx^y_)h#GRJ z6CxyPN*6Zaw(!3)H6nkpJ5EKdx44c~YYcFRRlLrSK}q>QJLrKU+@6Erj&$a;qseNY z2DlS-f#nv2LUG7?M@oSa$z=|r!z!Vove26#Jt4%MYRChpEAFbS6yguDs?gCE(vc>H zKlF#duyAd`Ef7JyP%dBGd}$B5LM>{YZJ8-rOT-4~#18)T(~5~bG7eBFL@D*sXp~E2b)#Kj-6#_;rKFTcZ5;~q>XBa%9qtnh|*NK z&npj)_woS2`Q)Duq;*G(ix)9}{FJ(tBr%|Zl{%`3vm<3;ZTao!@JCy!w$Hd$eTsHc z-QO?{AjJ$$xyVeeiaa(mIS{g>H~RWDd^7NrcuhG+n6;;IOM;Pnv9AXK%*F>lh;aH= z_~cR-sWJe&{k3#sLEJ9Q;xpFrzQ!1IA($)KQwTT-J78{YNzs2fS9t(^@rq2;%#zYD zCmxz&BIxr`?~%}btlSLY*nUOqSIu}@IIZ6m+uae;rw{n@(ccR5i+I!DYr1e1a(MOz zHzGaa-+2Qi4lE{yhB?MQdUJSqM$cf$?F?6pb~QsYC}kb`SX9W4V`o%%*{zQJ64`;g z8k36?6(Of^2y<*)?pbt(p*cCs&QLrs354H|(M+Bl84yFLM>{4$a^t<&uOd2(DhK}W z%R~V(8F-8g0-{X<0z&#<+Cu~|nc17Txz*{ydgG6K1SUW<$vOLopiy3gS`cC&FC=>; zr`snLQ%LuUC#KTsBx?;MheDbjj*4RB@x4+Vgvg2Q0OGj{zwyBl2R#&)Nvh zvK6QnA07AthA2Q;jZyLAv#dWXB zsc#rJtZK+q93409Gj3RpAi)7vniDD;7k#h9p`ONG^&?kWM@_HTY2MJ7fv8{2lmp#< z`J-dnYo&kBlvic17K6Q3r`TbDyeGhfDmX~v7lNj#hHn4I_ljv@>^eTP zsM3^xX;99&#b$e%l)1=eav2qB(&j!Xqg`#hQ<8u$PxKs)K#$9LEYBI`^KH#UbuRfk z#QfD^(R*cYc*XG7Pspb}?t*5U$jMa`Nn>*lEe^-$(lI6cwV#1}mN5TvOa!?~^;B3r zBboddfM}8i-3jwdYbNW>gqGdc?zl7)b|ExE1)Z^-n`B4kI&AqgQa$8?%Qf^l$Cbzu ztSFU&Bz*3h^uh1K5=z_ln}jihDv?EUR1-YannX-m9M)t{j^7v6bowz67XsK^Xr^c} zcFlYtF58Vqz6kKDGQ(T^wmdp6U&f?PZ`Rp1e_2}`}lv|TNrx{_n=|ObOh>ei9-=? zz>G@ysvB5~P5qM=CW>f^i=MESv72mUmDuyvA9D@?ZgwtA#7}?fD2)41H#3TaNL>~o zQ!p^4YZ)^?LKK}PHpZs}T+ z2z8>hH-Z7kSV29q3+;b&^SUu(;OZ%T0R4BO1)b~;Q8NFG+#eI&nYN(F zhwAbjaf7+kYgh@IhwWwOM`-w~5TS~hSf0m>DAdzIHZB1wutXyGY)7ar?&{`HNCRtg zil^3&>{&rauIyP#J9c3z9Qlb^%|qcdnm@#`qQFGsB@-4P7X^wIp)W<^h>BAs0c5r4 zDhE&uy;mkH5(?K2N#f!synxvJ9}r{q{HW3}CuliZol?h!-O;94=#!hcst$9zAY z8#-^)!_-ks2i^m2NwpK7?|-lH1{+s!k}wQ}fd9?$vi-ymHWohG zDwU(bqT7-ME>MBSe~XFj-uG~;b%R#8vwN#+N#D5L>r=e5;{l=|K@b-MI?(l;Rwo0_ z9+o^paw;?CByN0w_X0i1HCm%qtx|if(#Q2W_4diWf{#I*@MHm4E~ZHKLH~|})2b** zH|}eZUNhyz4UvD0y#IZ*{H}4+18YtgEtkby@`f?c&J|9IKb58`F>F2HM`CO2nj^k% zFt-E)snFVzAISg&3yYj3fOqc304+>K_}|s<8sGKJOP8z?an!w{d zjNgA-;K=E)7U=lZ=5c8+RZ0$CpS;JO;#wIp>heg-}wnk$m3wD%&)zFS_yWWn3_ zt_hrnnOPWjCZ=pii?er^l6M534sLIG@b99Z)p`7YJRX)}If1$_qjn+@nksjsE>5sqs@p{)hZzFCoe|K#!`{v*hQqwyUC$`K~*I zS*^Gb>Wcp_8B@J-F1W%)?t)n#ji40qdY+@TUveZZaG_=`4LV*JI&S`Z+5WUohCAuI z)<|8Ob}Q$_zVpr$QAFjly6WZ~~eJp6qeyBmM|?tOq}2`n_e z!E7+Q@EgU?@)x=hcu)rcZ3|yO`8; zhB>+-@N>$gyX5I`rmX%nP)Yb>N37|QdeLhva_P!%ANCTq=6lNKv|Cb~+ixYd*o5o= zj!`#)6b@*DCVBAcy}EpByR>zbx|e_Si=x-7hH4Id@~X?LTr(>wui!M`b7adDG*lJw zR~H<0MLOj0TW5U7!>J!a!toBz5|-5#(p=oC^mTSq%d?o=WfW(T{{_{cHu<5 zl&3bfJ|<^2@@c+KGRu}mn;xnG7B*W;{&~JR%kJ0k?u{C#a1}P&_ZSYZzonNIo8}Gn zG@qAN&eX~;+U@FAN5g1DBO5+|ElThH=)K|&i>R$QKfUKp0wY z9Q|GC4Iv6kVNMko8~&dhxZ)fUEPfa({5Ck805@R;%dP~uJD3N6*5(gqxm@{@s7(JW~(NN;&gRTP*kmPhIM|Uhk z+<^s0e)?efG=~MI3&nB5weBm;FIpv9t7&reD{v%PB%@n1eYyQ#zBZ|LZaZC^ls_;^=E=UiZ4 zU?=4jOZUrQvMXy=E!YBKp7hUnDgMa=Z>s@gM5KjsitnI}e*ug|)1aT+jA z!QW<$6ChJgLiP-0utHm)MWdxC#iD#Z!%qHL#tHwkit zLC_9f<+)3cJ*NPV5VY^08YImzZr?i)=WpR5wOYUF@zBa$7ETO-C2ScX^nPnRWg@VA{X*}x}GL)=e;F0k_5nEX!AKkp;eWCe& zf#euTDxFM(iAKgEwflXYS<2OoOKX=1_} zX2fZ#&&NgnGkqrqdHf&uiQs4g-3OJgMPf@{Aif|s4CU+^rb|?3`n6JkkaE5o|_@CY- za6#O(-YwB#-Z9aT-ZjA;RoV=ozsJGhh@Ovc>4v-`qP>m`9fR3M2{3Wzge3X~sY z{Hx&##;h;|$asb6NoBqXgqS0kE8ocaOOK}CqJtZ%H{u&$XRbE3m#}Pvn;R+u?vmzy z=iN$md%b#k+@ZmUD_&ImDeufDu)b=l({?omLIzee*|VDel=c}VR3HW^PrkIj?4{RB z`{^N7FikgG8EN@B#q%}%)NQUZHDkbS;f7BQ!+(K))13{Jt%({*9;JTCP!Azxxit3`Q=h_8C!;oh^wgM$f_y z_*br&OLaRUqBP8z>HL@_b6RH%vdtj3AI%v9E|(Os?TFKEInY~M$Q+Rnq%F>UB}k7LT#Xdc zmjc%!%NUrV%=MFBuzD6BUI%)NB5{I&4>#k&7(+rhI_LK?c zwrWM+*~-J@Ha=Y}%T^dOP-TW4w>mmv?1Ej-uu=TxC>_4+=ZGFdAJH5#Hu2U0wJNUT zH!k+P8>bG2@$V|Zb|S$pHDXs+!$EEc%`obC+o)Qgy$XR!q*F=X@R4eog5h zd2r-Nt|xgm$Ez>Amtv`5^rSUo^0Gski}eNZ3ejQi2gZ+IZ^~>DRBrdUaLtNto9Pv> zo&JeBg@@a3@xgbtZ$$k{`D$RmX~h!jFqZZgK){bEJb=vk2_vj|kB*pdR54ThAhuFf z0fj4$C_Frm`6)Wg{6LS$Dj+e8qG-btR6+OF7QTPb0p=z!bCrC`Lv()Vi9M%$nzmH* zi~jil=bz&)k-bb=EJVv#vj4A)VPc3Y!OV_k%`$t%(qEa*^&-GX0YoeCDNro)dk*vX zRB`BAXV8e_6BAgz_rl!)4zk06BfRP1ycu}Aq#qiC>A>N>>%JM>cgdm4r&bXO=?I2I zs?8Af6sAfMti)TE5;u>?^NP3PjRN(p_Rs_)nvuG#XqxU@yqb@KI;?`RTTQ-vwrAyj zVG?XO3r5%anzwY1s5YjtA(%pY{aX4X~b1kx5JxYH&g5EOuoD6nW>kO-h8uc znm^qVSIos=54#rQeLaF2(|~#AW745a%XX|vvCc!GViDk)=D3!~x$FnQil;3wm9EPS zsISVj8rHt-XNtHcdN*{rlkmSvEsSqKb9(u+ru`m?F=;^QhON-yEyaa_^#lW->A)w^ z7pZ2*Z*|UJHJ8|yycQZUZ#Qb1U=>lQrmS|7- zq-mVql^qaxkyY4JROJ=5QxE1y<+)UT#$ zbcy|v*FHNv4(9^u^wOKiW9kVE<} z1LB@E62?>17~4usdDO>iPyg88Yp*x_NzmuX<{o&;;r58{E9H35y6@<9!BJ!4W%$dZ z$uolT;MKFN=rWYkdK!MF2<5#JUX`>~jjHSZ|wy%hE+9Rp5$c<38iT!MGAdK>y zW+Z80q*GX3F^|3A%a)lf@`tBOGPy$LF-T>_)vB;dK%41x4Kg4OSKg@}XE4^1vNBPZ zH5$k=&q^D-K?oM9pRsv?{+gCz(Na9))MCOP{Iuk(HF=}+h2sS$?|6z^8onUHW zv>+U-7v5xz5d+&w5%S^E(m_7Zly8W%ya1(cMr&z;duGPFW(>*Kl)TrQ7Oy>fKC6q< ziD=bCq$I}vdrUIdDwfF@zP@nPWjFDfhyWPMQ@oLU7vPik(j*HZ|I8MJ&4_fzu}FO) zaVH>OC!#==5H<)*)rX2_CxFTm`YA$_>H*ylAAvjmv~mQYh;|G1Cx(2`nSziPjOy3> z%Y-DaY%T2)8=ou2VgJ~VVHP~8##Eu1^(Vq^LV$kUe{x&P}*l<{BKc4`P z6;|0a=Kk7&w$0XR)6ev-e@s}E>+!uO)vljlq8q%C=?wb}QillXPfikrw2f>bdJ#?4 zIQ9IHAo4CF2RAFRh~k8z~=U&CWK8VCqk%3(QSO2Hk>f1KyzkKu*+@4I=NAq8|v zSrpqkN7vqs`H(JjSX7kN0gZ$-6rwcm1}TTMh5h=5A;?$Rp-!srI?cC0TcT{kUUYHn z?+?2^r$x;=DZy*v7d43hCrj?lT?Sg#g8A<`udlto{jYx&=DyC0B0y`0gwIUC861;$ zdK2+;axl2#fmp0kN`fTRp~%n@HuF*+*I22Jh*oK28Jr=!a4W`Lj)82@`VGrBnKe|y2=bQIPj^n)18+yA4UXK{%-!$|4>j+eO z`v_QjLvj{TejlHDO?hMQF`6aTNgoLA^lANpztZd}0$DY6^e# zF}@w*|*Riqo}LeCfX{iI14Gp#%V!i?nHS*NT+a{Y2(mR@F;aIp$tLCaL z=!{R#EnYG%{+Yizy7Bn6K@qY|v?0Yikaz6emLY zc4DrLwL5V4M(4CdP=Qzx!7MB08OH*xV)XGGx~Q@8?+ZkeS&{~l}(d+4yP$zIv)8L z=#Z|gU}+nsnSx8Ld4#7pJ4}N68=Ml~Eq)SGG3B5}SUrFGOjkp9q^DXDe>=+ECy`Vf zfaFyzlOZuwL6Mt$52C|w;VV026Ey8M=T6@3cHf9)vHRrv+*!qEle6NGCzEIeVj;!h zu$_G=t~(i3TOTUunvm9Bl6_vPZ=anR`=ezy7Ed#}aHWb@OjCZS0#hK86>{4pC0Jpj z))=09emD-U-83gyvz2xu2w`$ctIU`H=z&Pb5Odelv1Ovt*Xeya*Cpnc;FEIJSftUA#0mLEI@-r9oq z8^8C-6f

5oS$1hlqW4niG-=sqgt=e`(!Af2s_oyrl#SA2W;VgJp(RYSKH5R4YtZ zDdu!sPuj{B+Kv}1a=?amb8=c_F;e_#@IUxo8IyCCEKawXQUhI(-v{r z+EpK))enRxr?s2M<*F3;bLvx^k8@gOOjW!*{wVgz$Xk-lR%P8p}qr@ETLa zIvc@pWpI)?*veM5_|+Mhab49;u%Pc&K>xe`nGl?DI|jM>OTPG#k1O__kZTQf?$Cyvfn} z@IvBi503r&i+dYg4DON4z^MqUDP&N3b|ukI-b-I0hkr<^zMP>5KOqD`PxnR(q5O+- zdpTs{_EO>G<(a|N&zF0VyEq|`|K9(|v0@QqibMr4F!;g|HyFm5y22YjsDb}Ge$W69 zJ%&;V4?T`jiy!d}fT*M&TH1z;AlHsCu4pde$^3xs2Jsrnz7QEy0^1@N?AJpz7PNTO z3H`Vx64!xxniKs^EY-!W#+GT+^)nj*D}K2rLo)zZpDX&$A6)hL;w&r(W?%dmDrX<7 zVF;`QGI4{|s%34_FHGFfs6d+n>efdg>2LJ=zg){Z!a)`Wz_b*rKn?74g}n7c#FvhW zDVUa}41EJx@EAfpRWU+!->jXs{{{dx|3G^4T57PJ(c%q8ue-B*4%Z4X6vW=CXpE8L z1QOFeHyCx;PWk2DV>SK$qbkLsu zBk2Mr>Y2eDI83AOt77JNU{cN;Z;xgq3#+Ms84AiJ6nc~rgbYPK4>zx}V~nezY79SW zYM;-`<%{w766iK1;FcGS3?U;;erCP%V)fvzclj5g60#b4#~E7Dc2R`?u51KW>Nz zDYF##oa6v1>4Ei^^T_3SxqcwBGsD$R_<;!f^#DZYW_Y<6jd?&M*_8;f{shDZ9HaR4 z#gSYIsBB$Acn5otfswfggn~cYm-gfp9XfzyNJmLS@q?<1pyc?1hyIR(Q4t~M5{Bhd zZ%SKY`dvmy=7<;U$`kUZLe{e32-RGPg))4LG{bP*q=Pv8@HeG#af)PGYdh$k5qI6o zk8k4tyJckqA(_G-3pum zJ-BR?Q5>0ADhXy5g?mTs@aD#^3CEgma;MG(@#4i1Ip$B5G4>WYJy}E!h54DyyjR}4 z&8%Hv0Qdw`9wG;KIkC`IRHm7@|4~lQ7wxLgnfOCy94|!W&s#seA(w5iNvr?JzT317 zpv_F6B~T6zz2mZ-zk$_1U(-s4UhC}BXM5W!P+?f6;oBKK=&$jrx8u=)6c$js)P3Ks z|NHNd)y9mW`uP-MgDoUgEi#c4SC~~;YM3G3>S8%bMn`L+wHU_8x#3=&Y4#a0JY+-ji5#5T?m48wWy_D1d;|pdGO&I<{>Y1 z{DxJerQ02jDnFwmvD1^~M(UsjHGIt|nHZ^`MW?xh5LVC6WC(i%&Yj!{2Wv?)LwKi<)pLHW(x~b4BMM054ZI;__{d^S)SZ`SFa3A?gvC)R8nXvikJbzmI`rRM4c3U(t$+`6)KIP~-2b1Ko_K;e zmtcT^Ffpd=l~V&cu>R_+tHRVRy(ZoaQK2mMNYW(qCQ@LgDJT>;V3Z7qD_3%l$+0tN z`@O8N2Ca3NZFP0Jw*O(V!9{RgC51KJ)|RebhOL8LUC%CdPrz1SV41?d^Zu+!3Llua zzi(lG_j+D;+~yyJ&-4AxBmQ;W;h-`e{(`n)K9^G?nZ*T`815DE_u5o4iUgTq8Z|q@)=SUOqc19&Q3kJ$Ic_&)5XlO{_UTo6V4sSYo7FBYW7}Z8f&=`eW>$%|?*>b)5SKoCWe<*V`-~0P5SRXeN{L*L zVR%LurL#i;pKHSlY24YX`b%<@-9h~-#-Oh5e?TGS_aoG47cp56?dpfK3dP&~rw&k!M zu!q5ID#x*Bn|DD2?3QTg5+CavtV zp5*r08AKTx-H1IkP-J7eB||>-+o6nI9GL*e?u|oCd2*86?4P7co#i!4s+64A&LZ;~ z*JEX12-f)A2t7*brcM5i)(5_CPd6nc#-KZ7QZK`rJBx}_^2kz+Zp~JA8v!928qGn{ zJ;Frdgn#$4t%vM>M}9qx&`9jVIL897y^ATiHA}P0wsF~KsE9CWF4bZqN!;I~>KJ&I zE|#??tGAvew4xKV&|Ih_oYqTPOZ9i^D3(Vjd~sQ>-|BAzr3mYym^BznKBdoAV=e!z ztn6p9Qa-L(*yZWYvDuWV6L6YgsI8rxx+c@qtTf5^n+58rXgPizRf_+#aCK)0`mh9zp zPto!rW$=3i2*E;zZmJO#)-Kh1%K*pjhK`QG zFcMwH+E!HCwbC8OW=?)1!R;x8-#7`HoRX=y!ARGLQ8)MXkZCTH;#0Ql8b4yW{d#7(w(YgZ zgDOL0D)BtW)#|T=MBt^VZvi5i>P2$xQr;z8?wi!GQS7|XbsReo8kyz#JIEJ%)&s2N zXo+N*D3Fl@Ye!`crA8jc?Yo~-_WQPYw~A~ETenfEd80MDz5zqgxb1Z?y($#K_m_?m zWb>?NSoEYeU0j$^e7TKLOSopR<|72CNI5MkJ$%;yX9;OMWt}>AERZk9HVCR}K!(MB z6e&z74ogqyfoBAtBALuj?qYAYu&Soo4R1@CtPl?3q~C+fNx7@b^a5IxE?;#Esd_}e zum0^i{I(A*aM1%b=xV#T zmyu$*sjl`>_TY|%TOm}74@Rbd3aiP2a(P~d^&(lh;(8rZ3-dQXRnxmCvBZ#WIoXIY zEe`jJ$W0!0O}EKMJ8a#>qU-h%>v~;@(11yO?y+Q_a@eNo4QS*eH5d%1%%@M@34~2n zsHX)6pV3SeA4bUJXO3) z#tD-XL%a7!0Zwc0E&lAb6CFSPnwq@u<~bee6^Yh|N4}mRa;DMvyZ6TlClt;T&cd2H z|E%}t2Sm=9A2Zy)*^DZlM84r%6Z~+CAGAEa@c@H!G5?6U{R1aiw~D!lcgeiFV(cs? zKBYD> zzP_EqvLnXC+p?6S=!&fE${6tHSe+&-R;!0cfVqo6it@0k!BpaM-X9CSZpB(nL(m-O zIJ%cHgo{tYe$+p+EdA}}N1haxme(k--4V)|2v+-e(`+9Ukk_9EzAEQ;55s(b(H>C{ z_$6dil(8K}e!Q8{fC zz|UeF!*#Pak2Mb%QGzR}D1Co`DQiwEm{W?8=rvV}YA!IJkkoYM`=>r(`O5>f;$hxB zFdV3VYDwmg89U2tg`K)WtFrEiCP?jy9F)()|4qc?K1>K(!^iM`j*TZ=@$__r!T&&yBC4|hnL{uzxB0;`wA&q{g!#*Dz=lyX0_uyRca zLz{Wo83tpMT_!Jy$Jm9m>Zg2DY{v8me!96N>nWZ&Z>?ES`sN<*k0h-k*gmrY53EBf zylqU&7#*tWc_5`XOg7eu6*+@DjuOgXUfD0wx6~P_@%>m?T+uY=#U`>**Q=s$=AKsF z_wMyUduw^JgEUR6J~TCZ_mFZZ?wi+X^n0E~TuZhUwYh$fm)uL#t$6D#=|hm7T0c>t zxqGUShG07-^`Ci8!7vDrA=99M2QKT*jnj|9XNq-x!@^pF`?j8Tb;nrM-P>@+Hf%nE ziTADIC<@=t+snxN^wcR2)$a+0s(Rt^?I^_Ijvrx^i1j#+#{#Q1UbObp*{1xwaPu@( z_;Lk(Jk>l+o{lG={7Fe-F%;KkyIhKO-$-rbl_|?OmObOT8ycVXv;EqD?TefKDBqu_ zJZ{`g_-o&TNmi`sk4?rKJ9JolQe$@~QPMSg{B%a5Oo~&(lBDPonno_Xi>%u~dUgUz zoq+Vx`P7mLB?IhVKCoA)lP;7@?Wr*c=ift}Pb8&aQ{u*}j4 zg{gI4KsIH`OS*AORxEKXM&{q+TuAj`Y6 zcy!}#kzG+LLWC~E=`dN>KF&u`d)17joz%vek4oGSJrwxkW6OrTZ-Uzbd$2`grgOMO z;_YL7*NE^W&a+3LhE8i8b={9TxUm6xJ4VLMnmG+EDM9oZv^zGFXtw^At&|edCsa(Rl?*!Hu6tXeqTDhFQ8~Qw5ge{h3ZQAeo!*4D~^p@i-VKKwXB zCrmkBnF9GBw(b&Ne+xEm4X=C3#Ws-T9udc#8nz~u!+&KNv|S-Px}je>$amf_1&7r^ zqP>+DW$TdAbx)JBW8XsJf;rlk_{C0>K+_dZ-Wo5kfKTG4^&N;`6A8u zN>!+6$U-M3?OupE(#kqQ%vdb3-WW9nWER?LaVHQm%BYWX3g;yn=S2=c&2c-hLOq1_ z|3V@d0h$!o{?f2ONsM!t#@R?-ei1!zsvZZQL~u3p3_1#i{pIZrfED)lvnnRG0T_P6 zqB`33x?)i`NHd4R`%~P%`@`q9XIXBPFVI?P2^?UpelbrrYQ^*VINQ@W+oBH?(*||( z34H)6!d;w@SFY*R@+H>1?=IEf!#T&ZR#2pV5 zI&jSlo7(kysxYaXZC>*Yg@1-M*SA2HA_taxgmu9_3oNK}EkRjZ`o>yl%syWb7TOB(0EkPpXS`lX52|S`qWJv9D#cyW?Z*{u*Om1G z)rnN!uyC&I9|Zi_?!LK^doe-HFv^W;{ohD%evoLN5b~h@n4kkyL^||4oIt_YCk&;&0CWf( zsJft z>9V-}Z_|hNCi^~rKk_%xHI5m6p`F1XwIvmUn^@q=^&$BnwaxwBymK8s@PB_F1ASib zY7KY!gig4VuXF2rC0bvzX z#prhKCgf;VS7paJV{s!6N$5`ujnl>KMQV5g=x<4J#?xcooBo?-}%4ZUFcKAA1P#Jrnvowg&kPoblw zZ_tCjsH<1Rn}po4SM+3b&#aYxHSD}TsJ>zQy24xK7338;3i7?f@mKYIDPe#jR@6%f z!@_-v1au>n`!K*h`M`jM0_q)z4op9mt<|dL?{Vyx;+0OhrX})#`m%vw)8%H`uruPcc>!`zff;+s45sv_rXYBAV*Ys!YzE5uR z=n90eW*i>*;xx6X$T46MpIi!*!|`j{GxfLuq{M5D)G8+3aLE%2!0d)L`WnJXGPRJ# zln#g(LcC_{O4is3w_6A#@e7Jn8hjL+=J2y@{l}!%3;NJX)y*(tf(0O?<_cX$1TZFH z#9VGLoQ?@Hqq><4>3SS=w<;5mqAgfmyh|k*4uU#%@0eLW@94dfWt2$Si&-KYTvp#M zw(uCVL_RD$Bz!jvXdJvqz^4dIqXP9{rnK0HESE~IijMRiq{W%u%Bv56KmrI+?ywT$`A z|H#Z_OQA)SpZ8y^o>x_HGvLc{area(;dsjtDufE92&3Df|orB)xqu)q(q13 zoiuU;-~X=%Ko#0XnyAVr# z#@1%m(}oU_NLTE;?7Vi6X5=nb*4}N_ndZ>AfD-aApyt53;2*OrT}?`gsUsqs=89j- z5FEM48gW1nJ~G>z;s!Pj9=*Awhh+|)QQ%?@P%Vjun!xz%RkeFqpK;8%_l0xDg<#9L zfzV`zUXFs6pZe6FSr3#%!K#$qc^Kc1n{HUb>w?8Y)W6Qwtd0ThWb_b57TKnJVfx(M zWtBpyN~%EF*^LxHyu9Y}{y{X0Cpx}-MhC|;e9z`P8##HC&Xn~7s9uFx%xgK%(9y!) zLhPpj|DI{5emS|U$zF?IC=j3Q0_O%zIBo%e|HF-M+UcwM?T2#aT&k`*4wjg(~@LeK61cfdrf5_>_-o|ZsrMbkT@c!6Mykuhn5M|hamwp zGmQwrauDD^MpO+Ig15}j`KZoXt3*+5epctE1tQXyKD-NF;;qpP5?Ws=Ox};|8!mPC zv~R-E!$=UP($We+Te?-a*%pp;2+3TdgKfanKjOj5f~0${aBbAfQC`SkRppgZ3o&nS zk)mQssBUu(cZ}(lcKu7C=R3sCcwvn?I&rm(CmokmKjS~4j{mAUYCduE;)DbON=Wh_ z<^agzc=H()u0eBnC}j(oNw;PK$!Db}udzh*HR?Mq{gCzxV!2|O%uQq-*0R=%BG0L{ z)@LG`9Z?v?Xl=!lZC~>Ay*s?DsdmJeFZs_`zdEkBT+=*HKHo1ncR`$Bz7w4US9qCV z!&^G9xS(lj&iKicXWA>Lhoo1>h9q zFuJztSWUWtZW+btWnkd-Vd`PyZvSCmWBAX-!^ZxCh{aQ&|JaoJQAZ*TwGVTP6p+tt zwSO(OXq%mQn`Uxi5zJ|>VfrsOADarl%1$eqki-tVievGjDI9`mi(-O#85-eW3O4LTUq0qv^w+5=qvoZZ?zh6y`+Ef znm!!Rfa#5OaL|xus8e~WoQMX&10RPJ7MaH27j+{(AZvWj5?hIl7@lS>x&erSx@HD$ zQw!q5I+PJ6r_#?Y^$T}Sn%XUNCFP|pg*NLTq5R~s)4Zh?jwOwq-xQxl4wJ{{cAb3G zLPUh`o&^ey$II}70>qQ-!WbC#OtDbOZ*R z*bGhYq)33GcFa9AHmaA@2zEC5Eh)D3ht^1vm&^#wu{mEP-S*}77>i$^rrDu#zV6PH z$-=x0_;T{C>dGs&pMtRT_zQR)#f>a>ugRHu7s=nHcSfI)mzMC|F~AGGALaft%Q2H8 zra+dT(h#B92QoT#-JT-LSM)0Q!=Ht!%JJ7r)H2;5HC zSO;5k_tiX6)lgL$G55jPTGf6D_TPgIMF!*1tWWkXS;4)3<*_$ks-k-vHaG1U-W(iY zPwlUASat^RD^Yu?7XUf#<%qGEY^p=M<{v?*>;V9kb(fIr2o-b*cG~mPRks6(+e>>c z*0j#b<4bwd8zga2k0Fv2Kx5~-Y4 zTwVb@+w*C9e~qqAvCFB0Q${|7=Vrd%&c)qr5*h1AmvN==4uBQ4=90N8s#Edfw4<2Z zPB+EY_u`+f+C=Bxc<(}Amv5lU&9{Lq!LBRJ@EDhGSZ-YKVTyL6i#xJT44Rh}k%s8D zMZ(EuIis#+%lw9>W(OS3cEb+jf5n`@2|pE2u9{el;GTEAgDx(-^3O_iiyI68k`EK* zJm=)Z<=_+bXTbWr>@Qf~$;RbI%pvc^{OEPvcO>ls&KWBH9e)qFzd>B^z=VbBxckjt zH?{7GeoL&<2#W+QN;tFg=YE;snL)QW!K-@9adTAjaB!slq+aP{>#76Zatl*Hsseqa z#p4|)phKvR`85Fx^3DEK1$g3+5_-j=xvg^Pt5brtBHZ<&e=_4E z1#=t-wFqF4BJ2<9=R0sDVy18(N>>Fygc5;;@k10Ndb12Z+5d94i`Vps;&^W8K0Py) zeEt%NssMO%=oj10*~Bd(9|((}z@Q~Z;G~Hcim%fNVWTvFGZlv-jNa`ZG@Z*s2b*Gr ze1AtkDR({>6r>@`si9nos&8pJU&Fdaw&(IoL}U@uYP%)uB6gDh%dOGyZnOGf8aZS40n9?<{3{9LMuaECo4PNaUC?{)0Ren%&jF^srL)#gYd>C6Ey$P zo9U=ZC7=TUWaI=>o`<#Dvo0|vymmJdlsXb; z*u9s3R#jvq(w@tcZKNz7xCiXTG}-*U)ju{xzKe_Pzr&dpF88vC7gVz!m*f_$#0Gve zLgT=%?BCF$(!U52hV9RXZ}c{)D6cts)wjNd7#|?~Z_xjQB@J$|n`Wn;!2TO8S;=34 zSpOr11b@ctf3^ue-QoaZlI(vF1*B2Sf`^R*8QDBAUl4R_#Jyq|7!qhHbvblVaFpG6 z`s^dAKZ%`H6n-@FWE4F&pf3f{te&vR=2__!tWB)w0?lnWjNqC)fRH)X$4}1 zb^DS1Y7?$eSuv_pzABczjrzI!q@OrQ#Iw?GjP@S(afTW6vdR@jzL4rXhLN`xwVLUa zF~t*W$e2?qAfX zqJrJ*M$AW4>pNiF+JjGlEY*vS542_`g<$8qUsQzRy1~HB-r>f@2k~$g zQB0wNLiqqEB)u@)Q*4R0AqotiO89g^p>GcXItDPz{Q%cndo0X-^oy$^2iG^W2Us-z zDTVxF1+D@t_XudT`R=(9)HP>xGKwHM8sVz}esn202pv>Iz{9^LX(kx<@6Tap?F)6f)u%oA_Y3#>mVT z0wQlwa9|cx8;kG%l>7gs9VI`?5z&7lUwA)g1J!@% zeAQ)4z%u~#1p7Oe{`K%civ_|C4tc~s-VP27ine$yeSbx?#V(w!C9?;2LW0XQGz;h1;pg$55n74|8SNDKa9S zSw=be3`@%95P&o^CDG3*9z_QczZBRKBnLzw~)tx1Tuhsp;? z3{wob!JExH-eYAEz#TZz3V@yZ@&@-jfUVxg^nN5a_{|+$SN}H4Ita^B>g|_1t~k~X zC^zEmnK-PYmO4NQGSFZO(gxSOc|s2(W@cO4-sNOrn`2GHI#qOoheMEs zdd6E-u(`yh=iSL|rYGg?(H;0uV9jc4ss1fBiRK0!V-AG>o~Ta{>|$cF`&Ssz*&CbL z+i7&me<&fw{0tUF_jZoW@O!JY;mTt zoo=0wec&^(fKSF?SW9xz~$sMw=6{%(4Xv7t(%&`|EddqMAv!ibQmOtM$xZ& zCKF#hOU`xWN2;fUbMc+b$!KS@Jma2Tc*gaXsh$T3g3}HS7N3WY^{;klLxgv86}q$N zmq`&(FQgI&zhgNb6O&zC09n8TG_tr6o7$WOQ__n_q@rlAQbc*g&u_2m^?Ss6PQHXj zr87^b-S`=rHkv9&_1bStkjA_bnqO`|7Bj z>MaPt-|B59Wp8W}>wB)(3JD8u=^A5Or+U2CP-o$cYGVt8bV>zf6;!cOP`PGO*qYRJ zR1NZzSL}D*CiLr7Wa1dSE$zjHBpi)U(9_?Y9%C?$4Km>xH@ur1o}CR#S88zkS!5e^ z9T`vb1fgoaxVr@-`im_>256>6dnB>67ridENWEkUXEUYL=NjL_RDa;%t}kr z6nW?>Kr(MiUe#&>Ud&pFfs1@fkia62k&HLm(NA&lbKeb=oEx`A-_qrw_>I1$~Zmwe#eP_2oDq9QlbNn<*-JTu>s1rnji8b zyXqgH-^ulLv(e!IvAArOi-v1OM;7%Ip5OTarc#iyi#YFj$|h;OqFRKC zKj@`lws}kr@tkFLI-RKy+GU+N8aCT@O^QP>ZJ;SKGUr~w(`T=te)F2ymw{pkV$1A0 zJ&HdSCuLE02pPj|l$Hk#rx03vShW%zJS-%EQS`b0FvdE}HApwBTuT6-a=4>mYG z(t)@_AQjKVv6h;GuEXfh^#A@hY; zBDv$w1&Fgbkl3!weGgA-iF{|^o+6rqZBmtPMz|mj|AxF8Rgg2mBp7z+=uJa<`pb7U z42$+1>}2f!BbAVTPLQ@$bRJqo56~tyhYV! ziT7W|q+G)vG7CFQABq?u+Ys93rdC1#*=k$r+M}a<1WsQgrnpL^yq;;wXfqu4wnF-+m*m`D`JF3qKHz3GfYSUDD{g$ zgVipHTHc7)bBT7MhpJSYD^b$R^rud&Fwt7Xu;oIUyfyQQo#5Hw1I|`#p;{H{_~JIS zvQd0=Xvm#ejRTm_A0efywVfTkP8KmZ%t*D(^3l==xZ6eGD*OmOi6d- zEP)fuU@8s8wMH_G=$&)ueOQHst*6>D#Yj6jPdOU*fL6a^S`GHnM)?UGXwDZ7&q?;^ z1HbpaLH;Mjyks5)OZd|tkN@)_1xmX3OP(|hi;8?mLo-b~J|*9B1oB_a^HTq>cHR&U z`{!Hr9(K~=9&^(moDj&*E$lva6Fy=Z*iSmY1vLfu=OT-4_**lJ-w0=(sej`0ev$#a=pJuN)#H5u=LGttNuTcb@EMdU+}yE%|5Xp z8IzB)+l*-E8HWH9-Bv7=@9fE`Y{wpMUe;fJUtf3VeMA~$Y@`cPqG}?rBq%0W4<=C0 zT%p`ou+!yWvCOfMcn2t5>B&TU#G|CK)DUs6GW1}DaDZ*;?J;qe(Clg21UZ8kvWFUa z?MVuCdF|AgK$D?yAH8KY*F@vi)%6cYSlMj)hN$Nn=5|yc4Pz_hz>=JrW)r@oMeoFB z^2g|G!z6h1iztz{{7EP0^O6cI)=Fh2P0s~!DTv*!QfdhjMobtO?HDc>IJJQSuI>!e zNf=F40sypVQf*CUqj71gy!t8^3S7<8hKIOJQoX?g1?Sc2g{9OcvcCxv{;0mn#E4Bsn@3I5_+j0=!?f}hNz;-o*rf?D~>n0)TR*p)T&a)9p*x3&(nf&Eh7KBPNSJ{=J^*1 zKoOLIqy5{Rd9NwIFv{1#Db-XS+0(`Q6MEL6mD78QN9d~?%cag6 z_}r4OYb#zLL&Stq;<2asc26MdPoSMgrS#UGFH!NuTyc##D^w#p5#R+lXFyub`fiq%j&^1OdE^pE!RLRvq%% zmjv2a0T9a-8mnPO4PqC{tG3+%tUmM1vT=J>{w5x2m!RV;2WU_5;NAd*AtsR9o=9SZ z+qFn!_gj`IMv1 zj2oLRxx242E(>0eKNx!A#mMJ}5dVg;%oxnNEF^-OW?sxp&3su{csjh_ueK2aSvYU{ z$0~zbN4qDn)fQP1MM#6H*1O65OE(@<>+;EovKdF_7*rZhVy~j`UT&$0{HLY($8K%8 zJah?PlIu%9G@-%k`Ibf0WxNW7uMCcM^HE+`;2?`ZTOqj%#&c4SM+PxQ8Zc?i zWOm*CVE=j;bL}NkF)6awZTMo;@BD)~4p zlr@`N$rJ_GXw#l6&IyOliFIsxX1m{VvlD@!$?3J07|C3AV1d!bG|S{&4PlnfH3L{@ zog(OEKfR9;R1ckR#pS=~fpPYOBjjO!16ZY75q{Zr*gK!yA1$8;;Tztuc(z@N8u+uo zJm{64!Iwx1J)%kL&;8WkmxMJ-7F)Af%C$mH)AhE_45#bXo2hJ-0Xo}iIt>Jq!*-m{AG!Kn5);7mi9G^r+!x!Xslr@OhpviG>=In zWow2QB6vTKOAae$4D;7-gJRc;v&gk@QNw|cmKM`uA+X>;dl-~tfyi}G=Fp7@-0_Is zuNS{PvpOdn2Z9_fK0sQTfQp^i3Sn4m|GCpE=lOinU=>8f{fR5>+@E z>{S}7)0bVw=bq}FwVT`v1{`vOe+Haf7Ysk$;WfLq3)8YT%;Hz7?Q`~$k?h!P%(r{W zQme=!j_KuV94cFhpX3Y3{<6T;oFmff_8PAN+{@OeIPF=e+T>N+Rx53~Ym+t#8OOXd zMbWIac$F?i6fEiBKvT8d)HbR4Jm4k|UxJP2bbs}n&JpYCCcR3Yx7n0dW~Ru^H^4U~ z{!5m76}_&P#|o^}M_zJYD{{2_^Cp(qc7tH0Yqe?N8aQVT4Alo)Gn%$KQpikbNp61^War-vJCVEJu4SOWnaqQ$j+8rtk9B{aB=7_3i&f%&cLdXsbq~mN0M;;!Q94oe`Y7XuiA;<~2X{ z`UC!a_m<1zkJ6Yd@&0s-50fA(cUhy02`#xWb;)9f=u#k*(tWzymgd$s!KbfZ1^+1fxnyvHbY0G3GMzMbstkS=ivVHQd?0ZA;c3t}GJ z(iyTaZ)V?=+Mm(tOC|9e??0Cz{g=(xOjD&J|Knd@|Lj4MNHRvpPco8#Oj0@`2b8G( zN6e1j^Swc-O=U7Hk|bQ+N*Ke7xiq+3UM_Pft~mI)0RQ~2N7|G_1Yr2PFN!h!#mM)G z5c~FE<_aQ6+;(5|WM+%|dFz*gr6Az@2Dy)d1GZk7+GvW7dy9RNA6J&5+pfsMba;e@ zxVOX?-5!-?a#>%b71@p4xUdA^`|3Nlo8%*T;hjz078rZu5u$ONP0=(@i;i-POOh-v znCw?h;!d`ipy5}C{D2sOp_~t`u=rf!;6(yQj>%^Y-f{BOeCo4s=`~?)XZWJO_*gPm zu#|$F>>jusp~yF~;POuh4|)~VZ&p73aZj#goW0+;7z8kQiVc#j@7M@vtlik9L|R4L zOgQcGqd-udKk4XRCXEFit{&ouZUU$8S zAR1T_kA#XU+9r`Jy*2|-T0MOT$u8zG{qE0VW;FYNlh?u$pLJOK2ysRSxN2*SPzrGS zx^Sb6>Rs|zdv-M_9kM$nK7glrUy}jJfbro5s)j{gmF6 zkzQek^nmWoBOcJxUqHxgOJ5RiTBdpEO>ji)#0ew<+~Pr-AvzhHU=Aiezd zzh=RUYDrNXtGT-ddp+n4r=qx&F@ii+NesiQSpx1@3&;R-;;=>dnat1FbVDzjTG0pi zdJ!jWYgaU$8N>3Rj4_{J|5HKvUZ~8>K>z_!ASYe3Qzi`^;Q^+#&OA|n7Kn6nOcyT# z%O=o>JBytrx&;LCYS@ZbH;dO`&@#Y{$0HQ8x?3y+;$C%zM@lI>i8^EQsZ{^<*+Tpd zJ$d2u;yUkUO)9nrv3@;Fd*0dde10SceB3{_0qNX^MEh)!7Xf?9wo6J-b0njR9hj3c zIvb#Lokn*^ivU;xfuTdA#nVYCCNtgrTr6%w+UEQH)QCsRn7(u}@qyF&#=c(hb zs93i)Hrh6ERJRoClP)iqb1`hEJmW~Kx-N1s8}J?ZlzitbOqt0VdEz$dTBnC@QaI)N zg&NRaRRH#5Gcs=Be}fbt&l3JayfHaxtjm3`S2k?|LURBb1}i{8jy^2{m0j{FZ)uL&<2{ zE;huXlmAU4O$}K~N6<8*DXHUE(D5N1b&X^DAS)o2DolmvSH+Yp_k`Xg{@i7Ya0Qj9 z0T*kY_gNC=B@r!I7m;yTFebR)`}c{S^M$#AL8_hp#3YM>j<@#ABuwp~wG&a;vyL@y zt)ZinQPsUuCO1BsUPMaQ1zLJm)s@HQN~?3k{jw|!!>~C_p_Rs5U6y5?qKRc3`nVq1oeDuef` z!&ddEbW_?bOjVm~f7Kd&edD&;V?VK{ZmJyqJf8blYiLYxt`etqD~@2usReW$^;(cJ zxc;eHJ*F*MS1dcq4pMt@d0Qv^Xo23{eF#7fL8ref&}qe+(D|}qMoby}{kAl?4XrE2 z6Rj(18wTMoKlrsP*+$1A^=dxOWTVFt^7cyE^aqiE(hafhH?lzPp?j|$n(qL@H(H+b zi=Gg@1|JN*=l7u{7Gf?;|bXo1{!=C2&joc!O!b2)s74|NIvbHrF+U= zIH+oJ6xDK86Dth0`EV=6lInzu=~Nc-Nn)r$FjaR>*rTi>uz)%zFOXyeRJAW z6~wFbGdb$h@d}9}b144SG3yMzKb-*ogQ(fcF5};o3DStzqwR6#DpYTQ&xY#1MZaL{ zDR8UgTr-fG!V{+V&ZUPkwkRML{Eu&b1&U?vczFC4_0y?eM2*-g5+-h_vZv*5p83m` z#TxOeZU(H00yunV1+r$(u7sXje~snqJV>UO3+HrH4!hE8Xucw{EW2$n|K0As`j zilnCK#?X%rwJ39tM5KvqM)~XUnnn$6fr|- z^lBU@iCY6p3~a(UF+`vixyr2A6@b%#h#CH=MY1!r9NaW;5^d{5|2IcVbuUM273F$p zBh`m;g;VSqznx+3iav2bi+>)#Joc;MFBZ*PRq`BX`m*6qzvbRe9n(A2%o_to=)}}x z_J=J`+VF_7dZ7D|)fMr+*15K_=#IY^W+InRW^bI1Gm`zjs9R(lA8h6CGi_L(dYIKD zhpIC?k#TU?Gha|1PCy0WvBE7 zACDf@4L`=?Q09o!d_Ms2eYZ|WP?kNhmy^|B^|NsSs^#i$FJPg8?_^1%5pSRCIMNXb zbyrml(8s?o86BQiFZ&U#d<)y1=r`zm%j<^%_^atWaIcx{+Zc7%nzgSNd2slLU_xzX z7Bv8IvmVseSv4LU7AZF8kaBgJQkh{dwO82{CDN0t7e&pg4PpBY!U{ zNsOQfy+)f0VlSYBk{{Xi@G}AVevHBYyMZ$4 zorMQruehj$Hu~*}yS;*rO%om`C$D)US!TGL?CS;mBKf8{_z} z_#%Q5GKA>|B$#}=)j9<%3o)5^mA&cechYc~*W2p{nm(Ku3+BR;I7TT=L*=d`3B$R( z9-SEJoP3aOK9@~D>mr8Nh81e~awp56uUZT6*QdyuiCSZ%aM~^ z%bm4laIm1_ z!n9|=8CF+J+*EPMA)YW7J@P!H7|bU{AX@1p>JWPW=Qn{&8@q;>!o#!+x$Sa|e{AI6 zOv)oi5W%yYJ6$u(JbF`F7xDZ={jQ7rs-%*}GI;2$hxMRdM$S1sn!1rVPs+hsi4E~X z52tNHxMj02#W91T(_yuT%R*ck@x=nfLtnpA!;Rm_KF!nly+N@leA#7r(Q8Vn`9kFwEzM3ZQ;MH)_@!-d$gIQ5q36e$tQDoA<^VLa zPe|jKek2{DHo;TE$I5qG13aD9H?f9#8w(N!wb+;2Wx;T0P5x6*wBkpLD zE(bkesGAFAtYVId#&cE8C%R(HR4*hJ8a#;xO^%kTJls@6Sh?RlGa8>P?Itk|ncy+*3w@8FX0f;egPv=*KKImj6dqHp7^mfTMh2$(%O>jwnGE$*8f z!!|*kwbJb&eRQtf8K?TH@?WhsiR4|s;Rcm@9wK{>Lm=Azg)~yqb@s4*WfM<{>r-r@ z7pHPPg_;r~k;Rhz>c!M|8j)PQD2r)$Om}=oSD93h#X8O;k8xW)v#uy7jz|t&OkbP> z#Hr#qm}vEPh3aZ4)t4JXPr|tdWK?(E$Te6%uhO}Q>)To605p>cfAaq5-{x^BVhZX_l@Ce744Dms=b z_O_VhR;Q<@=jaLeN4k?yJ0A_NuAOZGO*ES!BC5t3zQ!HZcpgMzg;l*6u-3Rv?H77)HnjkCXK^=tt02Lb!I^?bC#fx zPr%{cr=rYc)ztD{0>{Ecd#Hx{@9_ENMRTbb_ECnh8AuQAFY@bRXwLJHDJlhQbk;e= zc8R+o%~f?+L^4KqNdJVrlsZ-tZaUJktB?1UBAG7YcMOYe7uNksd4drsibJC@fLixh zAmx&*Qm`gF_2xh+Opm2Se*K3Q#qFcMFp_~pPzd;67yr=hNOnmgNi$bdGrsrJQ&*pF z_n(yhKbbsnLAjiv=2*5!5&9CQq5~W{_$D4Uv=Ay-=ClF(J>I&#+R$Hc&;%=3jgy-n zq-}gxtJN(4F1ODO5K+as@a?{`>B4`VwZJ==BLDq5CGw8G2ASXv&xEzQe%&Vn6Z zN>9S&0;ap&2|7d^v6sCjW3ZytGwPv5&tZ2x2O>v{#tKwzxuI+|=nvIr8|-FVXoS0G zJ}aeeGs6;4j}=B#fzL8g1zn3mM+NI{c#i(0GrG|LngR63Phpx}#AjCRv+$pdY)kx;V$5<|w5vHdHt(RiTwS0oIdnq5>o%0P&zvF*ByX(HSKe9|E?@cxyG?ML^@~&HnO?U}13^_NRxA!j-t* zT8w=F1`W5jJT6|6&&F&Ee<7aLo`}CcQXL!Pb-NzWhZZ0t(RY>6&f>z4)}d@GAlR2` zOfN0mI*2hT%reR=Y8H5?Fj}Xf)0eVS+Xv-G$!tJaL+e0JiIPp7{Vum~CbUxwMHpv7 zH+t|%4>U*>%B;Ymc=uw3BW;Hp%aIy9R3K9USSc=Al|&RH&}HuCTO>iAz6LfB{_vj( zC^n4i*z}Ndy(SN*`PWPR48xRUWds4kY~zDg`>kGjCA|>lcQq1(6cktDQU2mpPI8%$ zOdfGnwj|h;@rm-q(d8c!v|cH9l_2Zc37GB^# zf2`?~7z7}a7=&>FA?C2?1vENB)pIIl)I`C_NK&YY6zXy|QV$%-^4fYH<5#IKb$#Pm zX$D+ZqdaqWk`{=1Rq?caJl$j^0Cm zz*P|n>CqRz&W&I{TNBoE$w9j_-*6*-`U)qp>`vdiA5K&c)uwU(QM&#x++&&nKgt39 zi)`!n`bEYK=;W-vVZ~HFdtrFy%%N@AzF2y!Q(%0CGB8uc`X=BvWxP zjb(T`&U(@Jq4OSORDPt!gW>>XGpvQ)dkd}4Sy(qfiIyZ?Xu`iGll1dX#W`|kx;AVA zvDr|E4YN8{t$fe2AY*@n3K)iv603NUBs$Wp^ll)4B*G|CjdaE#%)%iqK9GY^FkRB! zP?(@-0bjj3Usz#JKxt1%rQOsgPEGl`>S@tAHcD3xf6^5-ip@Ld66OU+1W7@XJx!rl z%;*`Q2{^ZpNReccUG84s@J}oXVIPX3cyKDOys5}SXUHbElK@ z&b>^GM@53-f9**#`bdwlWsZV1;YRBX*vuwf?Y)})twc2W3vex6fDIiG#F$vTWwVwj zGmxU{!lZFi7eqm(jJhs%Q(wh2KE0dtU{o@-tR5Qk%qh6$-Zo-Eb}8m1bAMFx4pYhu zX9P_nMaTag-6e#wg4@k{E6vptZ(2r3tr*KYjViJO%SeP>Frsq=7h8`qhL#mVQIP$j z>6SNT%~E!`4{)|<*A^v?4-4o*diUAklf9;nryj%QZmgGGv!*-tUYVD)_w|!0|3=I- zdJb}BciZ)OTjI1}vgema#<&Bkx}~wZYSYEg5x*#~GtR4To3i8E=)J^)pV=}N6kIN{#KQ(r5><~6aGnogsosrWRe`80a@hdFDrj|dLPw`PsqWZ74z zb7Q>p#auKdcz4{GMO2iK0lp`>y7+Ic6*@zQkh%pk5mPKuw^+?8xjzww0sgJ z2xh}GkXyM#+6Rzhkz$QdK?01zzykl6!3M0$w-2C!GDtfBBtGh3+E-TjI|9V35*S=FD;JIzE`2uLN_pUZzxE;-k$j4_0RiWj506dtp=lMM!k?rj$(~34;7hq zd42Ay_OdU(po{0m>KDF~8%|?YVi#CQyqTl9CxG-uuM{hdy7>;|m`78Xx+nid?L})y zbFRd$;{s5WQ{;nX7a!(UXGX{}r&VRks2pd*zc=rQ z)!~*`o|!8a8#VC}mT_OINWr0AEY=%!A-}QDI81}_5vN&}NinQkW?)r!?Od;2lYwdx1?a4sR@wK#TBvAw?6Go&rnC}_! zIgEfGXn2x~%uA_~U_>@EMqQo4j08ql$tAf5j!ye)~f|)wAt|UWI$jPs`j=Cz=w+b_Dn7@GtD~nPQoUAJz(kY0PbT`rsf~3;0pyYyJ zAo%|-yav2}cc0z6_ssd7IdksJo#(mdoEcj@sKrRP0E{BC+F}^LYdI`;$9CLW{^pn> zCa|cN)!<;tl$mKirmJWmAJlX~CEz$RY-sl8oPGe`tEr+_Mss!5JbF*5_tVz$cW4{GxXz0(p6u%38F_upq@Gz&(8oydTAZ&+< z+aR{S;q?zNk=(miwwRwD$eM0XY?m8bPZ!zYg%r}h*A8aPE#5kojT083B9eC(401~@ zj&8*2KjNG8?)G#vALJ*e<=dRvR~M_}wtu=xg>nA3!2%QWW7kc?{c|SC-uFVVNBA0CZ{#>Ni&?-UbI7Vdaua%bBvrSHQ9RHGL)$}(iTpq zEFO3xC6XVdPI<_}{Kh8xZ6CGk=V3xlJkvR46EYWbu3aZayUQCCFOaTUGO3BM>AFF` z4<8jT2dDNtls3RdDHN-6FE>f~DVFjFcvu*Nxa4Pd3|agNCIRXm->VHx{eV4hKn5 zb60DRyV-68j5PV!Mh>5mn)^MXx$FbuqFnqGxSYd^sxb>H}T!5w!;Jp_r*CYuCIw zQGppd1syjklGuEPhfaLgSiYkP!tgq7=2eWv1i4({44LI?M&GA?C_PE0WBy!=>vP7)BB4Vfr>}fI2Fh+Te`{Q;E|())c( zD(bO}UE4Ndma`VTPs_sjefDx!1w-wCyRJ_C>zwc?%3H&(4+r@@O9I}8=u!}hvBg>M zst=_jW?9_XqFl~POpr^XR%1bj(sbpH%zL+IxQbu5Vk==qa!#TqVn*!lC&1wyJ z{TRGf4P{z*zgRhC`U|0O5VM(G86ayJI`yTsWV%eczEBZrOu}zj1~$Ec`&Yjt+tH3b zrIOuSe$-{$+rin@U2mGs>P3Dcp^XJ&xmsQ%PGx~N(;VpjsIbW#W}0d!X8Oci&XL`a zhM;HA*jmkzYxiB~3|#MJ)z@;TPfUp8e_l#&R~R#ssF304>qoqRHA(HuJ%e%!s)${S zWC?dikkEEPIW6ylzfzP;t>z)bIG@7yq47i-ZMi0jkZ8Gf@h`F>D{l8BD`izC2?HLwHM!P-}LE8IE;?xqor5F`k@)rxV}=siEaEp<)o)12cL% z2}{XYY;vP@&s#KQBi;vznMw03hxj;tZBMdw)+HEUsG9L@X(KISbgv5Cs&oKctQb~& z&OU8*&4S`D6yc8HC1Y(}RU@1)`h>G`4*qe~S;W$MUbxxQD4AMc;X`HK|Ax3Si#|0^ zzmc41GQeDw9rei(yv8yjEuJV6uqWsIp#7+%?a2UXxo;#lhbx!f6*nxenu0_JNUV1p zd3;@5AoYaTkL4ZX+ZnPkVt6Fu#7=LF>{`0t*S?fVH#LMedFjuFO=LfNGDYGRgul*D zD%g;OP88FB*lHc=B6v@=rp11crdw2GlQaOB)KVJ91K-IYHzph>8&h-j7foMg85g`C z^`2|~l>VOGx8#Z2QGhmrM99EA^EvJdDmY`xljDTCLWznw<+2R0x>2olR#|~VKcyhk zb{G+t@<%`Tu~iP=^}BS&{<6vZrom&pwGX8RV0Pu}6w~!h$zZYVax3>KM9jOqo8p@j zi6C-IC_?oy8)M}iCeKY>YY97TN+LLR#Z7US>oHGYPlpwZzBdN%PdP#7Nv^O+`nndd z{VEweg?&-yl>5VrSZ(b9f?5ab`?e1u1g z+56GxI%@;V&K-#7`}VoL=+&-Rl-Rsq2Z74^jM%RA#}sg7$zl)bWO2n!J9$mLiHtod zF>HOlO%2f-R$!%O*7iIwj1THC{OKXH5Hl)D5t;jAMyl6JU?nSQCgq8E0oLwX zz-0RecvVKLQS4iu%ukM-BIOi*lxzisi7#jlkB)sf2gXz(Kv}7xRu>kG$Y+r5)EFPvyx-* zTv6~Axvin@Hz})T^sXA-o~|+%1arlPQQq(RHoTjzWMQB@pb+x-lcIKJ@giRp1NzX+)uX*cY#~lcEnys*G!!O5}nATHBNK z?9E@lk0@_MmHX9}y?9Q)l1jcA)a~O$pLePGHcUvB(fqa2GSZ8$e3BAm6uv1279v_yE$|vEajC%n^3(a6A;Crtfs;W zdKR+#dODL4PO=8`5%?2oMTa=Y&H1xY?QlOy7>`z)%HxK@QGMitxI6>xlN)PeoIf<( z$fq`v8C~UbGDvhMJZv+zM1L$xKyrDWm6TMr5Wfu>Q@ZwXGIq#j*4@U!oL9AU+Fmv^ zJdaJI?X#G&F^RG)=|&k5m!rh{L)=G~YF0o8&%qBKF}*b=HMND(byJ8%UD=zO4mX0Y zFg7Xme<>r(e1Y9F%E@Hh?@`sqVU_sEMS(*ErEHVP8e~rDrofgx7R*x*q8v~O?KA8| zY5efLEQ%67=pCrLKi?^|Dr3L_e=V>NEcK-jaA*PmEKns9LYX3+ucu-9Z6T2!~!yJ3gz{G|H>gS)MeV|Qk(DFJ-U*n z>la|kJ{6O<^qBDbQ{!j^Ust7Nq+|d|baZw`G2)?o{-_B=WYFrEByWud@wB4~4ypCu zz>Ci8yhlVcv=k|gUp)AUz-i#KW!9VG`#);<$;N1)L0lz_W-+0n?8~Z@*B2)AlRmiXHduq)!;lJKzl0qny#It{Tt zgFm;2olC1x`JLF5F_~xy`#nqjh=XW**>NGgbLs%GF`Z*=f`?dZGP-^d15P2Ro$FUm z9PuH-7m~Z1F#d#-+kKqmm?i`mSJCp`HAx~Y793qVR~7Sh638mjq_wY-@aroY-WZ9k zFpQ$HnIb>B??v}I&ToM*?Z|;5c)MfOAC=uU(DUW;aj+$Qr|@hr=Qvk6FVn)aW*ogG zMO6=wCuTG8`Woj^awM*62fRpAkZaqU^EzakwIKFIy7sEpYi*yagaU@$A&+1*gJbcJ zbc>tbga}YHR)6aw4_^1o=y|thQ2mD4YNJc!I)5o6Y~&mN%TTNO7KcFFIHAC%nH7a9 z@Y99C+f9pM_X!O9do@4A^?2aje5(XzsVt+nPRf*8vkdxJjRZRhIj_QfyXP3XXY9d7 z|BGBlV`lX9qzMli3nMZkqK&R98O4E`m@D@xAZ=U~1f`0iz8s=^DYJ+v6iX9B>9UGv zx`%sS{4^7Xm+&@AzhjSl=-9|D9Cyve%oWPWdE%RdyiNj7z0v~`Aq@gKGXpeeNBRzF zg{Ve@(8RF76#PjuLkIYQQd773Fp_dl$Rl0%YE0f9*Z%sWgxLro9TCs`y-yxU-Sz4U zIaF$KU+KM+V{X2o`K8_4mIEKu`o4NSxo18_NaaaWt?JhN(xfEbxYb0@-=hh1w1`b8 zF!|Ls;sY)Pi45_I8RMFUauwP|dB;(tFSQGw#(c<>1p;*s3hsfgKJ=k-CVRKBL0WMy z!>4<`$Jbmk1$>K|S}da9$iLJ9RahZmqga}HbFLuuadY05lp%Hp>=OdtmC|10#jNc2 z=+=&}^$r*vg=Dwi_)5+%XV~8xb;spxMRA{~bym8ES+;hN%-1OG@mBrsge*g=?E10% zm}k6Uj?a{Id3@w6cnD-rPqF0-L^L7hQ^J90Up73mdH*YxNA#mAgoQ9@$O)8Q^I2)b zWZ~BT6ulQB;Ld3A&dPfkx9`uZJ6dVjMdkH6_XkevYOE$}ZC2lz+l*85_qDO*Y3jWz zZvR#ai`bYt;ubb9ci-XU)*+h-r+xKdw$D?Ux3MbD#UbupQSg&|nD)dzX3%v`$h1~Mx1<-VS2KBR^7V$B7`8K7zras^zmA2c zM~5-(_zmMXT#YN%^4HW%3Uqob4Jb1mC@Y_qXO2h=OSH9!r!MoDv?5PKA_ zw)RxErk#*)wMz9d%^3ClNZl&kUqx4mIud>?HHXuF)F$OH+(VuG>%XtWHz2?TQf?^C zm@WY)QOmcd2{^>CF-+z^sW&InlG)^dPoEU{o+kcSI+>W+m~)%jz>sxU=&qsupTr+> zB9@DcDofOOmw>z=Oc2>6d?Y3TInro>0Z8)kUyuTRPp_vJXny{~Uu63EPiB$p+|mT` zEN^q`ft8xTmoPARk->}1$UBZ?NELfrJeutF4yu^4{6uGoT4syWz%?NjAh5VOs zv_W+X0x0(y2!i1MRV#4L@y93n4ZP|N{tL*A(dWBDjDewZ0|SHM0xQl@-%XiCf|1rhaSG#EapVpwfT`SJ0%dWW5r|W-|5fvajZiPtY!3Me zI^7qQ5|Bi+%LKYFct%v%B|m5H3ma@*kRc&-#@?Jk{8z>2_QLqjO&XW{3BpC9cd5?R z^JilM3=F_fzmFXMROz1(9ORGO%Sd(fY5v&!YcSFQjSupEa8`)lM(~#s7uNpzE${S( zvFiaKk-q@H7oZ{nUc+7hTrmIujD$Re@i3!x{iX2@M29Q^lnLuhDzy%n2cbO9) zxBvtUALJ4{4e|pisN()H0K$_ z5C8)cHQxoJ{~oqy8G}nJ6d<;cQ#K^c>Wy<|JxzGZ23$0(z&a<;U(E&1IsOCTXY36O zB!8LpEb9aq;I3ExjdJ>h%kgiCIs+9mQ~w3J5Rv{1aaI%AGXSLU7vN7MF$RYC1wdCE zG7BYpt`+|cyZXhQRUfyO(L3+@h$npPikxgZZmJA!X SjTjh$z-I$+9LbEIUi}{|+iFq( diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradle/wrapper/gradle-wrapper.properties b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradle/wrapper/gradle-wrapper.properties index 8cf6eb5ad2..8707e8b506 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt index 9d3fafef2f..2ee32d5289 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -20,6 +15,10 @@ package org.openapitools.client.apis +import java.io.IOException +import okhttp3.OkHttpClient +import okhttp3.HttpUrl + import org.openapitools.client.models.ClearMonitorTransactionsV1Request import org.openapitools.client.models.ClearMonitorTransactionsV1Response import org.openapitools.client.models.DeployContractJarsBadRequestV1Response @@ -39,43 +38,45 @@ import org.openapitools.client.models.StartMonitorV1Response import org.openapitools.client.models.StopMonitorV1Request import org.openapitools.client.models.StopMonitorV1Response +import com.squareup.moshi.Json + import org.openapitools.client.infrastructure.ApiClient +import org.openapitools.client.infrastructure.ApiResponse import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap +import org.openapitools.client.infrastructure.PartConfig import org.openapitools.client.infrastructure.RequestConfig import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { +class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://localhost") + System.getProperties().getProperty(ApiClient.baseUrlKey, "http://localhost") } } /** - * Clear transactions from internal store so they'll not be available by GetMonitorTransactionsV1 anymore. - * - * @param clearMonitorTransactionsV1Request (optional) - * @return ClearMonitorTransactionsV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Clear transactions from internal store so they'll not be available by GetMonitorTransactionsV1 anymore. + * + * @param clearMonitorTransactionsV1Request (optional) + * @return ClearMonitorTransactionsV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun clearMonitorTransactionsV1(clearMonitorTransactionsV1Request: ClearMonitorTransactionsV1Request?) : ClearMonitorTransactionsV1Response { - val localVariableConfig = clearMonitorTransactionsV1RequestConfig(clearMonitorTransactionsV1Request = clearMonitorTransactionsV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun clearMonitorTransactionsV1(clearMonitorTransactionsV1Request: ClearMonitorTransactionsV1Request? = null) : ClearMonitorTransactionsV1Response { + val localVarResponse = clearMonitorTransactionsV1WithHttpInfo(clearMonitorTransactionsV1Request = clearMonitorTransactionsV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as ClearMonitorTransactionsV1Response @@ -93,42 +94,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation clearMonitorTransactionsV1 - * - * @param clearMonitorTransactionsV1Request (optional) - * @return RequestConfig - */ + * Clear transactions from internal store so they'll not be available by GetMonitorTransactionsV1 anymore. + * + * @param clearMonitorTransactionsV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun clearMonitorTransactionsV1WithHttpInfo(clearMonitorTransactionsV1Request: ClearMonitorTransactionsV1Request?) : ApiResponse { + val localVariableConfig = clearMonitorTransactionsV1RequestConfig(clearMonitorTransactionsV1Request = clearMonitorTransactionsV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation clearMonitorTransactionsV1 + * + * @param clearMonitorTransactionsV1Request (optional) + * @return RequestConfig + */ fun clearMonitorTransactionsV1RequestConfig(clearMonitorTransactionsV1Request: ClearMonitorTransactionsV1Request?) : RequestConfig { val localVariableBody = clearMonitorTransactionsV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.DELETE, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/clear-monitor-transactions", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Deploys a set of jar files (Cordapps, e.g. the contracts in Corda speak). - * - * @param deployContractJarsV1Request (optional) - * @return DeployContractJarsSuccessV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Deploys a set of jar files (Cordapps, e.g. the contracts in Corda speak). + * + * @param deployContractJarsV1Request (optional) + * @return DeployContractJarsSuccessV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun deployContractJarsV1(deployContractJarsV1Request: DeployContractJarsV1Request?) : DeployContractJarsSuccessV1Response { - val localVariableConfig = deployContractJarsV1RequestConfig(deployContractJarsV1Request = deployContractJarsV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun deployContractJarsV1(deployContractJarsV1Request: DeployContractJarsV1Request? = null) : DeployContractJarsSuccessV1Response { + val localVarResponse = deployContractJarsV1WithHttpInfo(deployContractJarsV1Request = deployContractJarsV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as DeployContractJarsSuccessV1Response @@ -146,42 +166,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation deployContractJarsV1 - * - * @param deployContractJarsV1Request (optional) - * @return RequestConfig - */ + * Deploys a set of jar files (Cordapps, e.g. the contracts in Corda speak). + * + * @param deployContractJarsV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun deployContractJarsV1WithHttpInfo(deployContractJarsV1Request: DeployContractJarsV1Request?) : ApiResponse { + val localVariableConfig = deployContractJarsV1RequestConfig(deployContractJarsV1Request = deployContractJarsV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation deployContractJarsV1 + * + * @param deployContractJarsV1Request (optional) + * @return RequestConfig + */ fun deployContractJarsV1RequestConfig(deployContractJarsV1Request: DeployContractJarsV1Request?) : RequestConfig { val localVariableBody = deployContractJarsV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/deploy-contract-jars", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * - * Responds with diagnostic information about the Corda node - * @param diagnoseNodeV1Request (optional) - * @return DiagnoseNodeV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * + * Responds with diagnostic information about the Corda node + * @param diagnoseNodeV1Request (optional) + * @return DiagnoseNodeV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun diagnoseNodeV1(diagnoseNodeV1Request: DiagnoseNodeV1Request?) : DiagnoseNodeV1Response { - val localVariableConfig = diagnoseNodeV1RequestConfig(diagnoseNodeV1Request = diagnoseNodeV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun diagnoseNodeV1(diagnoseNodeV1Request: DiagnoseNodeV1Request? = null) : DiagnoseNodeV1Response { + val localVarResponse = diagnoseNodeV1WithHttpInfo(diagnoseNodeV1Request = diagnoseNodeV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as DiagnoseNodeV1Response @@ -199,42 +238,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation diagnoseNodeV1 - * - * @param diagnoseNodeV1Request (optional) - * @return RequestConfig - */ + * + * Responds with diagnostic information about the Corda node + * @param diagnoseNodeV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun diagnoseNodeV1WithHttpInfo(diagnoseNodeV1Request: DiagnoseNodeV1Request?) : ApiResponse { + val localVariableConfig = diagnoseNodeV1RequestConfig(diagnoseNodeV1Request = diagnoseNodeV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation diagnoseNodeV1 + * + * @param diagnoseNodeV1Request (optional) + * @return RequestConfig + */ fun diagnoseNodeV1RequestConfig(diagnoseNodeV1Request: DiagnoseNodeV1Request?) : RequestConfig { val localVariableBody = diagnoseNodeV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/diagnose-node", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Get transactions for monitored state classes. - * - * @param getMonitorTransactionsV1Request (optional) - * @return GetMonitorTransactionsV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Get transactions for monitored state classes. + * + * @param getMonitorTransactionsV1Request (optional) + * @return GetMonitorTransactionsV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun getMonitorTransactionsV1(getMonitorTransactionsV1Request: GetMonitorTransactionsV1Request?) : GetMonitorTransactionsV1Response { - val localVariableConfig = getMonitorTransactionsV1RequestConfig(getMonitorTransactionsV1Request = getMonitorTransactionsV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun getMonitorTransactionsV1(getMonitorTransactionsV1Request: GetMonitorTransactionsV1Request? = null) : GetMonitorTransactionsV1Response { + val localVarResponse = getMonitorTransactionsV1WithHttpInfo(getMonitorTransactionsV1Request = getMonitorTransactionsV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as GetMonitorTransactionsV1Response @@ -252,41 +310,60 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation getMonitorTransactionsV1 - * - * @param getMonitorTransactionsV1Request (optional) - * @return RequestConfig - */ + * Get transactions for monitored state classes. + * + * @param getMonitorTransactionsV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun getMonitorTransactionsV1WithHttpInfo(getMonitorTransactionsV1Request: GetMonitorTransactionsV1Request?) : ApiResponse { + val localVariableConfig = getMonitorTransactionsV1RequestConfig(getMonitorTransactionsV1Request = getMonitorTransactionsV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation getMonitorTransactionsV1 + * + * @param getMonitorTransactionsV1Request (optional) + * @return RequestConfig + */ fun getMonitorTransactionsV1RequestConfig(getMonitorTransactionsV1Request: GetMonitorTransactionsV1Request?) : RequestConfig { val localVariableBody = getMonitorTransactionsV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.GET, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-monitor-transactions", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Get the Prometheus Metrics - * - * @return kotlin.String - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Get the Prometheus Metrics + * + * @return kotlin.String + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun getPrometheusMetricsV1() : kotlin.String { - val localVariableConfig = getPrometheusMetricsV1RequestConfig() - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = getPrometheusMetricsV1WithHttpInfo() return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String @@ -304,41 +381,57 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation getPrometheusMetricsV1 - * - * @return RequestConfig - */ + * Get the Prometheus Metrics + * + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun getPrometheusMetricsV1WithHttpInfo() : ApiResponse { + val localVariableConfig = getPrometheusMetricsV1RequestConfig() + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation getPrometheusMetricsV1 + * + * @return RequestConfig + */ fun getPrometheusMetricsV1RequestConfig() : RequestConfig { val localVariableBody = null val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() - + return RequestConfig( method = RequestMethod.GET, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-prometheus-exporter-metrics", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Invokes a contract on a Corda ledger (e.g. a flow) - * - * @param invokeContractV1Request (optional) - * @return InvokeContractV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Invokes a contract on a Corda ledger (e.g. a flow) + * + * @param invokeContractV1Request (optional) + * @return InvokeContractV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun invokeContractV1(invokeContractV1Request: InvokeContractV1Request?) : InvokeContractV1Response { - val localVariableConfig = invokeContractV1RequestConfig(invokeContractV1Request = invokeContractV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun invokeContractV1(invokeContractV1Request: InvokeContractV1Request? = null) : InvokeContractV1Response { + val localVarResponse = invokeContractV1WithHttpInfo(invokeContractV1Request = invokeContractV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as InvokeContractV1Response @@ -356,42 +449,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation invokeContractV1 - * - * @param invokeContractV1Request (optional) - * @return RequestConfig - */ + * Invokes a contract on a Corda ledger (e.g. a flow) + * + * @param invokeContractV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun invokeContractV1WithHttpInfo(invokeContractV1Request: InvokeContractV1Request?) : ApiResponse { + val localVariableConfig = invokeContractV1RequestConfig(invokeContractV1Request = invokeContractV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation invokeContractV1 + * + * @param invokeContractV1Request (optional) + * @return RequestConfig + */ fun invokeContractV1RequestConfig(invokeContractV1Request: InvokeContractV1Request?) : RequestConfig { val localVariableBody = invokeContractV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/invoke-contract", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * - * Responds with a list of the flows on the Corda node. - * @param listFlowsV1Request (optional) - * @return ListFlowsV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * + * Responds with a list of the flows on the Corda node. + * @param listFlowsV1Request (optional) + * @return ListFlowsV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun listFlowsV1(listFlowsV1Request: ListFlowsV1Request?) : ListFlowsV1Response { - val localVariableConfig = listFlowsV1RequestConfig(listFlowsV1Request = listFlowsV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun listFlowsV1(listFlowsV1Request: ListFlowsV1Request? = null) : ListFlowsV1Response { + val localVarResponse = listFlowsV1WithHttpInfo(listFlowsV1Request = listFlowsV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as ListFlowsV1Response @@ -409,42 +521,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation listFlowsV1 - * - * @param listFlowsV1Request (optional) - * @return RequestConfig - */ + * + * Responds with a list of the flows on the Corda node. + * @param listFlowsV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun listFlowsV1WithHttpInfo(listFlowsV1Request: ListFlowsV1Request?) : ApiResponse { + val localVariableConfig = listFlowsV1RequestConfig(listFlowsV1Request = listFlowsV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation listFlowsV1 + * + * @param listFlowsV1Request (optional) + * @return RequestConfig + */ fun listFlowsV1RequestConfig(listFlowsV1Request: ListFlowsV1Request?) : RequestConfig { val localVariableBody = listFlowsV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/list-flows", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * - * Responds with a snapshot of the network map as provided by the Corda RPC call: net.corda.core.messaging.CordaRPCOps public abstract fun networkMapSnapshot(): List<NodeInfo> - * @param body (optional) - * @return kotlin.collections.List - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * + * Responds with a snapshot of the network map as provided by the Corda RPC call: net.corda.core.messaging.CordaRPCOps public abstract fun networkMapSnapshot(): List<NodeInfo> + * @param body (optional) + * @return kotlin.collections.List + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun networkMapV1(body: kotlin.Any?) : kotlin.collections.List { - val localVariableConfig = networkMapV1RequestConfig(body = body) - - val localVarResponse = request>( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun networkMapV1(body: kotlin.Any? = null) : kotlin.collections.List { + val localVarResponse = networkMapV1WithHttpInfo(body = body) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List @@ -462,42 +593,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation networkMapV1 - * - * @param body (optional) - * @return RequestConfig - */ + * + * Responds with a snapshot of the network map as provided by the Corda RPC call: net.corda.core.messaging.CordaRPCOps public abstract fun networkMapSnapshot(): List<NodeInfo> + * @param body (optional) + * @return ApiResponse?> + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun networkMapV1WithHttpInfo(body: kotlin.Any?) : ApiResponse?> { + val localVariableConfig = networkMapV1RequestConfig(body = body) + + return request>( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation networkMapV1 + * + * @param body (optional) + * @return RequestConfig + */ fun networkMapV1RequestConfig(body: kotlin.Any?) : RequestConfig { val localVariableBody = body val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/network-map", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Start monitoring corda changes (transactions) of given state class - * - * @param startMonitorV1Request (optional) - * @return StartMonitorV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Start monitoring corda changes (transactions) of given state class + * + * @param startMonitorV1Request (optional) + * @return StartMonitorV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun startMonitorV1(startMonitorV1Request: StartMonitorV1Request?) : StartMonitorV1Response { - val localVariableConfig = startMonitorV1RequestConfig(startMonitorV1Request = startMonitorV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun startMonitorV1(startMonitorV1Request: StartMonitorV1Request? = null) : StartMonitorV1Response { + val localVarResponse = startMonitorV1WithHttpInfo(startMonitorV1Request = startMonitorV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as StartMonitorV1Response @@ -515,42 +665,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation startMonitorV1 - * - * @param startMonitorV1Request (optional) - * @return RequestConfig - */ + * Start monitoring corda changes (transactions) of given state class + * + * @param startMonitorV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun startMonitorV1WithHttpInfo(startMonitorV1Request: StartMonitorV1Request?) : ApiResponse { + val localVariableConfig = startMonitorV1RequestConfig(startMonitorV1Request = startMonitorV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation startMonitorV1 + * + * @param startMonitorV1Request (optional) + * @return RequestConfig + */ fun startMonitorV1RequestConfig(startMonitorV1Request: StartMonitorV1Request?) : RequestConfig { val localVariableBody = startMonitorV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/start-monitor", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Stop monitoring corda changes (transactions) of given state class - * - * @param stopMonitorV1Request (optional) - * @return StopMonitorV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Stop monitoring corda changes (transactions) of given state class + * + * @param stopMonitorV1Request (optional) + * @return StopMonitorV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun stopMonitorV1(stopMonitorV1Request: StopMonitorV1Request?) : StopMonitorV1Response { - val localVariableConfig = stopMonitorV1RequestConfig(stopMonitorV1Request = stopMonitorV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun stopMonitorV1(stopMonitorV1Request: StopMonitorV1Request? = null) : StopMonitorV1Response { + val localVarResponse = stopMonitorV1WithHttpInfo(stopMonitorV1Request = stopMonitorV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as StopMonitorV1Response @@ -568,23 +737,47 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation stopMonitorV1 - * - * @param stopMonitorV1Request (optional) - * @return RequestConfig - */ + * Stop monitoring corda changes (transactions) of given state class + * + * @param stopMonitorV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun stopMonitorV1WithHttpInfo(stopMonitorV1Request: StopMonitorV1Request?) : ApiResponse { + val localVariableConfig = stopMonitorV1RequestConfig(stopMonitorV1Request = stopMonitorV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation stopMonitorV1 + * + * @param stopMonitorV1Request (optional) + * @return RequestConfig + */ fun stopMonitorV1RequestConfig(stopMonitorV1Request: StopMonitorV1Request?) : RequestConfig { val localVariableBody = stopMonitorV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.DELETE, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } + + private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String = + HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0] } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b359be1e41..ea4b7b6593 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -10,21 +10,26 @@ import okhttp3.ResponseBody import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.Headers +import okhttp3.Headers.Companion.toHeaders import okhttp3.MultipartBody +import okhttp3.Call +import okhttp3.Callback +import okhttp3.Response +import okhttp3.internal.EMPTY_REQUEST import java.io.BufferedWriter import java.io.File import java.io.FileWriter +import java.io.IOException import java.net.URLConnection import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime import java.time.OffsetDateTime import java.time.OffsetTime -import java.util.Date import java.util.Locale import com.squareup.moshi.adapter -open class ApiClient(val baseUrl: String) { +open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) { companion object { protected const val ContentType = "Content-Type" protected const val Accept = "Accept" @@ -39,9 +44,10 @@ open class ApiClient(val baseUrl: String) { var username: String? = null var password: String? = null var accessToken: String? = null + const val baseUrlKey = "org.openapitools.client.baseUrl" @JvmStatic - val client: OkHttpClient by lazy { + val defaultClient: OkHttpClient by lazy { builder.build() } @@ -60,48 +66,50 @@ open class ApiClient(val baseUrl: String) { return contentType ?: "application/octet-stream" } - protected inline fun requestBody(content: T, mediaType: String = JsonMediaType): RequestBody = + protected inline fun requestBody(content: T, mediaType: String?): RequestBody = when { - content is File -> content.asRequestBody(mediaType.toMediaTypeOrNull()) - mediaType == FormDataMediaType -> { + content is File -> content.asRequestBody((mediaType ?: guessContentTypeFromFile(content)).toMediaTypeOrNull()) + mediaType == FormDataMediaType -> MultipartBody.Builder() .setType(MultipartBody.FORM) .apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - if (value is File) { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"; filename=\"${value.name}\"" + (content as Map>).forEach { (name, part) -> + if (part.body is File) { + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"") + val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull() + addPart( + partHeaders.toHeaders(), + part.body.asRequestBody(fileMediaType) ) - val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull() - addPart(partHeaders, value.asRequestBody(fileMediaType)) } else { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"" - ) + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"") addPart( - partHeaders, - parameterToString(value).toRequestBody(null) + partHeaders.toHeaders(), + parameterToString(part.body).toRequestBody(null) ) } } }.build() - } mediaType == FormUrlEncMediaType -> { FormBody.Builder().apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - add(key, parameterToString(value)) + (content as Map>).forEach { (name, part) -> + add(name, parameterToString(part.body)) } }.build() } - mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody( - mediaType.toMediaTypeOrNull() - ) + mediaType == null || mediaType.startsWith("application/") && mediaType.endsWith("json") -> + if (content == null) { + EMPTY_REQUEST + } else { + Serializer.moshi.adapter(T::class.java).toJson(content) + .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull()) + } mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.") // TODO: this should be extended with other serializers else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.") @@ -112,31 +120,35 @@ open class ApiClient(val baseUrl: String) { if(body == null) { return null } + if (T::class.java == File::class.java) { + // return tempFile + // Attention: if you are developing an android app that supports API Level 25 and bellow, please check flag supportAndroidApiLevel25AndBelow in https://openapi-generator.tech/docs/generators/kotlin#config-options + val tempFile = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() + tempFile.deleteOnExit() + body.byteStream().use { inputStream -> + tempFile.outputStream().use { tempFileOutputStream -> + inputStream.copyTo(tempFileOutputStream) + } + } + return tempFile as T + } val bodyContent = body.string() if (bodyContent.isEmpty()) { return null } - if (T::class.java == File::class.java) { - // return tempfile - val f = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() - f.deleteOnExit() - val out = BufferedWriter(FileWriter(f)) - out.write(bodyContent) - out.close() - return f as T - } - return when(mediaType) { - JsonMediaType -> Serializer.moshi.adapter().fromJson(bodyContent) + return when { + mediaType==null || (mediaType.startsWith("application/") && mediaType.endsWith("json")) -> + Serializer.moshi.adapter().fromJson(bodyContent) else -> throw UnsupportedOperationException("responseBody currently only supports JSON body.") } } - protected inline fun request(requestConfig: RequestConfig): ApiInfrastructureResponse { + protected inline fun request(requestConfig: RequestConfig): ApiResponse { val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.") val url = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) + .addEncodedPathSegments(requestConfig.path.trimStart('/')) .apply { requestConfig.query.forEach { query -> query.value.forEach { queryValue -> @@ -146,7 +158,7 @@ open class ApiClient(val baseUrl: String) { }.build() // take content-type/accept from spec or set to default (application/json) if not defined - if (requestConfig.headers[ContentType].isNullOrEmpty()) { + if (requestConfig.body != null && requestConfig.headers[ContentType].isNullOrEmpty()) { requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { @@ -154,16 +166,16 @@ open class ApiClient(val baseUrl: String) { } val headers = requestConfig.headers - if(headers[ContentType] ?: "" == "") { - throw kotlin.IllegalStateException("Missing Content-Type header. This is required.") - } - - if(headers[Accept] ?: "" == "") { + if (headers[Accept].isNullOrEmpty()) { throw kotlin.IllegalStateException("Missing Accept header. This is required.") } - // TODO: support multiple contentType options here. - val contentType = (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + val contentType = if (headers[ContentType] != null) { + // TODO: support multiple contentType options here. + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) + } else { + null + } val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType)) @@ -178,7 +190,8 @@ open class ApiClient(val baseUrl: String) { }.build() val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { @@ -215,7 +228,7 @@ open class ApiClient(val baseUrl: String) { null -> "" is Array<*> -> toMultiValue(value, "csv").toString() is Iterable<*> -> toMultiValue(value, "csv").toString() - is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> + is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime -> parseDateToQueryString(value) else -> value.toString() } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt index fb2c972cf8..064b57fc6b 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt @@ -14,4 +14,4 @@ class BigDecimalAdapter { fun fromJson(value: String): BigDecimal { return BigDecimal(value) } -} \ No newline at end of file +} diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt index 4b6963110c..7df6057b45 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt @@ -14,4 +14,4 @@ class BigIntegerAdapter { fun fromJson(value: String): BigInteger { return BigInteger(value) } -} \ No newline at end of file +} diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt index 7e948e1dd0..625a19002b 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt @@ -13,5 +13,6 @@ data class RequestConfig( val path: String, val headers: MutableMap = mutableMapOf(), val query: MutableMap> = mutableMapOf(), + val requiresAuthentication: Boolean, val body: T? = null ) \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Request.kt index 25aba32af7..3d127aa1e6 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param txIndexes */ + data class ClearMonitorTransactionsV1Request ( /* ID of a client application that wants to monitor the state changes */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Response.kt index e22a414029..89b9cc82dc 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClearMonitorTransactionsV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param msg Message describing operation status or any errors that occurred. */ + data class ClearMonitorTransactionsV1Response ( /* Flag set to true if operation completed correctly. */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaNodeSshCredentials.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaNodeSshCredentials.kt index d8e4d30bb5..780361e174 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaNodeSshCredentials.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaNodeSshCredentials.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -33,6 +29,7 @@ import com.squareup.moshi.Json * @param port */ + data class CordaNodeSshCredentials ( @Json(name = "hostKeyEntry") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaRpcCredentials.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaRpcCredentials.kt index 56b1b6c23b..8b2c948093 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaRpcCredentials.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaRpcCredentials.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param password */ + data class CordaRpcCredentials ( @Json(name = "hostname") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaX500Name.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaX500Name.kt index 343338c6f3..240e68f640 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaX500Name.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordaX500Name.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.X500Principal import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -36,6 +32,7 @@ import com.squareup.moshi.Json * @param state */ + data class CordaX500Name ( @Json(name = "organisation") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappDeploymentConfig.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappDeploymentConfig.kt index 5d2cb68dea..8934cdee63 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappDeploymentConfig.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappDeploymentConfig.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.CordaNodeSshCredentials import org.openapitools.client.models.CordaRpcCredentials import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -36,6 +32,7 @@ import com.squareup.moshi.Json * @param nodeBaseDirPath The absolute file system path where the base directory of the Corda node can be found. This is used to pass in to corda.jar when being invoked for certain tasks such as executing database schema migrations for a deployed contract. */ + data class CordappDeploymentConfig ( @Json(name = "sshCredentials") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappInfo.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappInfo.kt index eefa7d5951..6e1c398171 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappInfo.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CordappInfo.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.SHA256 import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * A CordappInfo describes a single CorDapp currently installed on the node @@ -38,6 +34,7 @@ import com.squareup.moshi.Json * @param version The version of this CorDapp */ + data class CordappInfo ( @Json(name = "jarHash") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsBadRequestV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsBadRequestV1Response.kt index 84f9b7bf0b..2ad876806b 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsBadRequestV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsBadRequestV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param errors */ + data class DeployContractJarsBadRequestV1Response ( @Json(name = "errors") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsSuccessV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsSuccessV1Response.kt index f0ec1dc101..57b34ab72d 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsSuccessV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsSuccessV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param deployedJarFiles */ + data class DeployContractJarsSuccessV1Response ( @Json(name = "deployedJarFiles") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsV1Request.kt index ba58a0481a..fc8ff0fc6c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractJarsV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.CordappDeploymentConfig import org.openapitools.client.models.JarFile import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param jarFiles */ + data class DeployContractJarsV1Request ( /* The list of deployment configurations pointing to the nodes where the provided cordapp jar files are to be deployed . */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Request.kt index ee97437fad..52c4f3f8eb 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,11 +25,12 @@ import com.squareup.moshi.Json * @param nodeIds Optional property specifying which Corda Node should be the one being diagnosed in case the Connector has multiple connections established for different nodes (which is not yet a supported feature, but we want to keep this possibility open for the future). */ + data class DiagnoseNodeV1Request ( /* Optional property specifying which Corda Node should be the one being diagnosed in case the Connector has multiple connections established for different nodes (which is not yet a supported feature, but we want to keep this possibility open for the future). */ @Json(name = "nodeIds") - val nodeIds: kotlin.collections.List? = null + val nodeIds: kotlin.collections.List? = arrayListOf() ) diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Response.kt index fdbac69303..27c49cd557 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DiagnoseNodeV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.NodeDiagnosticInfo import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param nodeDiagnosticInfo */ + data class DiagnoseNodeV1Response ( @Json(name = "nodeDiagnosticInfo") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FlowInvocationType.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FlowInvocationType.kt index 2255e96df7..6082e2e929 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FlowInvocationType.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FlowInvocationType.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Determines which flow starting method will be used on the back-end when invoking the flow. Based on the value here the plugin back-end might invoke the rpc.startFlowDynamic() method or the rpc.startTrackedFlowDynamic() method. Streamed responses are aggregated and returned in a single response to HTTP callers who are not equipped to handle streams like WebSocket/gRPC/etc. do. @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: tRACKEDFLOWDYNAMIC,fLOWDYNAMIC */ +@JsonClass(generateAdapter = false) enum class FlowInvocationType(val value: kotlin.String) { @Json(name = "TRACKED_FLOW_DYNAMIC") @@ -38,7 +35,7 @@ enum class FlowInvocationType(val value: kotlin.String) { fLOWDYNAMIC("FLOW_DYNAMIC"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -50,12 +47,12 @@ enum class FlowInvocationType(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is FlowInvocationType) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is FlowInvocationType) "$data" else null /** * Returns a valid [FlowInvocationType] for [data], null otherwise. */ - fun decode(data: Any?): FlowInvocationType? = data?.let { + fun decode(data: kotlin.Any?): FlowInvocationType? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Request.kt index d87d0287fd..cd51f7b19c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param stateFullClassName The fully qualified name of the Corda state to monitor */ + data class GetMonitorTransactionsV1Request ( /* ID of a client application that wants to monitor the state changes */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Response.kt index 033b622cb6..03347f3464 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -20,9 +15,10 @@ package org.openapitools.client.models -import org.openapitools.client.models.GetMonitorTransactionsV1ResponseTx +import org.openapitools.client.models.GetMonitorTransactionsV1ResponseTxInner import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -33,6 +29,7 @@ import com.squareup.moshi.Json * @param tx */ + data class GetMonitorTransactionsV1Response ( /* Flag set to true if operation completed correctly. */ @@ -48,7 +45,7 @@ data class GetMonitorTransactionsV1Response ( val stateFullClassName: kotlin.String? = null, @Json(name = "tx") - val tx: kotlin.collections.List? = null + val tx: kotlin.collections.List? = arrayListOf() ) diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1ResponseTxInner.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1ResponseTxInner.kt index 22400a6292..cc1007bf66 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1ResponseTxInner.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetMonitorTransactionsV1ResponseTxInner.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Request.kt index eb8ebb20d2..ac610cfcd3 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.FlowInvocationType import org.openapitools.client.models.JvmObject import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -34,6 +30,7 @@ import com.squareup.moshi.Json * @param timeoutMs The amount of milliseconds to wait for a transaction receipt beforegiving up and crashing. */ + data class InvokeContractV1Request ( /* The fully qualified name of the Corda flow to invoke */ @@ -49,7 +46,7 @@ data class InvokeContractV1Request ( /* The amount of milliseconds to wait for a transaction receipt beforegiving up and crashing. */ @Json(name = "timeoutMs") - val timeoutMs: kotlin.Int? = null + val timeoutMs: kotlin.Int? = 60000 ) diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt index 464e91e48f..435c2ed826 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/InvokeContractV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -33,6 +29,7 @@ import com.squareup.moshi.Json * @param progress An array of strings representing the aggregated stream of progress updates provided by a *tracked* flow invocation. If the flow invocation was not tracked, this array is still returned, but as empty. */ + data class InvokeContractV1Response ( @Json(name = "success") @@ -52,7 +49,7 @@ data class InvokeContractV1Response ( /* An array of strings representing the aggregated stream of progress updates provided by a *tracked* flow invocation. If the flow invocation was not tracked, this array is still returned, but as empty. */ @Json(name = "progress") - val progress: kotlin.collections.List? = null + val progress: kotlin.collections.List? = arrayListOf() ) diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JarFile.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JarFile.kt index 4e711ed85a..bb62d548a5 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JarFile.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JarFile.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param contentBase64 */ + data class JarFile ( @Json(name = "filename") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmObject.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmObject.kt index e2e34f2e56..80fa196c70 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmObject.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmObject.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.JvmType import org.openapitools.client.models.JvmTypeKind import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Can represent JVM primitive and reference types as well. The jvmTypeKind field indicates which one is being stored. If the jvmTypeKind field is set to REFERENCE then the jvmCtorArgs array is expected to be filled, otherwise (e.g. PRIMITIVE jvmTypeKind) it is expected that the primitiveValue property is filled with a primitive data type supported by the JSON standard such as strings, booleans, numbers, etc. @@ -34,6 +30,7 @@ import com.squareup.moshi.Json * @param jvmCtorArgs */ + data class JvmObject ( @Json(name = "jvmTypeKind") @@ -46,7 +43,7 @@ data class JvmObject ( val primitiveValue: kotlin.Any? = null, @Json(name = "jvmCtorArgs") - val jvmCtorArgs: kotlin.collections.List? = null + val jvmCtorArgs: kotlin.collections.List? = arrayListOf() ) diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmType.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmType.kt index 5648bd7561..68bd762e6f 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmType.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmType.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.JvmObject import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Represents a reference to a JVM type (such as a Java class) @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param invocationTarget */ + data class JvmType ( @Json(name = "fqClassName") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmTypeKind.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmTypeKind.kt index f6c740261b..5028372e48 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmTypeKind.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/JvmTypeKind.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: pRIMITIVE,rEFERENCE */ +@JsonClass(generateAdapter = false) enum class JvmTypeKind(val value: kotlin.String) { @Json(name = "PRIMITIVE") @@ -38,7 +35,7 @@ enum class JvmTypeKind(val value: kotlin.String) { rEFERENCE("REFERENCE"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -50,12 +47,12 @@ enum class JvmTypeKind(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is JvmTypeKind) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is JvmTypeKind) "$data" else null /** * Returns a valid [JvmTypeKind] for [data], null otherwise. */ - fun decode(data: Any?): JvmTypeKind? = data?.let { + fun decode(data: kotlin.Any?): JvmTypeKind? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Request.kt index 43c118469c..acd8dfd762 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param filter */ + data class ListFlowsV1Request ( @Json(name = "filter") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Response.kt index 6aa42ca4e8..5e4a1d7a40 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ListFlowsV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param flowNames An array of strings storing the names of the flows as returned by the flowList Corda RPC. */ + data class ListFlowsV1Response ( /* An array of strings storing the names of the flows as returned by the flowList Corda RPC. */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NetworkHostAndPort.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NetworkHostAndPort.kt index 4869153ed1..dbe858026c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NetworkHostAndPort.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NetworkHostAndPort.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param port */ + data class NetworkHostAndPort ( @Json(name = "host") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeDiagnosticInfo.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeDiagnosticInfo.kt index a43e1f69b7..1b057ae57e 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeDiagnosticInfo.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeDiagnosticInfo.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.CordappInfo import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * A NodeDiagnosticInfo holds information about the current node version. @@ -34,6 +30,7 @@ import com.squareup.moshi.Json * @param version The current node version string, e.g. 4.3, 4.4-SNAPSHOT. Note that this string is effectively freeform, and so should only be used for providing diagnostic information. It should not be used to make functionality decisions (the platformVersion is a better fit for this). */ + data class NodeDiagnosticInfo ( /* A list of CorDapps currently installed on this node */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeInfo.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeInfo.kt index 41c1b882d1..4174aecb4d 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeInfo.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/NodeInfo.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.NetworkHostAndPort import org.openapitools.client.models.Party import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -35,6 +31,7 @@ import com.squareup.moshi.Json * @param legalIdentitiesAndCerts */ + data class NodeInfo ( @Json(name = "addresses") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Party.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Party.kt index b3ca2e5baa..f042e13306 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Party.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/Party.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.CordaX500Name import org.openapitools.client.models.PublicKey import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param owningKey */ + data class Party ( @Json(name = "name") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PublicKey.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PublicKey.kt index 3b61bc18c4..0f4e6e4afa 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PublicKey.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PublicKey.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * An instance of a java.security.PublicKey (which is an interface) implementation such as org.hyperledger.cactus.plugin.ledger.connector.corda.server.impl.PublicKeyImpl @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param encoded */ + data class PublicKey ( @Json(name = "algorithm") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SHA256.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SHA256.kt index c557720879..c07eae447f 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SHA256.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SHA256.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * SHA-256 is part of the SHA-2 hash function family. Generated hash is fixed size, 256-bits (32-bytes). @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param propertySize */ + data class SHA256 ( @Json(name = "bytes") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Request.kt index 6a7c8748eb..83228ea8d1 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param stateFullClassName The fully qualified name of the Corda state to monitor */ + data class StartMonitorV1Request ( /* ID of a client application that wants to monitor the state changes */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Response.kt index e1ce5f707d..feaac0a5d0 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StartMonitorV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param msg Message describing operation status or any errors that occurred. */ + data class StartMonitorV1Response ( /* Flag set to true if monitoring started correctly. */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Request.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Request.kt index b0e93b3b1e..adc76d3856 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param stateFullClassName The fully qualified name of the Corda state to monitor */ + data class StopMonitorV1Request ( /* ID of a client application that wants to monitor the state changes */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Response.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Response.kt index 7ef86e7342..90dcab2015 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/StopMonitorV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param msg Message describing operation status or any errors that occurred. */ + data class StopMonitorV1Response ( /* Flag set to true if operation completed correctly. */ diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/X500Principal.kt b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/X500Principal.kt index 5cfccce590..f7c4067b5e 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/X500Principal.kt +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/X500Principal.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Corda - * - * Can perform basic tasks on a Corda ledger - * - * The version of the OpenAPI document: 0.3.0 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param encoded Base64 encoded public key */ + data class X500Principal ( @Json(name = "name") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/api-client/corda-api-client.ts b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/api-client/corda-api-client.ts index aed280c7b0..e09b395e9c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/api-client/corda-api-client.ts +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/api-client/corda-api-client.ts @@ -9,13 +9,13 @@ import { import { ISocketApiClient } from "@hyperledger/cactus-core-api"; import { DefaultApi, - GetMonitorTransactionsV1ResponseTx, + GetMonitorTransactionsV1ResponseTxInner, } from "../generated/openapi/typescript-axios"; import { Configuration } from "../generated/openapi/typescript-axios/configuration"; const DEFAULT_POLL_RATE_MS = 5000; -type CordaBlock = GetMonitorTransactionsV1ResponseTx; +type CordaBlock = GetMonitorTransactionsV1ResponseTxInner; /** * Options for CordaApiClient.watchBlocksV1 method. @@ -66,7 +66,7 @@ export class CordaApiClient * @param stateName Corda state to monitor. */ private async sendStartMonitorRequest( - subject: ReplaySubject, + subject: ReplaySubject, clientAppId: string, stateName: string, ) { @@ -103,7 +103,7 @@ export class CordaApiClient * @param stateName Corda state to monitor. */ private async pollTransactionsLogin( - subject: ReplaySubject, + subject: ReplaySubject, clientAppId: string, stateName: string, ) { diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/api.ts b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/api.ts index 59a9cd20b4..e027ffd16a 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * @@ -32,19 +34,19 @@ export interface ClearMonitorTransactionsV1Request { * @type {string} * @memberof ClearMonitorTransactionsV1Request */ - clientAppId: string; + 'clientAppId': string; /** * The fully qualified name of the Corda state to monitor * @type {string} * @memberof ClearMonitorTransactionsV1Request */ - stateFullClassName: string; + 'stateFullClassName': string; /** * * @type {Array} * @memberof ClearMonitorTransactionsV1Request */ - txIndexes: Array; + 'txIndexes': Array; } /** * @@ -57,13 +59,13 @@ export interface ClearMonitorTransactionsV1Response { * @type {boolean} * @memberof ClearMonitorTransactionsV1Response */ - success: boolean; + 'success': boolean; /** * Message describing operation status or any errors that occurred. * @type {string} * @memberof ClearMonitorTransactionsV1Response */ - msg: string; + 'msg': string; } /** * @@ -76,31 +78,31 @@ export interface CordaNodeSshCredentials { * @type {string} * @memberof CordaNodeSshCredentials */ - hostKeyEntry: string; + 'hostKeyEntry': string; /** * * @type {string} * @memberof CordaNodeSshCredentials */ - username: string; + 'username': string; /** * * @type {string} * @memberof CordaNodeSshCredentials */ - password: string; + 'password': string; /** * * @type {string} * @memberof CordaNodeSshCredentials */ - hostname: string; + 'hostname': string; /** * * @type {number} * @memberof CordaNodeSshCredentials */ - port: number; + 'port': number; } /** * @@ -113,25 +115,25 @@ export interface CordaRpcCredentials { * @type {string} * @memberof CordaRpcCredentials */ - hostname: string; + 'hostname': string; /** * * @type {number} * @memberof CordaRpcCredentials */ - port: number; + 'port': number; /** * * @type {string} * @memberof CordaRpcCredentials */ - username: string; + 'username': string; /** * * @type {string} * @memberof CordaRpcCredentials */ - password: string; + 'password': string; } /** * @@ -144,43 +146,43 @@ export interface CordaX500Name { * @type {string} * @memberof CordaX500Name */ - commonName?: string; + 'commonName'?: string; /** * * @type {string} * @memberof CordaX500Name */ - organisationUnit?: string; + 'organisationUnit'?: string; /** * * @type {string} * @memberof CordaX500Name */ - organisation: string; + 'organisation': string; /** * * @type {string} * @memberof CordaX500Name */ - locality: string; + 'locality': string; /** * * @type {string} * @memberof CordaX500Name */ - state?: string; + 'state'?: string; /** * * @type {string} * @memberof CordaX500Name */ - country: string; + 'country': string; /** * * @type {X500Principal} * @memberof CordaX500Name */ - x500Principal: X500Principal; + 'x500Principal': X500Principal; } /** * @@ -193,37 +195,37 @@ export interface CordappDeploymentConfig { * @type {CordaNodeSshCredentials} * @memberof CordappDeploymentConfig */ - sshCredentials: CordaNodeSshCredentials; + 'sshCredentials': CordaNodeSshCredentials; /** * * @type {CordaRpcCredentials} * @memberof CordappDeploymentConfig */ - rpcCredentials: CordaRpcCredentials; + 'rpcCredentials': CordaRpcCredentials; /** * The shell command to execute in order to start back up a Corda node after having placed new jars in the cordapp directory of said node. * @type {string} * @memberof CordappDeploymentConfig */ - cordaNodeStartCmd: string; + 'cordaNodeStartCmd': string; /** * The absolute file system path where the Corda Node is expecting deployed Cordapp jar files to be placed. * @type {string} * @memberof CordappDeploymentConfig */ - cordappDir: string; + 'cordappDir': string; /** * The absolute file system path where the corda.jar file of the node can be found. This is used to execute database schema migrations where applicable (H2 database in use in development environments). * @type {string} * @memberof CordappDeploymentConfig */ - cordaJarPath: string; + 'cordaJarPath': string; /** * The absolute file system path where the base directory of the Corda node can be found. This is used to pass in to corda.jar when being invoked for certain tasks such as executing database schema migrations for a deployed contract. * @type {string} * @memberof CordappDeploymentConfig */ - nodeBaseDirPath: string; + 'nodeBaseDirPath': string; } /** * A CordappInfo describes a single CorDapp currently installed on the node @@ -236,55 +238,55 @@ export interface CordappInfo { * @type {SHA256} * @memberof CordappInfo */ - jarHash: SHA256; + 'jarHash': SHA256; /** * The name of the licence this CorDapp is released under * @type {string} * @memberof CordappInfo */ - licence: string; + 'licence': string; /** * The minimum platform version the node must be at for the CorDapp to run * @type {number} * @memberof CordappInfo */ - minimumPlatformVersion: number; + 'minimumPlatformVersion': number; /** * The name of the JAR file that defines the CorDapp * @type {string} * @memberof CordappInfo */ - name: string; + 'name': string; /** * The name of the CorDapp * @type {string} * @memberof CordappInfo */ - shortName: string; + 'shortName': string; /** * The target platform version this CorDapp has been tested against * @type {number} * @memberof CordappInfo */ - targetPlatformVersion: number; + 'targetPlatformVersion': number; /** * A description of what sort of CorDapp this is - either a contract, workflow, or a combination. * @type {string} * @memberof CordappInfo */ - type: string; + 'type': string; /** * The vendor of this CorDapp * @type {string} * @memberof CordappInfo */ - vendor: string; + 'vendor': string; /** * The version of this CorDapp * @type {string} * @memberof CordappInfo */ - version: string; + 'version': string; } /** * @@ -297,7 +299,7 @@ export interface DeployContractJarsBadRequestV1Response { * @type {Array} * @memberof DeployContractJarsBadRequestV1Response */ - errors: Array; + 'errors': Array; } /** * @@ -310,7 +312,7 @@ export interface DeployContractJarsSuccessV1Response { * @type {Array} * @memberof DeployContractJarsSuccessV1Response */ - deployedJarFiles: Array; + 'deployedJarFiles': Array; } /** * @@ -323,13 +325,13 @@ export interface DeployContractJarsV1Request { * @type {Array} * @memberof DeployContractJarsV1Request */ - cordappDeploymentConfigs: Array; + 'cordappDeploymentConfigs': Array; /** * * @type {Array} * @memberof DeployContractJarsV1Request */ - jarFiles: Array; + 'jarFiles': Array; } /** * @@ -342,7 +344,7 @@ export interface DiagnoseNodeV1Request { * @type {Array} * @memberof DiagnoseNodeV1Request */ - nodeIds?: Array; + 'nodeIds'?: Array; } /** * @@ -355,7 +357,7 @@ export interface DiagnoseNodeV1Response { * @type {NodeDiagnosticInfo} * @memberof DiagnoseNodeV1Response */ - nodeDiagnosticInfo: NodeDiagnosticInfo; + 'nodeDiagnosticInfo': NodeDiagnosticInfo; } /** * Determines which flow starting method will be used on the back-end when invoking the flow. Based on the value here the plugin back-end might invoke the rpc.startFlowDynamic() method or the rpc.startTrackedFlowDynamic() method. Streamed responses are aggregated and returned in a single response to HTTP callers who are not equipped to handle streams like WebSocket/gRPC/etc. do. @@ -363,10 +365,13 @@ export interface DiagnoseNodeV1Response { * @enum {string} */ -export enum FlowInvocationType { - TrackedFlowDynamic = 'TRACKED_FLOW_DYNAMIC', - FlowDynamic = 'FLOW_DYNAMIC' -} +export const FlowInvocationType = { + TrackedFlowDynamic: 'TRACKED_FLOW_DYNAMIC', + FlowDynamic: 'FLOW_DYNAMIC' +} as const; + +export type FlowInvocationType = typeof FlowInvocationType[keyof typeof FlowInvocationType]; + /** * @@ -379,13 +384,13 @@ export interface GetMonitorTransactionsV1Request { * @type {string} * @memberof GetMonitorTransactionsV1Request */ - clientAppId: string; + 'clientAppId': string; /** * The fully qualified name of the Corda state to monitor * @type {string} * @memberof GetMonitorTransactionsV1Request */ - stateFullClassName: string; + 'stateFullClassName': string; } /** * @@ -398,44 +403,44 @@ export interface GetMonitorTransactionsV1Response { * @type {boolean} * @memberof GetMonitorTransactionsV1Response */ - success: boolean; + 'success': boolean; /** * Message describing operation status or any errors that occurred. * @type {string} * @memberof GetMonitorTransactionsV1Response */ - msg: string; + 'msg': string; /** * The fully qualified name of the Corda state to monitor * @type {string} * @memberof GetMonitorTransactionsV1Response */ - stateFullClassName?: string; + 'stateFullClassName'?: string; /** * - * @type {Array} + * @type {Array} * @memberof GetMonitorTransactionsV1Response */ - tx?: Array; + 'tx'?: Array; } /** * * @export - * @interface GetMonitorTransactionsV1ResponseTx + * @interface GetMonitorTransactionsV1ResponseTxInner */ -export interface GetMonitorTransactionsV1ResponseTx { +export interface GetMonitorTransactionsV1ResponseTxInner { /** * * @type {string} - * @memberof GetMonitorTransactionsV1ResponseTx + * @memberof GetMonitorTransactionsV1ResponseTxInner */ - index?: string; + 'index'?: string; /** * * @type {string} - * @memberof GetMonitorTransactionsV1ResponseTx + * @memberof GetMonitorTransactionsV1ResponseTxInner */ - data?: string; + 'data'?: string; } /** * @@ -448,26 +453,28 @@ export interface InvokeContractV1Request { * @type {string} * @memberof InvokeContractV1Request */ - flowFullClassName: string; + 'flowFullClassName': string; /** * * @type {FlowInvocationType} * @memberof InvokeContractV1Request */ - flowInvocationType: FlowInvocationType; + 'flowInvocationType': FlowInvocationType; /** * The list of arguments to pass in to the contract method being invoked. * @type {Array} * @memberof InvokeContractV1Request */ - params: Array; + 'params': Array; /** * The amount of milliseconds to wait for a transaction receipt beforegiving up and crashing. * @type {number} * @memberof InvokeContractV1Request */ - timeoutMs?: number; + 'timeoutMs'?: number; } + + /** * * @export @@ -479,31 +486,31 @@ export interface InvokeContractV1Response { * @type {boolean} * @memberof InvokeContractV1Response */ - success: boolean; + 'success': boolean; /** * Data returned from the JVM when no transaction is running * @type {object} * @memberof InvokeContractV1Response */ - callOutput: object; + 'callOutput': object; /** * The net.corda.core.flows.StateMachineRunId value returned by the flow execution. * @type {string} * @memberof InvokeContractV1Response */ - transactionId?: string; + 'transactionId'?: string; /** * An array of strings representing the aggregated stream of progress updates provided by a *tracked* flow invocation. If the flow invocation was not tracked, this array is still returned, but as empty. * @type {Array} * @memberof InvokeContractV1Response */ - progress?: Array; + 'progress'?: Array; /** * The id for the flow handle * @type {string} * @memberof InvokeContractV1Response */ - flowId: string; + 'flowId': string; } /** * @@ -511,26 +518,26 @@ export interface InvokeContractV1Response { * @interface JarFile */ export interface JarFile { - [key: string]: object | any; + [key: string]: any; /** * * @type {string} * @memberof JarFile */ - filename: string; + 'filename': string; /** * Indicates whether the cordapp jar in question contains any embedded migrations that Cactus can/should execute between copying the jar into the cordapp directory and starting the node back up. * @type {boolean} * @memberof JarFile */ - hasDbMigrations: boolean; + 'hasDbMigrations': boolean; /** * * @type {string} * @memberof JarFile */ - contentBase64: string; + 'contentBase64': string; } /** * Can represent JVM primitive and reference types as well. The jvmTypeKind field indicates which one is being stored. If the jvmTypeKind field is set to REFERENCE then the jvmCtorArgs array is expected to be filled, otherwise (e.g. PRIMITIVE jvmTypeKind) it is expected that the primitiveValue property is filled with a primitive data type supported by the JSON standard such as strings, booleans, numbers, etc. @@ -543,26 +550,28 @@ export interface JvmObject { * @type {JvmTypeKind} * @memberof JvmObject */ - jvmTypeKind: JvmTypeKind; + 'jvmTypeKind': JvmTypeKind; /** * * @type {object} * @memberof JvmObject */ - primitiveValue?: object; + 'primitiveValue'?: object; /** * * @type {Array} * @memberof JvmObject */ - jvmCtorArgs?: Array; + 'jvmCtorArgs'?: Array; /** * * @type {JvmType} * @memberof JvmObject */ - jvmType: JvmType; + 'jvmType': JvmType; } + + /** * Represents a reference to a JVM type (such as a Java class) * @export @@ -574,19 +583,19 @@ export interface JvmType { * @type {string} * @memberof JvmType */ - fqClassName: string; + 'fqClassName': string; /** * This parameter is used to specify that the function used to construct this JvmType is not a constructor function but instead is a factory function. Setting this parameter will cause the plugin to look up methods of the class denoted by fqClassName instead of its constructors. * @type {string} * @memberof JvmType */ - constructorName?: string; + 'constructorName'?: string; /** * * @type {JvmObject} * @memberof JvmType */ - invocationTarget?: JvmObject; + 'invocationTarget'?: JvmObject; } /** * @@ -594,10 +603,13 @@ export interface JvmType { * @enum {string} */ -export enum JvmTypeKind { - Primitive = 'PRIMITIVE', - Reference = 'REFERENCE' -} +export const JvmTypeKind = { + Primitive: 'PRIMITIVE', + Reference: 'REFERENCE' +} as const; + +export type JvmTypeKind = typeof JvmTypeKind[keyof typeof JvmTypeKind]; + /** * @@ -610,7 +622,7 @@ export interface ListFlowsV1Request { * @type {string} * @memberof ListFlowsV1Request */ - filter?: string; + 'filter'?: string; } /** * @@ -623,7 +635,7 @@ export interface ListFlowsV1Response { * @type {Array} * @memberof ListFlowsV1Response */ - flowNames: Array; + 'flowNames': Array; } /** * @@ -636,13 +648,13 @@ export interface NetworkHostAndPort { * @type {string} * @memberof NetworkHostAndPort */ - host: string; + 'host': string; /** * * @type {number} * @memberof NetworkHostAndPort */ - port: number; + 'port': number; } /** * A NodeDiagnosticInfo holds information about the current node version. @@ -655,31 +667,31 @@ export interface NodeDiagnosticInfo { * @type {Array} * @memberof NodeDiagnosticInfo */ - cordapps: Array; + 'cordapps': Array; /** * The platform version of this node. This number represents a released API version, and should be used to make functionality decisions (e.g. enabling an app feature only if an underlying platform feature exists) * @type {number} * @memberof NodeDiagnosticInfo */ - platformVersion: number; + 'platformVersion': number; /** * The git commit hash this node was built from * @type {string} * @memberof NodeDiagnosticInfo */ - revision: string; + 'revision': string; /** * The vendor of this node * @type {string} * @memberof NodeDiagnosticInfo */ - vendor: string; + 'vendor': string; /** * The current node version string, e.g. 4.3, 4.4-SNAPSHOT. Note that this string is effectively freeform, and so should only be used for providing diagnostic information. It should not be used to make functionality decisions (the platformVersion is a better fit for this). * @type {string} * @memberof NodeDiagnosticInfo */ - version: string; + 'version': string; } /** * @@ -692,31 +704,31 @@ export interface NodeInfo { * @type {Array} * @memberof NodeInfo */ - addresses: Array; + 'addresses': Array; /** * * @type {number} * @memberof NodeInfo */ - platformVersion: number; + 'platformVersion': number; /** * * @type {number} * @memberof NodeInfo */ - serial: number; + 'serial': number; /** * * @type {Array} * @memberof NodeInfo */ - legalIdentities: Array; + 'legalIdentities': Array; /** * * @type {Array} * @memberof NodeInfo */ - legalIdentitiesAndCerts: Array; + 'legalIdentitiesAndCerts': Array; } /** * @@ -729,13 +741,13 @@ export interface Party { * @type {CordaX500Name} * @memberof Party */ - name: CordaX500Name; + 'name': CordaX500Name; /** * * @type {PublicKey} * @memberof Party */ - owningKey: PublicKey; + 'owningKey': PublicKey; } /** * An instance of a java.security.PublicKey (which is an interface) implementation such as org.hyperledger.cactus.plugin.ledger.connector.corda.server.impl.PublicKeyImpl @@ -748,19 +760,19 @@ export interface PublicKey { * @type {string} * @memberof PublicKey */ - algorithm: string; + 'algorithm': string; /** * * @type {string} * @memberof PublicKey */ - format: string; + 'format': string; /** * * @type {string} * @memberof PublicKey */ - encoded: string; + 'encoded': string; } /** * SHA-256 is part of the SHA-2 hash function family. Generated hash is fixed size, 256-bits (32-bytes). @@ -773,19 +785,19 @@ export interface SHA256 { * @type {string} * @memberof SHA256 */ - bytes: string; + 'bytes': string; /** * * @type {number} * @memberof SHA256 */ - offset: number; + 'offset': number; /** * * @type {number} * @memberof SHA256 */ - size: number; + 'size': number; } /** * @@ -798,13 +810,13 @@ export interface StartMonitorV1Request { * @type {string} * @memberof StartMonitorV1Request */ - clientAppId: string; + 'clientAppId': string; /** * The fully qualified name of the Corda state to monitor * @type {string} * @memberof StartMonitorV1Request */ - stateFullClassName: string; + 'stateFullClassName': string; } /** * @@ -817,13 +829,13 @@ export interface StartMonitorV1Response { * @type {boolean} * @memberof StartMonitorV1Response */ - success: boolean; + 'success': boolean; /** * Message describing operation status or any errors that occurred. * @type {string} * @memberof StartMonitorV1Response */ - msg: string; + 'msg': string; } /** * @@ -836,13 +848,13 @@ export interface StopMonitorV1Request { * @type {string} * @memberof StopMonitorV1Request */ - clientAppId: string; + 'clientAppId': string; /** * The fully qualified name of the Corda state to monitor * @type {string} * @memberof StopMonitorV1Request */ - stateFullClassName: string; + 'stateFullClassName': string; } /** * @@ -855,13 +867,13 @@ export interface StopMonitorV1Response { * @type {boolean} * @memberof StopMonitorV1Response */ - success: boolean; + 'success': boolean; /** * Message describing operation status or any errors that occurred. * @type {string} * @memberof StopMonitorV1Response */ - msg: string; + 'msg': string; } /** * @@ -874,13 +886,13 @@ export interface X500Principal { * @type {string} * @memberof X500Principal */ - name: string; + 'name': string; /** * Base64 encoded public key * @type {string} * @memberof X500Principal */ - encoded: string; + 'encoded': string; } /** @@ -896,7 +908,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - clearMonitorTransactionsV1: async (clearMonitorTransactionsV1Request?: ClearMonitorTransactionsV1Request, options: any = {}): Promise => { + clearMonitorTransactionsV1: async (clearMonitorTransactionsV1Request?: ClearMonitorTransactionsV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/clear-monitor-transactions`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -913,7 +925,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(clearMonitorTransactionsV1Request, localVarRequestOptions, configuration) @@ -930,7 +942,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deployContractJarsV1: async (deployContractJarsV1Request?: DeployContractJarsV1Request, options: any = {}): Promise => { + deployContractJarsV1: async (deployContractJarsV1Request?: DeployContractJarsV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/deploy-contract-jars`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -947,7 +959,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(deployContractJarsV1Request, localVarRequestOptions, configuration) @@ -963,7 +975,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - diagnoseNodeV1: async (diagnoseNodeV1Request?: DiagnoseNodeV1Request, options: any = {}): Promise => { + diagnoseNodeV1: async (diagnoseNodeV1Request?: DiagnoseNodeV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/diagnose-node`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -980,7 +992,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(diagnoseNodeV1Request, localVarRequestOptions, configuration) @@ -997,7 +1009,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getMonitorTransactionsV1: async (getMonitorTransactionsV1Request?: GetMonitorTransactionsV1Request, options: any = {}): Promise => { + getMonitorTransactionsV1: async (getMonitorTransactionsV1Request?: GetMonitorTransactionsV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-monitor-transactions`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1014,7 +1026,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(getMonitorTransactionsV1Request, localVarRequestOptions, configuration) @@ -1030,7 +1042,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getPrometheusMetricsV1: async (options: any = {}): Promise => { + getPrometheusMetricsV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/get-prometheus-exporter-metrics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1045,7 +1057,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -1061,7 +1073,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - invokeContractV1: async (invokeContractV1Request?: InvokeContractV1Request, options: any = {}): Promise => { + invokeContractV1: async (invokeContractV1Request?: InvokeContractV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/invoke-contract`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1078,7 +1090,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(invokeContractV1Request, localVarRequestOptions, configuration) @@ -1094,7 +1106,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listFlowsV1: async (listFlowsV1Request?: ListFlowsV1Request, options: any = {}): Promise => { + listFlowsV1: async (listFlowsV1Request?: ListFlowsV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/list-flows`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1111,7 +1123,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(listFlowsV1Request, localVarRequestOptions, configuration) @@ -1127,7 +1139,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - networkMapV1: async (body?: object, options: any = {}): Promise => { + networkMapV1: async (body?: object, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/network-map`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1144,7 +1156,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration) @@ -1161,7 +1173,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - startMonitorV1: async (startMonitorV1Request?: StartMonitorV1Request, options: any = {}): Promise => { + startMonitorV1: async (startMonitorV1Request?: StartMonitorV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/start-monitor`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1178,7 +1190,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(startMonitorV1Request, localVarRequestOptions, configuration) @@ -1195,7 +1207,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - stopMonitorV1: async (stopMonitorV1Request?: StopMonitorV1Request, options: any = {}): Promise => { + stopMonitorV1: async (stopMonitorV1Request?: StopMonitorV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-corda/stop-monitor`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1212,7 +1224,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(stopMonitorV1Request, localVarRequestOptions, configuration) @@ -1239,7 +1251,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async clearMonitorTransactionsV1(clearMonitorTransactionsV1Request?: ClearMonitorTransactionsV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async clearMonitorTransactionsV1(clearMonitorTransactionsV1Request?: ClearMonitorTransactionsV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.clearMonitorTransactionsV1(clearMonitorTransactionsV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1250,7 +1262,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async deployContractJarsV1(deployContractJarsV1Request?: DeployContractJarsV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async deployContractJarsV1(deployContractJarsV1Request?: DeployContractJarsV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.deployContractJarsV1(deployContractJarsV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1260,7 +1272,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async diagnoseNodeV1(diagnoseNodeV1Request?: DiagnoseNodeV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async diagnoseNodeV1(diagnoseNodeV1Request?: DiagnoseNodeV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.diagnoseNodeV1(diagnoseNodeV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1271,7 +1283,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getMonitorTransactionsV1(getMonitorTransactionsV1Request?: GetMonitorTransactionsV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getMonitorTransactionsV1(getMonitorTransactionsV1Request?: GetMonitorTransactionsV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getMonitorTransactionsV1(getMonitorTransactionsV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1281,7 +1293,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getPrometheusMetricsV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getPrometheusMetricsV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getPrometheusMetricsV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1292,7 +1304,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.invokeContractV1(invokeContractV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1302,7 +1314,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listFlowsV1(listFlowsV1Request?: ListFlowsV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async listFlowsV1(listFlowsV1Request?: ListFlowsV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.listFlowsV1(listFlowsV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1312,7 +1324,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async networkMapV1(body?: object, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async networkMapV1(body?: object, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.networkMapV1(body, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1323,7 +1335,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async startMonitorV1(startMonitorV1Request?: StartMonitorV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async startMonitorV1(startMonitorV1Request?: StartMonitorV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.startMonitorV1(startMonitorV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1334,7 +1346,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async stopMonitorV1(stopMonitorV1Request?: StopMonitorV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async stopMonitorV1(stopMonitorV1Request?: StopMonitorV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.stopMonitorV1(stopMonitorV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1462,7 +1474,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public clearMonitorTransactionsV1(clearMonitorTransactionsV1Request?: ClearMonitorTransactionsV1Request, options?: any) { + public clearMonitorTransactionsV1(clearMonitorTransactionsV1Request?: ClearMonitorTransactionsV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).clearMonitorTransactionsV1(clearMonitorTransactionsV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1474,7 +1486,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public deployContractJarsV1(deployContractJarsV1Request?: DeployContractJarsV1Request, options?: any) { + public deployContractJarsV1(deployContractJarsV1Request?: DeployContractJarsV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).deployContractJarsV1(deployContractJarsV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1485,7 +1497,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public diagnoseNodeV1(diagnoseNodeV1Request?: DiagnoseNodeV1Request, options?: any) { + public diagnoseNodeV1(diagnoseNodeV1Request?: DiagnoseNodeV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).diagnoseNodeV1(diagnoseNodeV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1497,7 +1509,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getMonitorTransactionsV1(getMonitorTransactionsV1Request?: GetMonitorTransactionsV1Request, options?: any) { + public getMonitorTransactionsV1(getMonitorTransactionsV1Request?: GetMonitorTransactionsV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getMonitorTransactionsV1(getMonitorTransactionsV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1508,7 +1520,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getPrometheusMetricsV1(options?: any) { + public getPrometheusMetricsV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getPrometheusMetricsV1(options).then((request) => request(this.axios, this.basePath)); } @@ -1520,7 +1532,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: any) { + public invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).invokeContractV1(invokeContractV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1531,7 +1543,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public listFlowsV1(listFlowsV1Request?: ListFlowsV1Request, options?: any) { + public listFlowsV1(listFlowsV1Request?: ListFlowsV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).listFlowsV1(listFlowsV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1542,7 +1554,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public networkMapV1(body?: object, options?: any) { + public networkMapV1(body?: object, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).networkMapV1(body, options).then((request) => request(this.axios, this.basePath)); } @@ -1554,7 +1566,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public startMonitorV1(startMonitorV1Request?: StartMonitorV1Request, options?: any) { + public startMonitorV1(startMonitorV1Request?: StartMonitorV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).startMonitorV1(startMonitorV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1566,7 +1578,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public stopMonitorV1(stopMonitorV1Request?: StopMonitorV1Request, options?: any) { + public stopMonitorV1(stopMonitorV1Request?: StopMonitorV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).stopMonitorV1(stopMonitorV1Request, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/base.ts b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/base.ts index 9a3e41141e..63ec983187 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/common.ts b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/common.ts index 26f527dabd..5c812ea66e 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/packages/cactus-plugin-ledger-connector-fabric/openapitools.json b/packages/cactus-plugin-ledger-connector-fabric/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-fabric/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json index 9037c59c34..736b815450 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Connector Fabric", "description": "Can perform basic tasks on a fabric ledger", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, @@ -952,7 +952,6 @@ }, "buffer": { "type": "string", - "format": "binary", "description": "Buffer of blockHash. It's encoding should be described in `encoding` parameter.", "nullable": false } @@ -994,8 +993,7 @@ "required": ["encodedBlock"], "properties": { "encodedBlock": { - "type": "string", - "format": "binary" + "type": "string" } } }, diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES index b13fade7c2..13fe3a3422 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES @@ -6,7 +6,7 @@ settings.gradle src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt -src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt +src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt @@ -14,6 +14,7 @@ src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt +src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt @@ -26,6 +27,7 @@ src/main/kotlin/org/openapitools/client/models/ChainCodeProgrammingLanguage.kt src/main/kotlin/org/openapitools/client/models/ConnectionProfile.kt src/main/kotlin/org/openapitools/client/models/ConnectionProfileClient.kt src/main/kotlin/org/openapitools/client/models/DefaultEventHandlerStrategy.kt +src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1501Response.kt src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Request.kt src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1RequestConstructorArgs.kt src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Response.kt @@ -49,7 +51,6 @@ src/main/kotlin/org/openapitools/client/models/GetBlockResponseDecodedV1.kt src/main/kotlin/org/openapitools/client/models/GetBlockResponseEncodedV1.kt src/main/kotlin/org/openapitools/client/models/GetBlockResponseV1.kt src/main/kotlin/org/openapitools/client/models/GetTransactionReceiptResponse.kt -src/main/kotlin/org/openapitools/client/models/InlineResponse501.kt src/main/kotlin/org/openapitools/client/models/RunTransactionRequest.kt src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt src/main/kotlin/org/openapitools/client/models/SSHExecCommandResponse.kt diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/README.md index 5095d795c8..c074b2c826 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -1,9 +1,18 @@ # org.openapitools.client - Kotlin client library for Hyperledger Cactus Plugin - Connector Fabric +Can perform basic tasks on a fabric ledger + +## Overview +This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client. + +- API version: 0.0.1 +- Package version: +- Build package: org.openapitools.codegen.languages.KotlinClientCodegen + ## Requires -* Kotlin 1.4.30 -* Gradle 6.8.3 +* Kotlin 1.7.21 +* Gradle 7.5 ## Build @@ -28,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -43,7 +52,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**runTransactionV1**](docs/DefaultApi.md#runtransactionv1) | **POST** /api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/run-transaction | Runs a transaction on a Fabric ledger. - + ## Documentation for Models - [org.openapitools.client.models.ChainCodeLanguageRuntime](docs/ChainCodeLanguageRuntime.md) @@ -52,6 +61,7 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.ConnectionProfile](docs/ConnectionProfile.md) - [org.openapitools.client.models.ConnectionProfileClient](docs/ConnectionProfileClient.md) - [org.openapitools.client.models.DefaultEventHandlerStrategy](docs/DefaultEventHandlerStrategy.md) + - [org.openapitools.client.models.DeployContractGoSourceV1501Response](docs/DeployContractGoSourceV1501Response.md) - [org.openapitools.client.models.DeployContractGoSourceV1Request](docs/DeployContractGoSourceV1Request.md) - [org.openapitools.client.models.DeployContractGoSourceV1RequestConstructorArgs](docs/DeployContractGoSourceV1RequestConstructorArgs.md) - [org.openapitools.client.models.DeployContractGoSourceV1Response](docs/DeployContractGoSourceV1Response.md) @@ -75,7 +85,6 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.GetBlockResponseEncodedV1](docs/GetBlockResponseEncodedV1.md) - [org.openapitools.client.models.GetBlockResponseV1](docs/GetBlockResponseV1.md) - [org.openapitools.client.models.GetTransactionReceiptResponse](docs/GetTransactionReceiptResponse.md) - - [org.openapitools.client.models.InlineResponse501](docs/InlineResponse501.md) - [org.openapitools.client.models.RunTransactionRequest](docs/RunTransactionRequest.md) - [org.openapitools.client.models.RunTransactionResponse](docs/RunTransactionResponse.md) - [org.openapitools.client.models.SSHExecCommandResponse](docs/SSHExecCommandResponse.md) @@ -96,7 +105,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.WebSocketKey](docs/WebSocketKey.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/build.gradle b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/build.gradle index 3de8b45b13..66a3c68b89 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/build.gradle +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/build.gradle @@ -2,12 +2,12 @@ group 'org.openapitools' version '1.0.0' wrapper { - gradleVersion = '6.8.3' + gradleVersion = '7.5' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.7.21' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -18,6 +18,7 @@ buildscript { } apply plugin: 'kotlin' +apply plugin: 'maven-publish' repositories { maven { url "https://repo1.maven.org/maven2" } @@ -30,8 +31,8 @@ test { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation "com.squareup.moshi:moshi-kotlin:1.12.0" - implementation "com.squareup.moshi:moshi-adapters:1.12.0" - implementation "com.squareup.okhttp3:okhttp:4.9.1" + implementation "com.squareup.moshi:moshi-kotlin:1.13.0" + implementation "com.squareup.moshi:moshi-adapters:1.13.0" + implementation "com.squareup.okhttp3:okhttp:4.10.0" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt index f4fb426206..8206459ff0 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -20,6 +15,11 @@ package org.openapitools.client.apis +import java.io.IOException +import okhttp3.OkHttpClient +import okhttp3.HttpUrl + +import org.openapitools.client.models.DeployContractGoSourceV1501Response import org.openapitools.client.models.DeployContractGoSourceV1Request import org.openapitools.client.models.DeployContractGoSourceV1Response import org.openapitools.client.models.DeployContractV1Request @@ -28,47 +28,48 @@ import org.openapitools.client.models.ErrorExceptionResponseV1 import org.openapitools.client.models.GetBlockRequestV1 import org.openapitools.client.models.GetBlockResponseV1 import org.openapitools.client.models.GetTransactionReceiptResponse -import org.openapitools.client.models.InlineResponse501 import org.openapitools.client.models.RunTransactionRequest import org.openapitools.client.models.RunTransactionResponse +import com.squareup.moshi.Json + import org.openapitools.client.infrastructure.ApiClient +import org.openapitools.client.infrastructure.ApiResponse import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap +import org.openapitools.client.infrastructure.PartConfig import org.openapitools.client.infrastructure.RequestConfig import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { +class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://localhost") + System.getProperties().getProperty(ApiClient.baseUrlKey, "http://localhost") } } /** - * Deploys a chaincode contract in the form of a go sources. - * - * @param deployContractGoSourceV1Request (optional) - * @return DeployContractGoSourceV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Deploys a chaincode contract in the form of a go sources. + * + * @param deployContractGoSourceV1Request (optional) + * @return DeployContractGoSourceV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun deployContractGoSourceV1(deployContractGoSourceV1Request: DeployContractGoSourceV1Request?) : DeployContractGoSourceV1Response { - val localVariableConfig = deployContractGoSourceV1RequestConfig(deployContractGoSourceV1Request = deployContractGoSourceV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun deployContractGoSourceV1(deployContractGoSourceV1Request: DeployContractGoSourceV1Request? = null) : DeployContractGoSourceV1Response { + val localVarResponse = deployContractGoSourceV1WithHttpInfo(deployContractGoSourceV1Request = deployContractGoSourceV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as DeployContractGoSourceV1Response @@ -86,42 +87,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation deployContractGoSourceV1 - * - * @param deployContractGoSourceV1Request (optional) - * @return RequestConfig - */ + * Deploys a chaincode contract in the form of a go sources. + * + * @param deployContractGoSourceV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun deployContractGoSourceV1WithHttpInfo(deployContractGoSourceV1Request: DeployContractGoSourceV1Request?) : ApiResponse { + val localVariableConfig = deployContractGoSourceV1RequestConfig(deployContractGoSourceV1Request = deployContractGoSourceV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation deployContractGoSourceV1 + * + * @param deployContractGoSourceV1Request (optional) + * @return RequestConfig + */ fun deployContractGoSourceV1RequestConfig(deployContractGoSourceV1Request: DeployContractGoSourceV1Request?) : RequestConfig { val localVariableBody = deployContractGoSourceV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/deploy-contract-go-source", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Deploys a chaincode contract from a set of source files. Note: This endpoint only supports Fabric 2.x. The 'v1' suffix in the method name refers to the Cactus API version, not the supported Fabric ledger version. - * - * @param deployContractV1Request (optional) - * @return DeployContractV1Response - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Deploys a chaincode contract from a set of source files. Note: This endpoint only supports Fabric 2.x. The 'v1' suffix in the method name refers to the Cactus API version, not the supported Fabric ledger version. + * + * @param deployContractV1Request (optional) + * @return DeployContractV1Response + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun deployContractV1(deployContractV1Request: DeployContractV1Request?) : DeployContractV1Response { - val localVariableConfig = deployContractV1RequestConfig(deployContractV1Request = deployContractV1Request) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun deployContractV1(deployContractV1Request: DeployContractV1Request? = null) : DeployContractV1Response { + val localVarResponse = deployContractV1WithHttpInfo(deployContractV1Request = deployContractV1Request) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as DeployContractV1Response @@ -139,42 +159,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation deployContractV1 - * - * @param deployContractV1Request (optional) - * @return RequestConfig - */ + * Deploys a chaincode contract from a set of source files. Note: This endpoint only supports Fabric 2.x. The 'v1' suffix in the method name refers to the Cactus API version, not the supported Fabric ledger version. + * + * @param deployContractV1Request (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun deployContractV1WithHttpInfo(deployContractV1Request: DeployContractV1Request?) : ApiResponse { + val localVariableConfig = deployContractV1RequestConfig(deployContractV1Request = deployContractV1Request) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation deployContractV1 + * + * @param deployContractV1Request (optional) + * @return RequestConfig + */ fun deployContractV1RequestConfig(deployContractV1Request: DeployContractV1Request?) : RequestConfig { val localVariableBody = deployContractV1Request val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/deploy-contract", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Get block from the channel using one of selectors from the input. Works only on Fabric 2.x. - * - * @param getBlockRequestV1 (optional) - * @return GetBlockResponseV1 - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Get block from the channel using one of selectors from the input. Works only on Fabric 2.x. + * + * @param getBlockRequestV1 (optional) + * @return GetBlockResponseV1 + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) - fun getBlockV1(getBlockRequestV1: GetBlockRequestV1?) : GetBlockResponseV1 { - val localVariableConfig = getBlockV1RequestConfig(getBlockRequestV1 = getBlockRequestV1) - - val localVarResponse = request( - localVariableConfig - ) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) + fun getBlockV1(getBlockRequestV1: GetBlockRequestV1? = null) : GetBlockResponseV1 { + val localVarResponse = getBlockV1WithHttpInfo(getBlockRequestV1 = getBlockRequestV1) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as GetBlockResponseV1 @@ -192,41 +231,60 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation getBlockV1 - * - * @param getBlockRequestV1 (optional) - * @return RequestConfig - */ + * Get block from the channel using one of selectors from the input. Works only on Fabric 2.x. + * + * @param getBlockRequestV1 (optional) + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun getBlockV1WithHttpInfo(getBlockRequestV1: GetBlockRequestV1?) : ApiResponse { + val localVariableConfig = getBlockV1RequestConfig(getBlockRequestV1 = getBlockRequestV1) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation getBlockV1 + * + * @param getBlockRequestV1 (optional) + * @return RequestConfig + */ fun getBlockV1RequestConfig(getBlockRequestV1: GetBlockRequestV1?) : RequestConfig { val localVariableBody = getBlockRequestV1 val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/get-block", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Get the Prometheus Metrics - * - * @return kotlin.String - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Get the Prometheus Metrics + * + * @return kotlin.String + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun getPrometheusMetricsV1() : kotlin.String { - val localVariableConfig = getPrometheusMetricsV1RequestConfig() - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = getPrometheusMetricsV1WithHttpInfo() return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String @@ -244,41 +302,57 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation getPrometheusMetricsV1 - * - * @return RequestConfig - */ + * Get the Prometheus Metrics + * + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun getPrometheusMetricsV1WithHttpInfo() : ApiResponse { + val localVariableConfig = getPrometheusMetricsV1RequestConfig() + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation getPrometheusMetricsV1 + * + * @return RequestConfig + */ fun getPrometheusMetricsV1RequestConfig() : RequestConfig { val localVariableBody = null val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() - + return RequestConfig( method = RequestMethod.GET, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/get-prometheus-exporter-metrics", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * get a transaction receipt by tx id on a Fabric ledger. - * - * @param runTransactionRequest - * @return GetTransactionReceiptResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * get a transaction receipt by tx id on a Fabric ledger. + * + * @param runTransactionRequest + * @return GetTransactionReceiptResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun getTransactionReceiptByTxIDV1(runTransactionRequest: RunTransactionRequest) : GetTransactionReceiptResponse { - val localVariableConfig = getTransactionReceiptByTxIDV1RequestConfig(runTransactionRequest = runTransactionRequest) - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = getTransactionReceiptByTxIDV1WithHttpInfo(runTransactionRequest = runTransactionRequest) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as GetTransactionReceiptResponse @@ -296,42 +370,61 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation getTransactionReceiptByTxIDV1 - * - * @param runTransactionRequest - * @return RequestConfig - */ + * get a transaction receipt by tx id on a Fabric ledger. + * + * @param runTransactionRequest + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun getTransactionReceiptByTxIDV1WithHttpInfo(runTransactionRequest: RunTransactionRequest) : ApiResponse { + val localVariableConfig = getTransactionReceiptByTxIDV1RequestConfig(runTransactionRequest = runTransactionRequest) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation getTransactionReceiptByTxIDV1 + * + * @param runTransactionRequest + * @return RequestConfig + */ fun getTransactionReceiptByTxIDV1RequestConfig(runTransactionRequest: RunTransactionRequest) : RequestConfig { val localVariableBody = runTransactionRequest val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/get-transaction-receipt-by-txid", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } /** - * Runs a transaction on a Fabric ledger. - * - * @param runTransactionRequest - * @return RunTransactionResponse - * @throws UnsupportedOperationException If the API returns an informational or redirection response - * @throws ClientException If the API returns a client error response - * @throws ServerException If the API returns a server error response - */ + * Runs a transaction on a Fabric ledger. + * + * @param runTransactionRequest + * @return RunTransactionResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + * @throws UnsupportedOperationException If the API returns an informational or redirection response + * @throws ClientException If the API returns a client error response + * @throws ServerException If the API returns a server error response + */ @Suppress("UNCHECKED_CAST") - @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class) + @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class) fun runTransactionV1(runTransactionRequest: RunTransactionRequest) : RunTransactionResponse { - val localVariableConfig = runTransactionV1RequestConfig(runTransactionRequest = runTransactionRequest) - - val localVarResponse = request( - localVariableConfig - ) + val localVarResponse = runTransactionV1WithHttpInfo(runTransactionRequest = runTransactionRequest) return when (localVarResponse.responseType) { ResponseType.Success -> (localVarResponse as Success<*>).data as RunTransactionResponse @@ -349,23 +442,47 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath } /** - * To obtain the request config of the operation runTransactionV1 - * - * @param runTransactionRequest - * @return RequestConfig - */ + * Runs a transaction on a Fabric ledger. + * + * @param runTransactionRequest + * @return ApiResponse + * @throws IllegalStateException If the request is not correctly configured + * @throws IOException Rethrows the OkHttp execute method exception + */ + @Suppress("UNCHECKED_CAST") + @Throws(IllegalStateException::class, IOException::class) + fun runTransactionV1WithHttpInfo(runTransactionRequest: RunTransactionRequest) : ApiResponse { + val localVariableConfig = runTransactionV1RequestConfig(runTransactionRequest = runTransactionRequest) + + return request( + localVariableConfig + ) + } + + /** + * To obtain the request config of the operation runTransactionV1 + * + * @param runTransactionRequest + * @return RequestConfig + */ fun runTransactionV1RequestConfig(runTransactionRequest: RunTransactionRequest) : RequestConfig { val localVariableBody = runTransactionRequest val localVariableQuery: MultiValueMap = mutableMapOf() val localVariableHeaders: MutableMap = mutableMapOf() + localVariableHeaders["Content-Type"] = "application/json" + localVariableHeaders["Accept"] = "application/json" return RequestConfig( method = RequestMethod.POST, path = "/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/run-transaction", query = localVariableQuery, headers = localVariableHeaders, + requiresAuthentication = false, body = localVariableBody ) } + + private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String = + HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0] } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b359be1e41..ea4b7b6593 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -10,21 +10,26 @@ import okhttp3.ResponseBody import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.Headers +import okhttp3.Headers.Companion.toHeaders import okhttp3.MultipartBody +import okhttp3.Call +import okhttp3.Callback +import okhttp3.Response +import okhttp3.internal.EMPTY_REQUEST import java.io.BufferedWriter import java.io.File import java.io.FileWriter +import java.io.IOException import java.net.URLConnection import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime import java.time.OffsetDateTime import java.time.OffsetTime -import java.util.Date import java.util.Locale import com.squareup.moshi.adapter -open class ApiClient(val baseUrl: String) { +open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) { companion object { protected const val ContentType = "Content-Type" protected const val Accept = "Accept" @@ -39,9 +44,10 @@ open class ApiClient(val baseUrl: String) { var username: String? = null var password: String? = null var accessToken: String? = null + const val baseUrlKey = "org.openapitools.client.baseUrl" @JvmStatic - val client: OkHttpClient by lazy { + val defaultClient: OkHttpClient by lazy { builder.build() } @@ -60,48 +66,50 @@ open class ApiClient(val baseUrl: String) { return contentType ?: "application/octet-stream" } - protected inline fun requestBody(content: T, mediaType: String = JsonMediaType): RequestBody = + protected inline fun requestBody(content: T, mediaType: String?): RequestBody = when { - content is File -> content.asRequestBody(mediaType.toMediaTypeOrNull()) - mediaType == FormDataMediaType -> { + content is File -> content.asRequestBody((mediaType ?: guessContentTypeFromFile(content)).toMediaTypeOrNull()) + mediaType == FormDataMediaType -> MultipartBody.Builder() .setType(MultipartBody.FORM) .apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - if (value is File) { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"; filename=\"${value.name}\"" + (content as Map>).forEach { (name, part) -> + if (part.body is File) { + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"") + val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull() + addPart( + partHeaders.toHeaders(), + part.body.asRequestBody(fileMediaType) ) - val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull() - addPart(partHeaders, value.asRequestBody(fileMediaType)) } else { - val partHeaders = Headers.headersOf( - "Content-Disposition", - "form-data; name=\"$key\"" - ) + val partHeaders = part.headers.toMutableMap() + + ("Content-Disposition" to "form-data; name=\"$name\"") addPart( - partHeaders, - parameterToString(value).toRequestBody(null) + partHeaders.toHeaders(), + parameterToString(part.body).toRequestBody(null) ) } } }.build() - } mediaType == FormUrlEncMediaType -> { FormBody.Builder().apply { - // content's type *must* be Map + // content's type *must* be Map> @Suppress("UNCHECKED_CAST") - (content as Map).forEach { (key, value) -> - add(key, parameterToString(value)) + (content as Map>).forEach { (name, part) -> + add(name, parameterToString(part.body)) } }.build() } - mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody( - mediaType.toMediaTypeOrNull() - ) + mediaType == null || mediaType.startsWith("application/") && mediaType.endsWith("json") -> + if (content == null) { + EMPTY_REQUEST + } else { + Serializer.moshi.adapter(T::class.java).toJson(content) + .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull()) + } mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.") // TODO: this should be extended with other serializers else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.") @@ -112,31 +120,35 @@ open class ApiClient(val baseUrl: String) { if(body == null) { return null } + if (T::class.java == File::class.java) { + // return tempFile + // Attention: if you are developing an android app that supports API Level 25 and bellow, please check flag supportAndroidApiLevel25AndBelow in https://openapi-generator.tech/docs/generators/kotlin#config-options + val tempFile = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() + tempFile.deleteOnExit() + body.byteStream().use { inputStream -> + tempFile.outputStream().use { tempFileOutputStream -> + inputStream.copyTo(tempFileOutputStream) + } + } + return tempFile as T + } val bodyContent = body.string() if (bodyContent.isEmpty()) { return null } - if (T::class.java == File::class.java) { - // return tempfile - val f = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile() - f.deleteOnExit() - val out = BufferedWriter(FileWriter(f)) - out.write(bodyContent) - out.close() - return f as T - } - return when(mediaType) { - JsonMediaType -> Serializer.moshi.adapter().fromJson(bodyContent) + return when { + mediaType==null || (mediaType.startsWith("application/") && mediaType.endsWith("json")) -> + Serializer.moshi.adapter().fromJson(bodyContent) else -> throw UnsupportedOperationException("responseBody currently only supports JSON body.") } } - protected inline fun request(requestConfig: RequestConfig): ApiInfrastructureResponse { + protected inline fun request(requestConfig: RequestConfig): ApiResponse { val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.") val url = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) + .addEncodedPathSegments(requestConfig.path.trimStart('/')) .apply { requestConfig.query.forEach { query -> query.value.forEach { queryValue -> @@ -146,7 +158,7 @@ open class ApiClient(val baseUrl: String) { }.build() // take content-type/accept from spec or set to default (application/json) if not defined - if (requestConfig.headers[ContentType].isNullOrEmpty()) { + if (requestConfig.body != null && requestConfig.headers[ContentType].isNullOrEmpty()) { requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { @@ -154,16 +166,16 @@ open class ApiClient(val baseUrl: String) { } val headers = requestConfig.headers - if(headers[ContentType] ?: "" == "") { - throw kotlin.IllegalStateException("Missing Content-Type header. This is required.") - } - - if(headers[Accept] ?: "" == "") { + if (headers[Accept].isNullOrEmpty()) { throw kotlin.IllegalStateException("Missing Accept header. This is required.") } - // TODO: support multiple contentType options here. - val contentType = (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + val contentType = if (headers[ContentType] != null) { + // TODO: support multiple contentType options here. + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) + } else { + null + } val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType)) @@ -178,7 +190,8 @@ open class ApiClient(val baseUrl: String) { }.build() val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { @@ -215,7 +228,7 @@ open class ApiClient(val baseUrl: String) { null -> "" is Array<*> -> toMultiValue(value, "csv").toString() is Iterable<*> -> toMultiValue(value, "csv").toString() - is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> + is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime -> parseDateToQueryString(value) else -> value.toString() } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt new file mode 100644 index 0000000000..cf2cfaa95d --- /dev/null +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt @@ -0,0 +1,43 @@ +package org.openapitools.client.infrastructure + +enum class ResponseType { + Success, Informational, Redirection, ClientError, ServerError +} + +interface Response + +abstract class ApiResponse(val responseType: ResponseType): Response { + abstract val statusCode: Int + abstract val headers: Map> +} + +class Success( + val data: T, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +): ApiResponse(ResponseType.Success) + +class Informational( + val statusText: String, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Informational) + +class Redirection( + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.Redirection) + +class ClientError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> = mapOf() +) : ApiResponse(ResponseType.ClientError) + +class ServerError( + val message: String? = null, + val body: Any? = null, + override val statusCode: Int = -1, + override val headers: Map> +): ApiResponse(ResponseType.ServerError) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt index fb2c972cf8..064b57fc6b 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt @@ -14,4 +14,4 @@ class BigDecimalAdapter { fun fromJson(value: String): BigDecimal { return BigDecimal(value) } -} \ No newline at end of file +} diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt index 4b6963110c..7df6057b45 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt @@ -14,4 +14,4 @@ class BigIntegerAdapter { fun fromJson(value: String): BigInteger { return BigInteger(value) } -} \ No newline at end of file +} diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt new file mode 100644 index 0000000000..be00e38fba --- /dev/null +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt @@ -0,0 +1,11 @@ +package org.openapitools.client.infrastructure + +/** + * Defines a config object for a given part of a multi-part request. + * NOTE: Headers is a Map because rfc2616 defines + * multi-valued headers as csv-only. + */ +data class PartConfig( + val headers: MutableMap = mutableMapOf(), + val body: T? = null +) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt index 7e948e1dd0..625a19002b 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt @@ -13,5 +13,6 @@ data class RequestConfig( val path: String, val headers: MutableMap = mutableMapOf(), val query: MutableMap> = mutableMapOf(), + val requiresAuthentication: Boolean, val body: T? = null ) \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLanguageRuntime.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLanguageRuntime.kt index 74284bef7b..d206091930 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLanguageRuntime.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLanguageRuntime.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Enumerates the supported programming language runtimes of Hyperledger Fabric @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: golang,node,java */ +@JsonClass(generateAdapter = false) enum class ChainCodeLanguageRuntime(val value: kotlin.String) { @Json(name = "golang") @@ -41,7 +38,7 @@ enum class ChainCodeLanguageRuntime(val value: kotlin.String) { java("java"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -53,12 +50,12 @@ enum class ChainCodeLanguageRuntime(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is ChainCodeLanguageRuntime) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is ChainCodeLanguageRuntime) "$data" else null /** * Returns a valid [ChainCodeLanguageRuntime] for [data], null otherwise. */ - fun decode(data: Any?): ChainCodeLanguageRuntime? = data?.let { + fun decode(data: kotlin.Any?): ChainCodeLanguageRuntime? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLifeCycleCommandResponses.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLifeCycleCommandResponses.kt index 8bfd2d6d4f..804c263d21 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLifeCycleCommandResponses.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeLifeCycleCommandResponses.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.SSHExecCommandResponse import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -36,6 +32,7 @@ import com.squareup.moshi.Json * @param `init` */ + data class ChainCodeLifeCycleCommandResponses ( @Json(name = "installList") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeProgrammingLanguage.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeProgrammingLanguage.kt index 3774731c6d..ec49c9cb24 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeProgrammingLanguage.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ChainCodeProgrammingLanguage.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Enumerates the supported source code programming languages of Hyperledger Fabric @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: golang,javascript,typescript,java */ +@JsonClass(generateAdapter = false) enum class ChainCodeProgrammingLanguage(val value: kotlin.String) { @Json(name = "golang") @@ -44,7 +41,7 @@ enum class ChainCodeProgrammingLanguage(val value: kotlin.String) { java("java"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -56,12 +53,12 @@ enum class ChainCodeProgrammingLanguage(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is ChainCodeProgrammingLanguage) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is ChainCodeProgrammingLanguage) "$data" else null /** * Returns a valid [ChainCodeProgrammingLanguage] for [data], null otherwise. */ - fun decode(data: Any?): ChainCodeProgrammingLanguage? = data?.let { + fun decode(data: kotlin.Any?): ChainCodeProgrammingLanguage? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfile.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfile.kt index b9979c1178..c308a0d8ab 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfile.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfile.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.ConnectionProfileClient import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -39,6 +35,7 @@ import com.squareup.moshi.Json * @param certificateAuthorities */ + data class ConnectionProfile ( @Json(name = "name") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfileClient.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfileClient.kt index 91cfe619cc..b84781b513 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfileClient.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ConnectionProfileClient.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param organization */ + data class ConnectionProfileClient ( @Json(name = "organization") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DefaultEventHandlerStrategy.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DefaultEventHandlerStrategy.kt index a6a50656e1..0b6a171fa7 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DefaultEventHandlerStrategy.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DefaultEventHandlerStrategy.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: mSPIDSCOPEALLFORTX,mSPIDSCOPEANYFORTX,nETWORKSCOPEALLFORTX,nETWORKSCOPEANYFORTX */ +@JsonClass(generateAdapter = false) enum class DefaultEventHandlerStrategy(val value: kotlin.String) { @Json(name = "MSPID_SCOPE_ALLFORTX") @@ -44,7 +41,7 @@ enum class DefaultEventHandlerStrategy(val value: kotlin.String) { nETWORKSCOPEANYFORTX("NETWORK_SCOPE_ANYFORTX"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -56,12 +53,12 @@ enum class DefaultEventHandlerStrategy(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is DefaultEventHandlerStrategy) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is DefaultEventHandlerStrategy) "$data" else null /** * Returns a valid [DefaultEventHandlerStrategy] for [data], null otherwise. */ - fun decode(data: Any?): DefaultEventHandlerStrategy? = data?.let { + fun decode(data: kotlin.Any?): DefaultEventHandlerStrategy? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1501Response.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1501Response.kt new file mode 100644 index 0000000000..559c65d576 --- /dev/null +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1501Response.kt @@ -0,0 +1,35 @@ +/** + * + * Please note: + * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * Do not edit this file manually. + * + */ + +@file:Suppress( + "ArrayInDataClass", + "EnumEntryName", + "RemoveRedundantQualifierName", + "UnusedImport" +) + +package org.openapitools.client.models + + +import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass + +/** + * + * + * @param message + */ + + +data class DeployContractGoSourceV1501Response ( + + @Json(name = "message") + val message: kotlin.String? = null + +) + diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Request.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Request.kt index 55e9edbfbf..62bae207a7 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -25,6 +20,7 @@ import org.openapitools.client.models.DeploymentTargetOrganization import org.openapitools.client.models.FileBase64 import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -43,6 +39,7 @@ import com.squareup.moshi.Json * @param modTidyOnly Indicates to the go chaincode compiler of Cactus if it should do an actual go compilation with the contact source or if it should just execute the go mod tidy command. */ + data class DeployContractGoSourceV1Request ( @Json(name = "policyDslSource") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1RequestConstructorArgs.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1RequestConstructorArgs.kt index 7dcf489c32..97a54a3127 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1RequestConstructorArgs.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1RequestConstructorArgs.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param args */ + data class DeployContractGoSourceV1RequestConstructorArgs ( @Json(name = "Args") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Response.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Response.kt index 379ec559c6..56460729f5 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractGoSourceV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.SSHExecCommandResponse import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param instantiationCommandResponse */ + data class DeployContractGoSourceV1Response ( @Json(name = "success") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Request.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Request.kt index 73c5da76ee..37fd68a0c3 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Request.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Request.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -26,6 +21,7 @@ import org.openapitools.client.models.DeploymentTargetOrganization import org.openapitools.client.models.FileBase64 import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -47,6 +43,7 @@ import com.squareup.moshi.Json * @param constructorArgs */ + data class DeployContractV1Request ( @Json(name = "ccLang") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Response.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Response.kt index c0b26f71eb..6512b977d1 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Response.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeployContractV1Response.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.ChainCodeLifeCycleCommandResponses import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param lifecycle */ + data class DeployContractV1Response ( @Json(name = "success") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrgFabric2x.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrgFabric2x.kt index 44d4d98b42..bdaa0bcf0b 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrgFabric2x.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrgFabric2x.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -34,6 +30,7 @@ import com.squareup.moshi.Json * @param transient Transient map of arguments in JSON encoding */ + data class DeploymentTargetOrgFabric2x ( /* Mapped to environment variables of the Fabric CLI container. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrganization.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrganization.kt index b54b0b8d9b..5bab44452d 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrganization.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/DeploymentTargetOrganization.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -33,6 +29,7 @@ import com.squareup.moshi.Json * @param ORDERER_TLS_ROOTCERT_FILE Mapped to environment variables of the Fabric CLI container. */ + data class DeploymentTargetOrganization ( /* Mapped to environment variables of the Fabric CLI container. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ErrorExceptionResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ErrorExceptionResponseV1.kt index a4e04818ab..31968575b8 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ErrorExceptionResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ErrorExceptionResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param error */ + data class ErrorExceptionResponseV1 ( @Json(name = "message") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricContractInvocationType.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricContractInvocationType.kt index b1627a8ef5..1ab139edcc 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricContractInvocationType.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricContractInvocationType.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: sEND,cALL,sENDPRIVATE */ +@JsonClass(generateAdapter = false) enum class FabricContractInvocationType(val value: kotlin.String) { @Json(name = "FabricContractInvocationType.SEND") @@ -41,7 +38,7 @@ enum class FabricContractInvocationType(val value: kotlin.String) { sENDPRIVATE("FabricContractInvocationType.SENDPRIVATE"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -53,12 +50,12 @@ enum class FabricContractInvocationType(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is FabricContractInvocationType) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is FabricContractInvocationType) "$data" else null /** * Returns a valid [FabricContractInvocationType] for [data], null otherwise. */ - fun decode(data: Any?): FabricContractInvocationType? = data?.let { + fun decode(data: kotlin.Any?): FabricContractInvocationType? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredential.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredential.kt index 9a176b8308..bdf7c7bccb 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredential.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredential.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -25,6 +20,7 @@ import org.openapitools.client.models.VaultTransitKey import org.openapitools.client.models.WebSocketKey import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -36,6 +32,7 @@ import com.squareup.moshi.Json * @param webSocketKey */ + data class FabricSigningCredential ( @Json(name = "keychainId") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredentialType.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredentialType.kt index 01e8cba915..a655902ee1 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredentialType.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FabricSigningCredentialType.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * different type of identity provider for singing fabric messages supported by this package @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: xPeriod509,vaultMinusXPeriod509,wSMinusXPeriod509 */ +@JsonClass(generateAdapter = false) enum class FabricSigningCredentialType(val value: kotlin.String) { @Json(name = "X.509") @@ -41,7 +38,7 @@ enum class FabricSigningCredentialType(val value: kotlin.String) { wSMinusXPeriod509("WS-X.509"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -53,12 +50,12 @@ enum class FabricSigningCredentialType(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is FabricSigningCredentialType) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is FabricSigningCredentialType) "$data" else null /** * Returns a valid [FabricSigningCredentialType] for [data], null otherwise. */ - fun decode(data: Any?): FabricSigningCredentialType? = data?.let { + fun decode(data: kotlin.Any?): FabricSigningCredentialType? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FileBase64.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FileBase64.kt index 300fe0df28..98e74f5b36 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FileBase64.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/FileBase64.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Represents a file-system file that has a name and a body which holds the file contents as a Base64 encoded string @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param filepath The relative path of the file, if it should be placed in a sub-directory */ + data class FileBase64 ( /* The file's contents encoded as a Base64 string. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayDiscoveryOptions.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayDiscoveryOptions.kt index 034b0e9e2b..5f1771caae 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayDiscoveryOptions.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayDiscoveryOptions.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param enabled */ + data class GatewayDiscoveryOptions ( @Json(name = "asLocalhost") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayEventHandlerOptions.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayEventHandlerOptions.kt index fc551fac5e..73f02841e3 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayEventHandlerOptions.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayEventHandlerOptions.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.DefaultEventHandlerStrategy import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param endorseTimeout */ + data class GatewayEventHandlerOptions ( @Json(name = "strategy") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptions.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptions.kt index 5fcf2e401e..3b8fc10842 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptions.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptions.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -26,6 +21,7 @@ import org.openapitools.client.models.GatewayEventHandlerOptions import org.openapitools.client.models.GatewayOptionsWallet import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -37,6 +33,7 @@ import com.squareup.moshi.Json * @param eventHandlerOptions */ + data class GatewayOptions ( @Json(name = "identity") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptionsWallet.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptionsWallet.kt index 6e7c03e780..fba08bf06d 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptionsWallet.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GatewayOptionsWallet.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.FabricSigningCredential import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param json */ + data class GatewayOptionsWallet ( @Json(name = "keychain") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1.kt index 87bd35505d..bdb130a869 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.GatewayOptions import org.openapitools.client.models.GetBlockRequestV1Query import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Request for GetBlock endpoint. @@ -35,6 +31,7 @@ import com.squareup.moshi.Json * @param skipDecode If true, encoded buffer will be returned. Otherwise, entire block object is returned. */ + data class GetBlockRequestV1 ( /* Fabric channel which we want to query. */ @@ -53,7 +50,7 @@ data class GetBlockRequestV1 ( /* If true, encoded buffer will be returned. Otherwise, entire block object is returned. */ @Json(name = "skipDecode") - val skipDecode: kotlin.Boolean? = null + val skipDecode: kotlin.Boolean? = false ) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1Query.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1Query.kt index c9905fed39..72d98030a8 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1Query.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1Query.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.GetBlockRequestV1QueryBlockHash import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Query selector, caller must provide at least one of them. First found will be used, rest will be ignored, so it's recommended to pass single selector. @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param transactionId Select block by id of transaction that it contains. */ + data class GetBlockRequestV1Query ( /* Select block by it's number. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1QueryBlockHash.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1QueryBlockHash.kt index 974b449c59..12513f3083 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1QueryBlockHash.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockRequestV1QueryBlockHash.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Select block by it's hash. @@ -30,11 +26,12 @@ import com.squareup.moshi.Json * @param encoding NodeJS Buffer encoding (utf-8, hex, binary, base64, etc...). Passed directly to `Buffer.from()` call on hashBuffer. If not provided then JSON buffer format is assumed. */ + data class GetBlockRequestV1QueryBlockHash ( /* Buffer of blockHash. It's encoding should be described in `encoding` parameter. */ @Json(name = "buffer") - val buffer: java.io.File, + val buffer: kotlin.String, /* NodeJS Buffer encoding (utf-8, hex, binary, base64, etc...). Passed directly to `Buffer.from()` call on hashBuffer. If not provided then JSON buffer format is assumed. */ @Json(name = "encoding") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseDecodedV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseDecodedV1.kt index 3a42d06e73..1a637fdc73 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseDecodedV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseDecodedV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * When skipDecode is false (default) then decoded block object is returned. @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * @param decodedBlock Full hyperledger fabric block data. */ + data class GetBlockResponseDecodedV1 ( /* Full hyperledger fabric block data. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseEncodedV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseEncodedV1.kt index bcc246804c..8ce336c402 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseEncodedV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseEncodedV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * When skipDecode is true then encoded block Buffer is returned. @@ -29,10 +25,11 @@ import com.squareup.moshi.Json * @param encodedBlock */ + data class GetBlockResponseEncodedV1 ( @Json(name = "encodedBlock") - val encodedBlock: java.io.File + val encodedBlock: kotlin.String ) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseV1.kt index 27cbb91784..967461afd3 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetBlockResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.GetBlockResponseDecodedV1 import org.openapitools.client.models.GetBlockResponseEncodedV1 import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Response from GetBlock endpoint. @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param encodedBlock */ + data class GetBlockResponseV1 ( /* Full hyperledger fabric block data. */ @@ -39,7 +36,7 @@ data class GetBlockResponseV1 ( val decodedBlock: kotlin.Any?, @Json(name = "encodedBlock") - val encodedBlock: java.io.File + val encodedBlock: kotlin.String ) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetTransactionReceiptResponse.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetTransactionReceiptResponse.kt index 2f9df84f8b..5c924b55ab 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetTransactionReceiptResponse.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetTransactionReceiptResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -25,6 +20,7 @@ import org.openapitools.client.models.TransactReceiptTransactionCreator import org.openapitools.client.models.TransactReceiptTransactionEndorsement import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -41,6 +37,7 @@ import com.squareup.moshi.Json * @param rwsetWriteData */ + data class GetTransactionReceiptResponse ( @Json(name = "blockNumber") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionRequest.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionRequest.kt index 0fb471ff5a..b9abd97623 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionRequest.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionRequest.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -25,6 +20,7 @@ import org.openapitools.client.models.FabricSigningCredential import org.openapitools.client.models.GatewayOptions import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -42,6 +38,7 @@ import com.squareup.moshi.Json * @param responseType */ + data class RunTransactionRequest ( @Json(name = "signingCredential") @@ -73,7 +70,7 @@ data class RunTransactionRequest ( val gatewayOptions: GatewayOptions? = null, @Json(name = "endorsingParties") - val endorsingParties: kotlin.collections.List? = null, + val endorsingParties: kotlin.collections.List? = arrayListOf(), @Json(name = "responseType") val responseType: kotlin.String? = null diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt index 9c6879a4a7..4ed7d3516f 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RunTransactionResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param transactionId */ + data class RunTransactionResponse ( @Json(name = "functionOutput") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SSHExecCommandResponse.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SSHExecCommandResponse.kt index 1814837e1a..81c60b5aea 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SSHExecCommandResponse.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SSHExecCommandResponse.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param signal */ + data class SSHExecCommandResponse ( @Json(name = "stdout") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptBlockMetaData.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptBlockMetaData.kt index 8c04dd931c..4cfcd0828a 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptBlockMetaData.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptBlockMetaData.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param signature */ + data class TransactReceiptBlockMetaData ( @Json(name = "mspid") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionCreator.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionCreator.kt index e657590477..657aa2b330 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionCreator.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionCreator.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param creatorID */ + data class TransactReceiptTransactionCreator ( @Json(name = "mspid") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionEndorsement.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionEndorsement.kt index efa88287b0..73d0028e8d 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionEndorsement.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransactReceiptTransactionEndorsement.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -31,6 +27,7 @@ import com.squareup.moshi.Json * @param signature */ + data class TransactReceiptTransactionEndorsement ( @Json(name = "mspid") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/VaultTransitKey.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/VaultTransitKey.kt index 8402cf5177..0d914e98f2 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/VaultTransitKey.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/VaultTransitKey.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * vault key details for signing fabric message with private key stored with transit engine. @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param token token for accessing private key */ + data class VaultTransitKey ( /* label of private key */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusErrorResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusErrorResponseV1.kt index 62705cfe90..84fa901542 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusErrorResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusErrorResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Error response from WatchBlocks operation. @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param errorMessage Description of the error. */ + data class WatchBlocksCactusErrorResponseV1 ( /* Error code. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsEventV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsEventV1.kt index f0d7e00364..c504d8dc1a 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsEventV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsEventV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Transaction summary from commited block. @@ -32,6 +28,7 @@ import com.squareup.moshi.Json * @param functionArgs List of function arguments. */ + data class WatchBlocksCactusTransactionsEventV1 ( /* ChainCode containing function that was executed. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsResponseV1.kt index 9cb28f7fb7..c79b366efb 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksCactusTransactionsResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -23,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.WatchBlocksCactusTransactionsEventV1 import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Custom response containing block transactions summary. Compatible with legacy fabric-socketio connector monitoring. @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param cactusTransactionsEvents List of transactions summary */ + data class WatchBlocksCactusTransactionsResponseV1 ( /* List of transactions summary */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFilteredResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFilteredResponseV1.kt index f732b0199a..28d15da38e 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFilteredResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFilteredResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Response that corresponds to Fabric SDK 'filtered' EventType. @@ -29,11 +25,12 @@ import com.squareup.moshi.Json * @param filteredBlock Filtered commited block. */ + data class WatchBlocksFilteredResponseV1 ( /* Filtered commited block. */ @Json(name = "filteredBlock") - val filteredBlock: kotlin.Any + val filteredBlock: kotlin.Any? ) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFullResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFullResponseV1.kt index 109969f764..5e9d2682ef 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFullResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksFullResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Response that corresponds to Fabric SDK 'full' EventType. @@ -29,11 +25,12 @@ import com.squareup.moshi.Json * @param fullBlock Full commited block. */ + data class WatchBlocksFullResponseV1 ( /* Full commited block. */ @Json(name = "fullBlock") - val fullBlock: kotlin.Any + val fullBlock: kotlin.Any? ) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksListenerTypeV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksListenerTypeV1.kt index 4a42d02160..42a5adf2c8 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksListenerTypeV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksListenerTypeV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Response type from WatchBlocks. 'Cactus*' are custom views, others correspond to fabric SDK call. @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: Filtered,Full,Private,CactusTransactions */ +@JsonClass(generateAdapter = false) enum class WatchBlocksListenerTypeV1(val value: kotlin.String) { @Json(name = "filtered") @@ -44,7 +41,7 @@ enum class WatchBlocksListenerTypeV1(val value: kotlin.String) { CactusTransactions("cactus:transactions"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -56,12 +53,12 @@ enum class WatchBlocksListenerTypeV1(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is WatchBlocksListenerTypeV1) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is WatchBlocksListenerTypeV1) "$data" else null /** * Returns a valid [WatchBlocksListenerTypeV1] for [data], null otherwise. */ - fun decode(data: Any?): WatchBlocksListenerTypeV1? = data?.let { + fun decode(data: kotlin.Any?): WatchBlocksListenerTypeV1? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksOptionsV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksOptionsV1.kt index 988af1c114..7ade326bd7 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksOptionsV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksOptionsV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -24,6 +19,7 @@ import org.openapitools.client.models.GatewayOptions import org.openapitools.client.models.WatchBlocksListenerTypeV1 import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Options passed when subscribing to block monitoring. @@ -34,6 +30,7 @@ import com.squareup.moshi.Json * @param startBlock From which block start monitoring. Defaults to latest. */ + data class WatchBlocksOptionsV1 ( /* Hyperledger Fabric channel to connect to. */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksPrivateResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksPrivateResponseV1.kt index 587a2d714d..0545b68527 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksPrivateResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksPrivateResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Response that corresponds to Fabric SDK 'private' EventType. @@ -29,11 +25,12 @@ import com.squareup.moshi.Json * @param privateBlock Private commited block. */ + data class WatchBlocksPrivateResponseV1 ( /* Private commited block. */ @Json(name = "privateBlock") - val privateBlock: kotlin.Any + val privateBlock: kotlin.Any? ) diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksResponseV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksResponseV1.kt index 110698a17b..4939f4c2f1 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksResponseV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksResponseV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -28,6 +23,7 @@ import org.openapitools.client.models.WatchBlocksFullResponseV1 import org.openapitools.client.models.WatchBlocksPrivateResponseV1 import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Response block from WatchBlocks endpoint. Depends on 'type' passed in subscription options. @@ -40,6 +36,7 @@ import com.squareup.moshi.Json * @param errorMessage Description of the error. */ + data class WatchBlocksResponseV1 ( /* List of transactions summary */ @@ -48,15 +45,15 @@ data class WatchBlocksResponseV1 ( /* Full commited block. */ @Json(name = "fullBlock") - val fullBlock: kotlin.Any, + val fullBlock: kotlin.Any?, /* Filtered commited block. */ @Json(name = "filteredBlock") - val filteredBlock: kotlin.Any, + val filteredBlock: kotlin.Any?, /* Private commited block. */ @Json(name = "privateBlock") - val privateBlock: kotlin.Any, + val privateBlock: kotlin.Any?, /* Error code. */ @Json(name = "code") diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksV1.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksV1.kt index 642b720526..de97ec704a 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksV1.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WatchBlocksV1.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * Websocket requests for monitoring new blocks. @@ -29,6 +25,7 @@ import com.squareup.moshi.Json * Values: Subscribe,Next,Unsubscribe,Error,Complete */ +@JsonClass(generateAdapter = false) enum class WatchBlocksV1(val value: kotlin.String) { @Json(name = "org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Subscribe") @@ -47,7 +44,7 @@ enum class WatchBlocksV1(val value: kotlin.String) { Complete("org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Complete"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that @@ -59,12 +56,12 @@ enum class WatchBlocksV1(val value: kotlin.String) { /** * Converts the provided [data] to a [String] on success, null otherwise. */ - fun encode(data: Any?): kotlin.String? = if (data is WatchBlocksV1) "$data" else null + fun encode(data: kotlin.Any?): kotlin.String? = if (data is WatchBlocksV1) "$data" else null /** * Returns a valid [WatchBlocksV1] for [data], null otherwise. */ - fun decode(data: Any?): WatchBlocksV1? = data?.let { + fun decode(data: kotlin.Any?): WatchBlocksV1? = data?.let { val normalizedData = "$it".lowercase() values().firstOrNull { value -> it == value || normalizedData == "$value".lowercase() diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WebSocketKey.kt b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WebSocketKey.kt index f765a5b315..19a4b34aa0 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WebSocketKey.kt +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/WebSocketKey.kt @@ -1,14 +1,9 @@ /** - * Hyperledger Cactus Plugin - Connector Fabric - * - * Can perform basic tasks on a fabric ledger - * - * The version of the OpenAPI document: 0.0.1 - * * * Please note: * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * Do not edit this file manually. + * */ @file:Suppress( @@ -22,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * web-socket key details for signing fabric message with private key stored with external client @@ -30,6 +26,7 @@ import com.squareup.moshi.Json * @param signature signature of the session ID */ + data class WebSocketKey ( /* session Id to access client */ diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts index 6b5fbb9a6c..815ad8222c 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * Enumerates the supported programming language runtimes of Hyperledger Fabric @@ -27,11 +29,14 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr * @enum {string} */ -export enum ChainCodeLanguageRuntime { - Golang = 'golang', - Node = 'node', - Java = 'java' -} +export const ChainCodeLanguageRuntime = { + Golang: 'golang', + Node: 'node', + Java: 'java' +} as const; + +export type ChainCodeLanguageRuntime = typeof ChainCodeLanguageRuntime[keyof typeof ChainCodeLanguageRuntime]; + /** * @@ -44,43 +49,43 @@ export interface ChainCodeLifeCycleCommandResponses { * @type {SSHExecCommandResponse} * @memberof ChainCodeLifeCycleCommandResponses */ - packaging?: SSHExecCommandResponse; + 'packaging'?: SSHExecCommandResponse; /** * * @type {Array} * @memberof ChainCodeLifeCycleCommandResponses */ - installList: Array; + 'installList': Array; /** * * @type {Array} * @memberof ChainCodeLifeCycleCommandResponses */ - queryInstalledList: Array; + 'queryInstalledList': Array; /** * * @type {Array} * @memberof ChainCodeLifeCycleCommandResponses */ - approveForMyOrgList: Array; + 'approveForMyOrgList': Array; /** * * @type {SSHExecCommandResponse} * @memberof ChainCodeLifeCycleCommandResponses */ - commit?: SSHExecCommandResponse; + 'commit'?: SSHExecCommandResponse; /** * * @type {SSHExecCommandResponse} * @memberof ChainCodeLifeCycleCommandResponses */ - queryCommitted?: SSHExecCommandResponse; + 'queryCommitted'?: SSHExecCommandResponse; /** * * @type {SSHExecCommandResponse} * @memberof ChainCodeLifeCycleCommandResponses */ - init?: SSHExecCommandResponse; + 'init'?: SSHExecCommandResponse; } /** * Enumerates the supported source code programming languages of Hyperledger Fabric @@ -88,12 +93,15 @@ export interface ChainCodeLifeCycleCommandResponses { * @enum {string} */ -export enum ChainCodeProgrammingLanguage { - Golang = 'golang', - Javascript = 'javascript', - Typescript = 'typescript', - Java = 'java' -} +export const ChainCodeProgrammingLanguage = { + Golang: 'golang', + Javascript: 'javascript', + Typescript: 'typescript', + Java: 'java' +} as const; + +export type ChainCodeProgrammingLanguage = typeof ChainCodeProgrammingLanguage[keyof typeof ChainCodeProgrammingLanguage]; + /** * @@ -101,68 +109,68 @@ export enum ChainCodeProgrammingLanguage { * @interface ConnectionProfile */ export interface ConnectionProfile { - [key: string]: object | any; + [key: string]: any; /** * * @type {string} * @memberof ConnectionProfile */ - name: string; + 'name': string; /** * * @type {string} * @memberof ConnectionProfile */ - x_type?: string; + 'x-type'?: string; /** * * @type {string} * @memberof ConnectionProfile */ - description?: string; + 'description'?: string; /** * * @type {string} * @memberof ConnectionProfile */ - version: string; + 'version': string; /** * * @type {ConnectionProfileClient} * @memberof ConnectionProfile */ - client?: ConnectionProfileClient; + 'client'?: ConnectionProfileClient; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof ConnectionProfile */ - channels?: { [key: string]: object; }; + 'channels'?: { [key: string]: any; }; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof ConnectionProfile */ - organizations: { [key: string]: object; }; + 'organizations': { [key: string]: any; }; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof ConnectionProfile */ - orderers?: { [key: string]: object; }; + 'orderers'?: { [key: string]: any; }; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof ConnectionProfile */ - peers: { [key: string]: object; }; + 'peers': { [key: string]: any; }; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof ConnectionProfile */ - certificateAuthorities?: { [key: string]: object; }; + 'certificateAuthorities'?: { [key: string]: any; }; } /** * @@ -175,7 +183,7 @@ export interface ConnectionProfileClient { * @type {string} * @memberof ConnectionProfileClient */ - organization?: string; + 'organization'?: string; } /** * @@ -183,13 +191,29 @@ export interface ConnectionProfileClient { * @enum {string} */ -export enum DefaultEventHandlerStrategy { - MspidScopeAllfortx = 'MSPID_SCOPE_ALLFORTX', - MspidScopeAnyfortx = 'MSPID_SCOPE_ANYFORTX', - NetworkScopeAllfortx = 'NETWORK_SCOPE_ALLFORTX', - NetworkScopeAnyfortx = 'NETWORK_SCOPE_ANYFORTX' -} +export const DefaultEventHandlerStrategy = { + MspidScopeAllfortx: 'MSPID_SCOPE_ALLFORTX', + MspidScopeAnyfortx: 'MSPID_SCOPE_ANYFORTX', + NetworkScopeAllfortx: 'NETWORK_SCOPE_ALLFORTX', + NetworkScopeAnyfortx: 'NETWORK_SCOPE_ANYFORTX' +} as const; + +export type DefaultEventHandlerStrategy = typeof DefaultEventHandlerStrategy[keyof typeof DefaultEventHandlerStrategy]; + +/** + * + * @export + * @interface DeployContractGoSourceV1501Response + */ +export interface DeployContractGoSourceV1501Response { + /** + * + * @type {string} + * @memberof DeployContractGoSourceV1501Response + */ + 'message'?: string; +} /** * * @export @@ -201,73 +225,73 @@ export interface DeployContractGoSourceV1Request { * @type {string} * @memberof DeployContractGoSourceV1Request */ - policyDslSource: string; + 'policyDslSource': string; /** * The TLS root cert files that will be passed to the chaincode instantiation command. * @type {string} * @memberof DeployContractGoSourceV1Request */ - tlsRootCertFiles: string; + 'tlsRootCertFiles': string; /** * The name of the Fabric channel where the contract will get instantiated. * @type {string} * @memberof DeployContractGoSourceV1Request */ - channelId: string; + 'channelId': string; /** * * @type {Array} * @memberof DeployContractGoSourceV1Request */ - targetOrganizations: Array; + 'targetOrganizations': Array; /** * An array of peer addresses where the contract will be instantiated. Note that at present only the first item from this array will be used which is the behavior taken from the official Fabric samples repository and therefore it is assumed to be correct usage. * @type {Array} * @memberof DeployContractGoSourceV1Request */ - targetPeerAddresses: Array; + 'targetPeerAddresses': Array; /** * * @type {DeployContractGoSourceV1RequestConstructorArgs} * @memberof DeployContractGoSourceV1Request */ - constructorArgs?: DeployContractGoSourceV1RequestConstructorArgs; + 'constructorArgs'?: DeployContractGoSourceV1RequestConstructorArgs; /** * * @type {string} * @memberof DeployContractGoSourceV1Request */ - chainCodeVersion: string; + 'chainCodeVersion': string; /** * * @type {FileBase64} * @memberof DeployContractGoSourceV1Request */ - goSource: FileBase64; + 'goSource': FileBase64; /** * * @type {FileBase64} * @memberof DeployContractGoSourceV1Request */ - goMod?: FileBase64; + 'goMod'?: FileBase64; /** * The go module name that will be used for the go compilation process. * @type {string} * @memberof DeployContractGoSourceV1Request */ - moduleName?: string; + 'moduleName'?: string; /** * * @type {Array} * @memberof DeployContractGoSourceV1Request */ - pinnedDeps?: Array; + 'pinnedDeps'?: Array; /** * Indicates to the go chaincode compiler of Cactus if it should do an actual go compilation with the contact source or if it should just execute the go mod tidy command. * @type {boolean} * @memberof DeployContractGoSourceV1Request */ - modTidyOnly?: boolean | null; + 'modTidyOnly'?: boolean | null; } /** * @@ -280,7 +304,7 @@ export interface DeployContractGoSourceV1RequestConstructorArgs { * @type {Array} * @memberof DeployContractGoSourceV1RequestConstructorArgs */ - Args?: Array; + 'Args'?: Array; } /** * @@ -293,19 +317,19 @@ export interface DeployContractGoSourceV1Response { * @type {boolean} * @memberof DeployContractGoSourceV1Response */ - success: boolean; + 'success': boolean; /** * * @type {Array} * @memberof DeployContractGoSourceV1Response */ - installationCommandResponses: Array; + 'installationCommandResponses': Array; /** * * @type {SSHExecCommandResponse} * @memberof DeployContractGoSourceV1Response */ - instantiationCommandResponse: SSHExecCommandResponse; + 'instantiationCommandResponse': SSHExecCommandResponse; } /** * @@ -318,92 +342,94 @@ export interface DeployContractV1Request { * @type {ChainCodeProgrammingLanguage} * @memberof DeployContractV1Request */ - ccLang: ChainCodeProgrammingLanguage; + 'ccLang': ChainCodeProgrammingLanguage; /** * File-system path pointing at the CA file. * @type {string} * @memberof DeployContractV1Request */ - caFile: string; + 'caFile': string; /** * Ordering service endpoint specified as : * @type {string} * @memberof DeployContractV1Request */ - orderer: string; + 'orderer': string; /** * The hostname override to use when validating the TLS connection to the orderer * @type {string} * @memberof DeployContractV1Request */ - ordererTLSHostnameOverride: string; + 'ordererTLSHostnameOverride': string; /** * Timeout for client to connect (default 3s) * @type {number} * @memberof DeployContractV1Request */ - connTimeout?: number; + 'connTimeout'?: number; /** * Passed in to the peer via the --signature-policy argument on the command line. See also: https://hyperledger-fabric.readthedocs.io/en/release-2.2/endorsement-policies.html#setting-chaincode-level-endorsement-policies * @type {string} * @memberof DeployContractV1Request */ - signaturePolicy?: string; + 'signaturePolicy'?: string; /** * Name of the collections config file as present in the sourceFiles array of the request. * @type {string} * @memberof DeployContractV1Request */ - collectionsConfigFile?: string; + 'collectionsConfigFile'?: string; /** * The name of the Fabric channel where the contract will get instantiated. * @type {string} * @memberof DeployContractV1Request */ - channelId: string; + 'channelId': string; /** * * @type {Array} * @memberof DeployContractV1Request */ - targetOrganizations: Array; + 'targetOrganizations': Array; /** * * @type {DeployContractGoSourceV1RequestConstructorArgs} * @memberof DeployContractV1Request */ - constructorArgs?: DeployContractGoSourceV1RequestConstructorArgs; + 'constructorArgs'?: DeployContractGoSourceV1RequestConstructorArgs; /** * * @type {number} * @memberof DeployContractV1Request */ - ccSequence: number; + 'ccSequence': number; /** * * @type {string} * @memberof DeployContractV1Request */ - ccVersion: string; + 'ccVersion': string; /** * * @type {string} * @memberof DeployContractV1Request */ - ccName: string; + 'ccName': string; /** * Human readable label to uniquely identify the contract. Recommended to include in this at least the contract name and the exact version in order to make it easily distinguishable from other deployments of the same contract. * @type {string} * @memberof DeployContractV1Request */ - ccLabel: string; + 'ccLabel': string; /** * The your-smart-contract.go file where the functionality of your contract is implemented. * @type {Array} * @memberof DeployContractV1Request */ - sourceFiles: Array; + 'sourceFiles': Array; } + + /** * * @export @@ -415,19 +441,19 @@ export interface DeployContractV1Response { * @type {boolean} * @memberof DeployContractV1Response */ - success: boolean; + 'success': boolean; /** * * @type {Array} * @memberof DeployContractV1Response */ - packageIds: Array; + 'packageIds': Array; /** * * @type {ChainCodeLifeCycleCommandResponses} * @memberof DeployContractV1Response */ - lifecycle: ChainCodeLifeCycleCommandResponses; + 'lifecycle': ChainCodeLifeCycleCommandResponses; } /** * @@ -440,37 +466,37 @@ export interface DeploymentTargetOrgFabric2x { * @type {string} * @memberof DeploymentTargetOrgFabric2x */ - _transient?: string; + 'transient'?: string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrgFabric2x */ - CORE_PEER_LOCALMSPID: string; + 'CORE_PEER_LOCALMSPID': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrgFabric2x */ - CORE_PEER_ADDRESS: string; + 'CORE_PEER_ADDRESS': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrgFabric2x */ - CORE_PEER_MSPCONFIGPATH: string; + 'CORE_PEER_MSPCONFIGPATH': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrgFabric2x */ - CORE_PEER_TLS_ROOTCERT_FILE: string; + 'CORE_PEER_TLS_ROOTCERT_FILE': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrgFabric2x */ - ORDERER_TLS_ROOTCERT_FILE: string; + 'ORDERER_TLS_ROOTCERT_FILE': string; } /** * @@ -483,31 +509,31 @@ export interface DeploymentTargetOrganization { * @type {string} * @memberof DeploymentTargetOrganization */ - CORE_PEER_LOCALMSPID: string; + 'CORE_PEER_LOCALMSPID': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrganization */ - CORE_PEER_ADDRESS: string; + 'CORE_PEER_ADDRESS': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrganization */ - CORE_PEER_MSPCONFIGPATH: string; + 'CORE_PEER_MSPCONFIGPATH': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrganization */ - CORE_PEER_TLS_ROOTCERT_FILE: string; + 'CORE_PEER_TLS_ROOTCERT_FILE': string; /** * Mapped to environment variables of the Fabric CLI container. * @type {string} * @memberof DeploymentTargetOrganization */ - ORDERER_TLS_ROOTCERT_FILE: string; + 'ORDERER_TLS_ROOTCERT_FILE': string; } /** * @@ -520,13 +546,13 @@ export interface ErrorExceptionResponseV1 { * @type {string} * @memberof ErrorExceptionResponseV1 */ - message: string; + 'message': string; /** * * @type {string} * @memberof ErrorExceptionResponseV1 */ - error: string; + 'error': string; } /** * @@ -534,11 +560,14 @@ export interface ErrorExceptionResponseV1 { * @enum {string} */ -export enum FabricContractInvocationType { - Send = 'FabricContractInvocationType.SEND', - Call = 'FabricContractInvocationType.CALL', - Sendprivate = 'FabricContractInvocationType.SENDPRIVATE' -} +export const FabricContractInvocationType = { + Send: 'FabricContractInvocationType.SEND', + Call: 'FabricContractInvocationType.CALL', + Sendprivate: 'FabricContractInvocationType.SENDPRIVATE' +} as const; + +export type FabricContractInvocationType = typeof FabricContractInvocationType[keyof typeof FabricContractInvocationType]; + /** * @@ -551,43 +580,48 @@ export interface FabricSigningCredential { * @type {string} * @memberof FabricSigningCredential */ - keychainId: string; + 'keychainId': string; /** * * @type {string} * @memberof FabricSigningCredential */ - keychainRef: string; + 'keychainRef': string; /** * * @type {FabricSigningCredentialType} * @memberof FabricSigningCredential */ - type?: FabricSigningCredentialType; + 'type'?: FabricSigningCredentialType; /** * * @type {VaultTransitKey} * @memberof FabricSigningCredential */ - vaultTransitKey?: VaultTransitKey; + 'vaultTransitKey'?: VaultTransitKey; /** * * @type {WebSocketKey} * @memberof FabricSigningCredential */ - webSocketKey?: WebSocketKey; + 'webSocketKey'?: WebSocketKey; } + + /** * different type of identity provider for singing fabric messages supported by this package * @export * @enum {string} */ -export enum FabricSigningCredentialType { - X509 = 'X.509', - VaultX509 = 'Vault-X.509', - WsX509 = 'WS-X.509' -} +export const FabricSigningCredentialType = { + X509: 'X.509', + VaultX509: 'Vault-X.509', + WsX509: 'WS-X.509' +} as const; + +export type FabricSigningCredentialType = typeof FabricSigningCredentialType[keyof typeof FabricSigningCredentialType]; + /** * Represents a file-system file that has a name and a body which holds the file contents as a Base64 encoded string @@ -600,19 +634,19 @@ export interface FileBase64 { * @type {string} * @memberof FileBase64 */ - body: string; + 'body': string; /** * The name as referred to on a file system * @type {string} * @memberof FileBase64 */ - filename: string; + 'filename': string; /** * The relative path of the file, if it should be placed in a sub-directory * @type {string} * @memberof FileBase64 */ - filepath?: string; + 'filepath'?: string; } /** * @@ -625,13 +659,13 @@ export interface GatewayDiscoveryOptions { * @type {boolean} * @memberof GatewayDiscoveryOptions */ - asLocalhost?: boolean; + 'asLocalhost'?: boolean; /** * * @type {boolean} * @memberof GatewayDiscoveryOptions */ - enabled?: boolean; + 'enabled'?: boolean; } /** * @@ -644,20 +678,22 @@ export interface GatewayEventHandlerOptions { * @type {number} * @memberof GatewayEventHandlerOptions */ - commitTimeout?: number; + 'commitTimeout'?: number; /** * * @type {number} * @memberof GatewayEventHandlerOptions */ - endorseTimeout?: number; + 'endorseTimeout'?: number; /** * * @type {DefaultEventHandlerStrategy} * @memberof GatewayEventHandlerOptions */ - strategy: DefaultEventHandlerStrategy; + 'strategy': DefaultEventHandlerStrategy; } + + /** * * @export @@ -669,31 +705,31 @@ export interface GatewayOptions { * @type {ConnectionProfile} * @memberof GatewayOptions */ - connectionProfile?: ConnectionProfile; + 'connectionProfile'?: ConnectionProfile; /** * * @type {GatewayDiscoveryOptions} * @memberof GatewayOptions */ - discovery?: GatewayDiscoveryOptions; + 'discovery'?: GatewayDiscoveryOptions; /** * * @type {GatewayEventHandlerOptions} * @memberof GatewayOptions */ - eventHandlerOptions?: GatewayEventHandlerOptions; + 'eventHandlerOptions'?: GatewayEventHandlerOptions; /** * * @type {string} * @memberof GatewayOptions */ - identity: string; + 'identity': string; /** * * @type {GatewayOptionsWallet} * @memberof GatewayOptions */ - wallet: GatewayOptionsWallet; + 'wallet': GatewayOptionsWallet; } /** * @@ -706,13 +742,13 @@ export interface GatewayOptionsWallet { * @type {FabricSigningCredential} * @memberof GatewayOptionsWallet */ - keychain?: FabricSigningCredential; + 'keychain'?: FabricSigningCredential; /** * * @type {string} * @memberof GatewayOptionsWallet */ - json?: string; + 'json'?: string; } /** * Request for GetBlock endpoint. @@ -725,31 +761,31 @@ export interface GetBlockRequestV1 { * @type {string} * @memberof GetBlockRequestV1 */ - channelName: string; + 'channelName': string; /** * Fabric channel we want to connect to. If not provided, then one from channelName parameter will be used * @type {string} * @memberof GetBlockRequestV1 */ - connectionChannelName?: string; + 'connectionChannelName'?: string; /** * * @type {GatewayOptions} * @memberof GetBlockRequestV1 */ - gatewayOptions: GatewayOptions; + 'gatewayOptions': GatewayOptions; /** * * @type {GetBlockRequestV1Query} * @memberof GetBlockRequestV1 */ - query: GetBlockRequestV1Query; + 'query': GetBlockRequestV1Query; /** * If true, encoded buffer will be returned. Otherwise, entire block object is returned. * @type {boolean} * @memberof GetBlockRequestV1 */ - skipDecode?: boolean; + 'skipDecode'?: boolean; } /** * Query selector, caller must provide at least one of them. First found will be used, rest will be ignored, so it\'s recommended to pass single selector. @@ -762,19 +798,19 @@ export interface GetBlockRequestV1Query { * @type {string} * @memberof GetBlockRequestV1Query */ - blockNumber?: string; + 'blockNumber'?: string; /** * * @type {GetBlockRequestV1QueryBlockHash} * @memberof GetBlockRequestV1Query */ - blockHash?: GetBlockRequestV1QueryBlockHash; + 'blockHash'?: GetBlockRequestV1QueryBlockHash; /** * Select block by id of transaction that it contains. * @type {string} * @memberof GetBlockRequestV1Query */ - transactionId?: string; + 'transactionId'?: string; } /** * Select block by it\'s hash. @@ -787,13 +823,13 @@ export interface GetBlockRequestV1QueryBlockHash { * @type {string} * @memberof GetBlockRequestV1QueryBlockHash */ - encoding?: string; + 'encoding'?: string; /** * Buffer of blockHash. It\'s encoding should be described in `encoding` parameter. - * @type {any} + * @type {string} * @memberof GetBlockRequestV1QueryBlockHash */ - buffer: any; + 'buffer': string; } /** * When skipDecode is false (default) then decoded block object is returned. @@ -806,7 +842,7 @@ export interface GetBlockResponseDecodedV1 { * @type {any} * @memberof GetBlockResponseDecodedV1 */ - decodedBlock: any | null; + 'decodedBlock': any; } /** * When skipDecode is true then encoded block Buffer is returned. @@ -816,10 +852,10 @@ export interface GetBlockResponseDecodedV1 { export interface GetBlockResponseEncodedV1 { /** * - * @type {any} + * @type {string} * @memberof GetBlockResponseEncodedV1 */ - encodedBlock: any; + 'encodedBlock': string; } /** * @type GetBlockResponseV1 @@ -839,74 +875,61 @@ export interface GetTransactionReceiptResponse { * @type {string} * @memberof GetTransactionReceiptResponse */ - blockNumber?: string; + 'blockNumber'?: string; /** * * @type {string} * @memberof GetTransactionReceiptResponse */ - channelID?: string; + 'channelID'?: string; /** * * @type {TransactReceiptTransactionCreator} * @memberof GetTransactionReceiptResponse */ - transactionCreator?: TransactReceiptTransactionCreator; + 'transactionCreator'?: TransactReceiptTransactionCreator; /** * * @type {Array} * @memberof GetTransactionReceiptResponse */ - transactionEndorsement?: Array; + 'transactionEndorsement'?: Array; /** * * @type {TransactReceiptBlockMetaData} * @memberof GetTransactionReceiptResponse */ - blockMetaData?: TransactReceiptBlockMetaData; + 'blockMetaData'?: TransactReceiptBlockMetaData; /** * * @type {string} * @memberof GetTransactionReceiptResponse */ - chainCodeName?: string; + 'chainCodeName'?: string; /** * * @type {string} * @memberof GetTransactionReceiptResponse */ - chainCodeVersion?: string; + 'chainCodeVersion'?: string; /** * * @type {string} * @memberof GetTransactionReceiptResponse */ - responseStatus?: string; + 'responseStatus'?: string; /** * * @type {string} * @memberof GetTransactionReceiptResponse */ - rwsetKey?: string; + 'rwsetKey'?: string; /** * * @type {string} * @memberof GetTransactionReceiptResponse */ - rwsetWriteData?: string; -} -/** - * - * @export - * @interface InlineResponse501 - */ -export interface InlineResponse501 { - /** - * - * @type {string} - * @memberof InlineResponse501 - */ - message?: string; + 'rwsetWriteData'?: string; } /** * @@ -919,68 +942,70 @@ export interface RunTransactionRequest { * @type {Array} * @memberof RunTransactionRequest */ - endorsingPeers?: Array; + 'endorsingPeers'?: Array; /** * * @type {object} * @memberof RunTransactionRequest */ - transientData?: object | null; + 'transientData'?: object | null; /** * * @type {GatewayOptions} * @memberof RunTransactionRequest */ - gatewayOptions?: GatewayOptions; + 'gatewayOptions'?: GatewayOptions; /** * * @type {FabricSigningCredential} * @memberof RunTransactionRequest */ - signingCredential: FabricSigningCredential; + 'signingCredential': FabricSigningCredential; /** * * @type {string} * @memberof RunTransactionRequest */ - channelName: string; + 'channelName': string; /** * * @type {string} * @memberof RunTransactionRequest */ - contractName: string; + 'contractName': string; /** * * @type {FabricContractInvocationType} * @memberof RunTransactionRequest */ - invocationType: FabricContractInvocationType; + 'invocationType': FabricContractInvocationType; /** * * @type {string} * @memberof RunTransactionRequest */ - methodName: string; + 'methodName': string; /** * * @type {Array} * @memberof RunTransactionRequest */ - params: Array; + 'params': Array; /** * * @type {Array} * @memberof RunTransactionRequest */ - endorsingParties?: Array; + 'endorsingParties'?: Array; /** * * @type {string} * @memberof RunTransactionRequest */ - responseType?: string; + 'responseType'?: string; } + + /** * * @export @@ -992,19 +1017,19 @@ export interface RunTransactionResponse { * @type {string} * @memberof RunTransactionResponse */ - functionOutput: string; + 'functionOutput': string; /** * * @type {boolean} * @memberof RunTransactionResponse */ - success: boolean; + 'success': boolean; /** * * @type {string} * @memberof RunTransactionResponse */ - transactionId: string; + 'transactionId': string; } /** * @@ -1017,25 +1042,25 @@ export interface SSHExecCommandResponse { * @type {string} * @memberof SSHExecCommandResponse */ - stdout: string; + 'stdout': string; /** * * @type {string} * @memberof SSHExecCommandResponse */ - stderr: string; + 'stderr': string; /** * * @type {number} * @memberof SSHExecCommandResponse */ - code: number | null; + 'code': number | null; /** * * @type {string} * @memberof SSHExecCommandResponse */ - signal: string | null; + 'signal': string | null; } /** * @@ -1048,19 +1073,19 @@ export interface TransactReceiptBlockMetaData { * @type {string} * @memberof TransactReceiptBlockMetaData */ - mspid?: string; + 'mspid'?: string; /** * * @type {string} * @memberof TransactReceiptBlockMetaData */ - blockCreatorID?: string; + 'blockCreatorID'?: string; /** * * @type {string} * @memberof TransactReceiptBlockMetaData */ - signature?: string; + 'signature'?: string; } /** * @@ -1073,13 +1098,13 @@ export interface TransactReceiptTransactionCreator { * @type {string} * @memberof TransactReceiptTransactionCreator */ - mspid?: string; + 'mspid'?: string; /** * * @type {string} * @memberof TransactReceiptTransactionCreator */ - creatorID?: string; + 'creatorID'?: string; } /** * @@ -1092,19 +1117,19 @@ export interface TransactReceiptTransactionEndorsement { * @type {string} * @memberof TransactReceiptTransactionEndorsement */ - mspid?: string; + 'mspid'?: string; /** * * @type {string} * @memberof TransactReceiptTransactionEndorsement */ - endorserID?: string; + 'endorserID'?: string; /** * * @type {string} * @memberof TransactReceiptTransactionEndorsement */ - signature?: string; + 'signature'?: string; } /** * vault key details for signing fabric message with private key stored with transit engine. @@ -1117,13 +1142,13 @@ export interface VaultTransitKey { * @type {string} * @memberof VaultTransitKey */ - keyName: string; + 'keyName': string; /** * token for accessing private key * @type {string} * @memberof VaultTransitKey */ - token: string; + 'token': string; } /** * Error response from WatchBlocks operation. @@ -1136,13 +1161,13 @@ export interface WatchBlocksCactusErrorResponseV1 { * @type {number} * @memberof WatchBlocksCactusErrorResponseV1 */ - code: number; + 'code': number; /** * Description of the error. * @type {string} * @memberof WatchBlocksCactusErrorResponseV1 */ - errorMessage: string; + 'errorMessage': string; } /** * Transaction summary from commited block. @@ -1155,25 +1180,25 @@ export interface WatchBlocksCactusTransactionsEventV1 { * @type {string} * @memberof WatchBlocksCactusTransactionsEventV1 */ - chaincodeId: string; + 'chaincodeId': string; /** * Transaction identifier. * @type {string} * @memberof WatchBlocksCactusTransactionsEventV1 */ - transactionId: string; + 'transactionId': string; /** * Function name that was executed. * @type {string} * @memberof WatchBlocksCactusTransactionsEventV1 */ - functionName: string; + 'functionName': string; /** * List of function arguments. * @type {Array} * @memberof WatchBlocksCactusTransactionsEventV1 */ - functionArgs: Array; + 'functionArgs': Array; } /** * Custom response containing block transactions summary. Compatible with legacy fabric-socketio connector monitoring. @@ -1186,7 +1211,7 @@ export interface WatchBlocksCactusTransactionsResponseV1 { * @type {Array} * @memberof WatchBlocksCactusTransactionsResponseV1 */ - cactusTransactionsEvents: Array; + 'cactusTransactionsEvents': Array; } /** * Response that corresponds to Fabric SDK \'filtered\' EventType. @@ -1199,7 +1224,7 @@ export interface WatchBlocksFilteredResponseV1 { * @type {any} * @memberof WatchBlocksFilteredResponseV1 */ - filteredBlock: any; + 'filteredBlock': any; } /** * Response that corresponds to Fabric SDK \'full\' EventType. @@ -1212,7 +1237,7 @@ export interface WatchBlocksFullResponseV1 { * @type {any} * @memberof WatchBlocksFullResponseV1 */ - fullBlock: any; + 'fullBlock': any; } /** * Response type from WatchBlocks. \'Cactus*\' are custom views, others correspond to fabric SDK call. @@ -1220,12 +1245,15 @@ export interface WatchBlocksFullResponseV1 { * @enum {string} */ -export enum WatchBlocksListenerTypeV1 { - Filtered = 'filtered', - Full = 'full', - Private = 'private', - CactusTransactions = 'cactus:transactions' -} +export const WatchBlocksListenerTypeV1 = { + Filtered: 'filtered', + Full: 'full', + Private: 'private', + CactusTransactions: 'cactus:transactions' +} as const; + +export type WatchBlocksListenerTypeV1 = typeof WatchBlocksListenerTypeV1[keyof typeof WatchBlocksListenerTypeV1]; + /** * Options passed when subscribing to block monitoring. @@ -1238,26 +1266,28 @@ export interface WatchBlocksOptionsV1 { * @type {string} * @memberof WatchBlocksOptionsV1 */ - channelName: string; + 'channelName': string; /** * * @type {GatewayOptions} * @memberof WatchBlocksOptionsV1 */ - gatewayOptions: GatewayOptions; + 'gatewayOptions': GatewayOptions; /** * * @type {WatchBlocksListenerTypeV1} * @memberof WatchBlocksOptionsV1 */ - type: WatchBlocksListenerTypeV1; + 'type': WatchBlocksListenerTypeV1; /** * From which block start monitoring. Defaults to latest. * @type {string} * @memberof WatchBlocksOptionsV1 */ - startBlock?: string; + 'startBlock'?: string; } + + /** * Response that corresponds to Fabric SDK \'private\' EventType. * @export @@ -1269,7 +1299,7 @@ export interface WatchBlocksPrivateResponseV1 { * @type {any} * @memberof WatchBlocksPrivateResponseV1 */ - privateBlock: any; + 'privateBlock': any; } /** * @type WatchBlocksResponseV1 @@ -1284,13 +1314,16 @@ export type WatchBlocksResponseV1 = WatchBlocksCactusErrorResponseV1 | WatchBloc * @enum {string} */ -export enum WatchBlocksV1 { - Subscribe = 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Subscribe', - Next = 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Next', - Unsubscribe = 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Unsubscribe', - Error = 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Error', - Complete = 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Complete' -} +export const WatchBlocksV1 = { + Subscribe: 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Subscribe', + Next: 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Next', + Unsubscribe: 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Unsubscribe', + Error: 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Error', + Complete: 'org.hyperledger.cactus.api.async.hlfabric.WatchBlocksV1.Complete' +} as const; + +export type WatchBlocksV1 = typeof WatchBlocksV1[keyof typeof WatchBlocksV1]; + /** * web-socket key details for signing fabric message with private key stored with external client @@ -1303,13 +1336,13 @@ export interface WebSocketKey { * @type {string} * @memberof WebSocketKey */ - sessionId: string; + 'sessionId': string; /** * signature of the session ID * @type {string} * @memberof WebSocketKey */ - signature: string; + 'signature': string; } /** @@ -1325,7 +1358,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deployContractGoSourceV1: async (deployContractGoSourceV1Request?: DeployContractGoSourceV1Request, options: any = {}): Promise => { + deployContractGoSourceV1: async (deployContractGoSourceV1Request?: DeployContractGoSourceV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/deploy-contract-go-source`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1342,7 +1375,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(deployContractGoSourceV1Request, localVarRequestOptions, configuration) @@ -1359,7 +1392,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deployContractV1: async (deployContractV1Request?: DeployContractV1Request, options: any = {}): Promise => { + deployContractV1: async (deployContractV1Request?: DeployContractV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/deploy-contract`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1376,7 +1409,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(deployContractV1Request, localVarRequestOptions, configuration) @@ -1393,7 +1426,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getBlockV1: async (getBlockRequestV1?: GetBlockRequestV1, options: any = {}): Promise => { + getBlockV1: async (getBlockRequestV1?: GetBlockRequestV1, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/get-block`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1410,7 +1443,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(getBlockRequestV1, localVarRequestOptions, configuration) @@ -1426,7 +1459,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getPrometheusMetricsV1: async (options: any = {}): Promise => { + getPrometheusMetricsV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/get-prometheus-exporter-metrics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1441,7 +1474,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -1457,7 +1490,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getTransactionReceiptByTxIDV1: async (runTransactionRequest: RunTransactionRequest, options: any = {}): Promise => { + getTransactionReceiptByTxIDV1: async (runTransactionRequest: RunTransactionRequest, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'runTransactionRequest' is not null or undefined assertParamExists('getTransactionReceiptByTxIDV1', 'runTransactionRequest', runTransactionRequest) const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/get-transaction-receipt-by-txid`; @@ -1476,7 +1509,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(runTransactionRequest, localVarRequestOptions, configuration) @@ -1493,7 +1526,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - runTransactionV1: async (runTransactionRequest: RunTransactionRequest, options: any = {}): Promise => { + runTransactionV1: async (runTransactionRequest: RunTransactionRequest, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'runTransactionRequest' is not null or undefined assertParamExists('runTransactionV1', 'runTransactionRequest', runTransactionRequest) const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-fabric/run-transaction`; @@ -1512,7 +1545,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(runTransactionRequest, localVarRequestOptions, configuration) @@ -1539,7 +1572,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async deployContractGoSourceV1(deployContractGoSourceV1Request?: DeployContractGoSourceV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async deployContractGoSourceV1(deployContractGoSourceV1Request?: DeployContractGoSourceV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.deployContractGoSourceV1(deployContractGoSourceV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1550,7 +1583,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.deployContractV1(deployContractV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1561,7 +1594,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getBlockV1(getBlockRequestV1?: GetBlockRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getBlockV1(getBlockRequestV1?: GetBlockRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getBlockV1(getBlockRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1571,7 +1604,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getPrometheusMetricsV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getPrometheusMetricsV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getPrometheusMetricsV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1582,7 +1615,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getTransactionReceiptByTxIDV1(runTransactionRequest: RunTransactionRequest, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getTransactionReceiptByTxIDV1(runTransactionRequest: RunTransactionRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getTransactionReceiptByTxIDV1(runTransactionRequest, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1593,7 +1626,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async runTransactionV1(runTransactionRequest: RunTransactionRequest, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async runTransactionV1(runTransactionRequest: RunTransactionRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.runTransactionV1(runTransactionRequest, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1684,7 +1717,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public deployContractGoSourceV1(deployContractGoSourceV1Request?: DeployContractGoSourceV1Request, options?: any) { + public deployContractGoSourceV1(deployContractGoSourceV1Request?: DeployContractGoSourceV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).deployContractGoSourceV1(deployContractGoSourceV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1696,7 +1729,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: any) { + public deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).deployContractV1(deployContractV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1708,7 +1741,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getBlockV1(getBlockRequestV1?: GetBlockRequestV1, options?: any) { + public getBlockV1(getBlockRequestV1?: GetBlockRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getBlockV1(getBlockRequestV1, options).then((request) => request(this.axios, this.basePath)); } @@ -1719,7 +1752,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getPrometheusMetricsV1(options?: any) { + public getPrometheusMetricsV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getPrometheusMetricsV1(options).then((request) => request(this.axios, this.basePath)); } @@ -1731,7 +1764,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getTransactionReceiptByTxIDV1(runTransactionRequest: RunTransactionRequest, options?: any) { + public getTransactionReceiptByTxIDV1(runTransactionRequest: RunTransactionRequest, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getTransactionReceiptByTxIDV1(runTransactionRequest, options).then((request) => request(this.axios, this.basePath)); } @@ -1743,7 +1776,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public runTransactionV1(runTransactionRequest: RunTransactionRequest, options?: any) { + public runTransactionV1(runTransactionRequest: RunTransactionRequest, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).runTransactionV1(runTransactionRequest, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts index f6416543b7..b2e2b0d441 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts index ccc54a4a1b..c9e4f9fc50 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts index 902990ddad..257e35abd2 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts +++ b/packages/cactus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts @@ -1534,6 +1534,7 @@ export class PluginLedgerConnectorFabric * @returns Entire block object or encoded buffer (if req.skipDecode is true) */ public async getBlock(req: GetBlockRequestV1): Promise { + const fnTag = `${this.className}:getBlock(req: GetBlockRequestV1)`; this.log.debug( "getBlock() called, channelName:", req.channelName, @@ -1590,14 +1591,20 @@ export class PluginLedgerConnectorFabric ); } + this.log.debug("responseData:", responseData); if (!responseData) { - throw new Error("Could not retrieve block data (got empty response)"); + const eMsg = `${fnTag} - expected string as GetBlockByTxID response from Fabric system chaincode but received a falsy value instead...`; + throw new RuntimeError(eMsg); } - this.log.debug("responseData:", responseData); if (skipDecode) { + if (!(responseData instanceof Buffer)) { + const eMsg = `${fnTag} - expected Buffer as GetBlockByTxID response from Fabric system chaincode but received ${typeof responseData} instead...`; + throw new RuntimeError(eMsg); + } + const encodedBlockB64 = responseData.toString("base64"); return { - encodedBlock: responseData, + encodedBlock: encodedBlockB64, }; } diff --git a/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/get-block.test.ts b/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/get-block.test.ts index 21b2c7dd1f..c2c2a6d220 100644 --- a/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/get-block.test.ts +++ b/packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/get-block.test.ts @@ -5,6 +5,8 @@ import { v4 as uuidv4 } from "uuid"; import bodyParser from "body-parser"; import express from "express"; import { DiscoveryOptions } from "fabric-network"; +// BlockDecoder is not exported in ts definition so we need to use legacy import. +const { BlockDecoder } = require("fabric-common"); import { DEFAULT_FABRIC_2_AIO_FABRIC_VERSION, @@ -33,6 +35,7 @@ import { DefaultEventHandlerStrategy, DefaultApi as FabricApi, GatewayOptions, + GetBlockRequestV1, FabricContractInvocationType, FabricSigningCredential, } from "../../../../main/typescript/public-api"; @@ -55,8 +58,8 @@ const ledgerChannelName = "mychannel"; const ledgerContractName = "basic"; // Log settings -const testLogLevel: LogLevelDesc = "info"; // default: info -const sutLogLevel: LogLevelDesc = "info"; // default: info +const testLogLevel: LogLevelDesc = "debug"; // default: info +const sutLogLevel: LogLevelDesc = "debug"; // default: info // Logger setup const log: Logger = LoggerProvider.getOrCreate({ @@ -221,6 +224,7 @@ describe("Get Block endpoint tests", () => { }; const getBlockResponse = await apiClient.getBlockV1(getBlockReq); + log.debug("getBlockResponse=%o", getBlockResponse); expect(getBlockResponse).toBeTruthy(); expect(getBlockResponse.status).toEqual(200); @@ -281,7 +285,7 @@ describe("Get Block endpoint tests", () => { /** * GetBlock endpoint using block number */ - test("Get first block by it's number, both decoded and encoded.", async () => { + test("Get first block by it's number - decoded.", async () => { // Check decoded const decodedFirstBlock = await getBlockByNumber("0", false); log.debug("Received decodedFirstBlock:", decodedFirstBlock); @@ -290,12 +294,19 @@ describe("Get Block endpoint tests", () => { expect(decodedFirstBlock.header.number.high).toBe(0); expect(decodedFirstBlock.data).toBeTruthy(); expect(decodedFirstBlock.metadata).toBeTruthy(); + }); - // Check encoded + test("Get first block by it's number - encoded.", async () => { + // Check decoded const encodedFirstBlock = await getBlockByNumber("0", true); - log.debug("Received encodedFirstBlock:", encodedFirstBlock); - const blockBuffer = Buffer.from(encodedFirstBlock); - expect(blockBuffer).toBeTruthy(); + const decodedFirstBlockBuffer = Buffer.from(encodedFirstBlock, "base64"); + const decodedFirstBlock = BlockDecoder.decode(decodedFirstBlockBuffer); + log.debug("Received decodedFirstBlock:", decodedFirstBlock); + expect(decodedFirstBlock.header).toBeTruthy(); + expect(decodedFirstBlock.header.number.low).toBe(0); + expect(decodedFirstBlock.header.number.high).toBe(0); + expect(decodedFirstBlock.data).toBeTruthy(); + expect(decodedFirstBlock.metadata).toBeTruthy(); }); /** @@ -372,7 +383,7 @@ describe("Get Block endpoint tests", () => { // Get using HEX encoded hash representation const firstBlockHashHex = Buffer.from(firstBlockHashJSON).toString("hex"); log.info("Get by HEX hash:", firstBlockHashHex); - const getBlockByHexHashReq = { + const getBlockByHexHashReq: GetBlockRequestV1 = { channelName: ledgerChannelName, gatewayOptions, query: { diff --git a/packages/cactus-plugin-ledger-connector-iroha/openapitools.json b/packages/cactus-plugin-ledger-connector-iroha/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-iroha/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-iroha/src/main/json/openapi.json index dc6d7369d3..b142cd4835 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Connector Iroha", "description": "Can perform basic tasks on a Iroha ledger", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, @@ -274,12 +274,10 @@ "nullable": false }, "baseConfig": { - "$ref": "#/components/schemas/IrohaBaseConfig", - "nullable": false + "$ref": "#/components/schemas/IrohaBaseConfig" }, "params": { - "$ref": "#/components/schemas/RunTransactionRequestV1Params", - "nullable": false + "$ref": "#/components/schemas/RunTransactionRequestV1Params" } } }, @@ -758,12 +756,10 @@ "properties": { "signedTransaction": { "description": "Signed transaction binary data received from generate-transaction endpoint.", - "type": "string", - "format": "binary" + "type": "string" }, "baseConfig": { - "$ref": "#/components/schemas/IrohaBaseConfig", - "nullable": false + "$ref": "#/components/schemas/IrohaBaseConfig" } } }, @@ -1059,8 +1055,7 @@ "content": { "application/octet-stream": { "schema": { - "type": "string", - "format": "binary" + "type": "string" } } } diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/api.ts b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/api.ts index 7422b1ac85..e643a6b99c 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * The list of arguments to pass in to the transaction request to Add Asset Quantity. @@ -32,13 +34,13 @@ export interface AddAssetQuantityRequestParameters { * @type {string} * @memberof AddAssetQuantityRequestParameters */ - assetId: string; + 'assetId': string; /** * * @type {number} * @memberof AddAssetQuantityRequestParameters */ - amount: number; + 'amount': number; } /** * The list of arguments to pass in to the transaction request to Add Peer. @@ -51,25 +53,25 @@ export interface AddPeerRequestParameters { * @type {string} * @memberof AddPeerRequestParameters */ - address: string; + 'address': string; /** * * @type {string} * @memberof AddPeerRequestParameters */ - peerKey: string; + 'peerKey': string; /** * * @type {string} * @memberof AddPeerRequestParameters */ - tlsCertificate?: string; + 'tlsCertificate'?: string; /** * * @type {boolean} * @memberof AddPeerRequestParameters */ - syncingPeer?: boolean; + 'syncingPeer'?: boolean; } /** * The list of arguments to pass in to the transaction request to Add Signatory. @@ -82,13 +84,13 @@ export interface AddSignatoryRequestParameters { * @type {string} * @memberof AddSignatoryRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof AddSignatoryRequestParameters */ - publicKey: string; + 'publicKey': string; } /** * The list of arguments to pass in to the transaction request to Append Role. @@ -101,13 +103,13 @@ export interface AppendRoleRequestParameters { * @type {string} * @memberof AppendRoleRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof AppendRoleRequestParameters */ - roleName: string; + 'roleName': string; } /** * The list of arguments to pass in to the transaction request to Call Engine. @@ -120,19 +122,19 @@ export interface CallEngineRequestParameters { * @type {string} * @memberof CallEngineRequestParameters */ - caller: string; + 'caller': string; /** * * @type {string} * @memberof CallEngineRequestParameters */ - callee: string; + 'callee': string; /** * * @type {string} * @memberof CallEngineRequestParameters */ - input: string; + 'input': string; } /** * The list of arguments to pass in to the transaction request to Compare And Set Account Detail. @@ -145,31 +147,31 @@ export interface CompareAndSetAccountDetailRequestParameters { * @type {string} * @memberof CompareAndSetAccountDetailRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof CompareAndSetAccountDetailRequestParameters */ - key: string; + 'key': string; /** * * @type {string} * @memberof CompareAndSetAccountDetailRequestParameters */ - value: string; + 'value': string; /** * * @type {string} * @memberof CompareAndSetAccountDetailRequestParameters */ - oldValue?: string; + 'oldValue'?: string; /** * * @type {boolean} * @memberof CompareAndSetAccountDetailRequestParameters */ - check_empty: boolean; + 'check_empty': boolean; } /** * The list of arguments to pass in to the transaction request to Create Account. @@ -182,19 +184,19 @@ export interface CreateAccountRequestParameters { * @type {string} * @memberof CreateAccountRequestParameters */ - accountName: string; + 'accountName': string; /** * * @type {string} * @memberof CreateAccountRequestParameters */ - domainId: string; + 'domainId': string; /** * * @type {string} * @memberof CreateAccountRequestParameters */ - publicKey: string; + 'publicKey': string; } /** * The list of arguments to pass in to the transaction request to Create Asset. @@ -207,19 +209,19 @@ export interface CreateAssetRequestParameters { * @type {string} * @memberof CreateAssetRequestParameters */ - assetName: string; + 'assetName': string; /** * * @type {string} * @memberof CreateAssetRequestParameters */ - domainId: string; + 'domainId': string; /** * * @type {number} * @memberof CreateAssetRequestParameters */ - precision: number; + 'precision': number; } /** * The list of arguments to pass in to the transaction request to Create Domain. @@ -232,13 +234,13 @@ export interface CreateDomainRequestParameters { * @type {string} * @memberof CreateDomainRequestParameters */ - domainId: string; + 'domainId': string; /** * * @type {string} * @memberof CreateDomainRequestParameters */ - defaultRole: string; + 'defaultRole': string; } /** * The list of arguments to pass in to the transaction request to Create Role. @@ -251,13 +253,13 @@ export interface CreateRoleRequestParameters { * @type {string} * @memberof CreateRoleRequestParameters */ - roleName: string; + 'roleName': string; /** * * @type {Array} * @memberof CreateRoleRequestParameters */ - permissionsList: Array; + 'permissionsList': Array; } /** * The list of arguments to pass in to the transaction request to Detach Role. @@ -270,13 +272,13 @@ export interface DetachRoleRequestParameters { * @type {string} * @memberof DetachRoleRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof DetachRoleRequestParameters */ - roleName: string; + 'roleName': string; } /** * @@ -289,31 +291,31 @@ export interface ErrorExceptionJsonResponseV1 { * @type {string} * @memberof ErrorExceptionJsonResponseV1 */ - message: string; + 'message': string; /** * * @type {string} * @memberof ErrorExceptionJsonResponseV1 */ - name?: string; + 'name'?: string; /** * * @type {string} * @memberof ErrorExceptionJsonResponseV1 */ - error?: string; + 'error'?: string; /** * * @type {string} * @memberof ErrorExceptionJsonResponseV1 */ - stack?: string; + 'stack'?: string; /** * * @type {string} * @memberof ErrorExceptionJsonResponseV1 */ - cause?: string; + 'cause'?: string; } /** * @@ -326,13 +328,13 @@ export interface ErrorExceptionResponseV1 { * @type {string} * @memberof ErrorExceptionResponseV1 */ - message: string; + 'message': string; /** * * @type {string} * @memberof ErrorExceptionResponseV1 */ - error: string; + 'error': string; } /** * @@ -345,25 +347,25 @@ export interface GenerateTransactionRequestV1 { * @type {IrohaCommand} * @memberof GenerateTransactionRequestV1 */ - commandName: IrohaCommand; + 'commandName': IrohaCommand; /** * Parameters for iroha command specified in commandName * @type {object} * @memberof GenerateTransactionRequestV1 */ - commandParams: object; + 'commandParams': object; /** * Sender account id * @type {string} * @memberof GenerateTransactionRequestV1 */ - creatorAccountId: string; + 'creatorAccountId': string; /** * Requested transaction quorum * @type {number} * @memberof GenerateTransactionRequestV1 */ - quorum?: number; + 'quorum'?: number; } /** * The list of arguments to pass in to the transaction request to Get Account Asset Transactions. @@ -376,25 +378,25 @@ export interface GetAccountAssetTransactionsRequestParameters { * @type {string} * @memberof GetAccountAssetTransactionsRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof GetAccountAssetTransactionsRequestParameters */ - assetId: string; + 'assetId': string; /** * * @type {number} * @memberof GetAccountAssetTransactionsRequestParameters */ - pageSize: number; + 'pageSize': number; /** * * @type {string} * @memberof GetAccountAssetTransactionsRequestParameters */ - firstTxHash: string; + 'firstTxHash': string; } /** * The list of arguments to pass in to the transaction request to Get Account Assets. @@ -407,19 +409,19 @@ export interface GetAccountAssetsRequestParameters { * @type {string} * @memberof GetAccountAssetsRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {number} * @memberof GetAccountAssetsRequestParameters */ - pageSize: number; + 'pageSize': number; /** * * @type {string} * @memberof GetAccountAssetsRequestParameters */ - firstAssetId?: string; + 'firstAssetId'?: string; } /** * The list of arguments to pass in to the transaction request to Get Account Detail. @@ -432,37 +434,37 @@ export interface GetAccountDetailRequestParameters { * @type {string} * @memberof GetAccountDetailRequestParameters */ - accountId?: string; + 'accountId'?: string; /** * * @type {string} * @memberof GetAccountDetailRequestParameters */ - key?: string; + 'key'?: string; /** * * @type {string} * @memberof GetAccountDetailRequestParameters */ - writer?: string; + 'writer'?: string; /** * * @type {number} * @memberof GetAccountDetailRequestParameters */ - pageSize: number; + 'pageSize': number; /** * * @type {string} * @memberof GetAccountDetailRequestParameters */ - paginationKey: string; + 'paginationKey': string; /** * * @type {string} * @memberof GetAccountDetailRequestParameters */ - paginationWriter: string; + 'paginationWriter': string; } /** * The list of arguments to pass in to the transaction request to Get Account. @@ -475,7 +477,7 @@ export interface GetAccountRequestParameters { * @type {string} * @memberof GetAccountRequestParameters */ - accountId: string; + 'accountId': string; } /** * The list of arguments to pass in to the transaction request to Get Account Transactions. @@ -488,43 +490,43 @@ export interface GetAccountTransactionsRequestParameters { * @type {string} * @memberof GetAccountTransactionsRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {number} * @memberof GetAccountTransactionsRequestParameters */ - pageSize: number; + 'pageSize': number; /** * * @type {string} * @memberof GetAccountTransactionsRequestParameters */ - firstTxHash: string; + 'firstTxHash': string; /** * * @type {object} * @memberof GetAccountTransactionsRequestParameters */ - firstTxTime?: object; + 'firstTxTime'?: object; /** * * @type {object} * @memberof GetAccountTransactionsRequestParameters */ - lastTxTime?: object; + 'lastTxTime'?: object; /** * * @type {number} * @memberof GetAccountTransactionsRequestParameters */ - firstTxHeight?: number; + 'firstTxHeight'?: number; /** * * @type {number} * @memberof GetAccountTransactionsRequestParameters */ - lastTxHeight?: number; + 'lastTxHeight'?: number; } /** * The list of arguments to pass in to the transaction request to Get Asset Info. @@ -537,7 +539,7 @@ export interface GetAssetInfoRequestParameters { * @type {string} * @memberof GetAssetInfoRequestParameters */ - assetId: string; + 'assetId': string; } /** * The list of arguments to pass in to the transaction request to Get Block. @@ -550,7 +552,7 @@ export interface GetBlockRequestParameters { * @type {number} * @memberof GetBlockRequestParameters */ - height: number; + 'height': number; } /** * The list of arguments to pass in to the transaction request to Get Engine Receipts. @@ -563,7 +565,7 @@ export interface GetEngineReceiptsRequestParameters { * @type {string} * @memberof GetEngineReceiptsRequestParameters */ - txHash: string; + 'txHash': string; } /** * The list of arguments to pass in to the transaction request to Get Pending Transactions. @@ -576,25 +578,25 @@ export interface GetPendingTransactionsRequestParameters { * @type {number} * @memberof GetPendingTransactionsRequestParameters */ - pageSize: number; + 'pageSize': number; /** * * @type {string} * @memberof GetPendingTransactionsRequestParameters */ - firstTxHash?: string; + 'firstTxHash'?: string; /** * * @type {object} * @memberof GetPendingTransactionsRequestParameters */ - firstTxTime?: object; + 'firstTxTime'?: object; /** * * @type {object} * @memberof GetPendingTransactionsRequestParameters */ - lastTxTime?: object; + 'lastTxTime'?: object; } /** * The list of arguments to pass in to the transaction request to Get Role Permissions. @@ -607,7 +609,7 @@ export interface GetRolePermissionsRequestParameters { * @type {string} * @memberof GetRolePermissionsRequestParameters */ - roleId: string; + 'roleId': string; } /** * The list of arguments to pass in to the transaction request to Get Signatories. @@ -620,7 +622,7 @@ export interface GetSignatoriesRequestParameters { * @type {string} * @memberof GetSignatoriesRequestParameters */ - accountId: string; + 'accountId': string; } /** * The list of arguments to pass in to the transaction request to Get Transactions. @@ -633,7 +635,7 @@ export interface GetTransactionsRequestParameters { * @type {Array} * @memberof GetTransactionsRequestParameters */ - txHashesList: Array; + 'txHashesList': Array; } /** * The list of arguments to pass in to the transaction request to Grant Permission. @@ -646,13 +648,13 @@ export interface GrantPermissionRequestParameters { * @type {string} * @memberof GrantPermissionRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof GrantPermissionRequestParameters */ - permission: string; + 'permission': string; } /** * @@ -660,56 +662,56 @@ export interface GrantPermissionRequestParameters { * @interface IrohaBaseConfig */ export interface IrohaBaseConfig { - [key: string]: object | any; + [key: string]: any; /** * * @type {string} * @memberof IrohaBaseConfig */ - irohaHost?: string; + 'irohaHost'?: string; /** * * @type {number} * @memberof IrohaBaseConfig */ - irohaPort?: number; + 'irohaPort'?: number; /** * * @type {string} * @memberof IrohaBaseConfig */ - creatorAccountId?: string; + 'creatorAccountId'?: string; /** * * @type {Array} * @memberof IrohaBaseConfig */ - privKey?: Array; + 'privKey'?: Array; /** * * @type {number} * @memberof IrohaBaseConfig */ - quorum?: number; + 'quorum'?: number; /** * * @type {number} * @memberof IrohaBaseConfig */ - timeoutLimit?: number; + 'timeoutLimit'?: number; /** * Can only be set to false for an insecure grpc connection. * @type {boolean} * @memberof IrohaBaseConfig */ - tls?: boolean; + 'tls'?: boolean; /** * Flag used for monitoring. It changes default beahviour of transaction wrapper so it return error to caller instead of throwing RuntimeError straight away. * @type {boolean} * @memberof IrohaBaseConfig */ - monitorMode?: boolean | null; + 'monitorMode'?: boolean | null; } /** * @@ -722,7 +724,7 @@ export interface IrohaBlockProgress { * @type {IrohaBlockResponse} * @memberof IrohaBlockProgress */ - transactionReceipt: IrohaBlockResponse; + 'transactionReceipt': IrohaBlockResponse; } /** * @@ -735,13 +737,13 @@ export interface IrohaBlockResponse { * @type {IrohaBlockResponsePayload} * @memberof IrohaBlockResponse */ - payload: IrohaBlockResponsePayload; + 'payload': IrohaBlockResponsePayload; /** * * @type {Array} * @memberof IrohaBlockResponse */ - signaturesList: Array; + 'signaturesList': Array; } /** * @@ -754,37 +756,37 @@ export interface IrohaBlockResponsePayload { * @type {Array} * @memberof IrohaBlockResponsePayload */ - transactionsList: Array; + 'transactionsList': Array; /** * * @type {number} * @memberof IrohaBlockResponsePayload */ - txNumber: number; + 'txNumber': number; /** * * @type {number} * @memberof IrohaBlockResponsePayload */ - height: number; + 'height': number; /** * * @type {string} * @memberof IrohaBlockResponsePayload */ - prevBlockHash: string; + 'prevBlockHash': string; /** * * @type {number} * @memberof IrohaBlockResponsePayload */ - createdTime: number; + 'createdTime': number; /** * * @type {Array} * @memberof IrohaBlockResponsePayload */ - rejectedTransactionsHashesList: Array; + 'rejectedTransactionsHashesList': Array; } /** * @@ -792,88 +794,91 @@ export interface IrohaBlockResponsePayload { * @enum {string} */ -export enum IrohaCommand { +export const IrohaCommand = { /** * Make entity in the system, capable of sending transactions or queries, storing signatories, personal data and identifiers. */ - CreateAccount = 'createAccount', + CreateAccount: 'createAccount', /** * Set key-value information for a given account. */ - SetAccountDetail = 'setAccountDetail', + SetAccountDetail: 'setAccountDetail', /** * Set the number of signatories required to confirm the identity of a user, who creates the transaction. */ - SetAccountQuorum = 'setAccountQuorum', + SetAccountQuorum: 'setAccountQuorum', /** * Set key-value information for a given account if the old value matches the value passed. */ - CompareAndSetAccountDetail = 'compareAndSetAccountDetail', + CompareAndSetAccountDetail: 'compareAndSetAccountDetail', /** * Create a new type of asset, unique in a domain. An asset is a countable representation of a commodity. */ - CreateAsset = 'createAsset', + CreateAsset: 'createAsset', /** * Increase the quantity of an asset on account of transaction creator. */ - AddAssetQuantity = 'addAssetQuantity', + AddAssetQuantity: 'addAssetQuantity', /** * Decrease the number of assets on account of transaction creator. */ - SubtractAssetQuantity = 'subtractAssetQuantity', + SubtractAssetQuantity: 'subtractAssetQuantity', /** * Share assets within the account in peer network: in the way that source account transfers assets to the target account. */ - TransferAsset = 'transferAsset', + TransferAsset: 'transferAsset', /** * Make new domain in Iroha network, which is a group of accounts. */ - CreateDomain = 'createDomain', + CreateDomain: 'createDomain', /** * Create a new role in the system from the set of permissions. */ - CreateRole = 'createRole', + CreateRole: 'createRole', /** * Detach a role from the set of roles of an account. */ - DetachRole = 'detachRole', + DetachRole: 'detachRole', /** * Promote an account to some created role in the system, where a role is a set of permissions account has to perform an action (command or query). */ - AppendRole = 'appendRole', + AppendRole: 'appendRole', /** * Add an identifier to the account. Such identifier is a public key of another device or a public key of another user. */ - AddSignatory = 'addSignatory', + AddSignatory: 'addSignatory', /** * Remove a public key, associated with an identity, from an account */ - RemoveSignatory = 'removeSignatory', + RemoveSignatory: 'removeSignatory', /** * Give another account rights to perform actions on the account of transaction sender (give someone right to do something with my account). */ - GrantPermission = 'grantPermission', + GrantPermission: 'grantPermission', /** * Revoke or dismiss given granted permission from another account in the network. */ - RevokePermission = 'revokePermission', + RevokePermission: 'revokePermission', /** * Write into ledger the fact of peer addition into the peer network. */ - AddPeer = 'addPeer', + AddPeer: 'addPeer', /** * Write into ledger the fact of peer removal from the network. */ - RemovePeer = 'removePeer', + RemovePeer: 'removePeer', /** * This command is not available for use, it was added for backward compatibility with Iroha. */ - SetSettingValue = 'setSettingValue', + SetSettingValue: 'setSettingValue', /** * This command is not availalbe for use because it is related to smart contract. */ - CallEngine = 'callEngine' -} + CallEngine: 'callEngine' +} as const; + +export type IrohaCommand = typeof IrohaCommand[keyof typeof IrohaCommand]; + /** * @@ -881,68 +886,71 @@ export enum IrohaCommand { * @enum {string} */ -export enum IrohaQuery { +export const IrohaQuery = { /** * To get the state of an account */ - GetAccount = 'getAccount', + GetAccount: 'getAccount', /** * To get details of the account. */ - GetAccountDetail = 'getAccountDetail', + GetAccountDetail: 'getAccountDetail', /** * To get information on the given asset (as for now - its precision). */ - GetAssetInfo = 'getAssetInfo', + GetAssetInfo: 'getAssetInfo', /** * To get the state of all assets in an account (a balance). */ - GetAccountAssets = 'getAccountAssets', + GetAccountAssets: 'getAccountAssets', /** * To retrieve information about transactions, based on their hashes. */ - GetTransactions = 'getTransactions', + GetTransactions: 'getTransactions', /** * To retrieve a list of pending (not fully signed) multisignature transactions or batches of transactions issued by account of query creator. */ - GetPendingTransactions = 'getPendingTransactions', + GetPendingTransactions: 'getPendingTransactions', /** * To retrieve a list of transactions per account. */ - GetAccountTransactions = 'getAccountTransactions', + GetAccountTransactions: 'getAccountTransactions', /** * To retrieve all transactions associated with given account and asset. */ - GetAccountAssetTransactions = 'getAccountAssetTransactions', + GetAccountAssetTransactions: 'getAccountAssetTransactions', /** * To get existing roles in the system. */ - GetRoles = 'getRoles', + GetRoles: 'getRoles', /** * To get signatories, which act as an identity of the account. */ - GetSignatories = 'getSignatories', + GetSignatories: 'getSignatories', /** * To get available permissions per role in the system. */ - GetRolePermissions = 'getRolePermissions', + GetRolePermissions: 'getRolePermissions', /** * To get a specific block, using its height as an identifier. */ - GetBlock = 'getBlock', + GetBlock: 'getBlock', /** * To retrieve a receipt of a CallEngine command. Allows to access the event log created during computations inside the EVM. */ - GetEngineReceipts = 'getEngineReceipts', + GetEngineReceipts: 'getEngineReceipts', /** * To get new blocks as soon as they are committed, a user can invoke FetchCommits RPC call to Iroha network. */ - FetchCommits = 'fetchCommits', + FetchCommits: 'fetchCommits', /** * A query that returns a list of peers in Iroha network. */ - GetPeers = 'getPeers' -} + GetPeers: 'getPeers' +} as const; + +export type IrohaQuery = typeof IrohaQuery[keyof typeof IrohaQuery]; + /** * @@ -950,10 +958,13 @@ export enum IrohaQuery { * @enum {string} */ -export enum IrohaSocketIOTransactV1 { - SendAsyncRequest = 'org.hyperledger.cactus.api.async.iroha.IrohaSocketIOTransactV1.SendAsyncRequest', - SendSyncRequest = 'org.hyperledger.cactus.api.async.iroha.IrohaSocketIOTransactV1.SendSyncRequest' -} +export const IrohaSocketIOTransactV1 = { + SendAsyncRequest: 'org.hyperledger.cactus.api.async.iroha.IrohaSocketIOTransactV1.SendAsyncRequest', + SendSyncRequest: 'org.hyperledger.cactus.api.async.iroha.IrohaSocketIOTransactV1.SendSyncRequest' +} as const; + +export type IrohaSocketIOTransactV1 = typeof IrohaSocketIOTransactV1[keyof typeof IrohaSocketIOTransactV1]; + /** * @@ -966,13 +977,13 @@ export interface KeyPair { * @type {string} * @memberof KeyPair */ - publicKey: string; + 'publicKey': string; /** * SHA-3 ed25519 private keys of length 64 are recommended. * @type {string} * @memberof KeyPair */ - privateKey: string; + 'privateKey': string; } /** * The list of arguments to pass in to the transaction request to Remove Peer. @@ -985,7 +996,7 @@ export interface RemovePeerRequestParameters { * @type {string} * @memberof RemovePeerRequestParameters */ - publicKey: string; + 'publicKey': string; } /** * The list of arguments to pass in to the transaction request to Remove Signatory. @@ -998,13 +1009,13 @@ export interface RemoveSignatoryRequestParameters { * @type {string} * @memberof RemoveSignatoryRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof RemoveSignatoryRequestParameters */ - publicKey: string; + 'publicKey': string; } /** * The list of arguments to pass in to the transaction request to Revoke Permission. @@ -1017,13 +1028,13 @@ export interface RevokePermissionRequestParameters { * @type {string} * @memberof RevokePermissionRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {number} * @memberof RevokePermissionRequestParameters */ - permission: number; + 'permission': number; } /** * @@ -1036,19 +1047,19 @@ export interface RunTransactionRequestV1 { * @type {string} * @memberof RunTransactionRequestV1 */ - commandName: string; + 'commandName': string; /** * * @type {IrohaBaseConfig} * @memberof RunTransactionRequestV1 */ - baseConfig: IrohaBaseConfig; + 'baseConfig': IrohaBaseConfig; /** * * @type {RunTransactionRequestV1Params} * @memberof RunTransactionRequestV1 */ - params: RunTransactionRequestV1Params; + 'params': RunTransactionRequestV1Params; } /** * @type RunTransactionRequestV1Body @@ -1073,7 +1084,7 @@ export interface RunTransactionResponse { * @type {any} * @memberof RunTransactionResponse */ - transactionReceipt: any | null; + 'transactionReceipt': any; } /** * @@ -1083,16 +1094,16 @@ export interface RunTransactionResponse { export interface RunTransactionSignedRequestV1 { /** * Signed transaction binary data received from generate-transaction endpoint. - * @type {any} + * @type {string} * @memberof RunTransactionSignedRequestV1 */ - signedTransaction: any; + 'signedTransaction': string; /** * * @type {IrohaBaseConfig} * @memberof RunTransactionSignedRequestV1 */ - baseConfig?: IrohaBaseConfig; + 'baseConfig'?: IrohaBaseConfig; } /** * The list of arguments to pass in to the transaction request to Set Account Detail. @@ -1105,19 +1116,19 @@ export interface SetAccountDetailRequestParameters { * @type {string} * @memberof SetAccountDetailRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {string} * @memberof SetAccountDetailRequestParameters */ - key: string; + 'key': string; /** * * @type {string} * @memberof SetAccountDetailRequestParameters */ - value: string; + 'value': string; } /** * The list of arguments to pass in to the transaction request to Set Account Quorum. @@ -1130,13 +1141,13 @@ export interface SetAccountQuorumRequestParameters { * @type {string} * @memberof SetAccountQuorumRequestParameters */ - accountId: string; + 'accountId': string; /** * * @type {number} * @memberof SetAccountQuorumRequestParameters */ - quorum: number; + 'quorum': number; } /** * The list of arguments to pass in to the transaction request to Subtract Asset Quantity. @@ -1149,13 +1160,13 @@ export interface SubtractAssetQuantityRequestParameters { * @type {string} * @memberof SubtractAssetQuantityRequestParameters */ - assetId: string; + 'assetId': string; /** * * @type {number} * @memberof SubtractAssetQuantityRequestParameters */ - amount: number; + 'amount': number; } /** * The list of arguments to pass in to the transaction request to Transfer Asset. @@ -1168,31 +1179,31 @@ export interface TransferAssetRequestParameters { * @type {string} * @memberof TransferAssetRequestParameters */ - srcAccountId: string; + 'srcAccountId': string; /** * * @type {string} * @memberof TransferAssetRequestParameters */ - destAccountId: string; + 'destAccountId': string; /** * * @type {string} * @memberof TransferAssetRequestParameters */ - assetId: string; + 'assetId': string; /** * * @type {string} * @memberof TransferAssetRequestParameters */ - description: string; + 'description': string; /** * * @type {number} * @memberof TransferAssetRequestParameters */ - amount: number; + 'amount': number; } /** * @@ -1200,13 +1211,16 @@ export interface TransferAssetRequestParameters { * @enum {string} */ -export enum WatchBlocksV1 { - Subscribe = 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Subscribe', - Next = 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Next', - Unsubscribe = 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Unsubscribe', - Error = 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Error', - Complete = 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Complete' -} +export const WatchBlocksV1 = { + Subscribe: 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Subscribe', + Next: 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Next', + Unsubscribe: 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Unsubscribe', + Error: 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Error', + Complete: 'org.hyperledger.cactus.api.async.iroha.WatchBlocksV1.Complete' +} as const; + +export type WatchBlocksV1 = typeof WatchBlocksV1[keyof typeof WatchBlocksV1]; + /** @@ -1222,7 +1236,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - generateTransactionV1: async (generateTransactionRequestV1?: GenerateTransactionRequestV1, options: any = {}): Promise => { + generateTransactionV1: async (generateTransactionRequestV1?: GenerateTransactionRequestV1, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-iroha/generate-transaction`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1239,7 +1253,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(generateTransactionRequestV1, localVarRequestOptions, configuration) @@ -1255,7 +1269,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getPrometheusMetricsV1: async (options: any = {}): Promise => { + getPrometheusMetricsV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-iroha/get-prometheus-exporter-metrics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1270,7 +1284,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -1286,7 +1300,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - runTransactionV1: async (runTransactionRequestV1Body?: RunTransactionRequestV1Body, options: any = {}): Promise => { + runTransactionV1: async (runTransactionRequestV1Body?: RunTransactionRequestV1Body, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-iroha/run-transaction`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1303,7 +1317,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(runTransactionRequestV1Body, localVarRequestOptions, configuration) @@ -1330,7 +1344,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.generateTransactionV1(generateTransactionRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1340,7 +1354,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getPrometheusMetricsV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getPrometheusMetricsV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getPrometheusMetricsV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1351,7 +1365,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async runTransactionV1(runTransactionRequestV1Body?: RunTransactionRequestV1Body, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async runTransactionV1(runTransactionRequestV1Body?: RunTransactionRequestV1Body, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.runTransactionV1(runTransactionRequestV1Body, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1372,7 +1386,7 @@ export const DefaultApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any): AxiosPromise { + generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any): AxiosPromise { return localVarFp.generateTransactionV1(generateTransactionRequestV1, options).then((request) => request(axios, basePath)); }, /** @@ -1412,7 +1426,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any) { + public generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).generateTransactionV1(generateTransactionRequestV1, options).then((request) => request(this.axios, this.basePath)); } @@ -1423,7 +1437,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getPrometheusMetricsV1(options?: any) { + public getPrometheusMetricsV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getPrometheusMetricsV1(options).then((request) => request(this.axios, this.basePath)); } @@ -1435,7 +1449,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public runTransactionV1(runTransactionRequestV1Body?: RunTransactionRequestV1Body, options?: any) { + public runTransactionV1(runTransactionRequestV1Body?: RunTransactionRequestV1Body, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).runTransactionV1(runTransactionRequestV1Body, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/base.ts b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/base.ts index 8dc30459ae..1ae57dce2f 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/common.ts b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/common.ts index 7be7eb826f..586a3d25e5 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/plugin-ledger-connector-iroha.ts b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/plugin-ledger-connector-iroha.ts index 5b50fc6c51..7327b75046 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/plugin-ledger-connector-iroha.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/plugin-ledger-connector-iroha.ts @@ -71,7 +71,8 @@ export class PluginLedgerConnectorIroha RunTransactionResponse >, ICactusPlugin, - IPluginWebService { + IPluginWebService +{ private readonly instanceId: string; public prometheusExporter: PrometheusExporter; private readonly log: Logger; @@ -234,13 +235,12 @@ export class PluginLedgerConnectorIroha return `@hyperledger/cactus-plugin-ledger-connector-iroha`; } - public async getConsensusAlgorithmFamily(): Promise< - ConsensusAlgorithmFamily - > { + public async getConsensusAlgorithmFamily(): Promise { return ConsensusAlgorithmFamily.Authority; } public async hasTransactionFinality(): Promise { - const currentConsensusAlgorithmFamily = await this.getConsensusAlgorithmFamily(); + const currentConsensusAlgorithmFamily = + await this.getConsensusAlgorithmFamily(); return consensusHasTransactionFinality(currentConsensusAlgorithmFamily); } @@ -272,6 +272,7 @@ export class PluginLedgerConnectorIroha private async transactSigned( req: RunTransactionSignedRequestV1, ): Promise { + const fnTag = `${this.className}:transactSigned(RunTransactionSignedRequestV1)`; if (!req.baseConfig || !req.baseConfig.timeoutLimit) { throw new RuntimeError("baseConfig.timeoutLimit is undefined"); } @@ -281,12 +282,10 @@ export class PluginLedgerConnectorIroha ); try { - const transactionBinary = Uint8Array.from( - Object.values(req.signedTransaction), - ); - const signedTransaction = Transaction.deserializeBinary( - transactionBinary, - ); + const signedTxBuffer = Buffer.from(req.signedTransaction, "base64"); + const txBinary = Uint8Array.from(signedTxBuffer); + + const signedTransaction = Transaction.deserializeBinary(txBinary); this.log.debug("Received signed transaction:", signedTransaction); const sendResponse = await new TxBuilder(signedTransaction).send( @@ -295,8 +294,8 @@ export class PluginLedgerConnectorIroha ); return { transactionReceipt: sendResponse }; - } catch (error) { - throw new RuntimeError(error as any); + } catch (ex) { + throw new RuntimeError(`${fnTag} crashed with: `, ex); } } diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/web-services/generate-transaction-endpoint.ts b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/web-services/generate-transaction-endpoint.ts index 9f17ea0320..66bfce1490 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/web-services/generate-transaction-endpoint.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/web-services/generate-transaction-endpoint.ts @@ -90,7 +90,10 @@ export class GenerateTransactionEndpoint implements IWebServiceEndpoint { this.log.debug(reqTag); try { - res.send(this.options.connector.generateTransaction(req.body)); + const txBytesU8 = this.options.connector.generateTransaction(req.body); + const txBytesBuffer = Buffer.from(txBytesU8); + const txBytesBase64 = txBytesBuffer.toString("base64"); + res.send(txBytesBase64); } catch (error) { this.log.error(`Crash while serving ${reqTag}:`, error); diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/generate-and-send-signed-transaction.test.ts b/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/generate-and-send-signed-transaction.test.ts index 03431fda5e..0df95c751c 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/generate-and-send-signed-transaction.test.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/generate-and-send-signed-transaction.test.ts @@ -302,9 +302,9 @@ describe("Generate and send signed transaction tests", () => { expect(genTxResponse).toBeTruthy(); expect(genTxResponse.data).toBeTruthy(); expect(genTxResponse.status).toEqual(200); - const unsignedTransaction = Uint8Array.from( - Object.values(genTxResponse.data), - ); + + const genTxResponseDataBuffer = Buffer.from(genTxResponse.data, "base64"); + const unsignedTransaction = Uint8Array.from(genTxResponseDataBuffer); expect(unsignedTransaction).toBeTruthy(); log.info("Received unsigned transcation"); log.debug("unsignedTransaction:", unsignedTransaction); @@ -318,9 +318,11 @@ describe("Generate and send signed transaction tests", () => { log.info("Transaction signed with local private key"); log.debug("signedTx:", signedTransaction); + const signedTxB64 = Buffer.from(signedTransaction).toString("base64"); + // Send const sendTransactionResponse = await apiClient.runTransactionV1({ - signedTransaction, + signedTransaction: signedTxB64, baseConfig: { irohaHost: irohaLedgerHost, irohaPort: irohaLedgerPort, diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/iroha-socketio-endpoint.test.ts b/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/iroha-socketio-endpoint.test.ts index e6353c322c..e7c06ed939 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/iroha-socketio-endpoint.test.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/iroha-socketio-endpoint.test.ts @@ -1,4 +1,15 @@ +import "jest-extended"; +import http from "http"; +import { AddressInfo } from "net"; import KeyEncoder from "key-encoder"; +import { v4 as internalIpV4 } from "internal-ip"; +import { v4 as uuidv4 } from "uuid"; +import { RuntimeError } from "run-time-error"; +import cryptoHelper from "iroha-helpers/lib/cryptoHelper"; +import express from "express"; +import bodyParser from "body-parser"; +import { Server as SocketIoServer } from "socket.io"; + import { PluginRegistry } from "@hyperledger/cactus-core"; import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory"; @@ -18,10 +29,6 @@ import { pruneDockerAllIfGithubAction, } from "@hyperledger/cactus-test-tooling"; -import { v4 as internalIpV4 } from "internal-ip"; -import { v4 as uuidv4 } from "uuid"; -import { RuntimeError } from "run-time-error"; -import cryptoHelper from "iroha-helpers/lib/cryptoHelper"; import { IrohaBlockProgress, IrohaBlockResponse, @@ -36,12 +43,7 @@ import { PluginFactoryLedgerConnector, } from "../../../main/typescript"; -import { AddressInfo } from "net"; import { Constants, PluginImportType } from "@hyperledger/cactus-core-api"; -import express from "express"; -import bodyParser from "body-parser"; -import http from "http"; -import { Server as SocketIoServer } from "socket.io"; const logLevel: LogLevelDesc = "info"; diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/openapi/openapi-validation.test.ts b/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/openapi/openapi-validation.test.ts index eea8fb0cc5..e98e7f735b 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/openapi/openapi-validation.test.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/openapi/openapi-validation.test.ts @@ -42,7 +42,7 @@ import { installOpenapiValidationMiddleware } from "@hyperledger/cactus-core"; import { Constants } from "@hyperledger/cactus-core-api"; const testCase = "Iroha plugin openapi validation"; -const logLevel: LogLevelDesc = "INFO"; +const logLevel: LogLevelDesc = "DEBUG"; test.onFailure(async () => { await Containers.logDiagnostics({ logLevel }); diff --git a/packages/cactus-plugin-ledger-connector-iroha2/openapitools.json b/packages/cactus-plugin-ledger-connector-iroha2/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-iroha2/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-iroha2/src/main/json/openapi.json index 20ae5a8d83..0391ae1be8 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Connector Iroha V2", "description": "Can perform basic tasks on a Iroha V2 ledger", "version": "1.0.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, @@ -169,7 +169,6 @@ "properties": { "binaryBlock": { "type": "string", - "format": "binary", "nullable": false } } @@ -403,7 +402,6 @@ "payload": { "description": "Signed query transaction binary data received from generate-transaction endpoint.", "type": "string", - "format": "binary", "nullable": false } } @@ -416,7 +414,6 @@ "signedTransaction": { "description": "Signed transaction binary data received from generate-transaction endpoint.", "type": "string", - "format": "binary", "nullable": false }, "transaction": { @@ -607,10 +604,9 @@ "200": { "description": "OK", "content": { - "application/octet-stream": { + "text/plain": { "schema": { - "type": "string", - "format": "binary" + "type": "string" } } } diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/api.ts b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/api.ts index 7fa12b0981..4bfe9123b0 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * Iroha V2 block response type. @@ -27,16 +29,19 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr * @enum {string} */ -export enum BlockTypeV1 { +export const BlockTypeV1 = { /** * Default JSON-encoded string full block data. */ - Raw = 'raw', + Raw: 'raw', /** * Encoded format that must be decoded with Iroha SDK on client side before use */ - Binary = 'binary' -} + Binary: 'binary' +} as const; + +export type BlockTypeV1 = typeof BlockTypeV1[keyof typeof BlockTypeV1]; + /** * Error response from the connector. @@ -49,13 +54,13 @@ export interface ErrorExceptionResponseV1 { * @type {string} * @memberof ErrorExceptionResponseV1 */ - message: string; + 'message': string; /** * Detailed error information. * @type {string} * @memberof ErrorExceptionResponseV1 */ - error: string; + 'error': string; } /** * Request for generating transaction or query payload that can be signed on the client side. @@ -65,17 +70,23 @@ export interface ErrorExceptionResponseV1 { export interface GenerateTransactionRequestV1 { /** * - * @type {IrohaTransactionDefinitionV1 | IrohaQueryDefinitionV1} + * @type {GenerateTransactionRequestV1Request} * @memberof GenerateTransactionRequestV1 */ - request: IrohaTransactionDefinitionV1 | IrohaQueryDefinitionV1; + 'request': GenerateTransactionRequestV1Request; /** * * @type {Iroha2BaseConfig} * @memberof GenerateTransactionRequestV1 */ - baseConfig?: Iroha2BaseConfig; + 'baseConfig'?: Iroha2BaseConfig; } +/** + * @type GenerateTransactionRequestV1Request + * @export + */ +export type GenerateTransactionRequestV1Request = IrohaQueryDefinitionV1 | IrohaTransactionDefinitionV1; + /** * Iroha V2 account ID. * @export @@ -87,13 +98,13 @@ export interface Iroha2AccountId { * @type {string} * @memberof Iroha2AccountId */ - name: string; + 'name': string; /** * * @type {string} * @memberof Iroha2AccountId */ - domainId: string; + 'domainId': string; } /** * Iroha V2 connection configuration. @@ -106,20 +117,26 @@ export interface Iroha2BaseConfig { * @type {Iroha2BaseConfigTorii} * @memberof Iroha2BaseConfig */ - torii: Iroha2BaseConfigTorii; + 'torii': Iroha2BaseConfigTorii; /** * * @type {Iroha2AccountId} * @memberof Iroha2BaseConfig */ - accountId?: Iroha2AccountId; + 'accountId'?: Iroha2AccountId; /** * - * @type {Iroha2KeyPair | KeychainReference} + * @type {Iroha2BaseConfigSigningCredential} * @memberof Iroha2BaseConfig */ - signingCredential?: Iroha2KeyPair | KeychainReference; + 'signingCredential'?: Iroha2BaseConfigSigningCredential; } +/** + * @type Iroha2BaseConfigSigningCredential + * @export + */ +export type Iroha2BaseConfigSigningCredential = Iroha2KeyPair | KeychainReference; + /** * Iroha V2 peer connection information. * @export @@ -131,13 +148,13 @@ export interface Iroha2BaseConfigTorii { * @type {string} * @memberof Iroha2BaseConfigTorii */ - apiURL?: string; + 'apiURL'?: string; /** * * @type {string} * @memberof Iroha2BaseConfigTorii */ - telemetryURL?: string; + 'telemetryURL'?: string; } /** * Private/Public key JSON containing payload and digest function. @@ -150,13 +167,13 @@ export interface Iroha2KeyJson { * @type {string} * @memberof Iroha2KeyJson */ - digestFunction: string; + 'digestFunction': string; /** * * @type {string} * @memberof Iroha2KeyJson */ - payload: string; + 'payload': string; } /** * Pair of Iroha account private and public keys. @@ -169,13 +186,13 @@ export interface Iroha2KeyPair { * @type {Iroha2KeyJson} * @memberof Iroha2KeyPair */ - privateKey: Iroha2KeyJson; + 'privateKey': Iroha2KeyJson; /** * * @type {string} * @memberof Iroha2KeyPair */ - publicKey: string; + 'publicKey': string; } /** * Command names that correspond to Iroha Special Instructions (https://hyperledger.github.io/iroha-2-docs/guide/advanced/isi.html) @@ -183,36 +200,39 @@ export interface Iroha2KeyPair { * @enum {string} */ -export enum IrohaInstruction { +export const IrohaInstruction = { /** * Register new domain */ - RegisterDomain = 'registerDomain', + RegisterDomain: 'registerDomain', /** * Register new asset definition */ - RegisterAssetDefinition = 'registerAssetDefinition', + RegisterAssetDefinition: 'registerAssetDefinition', /** * Register new asset */ - RegisterAsset = 'registerAsset', + RegisterAsset: 'registerAsset', /** * Mint asset value */ - MintAsset = 'mintAsset', + MintAsset: 'mintAsset', /** * Burn asset value */ - BurnAsset = 'burnAsset', + BurnAsset: 'burnAsset', /** * Transfer asset between accounts */ - TransferAsset = 'transferAsset', + TransferAsset: 'transferAsset', /** * Register new account */ - RegisterAccount = 'registerAccount' -} + RegisterAccount: 'registerAccount' +} as const; + +export type IrohaInstruction = typeof IrohaInstruction[keyof typeof IrohaInstruction]; + /** * Single Iroha V2 instruction to be executed request. @@ -225,13 +245,13 @@ export interface IrohaInstructionRequestV1 { * @type {IrohaInstruction} * @memberof IrohaInstructionRequestV1 */ - name: IrohaInstruction; + 'name': IrohaInstruction; /** * The list of arguments to pass with specified instruction. * @type {Array} * @memberof IrohaInstructionRequestV1 */ - params: Array; + 'params': Array; } /** * Command names that correspond to Iroha queries (https://hyperledger.github.io/iroha-2-docs/guide/advanced/queries.html) @@ -239,56 +259,59 @@ export interface IrohaInstructionRequestV1 { * @enum {string} */ -export enum IrohaQuery { +export const IrohaQuery = { /** * Get list of all registered domains */ - FindAllDomains = 'findAllDomains', + FindAllDomains: 'findAllDomains', /** * Get domain with specified ID */ - FindDomainById = 'findDomainById', + FindDomainById: 'findDomainById', /** * Get asset definition with specified ID */ - FindAssetDefinitionById = 'findAssetDefinitionById', + FindAssetDefinitionById: 'findAssetDefinitionById', /** * Get list of all registered asset definition */ - FindAllAssetsDefinitions = 'findAllAssetsDefinitions', + FindAllAssetsDefinitions: 'findAllAssetsDefinitions', /** * Get asset with specified ID */ - FindAssetById = 'findAssetById', + FindAssetById: 'findAssetById', /** * Get list of all registered assets */ - FindAllAssets = 'findAllAssets', + FindAllAssets: 'findAllAssets', /** * Get list of all ledger peers */ - FindAllPeers = 'findAllPeers', + FindAllPeers: 'findAllPeers', /** * Get list of all ledger blocks */ - FindAllBlocks = 'findAllBlocks', + FindAllBlocks: 'findAllBlocks', /** * Get account with specified ID */ - FindAccountById = 'findAccountById', + FindAccountById: 'findAccountById', /** * Get list of all registered accounts */ - FindAllAccounts = 'findAllAccounts', + FindAllAccounts: 'findAllAccounts', /** * Get list of all transactions */ - FindAllTransactions = 'findAllTransactions', + FindAllTransactions: 'findAllTransactions', /** * Get transaction with specified hash */ - FindTransactionByHash = 'findTransactionByHash' -} + FindTransactionByHash: 'findTransactionByHash' +} as const; + +export type IrohaQuery = typeof IrohaQuery[keyof typeof IrohaQuery]; + /** * Iroha V2 query definition. @@ -301,13 +324,13 @@ export interface IrohaQueryDefinitionV1 { * @type {IrohaQuery} * @memberof IrohaQueryDefinitionV1 */ - query: IrohaQuery; + 'query': IrohaQuery; /** * The list of arguments to pass with the query. * @type {Array} * @memberof IrohaQueryDefinitionV1 */ - params?: Array; + 'params'?: Array; } /** * Iroha V2 signed query definition @@ -320,13 +343,13 @@ export interface IrohaSignedQueryDefinitionV1 { * @type {IrohaQuery} * @memberof IrohaSignedQueryDefinitionV1 */ - query: IrohaQuery; + 'query': IrohaQuery; /** * Signed query transaction binary data received from generate-transaction endpoint. - * @type {any} + * @type {string} * @memberof IrohaSignedQueryDefinitionV1 */ - payload: any; + 'payload': string; } /** * Iroha V2 transaction definition @@ -336,43 +359,49 @@ export interface IrohaSignedQueryDefinitionV1 { export interface IrohaTransactionDefinitionV1 { /** * - * @type {IrohaInstructionRequestV1 | Array} + * @type {IrohaTransactionDefinitionV1Instruction} * @memberof IrohaTransactionDefinitionV1 */ - instruction: IrohaInstructionRequestV1 | Array; + 'instruction': IrohaTransactionDefinitionV1Instruction; /** * * @type {IrohaTransactionParametersV1} * @memberof IrohaTransactionDefinitionV1 */ - params?: IrohaTransactionParametersV1; + 'params'?: IrohaTransactionParametersV1; } +/** + * @type IrohaTransactionDefinitionV1Instruction + * @export + */ +export type IrohaTransactionDefinitionV1Instruction = Array | IrohaInstructionRequestV1; + /** * Iroha V2 transaction payload parameters * @export * @interface IrohaTransactionParametersV1 */ export interface IrohaTransactionParametersV1 { - [key: string]: object | any; + [key: string]: any; /** * BigInt time to live. * @type {string} * @memberof IrohaTransactionParametersV1 */ - ttl?: string; + 'ttl'?: string; /** * BigInt creation time * @type {string} * @memberof IrohaTransactionParametersV1 */ - creationTime?: string; + 'creationTime'?: string; /** * Transaction nonce * @type {number} * @memberof IrohaTransactionParametersV1 */ - nonce?: number; + 'nonce'?: number; } /** * Reference to entry stored in Cactus keychain plugin. @@ -385,13 +414,13 @@ export interface KeychainReference { * @type {string} * @memberof KeychainReference */ - keychainId: string; + 'keychainId': string; /** * Key reference name. * @type {string} * @memberof KeychainReference */ - keychainRef: string; + 'keychainRef': string; } /** * Request to query endpoint. @@ -404,19 +433,19 @@ export interface QueryRequestV1 { * @type {IrohaQueryDefinitionV1} * @memberof QueryRequestV1 */ - query?: IrohaQueryDefinitionV1; + 'query'?: IrohaQueryDefinitionV1; /** * * @type {IrohaSignedQueryDefinitionV1} * @memberof QueryRequestV1 */ - signedQuery?: IrohaSignedQueryDefinitionV1; + 'signedQuery'?: IrohaSignedQueryDefinitionV1; /** * * @type {Iroha2BaseConfig} * @memberof QueryRequestV1 */ - baseConfig?: Iroha2BaseConfig; + 'baseConfig'?: Iroha2BaseConfig; } /** * Response with the query results. @@ -429,7 +458,7 @@ export interface QueryResponseV1 { * @type {any} * @memberof QueryResponseV1 */ - response: any; + 'response': any; } /** * Request to transact endpoint. @@ -439,28 +468,28 @@ export interface QueryResponseV1 { export interface TransactRequestV1 { /** * Signed transaction binary data received from generate-transaction endpoint. - * @type {any} + * @type {string} * @memberof TransactRequestV1 */ - signedTransaction?: any; + 'signedTransaction'?: string; /** * * @type {IrohaTransactionDefinitionV1} * @memberof TransactRequestV1 */ - transaction?: IrohaTransactionDefinitionV1; + 'transaction'?: IrohaTransactionDefinitionV1; /** * Wait unitl transaction is sent and return the final status (committed / rejected) * @type {boolean} * @memberof TransactRequestV1 */ - waitForCommit?: boolean; + 'waitForCommit'?: boolean; /** * * @type {Iroha2BaseConfig} * @memberof TransactRequestV1 */ - baseConfig?: Iroha2BaseConfig; + 'baseConfig'?: Iroha2BaseConfig; } /** * Response from transaction endpoint with operation status. @@ -473,40 +502,45 @@ export interface TransactResponseV1 { * @type {string} * @memberof TransactResponseV1 */ - hash: string; + 'hash': string; /** * * @type {TransactionStatusV1} * @memberof TransactResponseV1 */ - status: TransactionStatusV1; + 'status': TransactionStatusV1; /** * When waitForCommit was suplied and the transaction was rejected, contains the reason of the rejection. * @type {string} * @memberof TransactResponseV1 */ - rejectReason?: string; + 'rejectReason'?: string; } + + /** * Status of Iroha V2 transaction. * @export * @enum {string} */ -export enum TransactionStatusV1 { +export const TransactionStatusV1 = { /** * Transaction was submitted to the ledger - use other tools to check if it was accepted and committed. */ - Submitted = 'submitted', + Submitted: 'submitted', /** * Transaction was committed to the ledger. */ - Committed = 'committed', + Committed: 'committed', /** * Transaction was rejected. */ - Rejected = 'rejected' -} + Rejected: 'rejected' +} as const; + +export type TransactionStatusV1 = typeof TransactionStatusV1[keyof typeof TransactionStatusV1]; + /** * Binary encoded response of block data. @@ -516,10 +550,10 @@ export enum TransactionStatusV1 { export interface WatchBlocksBinaryResponseV1 { /** * - * @type {any} + * @type {string} * @memberof WatchBlocksBinaryResponseV1 */ - binaryBlock: any; + 'binaryBlock': string; } /** * Options passed when subscribing to block monitoring. @@ -532,20 +566,22 @@ export interface WatchBlocksOptionsV1 { * @type {BlockTypeV1} * @memberof WatchBlocksOptionsV1 */ - type?: BlockTypeV1; + 'type'?: BlockTypeV1; /** * Number of block to start monitoring from. * @type {string} * @memberof WatchBlocksOptionsV1 */ - startBlock?: string; + 'startBlock'?: string; /** * * @type {Iroha2BaseConfig} * @memberof WatchBlocksOptionsV1 */ - baseConfig?: Iroha2BaseConfig; + 'baseConfig'?: Iroha2BaseConfig; } + + /** * Default JSON-encoded string full block data. * @export @@ -557,7 +593,7 @@ export interface WatchBlocksRawResponseV1 { * @type {string} * @memberof WatchBlocksRawResponseV1 */ - blockData: string; + 'blockData': string; } /** * @type WatchBlocksResponseV1 @@ -571,13 +607,16 @@ export type WatchBlocksResponseV1 = ErrorExceptionResponseV1 | WatchBlocksBinary * @enum {string} */ -export enum WatchBlocksV1 { - Subscribe = 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Subscribe', - Next = 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Next', - Unsubscribe = 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Unsubscribe', - Error = 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Error', - Complete = 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Complete' -} +export const WatchBlocksV1 = { + Subscribe: 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Subscribe', + Next: 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Next', + Unsubscribe: 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Unsubscribe', + Error: 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Error', + Complete: 'org.hyperledger.cactus.api.async.hliroha2.WatchBlocksV1.Complete' +} as const; + +export type WatchBlocksV1 = typeof WatchBlocksV1[keyof typeof WatchBlocksV1]; + /** @@ -593,7 +632,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - generateTransactionV1: async (generateTransactionRequestV1?: GenerateTransactionRequestV1, options: any = {}): Promise => { + generateTransactionV1: async (generateTransactionRequestV1?: GenerateTransactionRequestV1, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-iroha2/generate-transaction`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -610,7 +649,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(generateTransactionRequestV1, localVarRequestOptions, configuration) @@ -627,7 +666,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - queryV1: async (queryRequestV1?: QueryRequestV1, options: any = {}): Promise => { + queryV1: async (queryRequestV1?: QueryRequestV1, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-iroha2/query`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -644,7 +683,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(queryRequestV1, localVarRequestOptions, configuration) @@ -661,7 +700,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - transactV1: async (transactRequestV1?: TransactRequestV1, options: any = {}): Promise => { + transactV1: async (transactRequestV1?: TransactRequestV1, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-iroha2/transact`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -678,7 +717,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(transactRequestV1, localVarRequestOptions, configuration) @@ -705,7 +744,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.generateTransactionV1(generateTransactionRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -716,7 +755,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async queryV1(queryRequestV1?: QueryRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async queryV1(queryRequestV1?: QueryRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.queryV1(queryRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -727,7 +766,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async transactV1(transactRequestV1?: TransactRequestV1, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async transactV1(transactRequestV1?: TransactRequestV1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.transactV1(transactRequestV1, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -748,7 +787,7 @@ export const DefaultApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any): AxiosPromise { + generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any): AxiosPromise { return localVarFp.generateTransactionV1(generateTransactionRequestV1, options).then((request) => request(axios, basePath)); }, /** @@ -789,7 +828,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: any) { + public generateTransactionV1(generateTransactionRequestV1?: GenerateTransactionRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).generateTransactionV1(generateTransactionRequestV1, options).then((request) => request(this.axios, this.basePath)); } @@ -801,7 +840,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public queryV1(queryRequestV1?: QueryRequestV1, options?: any) { + public queryV1(queryRequestV1?: QueryRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).queryV1(queryRequestV1, options).then((request) => request(this.axios, this.basePath)); } @@ -813,7 +852,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public transactV1(transactRequestV1?: TransactRequestV1, options?: any) { + public transactV1(transactRequestV1?: TransactRequestV1, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).transactV1(transactRequestV1, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/base.ts b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/base.ts index 876936a83e..45c91b165a 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/common.ts b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/common.ts index ed3f989cee..ac5742337c 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/plugin-ledger-connector-iroha2.ts b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/plugin-ledger-connector-iroha2.ts index 0c1f84a31c..2dc28272f7 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/plugin-ledger-connector-iroha2.ts +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/plugin-ledger-connector-iroha2.ts @@ -607,6 +607,7 @@ export class PluginLedgerConnectorIroha2 * @returns Status of the operation. */ public async transact(req: TransactRequestV1): Promise { + const fnTag = `${this.className}:transact()`; const client = await this.createClient(req.baseConfig); try { @@ -617,17 +618,18 @@ export class PluginLedgerConnectorIroha2 req.waitForCommit, ); } else if (req.signedTransaction) { - const transactionBinary = Uint8Array.from( - Object.values(req.signedTransaction), - ); + const signedTxB64 = Buffer.from(req.signedTransaction, "base64"); + const transactionBinary = Uint8Array.from(signedTxB64); + return await client.sendSignedPayload( transactionBinary, req.waitForCommit, ); } else { - throw new Error( - "To submit transaction you must provide either signed transaction payload or list of instructions with signingCredential", - ); + const eMsg = + `${fnTag} To submit transaction you must provide either signed transaction` + + ` payload (.signedTransaction) or list of instructions with signingCredential`; + throw new Error(eMsg); } } finally { client.free(); @@ -662,9 +664,8 @@ export class PluginLedgerConnectorIroha2 req.signedQuery.query, ); - const queryBinary = Uint8Array.from( - Object.values(req.signedQuery.payload), - ); + const payloadBuffer = Buffer.from(req.signedQuery.payload, "base64"); + const queryBinary = Uint8Array.from(payloadBuffer); return { response: await queryContext.requestSigned(queryBinary), @@ -687,15 +688,17 @@ export class PluginLedgerConnectorIroha2 */ public async generateTransaction( req: GenerateTransactionRequestV1, - ): Promise { + ): Promise { const client = await this.createClient(req.baseConfig); try { if ("instruction" in req.request) { this.processInstructionsRequests(client, req.request.instruction); - return client.getTransactionPayloadBuffer( - this.tryParseTransactionParams(req.request.params), - ); + const txParams = this.tryParseTransactionParams(req.request.params); + const payloadTypedArray = client.getTransactionPayloadBuffer(txParams); + const payloadBuffer = Buffer.from(payloadTypedArray); + const payloadBase64 = payloadBuffer.toString("base64"); + return payloadBase64; } else if ("query" in req.request) { const queryContext = this.getQueryContext( client.query, @@ -703,7 +706,10 @@ export class PluginLedgerConnectorIroha2 ); const params = req.request.params ?? []; - return await queryContext.payload(...params); + const payloadTypedArray = await queryContext.payload(...params); + const payloadBuffer = Buffer.from(payloadTypedArray); + const payloadBase64 = payloadBuffer.toString("base64"); + return payloadBase64; } else { throw new Error("Missing required transaction or query definition"); } diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/web-services/watch-blocks-v1-endpoint.ts b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/web-services/watch-blocks-v1-endpoint.ts index 47515bb810..bcc7408f41 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/web-services/watch-blocks-v1-endpoint.ts +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/main/typescript/web-services/watch-blocks-v1-endpoint.ts @@ -111,11 +111,14 @@ export class Iroha2WatchBlocksEndpointV1 { blockData: JSON.stringify(block, stringifyBigIntReplacer), }); break; - case BlockTypeV1.Binary: + case BlockTypeV1.Binary: { + const asU8Array = VersionedCommittedBlock.toBuffer(block); + const asB64Str = Buffer.from(asU8Array).toString("base64"); socket.emit(WatchBlocksV1.Next, { - binaryBlock: VersionedCommittedBlock.toBuffer(block), + binaryBlock: asB64Str, }); break; + } default: const unknownType: never = blockType; throw new Error( diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-generate-and-send-signed-transaction.test.ts b/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-generate-and-send-signed-transaction.test.ts index 73cd4b33b3..07ac3e53ed 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-generate-and-send-signed-transaction.test.ts +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-generate-and-send-signed-transaction.test.ts @@ -8,7 +8,7 @@ ////////////////////////////////// // Log settings -const testLogLevel: LogLevelDesc = "info"; +const testLogLevel: LogLevelDesc = "debug"; import { LogLevelDesc, @@ -133,9 +133,10 @@ describe("Generate and send signed transaction tests", () => { expect(genTxResponse).toBeTruthy(); expect(genTxResponse.data).toBeTruthy(); expect(genTxResponse.status).toEqual(200); - const unsignedTransaction = Uint8Array.from( - Object.values(genTxResponse.data), - ); + + const genTxResponseDataB64 = Buffer.from(genTxResponse.data, "base64"); + const unsignedTransaction = Uint8Array.from(genTxResponseDataB64); + expect(unsignedTransaction).toBeTruthy(); log.info("Received unsigned transcation"); log.debug("unsignedTransaction:", unsignedTransaction); @@ -156,9 +157,12 @@ describe("Generate and send signed transaction tests", () => { log.info("Transaction signed with local private key"); log.debug("signedTransaction:", signedTransaction); + const signedTxBuffer = Buffer.from(signedTransaction); + const signedTxBase64 = signedTxBuffer.toString("base64"); + // 3. Send const transactionResponse = await env.apiClient.transactV1({ - signedTransaction, + signedTransaction: signedTxBase64, waitForCommit: true, baseConfig: env.defaultBaseConfig, }); @@ -201,9 +205,10 @@ describe("Generate and send signed transaction tests", () => { expect(genTxResponse).toBeTruthy(); expect(genTxResponse.data).toBeTruthy(); expect(genTxResponse.status).toEqual(200); - const unsignedTransaction = Uint8Array.from( - Object.values(genTxResponse.data), - ); + + const dataBuffer = Buffer.from(genTxResponse.data, "base64"); + const unsignedTransaction = Uint8Array.from(dataBuffer); + expect(unsignedTransaction).toBeTruthy(); log.info("Received unsigned transcation"); @@ -255,9 +260,10 @@ describe("Generate and send signed transaction tests", () => { expect(genQueryResponse).toBeTruthy(); expect(genQueryResponse.data).toBeTruthy(); expect(genQueryResponse.status).toEqual(200); - const unsignedQueryReq = Uint8Array.from( - Object.values(genQueryResponse.data), - ); + + const queryResponseDataBuf = Buffer.from(genQueryResponse.data, "base64"); + const unsignedQueryReq = Uint8Array.from(queryResponseDataBuf); + expect(unsignedQueryReq).toBeTruthy(); log.info("Received unsigned query request"); log.debug("unsignedQueryReq:", unsignedQueryReq); @@ -278,11 +284,14 @@ describe("Generate and send signed transaction tests", () => { log.info("Query request signed with a local private key"); log.debug("signedQueryReq:", signedQueryReq); + const payloadBuffer = Buffer.from(signedQueryReq); + const payloadBase64 = payloadBuffer.toString("base64"); + // 3. Send const queryResponse = await env.apiClient.queryV1({ signedQuery: { query: IrohaQuery.FindDomainById, - payload: signedQueryReq, + payload: payloadBase64, }, baseConfig: env.defaultBaseConfig, }); @@ -536,9 +545,10 @@ describe("Generate and send signed transaction tests", () => { expect(genTxResponse).toBeTruthy(); expect(genTxResponse.data).toBeTruthy(); expect(genTxResponse.status).toEqual(200); - const unsignedTransaction = Uint8Array.from( - Object.values(genTxResponse.data), - ); + + const genTxResponseDataBuffer = Buffer.from(genTxResponse.data, "base64"); + const unsignedTransaction = Uint8Array.from(genTxResponseDataBuffer); + expect(unsignedTransaction).toBeTruthy(); log.info("Received unsigned transcation"); log.debug("unsignedTransaction:", unsignedTransaction); @@ -556,9 +566,12 @@ describe("Generate and send signed transaction tests", () => { log.info("Transaction signed with bob private key"); log.debug("signedTransaction:", signedTransaction); + const signedTxBuffer = Buffer.from(signedTransaction); + const signedTxBase64 = signedTxBuffer.toString("base64"); + // 7. Send signed transfer transaction const transactionResponse = await env.apiClient.transactV1({ - signedTransaction, + signedTransaction: signedTxBase64, waitForCommit: true, baseConfig: bobConfig, }); diff --git a/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-monitoring-endpoints.test.ts b/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-monitoring-endpoints.test.ts index 1f5c36c203..aa25ae93aa 100644 --- a/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-monitoring-endpoints.test.ts +++ b/packages/cactus-plugin-ledger-connector-iroha2/src/test/typescript/integration/iroha2-monitoring-endpoints.test.ts @@ -154,9 +154,8 @@ describe("Block monitoring tests", () => { throw new Error("Unknown response type, wanted binary data"); } Checks.truthy(event.binaryBlock); - const decodedBlock = VersionedCommittedBlock.fromBuffer( - Buffer.from(event.binaryBlock), - ); + const asBuffer = Buffer.from(event.binaryBlock, "base64"); + const decodedBlock = VersionedCommittedBlock.fromBuffer(asBuffer); log.debug("decodedBlock:", decodedBlock); expect(decodedBlock.as("V1").header).toBeTruthy(); }); @@ -188,9 +187,8 @@ describe("Block monitoring tests", () => { throw new Error("Unknown response type, wanted binary data"); } Checks.truthy(event.binaryBlock); - const decodedBlock = VersionedCommittedBlock.fromBuffer( - Buffer.from(event.binaryBlock), - ); + const asBuffer = Buffer.from(event.binaryBlock, "base64"); + const decodedBlock = VersionedCommittedBlock.fromBuffer(asBuffer); decodedBlock.as("V1").transactions.forEach((tx) => { const txPayload = tx.as("V1").payload; const hashByes = computeTransactionHash(txPayload); diff --git a/packages/cactus-plugin-ledger-connector-quorum/openapitools.json b/packages/cactus-plugin-ledger-connector-quorum/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-quorum/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-quorum/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-quorum/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-quorum/src/main/json/openapi.json index 05fabd6bb0..8ca3ef3d46 100644 --- a/packages/cactus-plugin-ledger-connector-quorum/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-quorum/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Connector Quorum", "description": "Can perform basic tasks on a Quorum ledger", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-ubiquity/openapitools.json b/packages/cactus-plugin-ledger-connector-ubiquity/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-ubiquity/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-ubiquity/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-ubiquity/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-ubiquity/src/main/json/openapi.json index 30ac5f7409..fc08dd36bd 100644 --- a/packages/cactus-plugin-ledger-connector-ubiquity/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-ubiquity/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Ubiquity", "description": "Ubiquity wrapper for Hyperledger Cactus", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-ledger-connector-ubiquity/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-ubiquity/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-ubiquity/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-ubiquity/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-xdai/openapitools.json b/packages/cactus-plugin-ledger-connector-xdai/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/packages/cactus-plugin-ledger-connector-xdai/openapitools.json +++ b/packages/cactus-plugin-ledger-connector-xdai/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-ledger-connector-xdai/src/main/json/openapi.json b/packages/cactus-plugin-ledger-connector-xdai/src/main/json/openapi.json index 87807f5730..6499acdfe2 100644 --- a/packages/cactus-plugin-ledger-connector-xdai/src/main/json/openapi.json +++ b/packages/cactus-plugin-ledger-connector-xdai/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Connector Xdai", "description": "Can perform basic tasks on a Xdai ledger", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/api.ts b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/api.ts index 2c28611b0b..a702b676b8 100644 --- a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * @@ -32,112 +34,114 @@ export interface ConsistencyStrategy { * @type {ReceiptType} * @memberof ConsistencyStrategy */ - receiptType: ReceiptType; + 'receiptType': ReceiptType; /** * The amount of milliseconds to wait for the receipt to arrive to the connector. Defaults to 0 which means to wait for an unlimited amount of time. Note that this wait may be interrupted still by other parts of the infrastructure such as load balancers cutting of HTTP requests after some time even if they are the type that is supposed to be kept alive. The question of re-entrance is a broader topic not in scope to discuss here, but it is important to mention it. * @type {number} * @memberof ConsistencyStrategy */ - timeoutMs?: number; + 'timeoutMs'?: number; /** * The number of blocks to wait to be confirmed in addition to the block containing the transaction in question. Note that if the receipt type is set to only wait for node transaction pool ACK and this parameter is set to anything, but zero then the API will not accept the request due to conflicting parameters. * @type {number} * @memberof ConsistencyStrategy */ - blockConfirmations: number; + 'blockConfirmations': number; /** * The amount of time (in milliseconds) connector will wait before making another confiramtion request to the network in case of previous confiramtion request fails * @type {number} * @memberof ConsistencyStrategy */ - pollIntervalMs?: number; + 'pollIntervalMs'?: number; } + + /** * * @export * @interface ContractJSON */ export interface ContractJSON { - [key: string]: object | any; + [key: string]: any; /** * * @type {string} * @memberof ContractJSON */ - contractName: string; + 'contractName': string; /** * See https://ethereum.stackexchange.com/a/47556 regarding the maximum length of the bytecode * @type {string} * @memberof ContractJSON */ - bytecode: string; + 'bytecode': string; /** * The application binary interface of the solidity contract, optional parameter * @type {Array} * @memberof ContractJSON */ - abi: Array; + 'abi': Array; /** * * @type {string} * @memberof ContractJSON */ - metadata?: string; + 'metadata'?: string; /** * * @type {string} * @memberof ContractJSON */ - deployedBytecode?: string; + 'deployedBytecode'?: string; /** * * @type {string} * @memberof ContractJSON */ - sourceMap?: string; + 'sourceMap'?: string; /** * * @type {string} * @memberof ContractJSON */ - deployedSourceMap?: string; + 'deployedSourceMap'?: string; /** * * @type {string} * @memberof ContractJSON */ - sourcePath?: string; + 'sourcePath'?: string; /** * * @type {object} * @memberof ContractJSON */ - compiler?: object; + 'compiler'?: object; /** * * @type {object} * @memberof ContractJSON */ - networks?: object; + 'networks'?: object; /** * * @type {object} * @memberof ContractJSON */ - ast?: object; + 'ast'?: object; /** * * @type {object} * @memberof ContractJSON */ - functionHashes?: object; + 'functionHashes'?: object; /** * * @type {object} * @memberof ContractJSON */ - gasEstimates?: object; + 'gasEstimates'?: object; } /** * @@ -150,37 +154,37 @@ export interface DeployContractJsonObjectV1Request { * @type {Web3SigningCredential} * @memberof DeployContractJsonObjectV1Request */ - web3SigningCredential: Web3SigningCredential; + 'web3SigningCredential': Web3SigningCredential; /** * * @type {number} * @memberof DeployContractJsonObjectV1Request */ - gas?: number; + 'gas'?: number; /** * * @type {string} * @memberof DeployContractJsonObjectV1Request */ - gasPrice?: string; + 'gasPrice'?: string; /** * The amount of milliseconds to wait for a transaction receipt with theaddress of the contract(which indicates successful deployment) beforegiving up and crashing. * @type {number} * @memberof DeployContractJsonObjectV1Request */ - timeoutMs?: number; + 'timeoutMs'?: number; /** * * @type {ContractJSON} * @memberof DeployContractJsonObjectV1Request */ - contractJSON: ContractJSON; + 'contractJSON': ContractJSON; /** * The list of arguments to pass in to the constructor of the contract being deployed. * @type {Array} * @memberof DeployContractJsonObjectV1Request */ - constructorArgs?: Array; + 'constructorArgs'?: Array; } /** * @@ -193,43 +197,43 @@ export interface DeployContractV1Request { * @type {string} * @memberof DeployContractV1Request */ - contractName: string; + 'contractName': string; /** * * @type {Array} * @memberof DeployContractV1Request */ - constructorArgs?: Array; + 'constructorArgs'?: Array; /** * * @type {Web3SigningCredential} * @memberof DeployContractV1Request */ - web3SigningCredential: Web3SigningCredential; + 'web3SigningCredential': Web3SigningCredential; /** * The keychainId for retrieve the contracts json. * @type {string} * @memberof DeployContractV1Request */ - keychainId: string; + 'keychainId': string; /** * * @type {number} * @memberof DeployContractV1Request */ - gas?: number; + 'gas'?: number; /** * * @type {string} * @memberof DeployContractV1Request */ - gasPrice?: string; + 'gasPrice'?: string; /** * The amount of milliseconds to wait for a transaction receipt with theaddress of the contract(which indicates successful deployment) beforegiving up and crashing. * @type {number} * @memberof DeployContractV1Request */ - timeoutMs?: number; + 'timeoutMs'?: number; } /** * @@ -242,7 +246,7 @@ export interface DeployContractV1Response { * @type {Web3TransactionReceipt} * @memberof DeployContractV1Response */ - transactionReceipt: Web3TransactionReceipt; + 'transactionReceipt': Web3TransactionReceipt; } /** * @@ -255,37 +259,37 @@ export interface DeployRequestBaseV1 { * @type {ContractJSON} * @memberof DeployRequestBaseV1 */ - contractJSON: ContractJSON; + 'contractJSON': ContractJSON; /** * * @type {Array} * @memberof DeployRequestBaseV1 */ - constructorArgs?: Array; + 'constructorArgs'?: Array; /** * * @type {Web3SigningCredential} * @memberof DeployRequestBaseV1 */ - web3SigningCredential: Web3SigningCredential; + 'web3SigningCredential': Web3SigningCredential; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof DeployRequestBaseV1 */ - gas?: string | number; + 'gas'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof DeployRequestBaseV1 */ - gasPrice?: string | number; + 'gasPrice'?: XdaiTransactionConfigFrom; /** * The amount of milliseconds to wait for a transaction receipt with theaddress of the contract(which indicates successful deployment) beforegiving up and crashing. * @type {number} * @memberof DeployRequestBaseV1 */ - timeoutMs?: number; + 'timeoutMs'?: number; } /** * @@ -293,10 +297,13 @@ export interface DeployRequestBaseV1 { * @enum {string} */ -export enum EthContractInvocationType { - Send = 'SEND', - Call = 'CALL' -} +export const EthContractInvocationType = { + Send: 'SEND', + Call: 'CALL' +} as const; + +export type EthContractInvocationType = typeof EthContractInvocationType[keyof typeof EthContractInvocationType]; + /** * @@ -309,68 +316,70 @@ export interface InvokeContractJsonObjectV1Request { * @type {Web3SigningCredential} * @memberof InvokeContractJsonObjectV1Request */ - web3SigningCredential: Web3SigningCredential; + 'web3SigningCredential': Web3SigningCredential; /** * * @type {EthContractInvocationType} * @memberof InvokeContractJsonObjectV1Request */ - invocationType: EthContractInvocationType; + 'invocationType': EthContractInvocationType; /** * The name of the contract method to invoke. * @type {string} * @memberof InvokeContractJsonObjectV1Request */ - methodName: string; + 'methodName': string; /** * The list of arguments to pass in to the contract method being invoked. * @type {Array} * @memberof InvokeContractJsonObjectV1Request */ - params: Array; + 'params': Array; /** * Address of the solidity contract * @type {string} * @memberof InvokeContractJsonObjectV1Request */ - contractAddress: string; + 'contractAddress': string; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeContractJsonObjectV1Request */ - value?: string | number; + 'value'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeContractJsonObjectV1Request */ - gas?: string | number; + 'gas'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeContractJsonObjectV1Request */ - gasPrice?: string | number; + 'gasPrice'?: XdaiTransactionConfigFrom; /** * * @type {number} * @memberof InvokeContractJsonObjectV1Request */ - nonce?: number; + 'nonce'?: number; /** * The amount of milliseconds to wait for a transaction receipt beforegiving up and crashing. Only has any effect if the invocation type is SEND * @type {number} * @memberof InvokeContractJsonObjectV1Request */ - timeoutMs?: number; + 'timeoutMs'?: number; /** * * @type {ContractJSON} * @memberof InvokeContractJsonObjectV1Request */ - contractJSON: ContractJSON; + 'contractJSON': ContractJSON; } + + /** * * @export @@ -382,68 +391,70 @@ export interface InvokeContractV1Request { * @type {string} * @memberof InvokeContractV1Request */ - contractName: string; + 'contractName': string; /** * * @type {Web3SigningCredential} * @memberof InvokeContractV1Request */ - web3SigningCredential: Web3SigningCredential; + 'web3SigningCredential': Web3SigningCredential; /** * * @type {EthContractInvocationType} * @memberof InvokeContractV1Request */ - invocationType: EthContractInvocationType; + 'invocationType': EthContractInvocationType; /** * The name of the contract method to invoke. * @type {string} * @memberof InvokeContractV1Request */ - methodName: string; + 'methodName': string; /** * The list of arguments to pass in to the contract method being invoked. * @type {Array} * @memberof InvokeContractV1Request */ - params: Array; + 'params': Array; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeContractV1Request */ - value?: string | number; + 'value'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeContractV1Request */ - gas?: string | number; + 'gas'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeContractV1Request */ - gasPrice?: string | number; + 'gasPrice'?: XdaiTransactionConfigFrom; /** * * @type {number} * @memberof InvokeContractV1Request */ - nonce?: number; + 'nonce'?: number; /** * The amount of milliseconds to wait for a transaction receipt beforegiving up and crashing. Only has any effect if the invocation type is SEND * @type {number} * @memberof InvokeContractV1Request */ - timeoutMs?: number; + 'timeoutMs'?: number; /** * The keychainId for retrieve the contracts json. * @type {string} * @memberof InvokeContractV1Request */ - keychainId: string; + 'keychainId': string; } + + /** * * @export @@ -455,19 +466,19 @@ export interface InvokeContractV1Response { * @type {Web3TransactionReceipt} * @memberof InvokeContractV1Response */ - transactionReceipt?: Web3TransactionReceipt; + 'transactionReceipt'?: Web3TransactionReceipt; /** * * @type {any} * @memberof InvokeContractV1Response */ - callOutput?: any | null; + 'callOutput'?: any; /** * * @type {boolean} * @memberof InvokeContractV1Response */ - success: boolean; + 'success': boolean; } /** * @@ -480,78 +491,83 @@ export interface InvokeRequestBaseV1 { * @type {string} * @memberof InvokeRequestBaseV1 */ - contractAddress: string; + 'contractAddress': string; /** * * @type {Web3SigningCredential} * @memberof InvokeRequestBaseV1 */ - web3SigningCredential: Web3SigningCredential; + 'web3SigningCredential': Web3SigningCredential; /** * * @type {EthContractInvocationType} * @memberof InvokeRequestBaseV1 */ - invocationType: EthContractInvocationType; + 'invocationType': EthContractInvocationType; /** * The name of the contract method to invoke. * @type {string} * @memberof InvokeRequestBaseV1 */ - methodName: string; + 'methodName': string; /** * The list of arguments to pass in to the contract method being invoked. * @type {Array} * @memberof InvokeRequestBaseV1 */ - params: Array; + 'params': Array; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeRequestBaseV1 */ - value?: string | number; + 'value'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeRequestBaseV1 */ - gas?: string | number; + 'gas'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof InvokeRequestBaseV1 */ - gasPrice?: string | number; + 'gasPrice'?: XdaiTransactionConfigFrom; /** * * @type {number} * @memberof InvokeRequestBaseV1 */ - nonce?: number; + 'nonce'?: number; /** * The amount of milliseconds to wait for a transaction receipt beforegiving up and crashing. Only has any effect if the invocation type is SEND * @type {number} * @memberof InvokeRequestBaseV1 */ - timeoutMs?: number; + 'timeoutMs'?: number; /** * * @type {ContractJSON} * @memberof InvokeRequestBaseV1 */ - contractJSON: ContractJSON; + 'contractJSON': ContractJSON; } + + /** * Enumerates the possible types of receipts that can be waited for by someone or something that has requested the execution of a transaction on a ledger. * @export * @enum {string} */ -export enum ReceiptType { - NodeTxPoolAck = 'NODE_TX_POOL_ACK', - LedgerBlockAck = 'LEDGER_BLOCK_ACK' -} +export const ReceiptType = { + NodeTxPoolAck: 'NODE_TX_POOL_ACK', + LedgerBlockAck: 'LEDGER_BLOCK_ACK' +} as const; + +export type ReceiptType = typeof ReceiptType[keyof typeof ReceiptType]; + /** * @@ -564,19 +580,19 @@ export interface RunTransactionV1Request { * @type {Web3SigningCredential} * @memberof RunTransactionV1Request */ - web3SigningCredential: Web3SigningCredential; + 'web3SigningCredential': Web3SigningCredential; /** * * @type {XdaiTransactionConfig} * @memberof RunTransactionV1Request */ - transactionConfig: XdaiTransactionConfig; + 'transactionConfig': XdaiTransactionConfig; /** * * @type {ConsistencyStrategy} * @memberof RunTransactionV1Request */ - consistencyStrategy: ConsistencyStrategy; + 'consistencyStrategy': ConsistencyStrategy; } /** * @@ -589,7 +605,7 @@ export interface RunTransactionV1Response { * @type {Web3TransactionReceipt} * @memberof RunTransactionV1Response */ - transactionReceipt: Web3TransactionReceipt; + 'transactionReceipt': Web3TransactionReceipt; } /** * @@ -602,61 +618,126 @@ export interface SolidityContractJsonArtifact { * @type {string} * @memberof SolidityContractJsonArtifact */ - contractName: string; + 'contractName': string; /** * * @type {string} * @memberof SolidityContractJsonArtifact */ - metadata?: string; + 'metadata'?: string; /** * * @type {string} * @memberof SolidityContractJsonArtifact */ - bytecode?: string; + 'bytecode'?: string; /** * * @type {string} * @memberof SolidityContractJsonArtifact */ - deployedBytecode?: string; + 'deployedBytecode'?: string; /** * * @type {string} * @memberof SolidityContractJsonArtifact */ - sourceMap?: string; + 'sourceMap'?: string; /** * * @type {string} * @memberof SolidityContractJsonArtifact */ - deployedSourceMap?: string; + 'deployedSourceMap'?: string; /** * * @type {string} * @memberof SolidityContractJsonArtifact */ - sourcePath?: string; + 'sourcePath'?: string; /** * - * @type {{ [key: string]: object; }} + * @type {SolidityContractJsonArtifactCompiler} * @memberof SolidityContractJsonArtifact */ - compiler?: { [key: string]: object; }; + 'compiler'?: SolidityContractJsonArtifactCompiler; /** * - * @type {{ [key: string]: object; }} + * @type {{ [key: string]: any; }} * @memberof SolidityContractJsonArtifact */ - functionHashes?: { [key: string]: object; }; + 'functionHashes'?: { [key: string]: any; }; /** * - * @type {object} + * @type {SolidityContractJsonArtifactGasEstimates} * @memberof SolidityContractJsonArtifact */ - gasEstimates?: object; + 'gasEstimates'?: SolidityContractJsonArtifactGasEstimates; +} +/** + * + * @export + * @interface SolidityContractJsonArtifactCompiler + */ +export interface SolidityContractJsonArtifactCompiler { + [key: string]: any; + + /** + * + * @type {string} + * @memberof SolidityContractJsonArtifactCompiler + */ + 'name'?: string; + /** + * + * @type {string} + * @memberof SolidityContractJsonArtifactCompiler + */ + 'version'?: string; +} +/** + * + * @export + * @interface SolidityContractJsonArtifactGasEstimates + */ +export interface SolidityContractJsonArtifactGasEstimates { + /** + * + * @type {SolidityContractJsonArtifactGasEstimatesCreation} + * @memberof SolidityContractJsonArtifactGasEstimates + */ + 'creation'?: SolidityContractJsonArtifactGasEstimatesCreation; + /** + * + * @type {{ [key: string]: any; }} + * @memberof SolidityContractJsonArtifactGasEstimates + */ + 'external'?: { [key: string]: any; }; +} +/** + * + * @export + * @interface SolidityContractJsonArtifactGasEstimatesCreation + */ +export interface SolidityContractJsonArtifactGasEstimatesCreation { + /** + * + * @type {string} + * @memberof SolidityContractJsonArtifactGasEstimatesCreation + */ + 'codeDepositCost'?: string; + /** + * + * @type {string} + * @memberof SolidityContractJsonArtifactGasEstimatesCreation + */ + 'executionCost'?: string; + /** + * + * @type {string} + * @memberof SolidityContractJsonArtifactGasEstimatesCreation + */ + 'totalCost'?: string; } /** * @type Web3SigningCredential @@ -675,26 +756,28 @@ export interface Web3SigningCredentialCactusKeychainRef { * @type {Web3SigningCredentialType} * @memberof Web3SigningCredentialCactusKeychainRef */ - type: Web3SigningCredentialType; + 'type': Web3SigningCredentialType; /** * The ethereum account (public key) that the credential belongs to. Basically the username in the traditional terminology of authentication. * @type {string} * @memberof Web3SigningCredentialCactusKeychainRef */ - ethAccount: string; + 'ethAccount': string; /** * The key to use when looking up the the keychain entry holding the secret pointed to by the keychainEntryKey parameter. * @type {string} * @memberof Web3SigningCredentialCactusKeychainRef */ - keychainEntryKey: string; + 'keychainEntryKey': string; /** * The keychain ID to use when looking up the the keychain plugin instance that will be used to retrieve the secret pointed to by the keychainEntryKey parameter. * @type {string} * @memberof Web3SigningCredentialCactusKeychainRef */ - keychainId: string; + 'keychainId': string; } + + /** * Using this denotes that there is no signing required because the transaction is pre-signed. * @export @@ -706,8 +789,10 @@ export interface Web3SigningCredentialNone { * @type {Web3SigningCredentialType} * @memberof Web3SigningCredentialNone */ - type: Web3SigningCredentialType; + 'type': Web3SigningCredentialType; } + + /** * * @export @@ -719,32 +804,37 @@ export interface Web3SigningCredentialPrivateKeyHex { * @type {Web3SigningCredentialType} * @memberof Web3SigningCredentialPrivateKeyHex */ - type: Web3SigningCredentialType; + 'type': Web3SigningCredentialType; /** * The ethereum account (public key) that the credential belongs to. Basically the username in the traditional terminology of authentication. * @type {string} * @memberof Web3SigningCredentialPrivateKeyHex */ - ethAccount: string; + 'ethAccount': string; /** * The HEX encoded private key of an eth account. * @type {string} * @memberof Web3SigningCredentialPrivateKeyHex */ - secret: string; + 'secret': string; } + + /** * * @export * @enum {string} */ -export enum Web3SigningCredentialType { - CactusKeychainRef = 'CACTUS_KEYCHAIN_REF', - GethKeychainPassword = 'GETH_KEYCHAIN_PASSWORD', - PrivateKeyHex = 'PRIVATE_KEY_HEX', - None = 'NONE' -} +export const Web3SigningCredentialType = { + CactusKeychainRef: 'CACTUS_KEYCHAIN_REF', + GethKeychainPassword: 'GETH_KEYCHAIN_PASSWORD', + PrivateKeyHex: 'PRIVATE_KEY_HEX', + None: 'NONE' +} as const; + +export type Web3SigningCredentialType = typeof Web3SigningCredentialType[keyof typeof Web3SigningCredentialType]; + /** * @@ -752,62 +842,62 @@ export enum Web3SigningCredentialType { * @interface Web3TransactionReceipt */ export interface Web3TransactionReceipt { - [key: string]: object | any; + [key: string]: any; /** * * @type {boolean} * @memberof Web3TransactionReceipt */ - status: boolean; + 'status': boolean; /** * * @type {string} * @memberof Web3TransactionReceipt */ - transactionHash: string; + 'transactionHash': string; /** * * @type {number} * @memberof Web3TransactionReceipt */ - transactionIndex: number; + 'transactionIndex': number; /** * * @type {string} * @memberof Web3TransactionReceipt */ - blockHash: string; + 'blockHash': string; /** * * @type {number} * @memberof Web3TransactionReceipt */ - blockNumber: number; + 'blockNumber': number; /** * * @type {number} * @memberof Web3TransactionReceipt */ - gasUsed: number; + 'gasUsed': number; /** * * @type {string} * @memberof Web3TransactionReceipt */ - contractAddress?: string | null; + 'contractAddress'?: string | null; /** * * @type {string} * @memberof Web3TransactionReceipt */ - from: string; + 'from': string; /** * * @type {string} * @memberof Web3TransactionReceipt */ - to: string; + 'to': string; } /** * @@ -815,57 +905,69 @@ export interface Web3TransactionReceipt { * @interface XdaiTransactionConfig */ export interface XdaiTransactionConfig { - [key: string]: object | any; + [key: string]: any; /** * * @type {string} * @memberof XdaiTransactionConfig */ - rawTransaction?: string; + 'rawTransaction'?: string; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof XdaiTransactionConfig */ - from?: string | number; + 'from'?: XdaiTransactionConfigFrom; /** * - * @type {string} + * @type {XdaiTransactionConfigTo} * @memberof XdaiTransactionConfig */ - to?: string; + 'to'?: XdaiTransactionConfigTo; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof XdaiTransactionConfig */ - value?: string | number; + 'value'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof XdaiTransactionConfig */ - gas?: string | number; + 'gas'?: XdaiTransactionConfigFrom; /** * - * @type {string | number} + * @type {XdaiTransactionConfigFrom} * @memberof XdaiTransactionConfig */ - gasPrice?: string | number; + 'gasPrice'?: XdaiTransactionConfigFrom; /** * * @type {number} * @memberof XdaiTransactionConfig */ - nonce?: number; + 'nonce'?: number; /** * - * @type {string} + * @type {XdaiTransactionConfigTo} * @memberof XdaiTransactionConfig */ - data?: string; + 'data'?: XdaiTransactionConfigTo; } +/** + * @type XdaiTransactionConfigFrom + * @export + */ +export type XdaiTransactionConfigFrom = number | string; + +/** + * @type XdaiTransactionConfigTo + * @export + */ +export type XdaiTransactionConfigTo = string; + /** * DefaultApi - axios parameter creator @@ -880,7 +982,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deployContractJsonObjectV1: async (deployContractJsonObjectV1Request?: DeployContractJsonObjectV1Request, options: any = {}): Promise => { + deployContractJsonObjectV1: async (deployContractJsonObjectV1Request?: DeployContractJsonObjectV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-xdai/deploy-contract-solidity-bytecode-json-object`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -897,7 +999,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(deployContractJsonObjectV1Request, localVarRequestOptions, configuration) @@ -914,7 +1016,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deployContractV1: async (deployContractV1Request?: DeployContractV1Request, options: any = {}): Promise => { + deployContractV1: async (deployContractV1Request?: DeployContractV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-xdai/deploy-contract-solidity-bytecode`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -931,7 +1033,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(deployContractV1Request, localVarRequestOptions, configuration) @@ -947,7 +1049,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getPrometheusMetricsV1: async (options: any = {}): Promise => { + getPrometheusMetricsV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-xdai/get-prometheus-exporter-metrics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -962,7 +1064,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -978,7 +1080,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - invokeContractJsonObject: async (invokeContractJsonObjectV1Request?: InvokeContractJsonObjectV1Request, options: any = {}): Promise => { + invokeContractJsonObject: async (invokeContractJsonObjectV1Request?: InvokeContractJsonObjectV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-xdai/invoke-contract-json-object`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -995,7 +1097,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(invokeContractJsonObjectV1Request, localVarRequestOptions, configuration) @@ -1012,7 +1114,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - invokeContractV1: async (invokeContractV1Request?: InvokeContractV1Request, options: any = {}): Promise => { + invokeContractV1: async (invokeContractV1Request?: InvokeContractV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-xdai/invoke-contract`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1029,7 +1131,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(invokeContractV1Request, localVarRequestOptions, configuration) @@ -1046,7 +1148,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - runTransactionV1: async (runTransactionV1Request?: RunTransactionV1Request, options: any = {}): Promise => { + runTransactionV1: async (runTransactionV1Request?: RunTransactionV1Request, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-ledger-connector-xdai/run-transaction`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -1063,7 +1165,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati localVarHeaderParameter['Content-Type'] = 'application/json'; - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; localVarRequestOptions.data = serializeDataIfNeeded(runTransactionV1Request, localVarRequestOptions, configuration) @@ -1090,7 +1192,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async deployContractJsonObjectV1(deployContractJsonObjectV1Request?: DeployContractJsonObjectV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async deployContractJsonObjectV1(deployContractJsonObjectV1Request?: DeployContractJsonObjectV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.deployContractJsonObjectV1(deployContractJsonObjectV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1101,7 +1203,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.deployContractV1(deployContractV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1111,7 +1213,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getPrometheusMetricsV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getPrometheusMetricsV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getPrometheusMetricsV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1122,7 +1224,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async invokeContractJsonObject(invokeContractJsonObjectV1Request?: InvokeContractJsonObjectV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async invokeContractJsonObject(invokeContractJsonObjectV1Request?: InvokeContractJsonObjectV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.invokeContractJsonObject(invokeContractJsonObjectV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1133,7 +1235,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.invokeContractV1(invokeContractV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1144,7 +1246,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async runTransactionV1(runTransactionV1Request?: RunTransactionV1Request, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async runTransactionV1(runTransactionV1Request?: RunTransactionV1Request, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.runTransactionV1(runTransactionV1Request, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -1235,7 +1337,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public deployContractJsonObjectV1(deployContractJsonObjectV1Request?: DeployContractJsonObjectV1Request, options?: any) { + public deployContractJsonObjectV1(deployContractJsonObjectV1Request?: DeployContractJsonObjectV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).deployContractJsonObjectV1(deployContractJsonObjectV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1247,7 +1349,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: any) { + public deployContractV1(deployContractV1Request?: DeployContractV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).deployContractV1(deployContractV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1258,7 +1360,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getPrometheusMetricsV1(options?: any) { + public getPrometheusMetricsV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getPrometheusMetricsV1(options).then((request) => request(this.axios, this.basePath)); } @@ -1270,7 +1372,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public invokeContractJsonObject(invokeContractJsonObjectV1Request?: InvokeContractJsonObjectV1Request, options?: any) { + public invokeContractJsonObject(invokeContractJsonObjectV1Request?: InvokeContractJsonObjectV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).invokeContractJsonObject(invokeContractJsonObjectV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1282,7 +1384,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: any) { + public invokeContractV1(invokeContractV1Request?: InvokeContractV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).invokeContractV1(invokeContractV1Request, options).then((request) => request(this.axios, this.basePath)); } @@ -1294,7 +1396,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public runTransactionV1(runTransactionV1Request?: RunTransactionV1Request, options?: any) { + public runTransactionV1(runTransactionV1Request?: RunTransactionV1Request, options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).runTransactionV1(runTransactionV1Request, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/base.ts b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/base.ts index a40d340f8d..0964994a7c 100644 --- a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/common.ts b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/common.ts index 7cdce8249a..55cfc61de8 100644 --- a/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/packages/cactus-plugin-ledger-connector-xdai/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/packages/cactus-plugin-odap-hermes/openapitools.json b/packages/cactus-plugin-odap-hermes/openapitools.json index 03392961f6..225ff1aaae 100644 --- a/packages/cactus-plugin-odap-hermes/openapitools.json +++ b/packages/cactus-plugin-odap-hermes/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "6.3.0" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-odap-hermes/src/main/json/openapi.json b/packages/cactus-plugin-odap-hermes/src/main/json/openapi.json index ee7db4efde..3dbc323475 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/json/openapi.json +++ b/packages/cactus-plugin-odap-hermes/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Odap Hermes", "description": "Implementation for Odap and Hermes", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/README.md b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/README.md index 52f3d78b15..c04993eb32 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/README.md +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/README.md @@ -37,7 +37,7 @@ This runs all tests and packages the library. * Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions. * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets. - + ## Documentation for API Endpoints All URIs are relative to *http://localhost* @@ -64,7 +64,7 @@ Class | Method | HTTP request | Description *DefaultApi* | [**rollbackV1Message**](docs/DefaultApi.md#rollbackv1message) | **POST** /api/v1/@hyperledger/cactus-plugin-odap-hermes/rollbackmessage | - + ## Documentation for Models - [org.openapitools.client.models.AssetProfile](docs/AssetProfile.md) @@ -96,7 +96,8 @@ Class | Method | HTTP request | Description - [org.openapitools.client.models.TransferInitializationV1Response](docs/TransferInitializationV1Response.md) - + ## Documentation for Authorization -All endpoints do not require authorization. +Endpoints do not require authorization. + diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew index 4f906e0c81..aeb74cbb43 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed..ea4b7b6593 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AssetProfile.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AssetProfile.kt index d7e338ca33..d3c7e00fa7 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AssetProfile.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/AssetProfile.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1Request.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1Request.kt index 5d4a16791a..bbf1fbb1a0 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1Request.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1Request.kt @@ -20,6 +20,7 @@ import org.openapitools.client.models.ClientV1RequestClientGatewayConfiguration import org.openapitools.client.models.PayloadProfile import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1RequestClientGatewayConfiguration.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1RequestClientGatewayConfiguration.kt index 504f22e72e..ef6b9f8314 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1RequestClientGatewayConfiguration.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/ClientV1RequestClientGatewayConfiguration.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Request.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Request.kt index 47f4f961e8..502356b737 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Request.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Request.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Response.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Response.kt index 62c4cf3366..727afa6a98 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Response.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitFinalV1Response.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Request.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Request.kt index dddb775189..8373145314 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Request.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Request.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Response.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Response.kt index e7774c6a69..fb5c974147 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Response.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CommitPreparationV1Response.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CredentialProfile.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CredentialProfile.kt index 0c74f0373c..3d99d1cf90 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CredentialProfile.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/CredentialProfile.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -24,6 +25,7 @@ import com.squareup.moshi.Json * Values: sAML,oAUTH,x509 */ +@JsonClass(generateAdapter = false) enum class CredentialProfile(val value: kotlin.String) { @Json(name = "SAML") @@ -36,7 +38,7 @@ enum class CredentialProfile(val value: kotlin.String) { x509("X509"); /** - * Override toString() to avoid using the enum variable name as the value, and instead use + * Override [toString()] to avoid using the enum variable name as the value, and instead use * the actual value defined in the API spec file. * * This solves a problem when the variable name and its value are different, and ensures that diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/History.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/History.kt index 142f7c2efb..51eb5a02ad 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/History.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/History.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Request.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Request.kt index c357047911..f16479bb7d 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Request.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Request.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Response.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Response.kt index 8e8de79399..d9eb294a3c 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Response.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/LockEvidenceV1Response.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapLocalLog.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapLocalLog.kt index 0ffd5ca5a2..2137f6736d 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapLocalLog.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapLocalLog.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessage.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessage.kt index 3d25bdad4e..e5e4137e3d 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessage.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessage.kt @@ -19,6 +19,7 @@ import org.openapitools.client.models.OdapMessageActionResponse import org.openapitools.client.models.PayloadProfile import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -83,6 +84,7 @@ data class OdapMessage ( * * Values: transferInitialization,lockEvidenceVerification,commitmentEstablishment */ + @JsonClass(generateAdapter = false) enum class Phase(val value: kotlin.String) { @Json(name = "TransferInitialization") transferInitialization("TransferInitialization"), @Json(name = "LockEvidenceVerification") lockEvidenceVerification("LockEvidenceVerification"), @@ -93,6 +95,7 @@ data class OdapMessage ( * * Values: sAML,oAuth,x509 */ + @JsonClass(generateAdapter = false) enum class CredentialProfile(val value: kotlin.String) { @Json(name = "SAML") sAML("SAML"), @Json(name = "OAuth") oAuth("OAuth"), diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessageActionResponse.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessageActionResponse.kt index 85525355e8..a13d3464bd 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessageActionResponse.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/OdapMessageActionResponse.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -41,6 +42,7 @@ data class OdapMessageActionResponse ( * * Values: OK,RESOURCE_NOT_FOUND */ + @JsonClass(generateAdapter = false) enum class ResponseCode(val value: kotlin.String) { @Json(name = "200") OK("200"), @Json(name = "404") RESOURCE_NOT_FOUND("404"); diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PayloadProfile.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PayloadProfile.kt index dfc8127c0b..fdf0abc5ff 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PayloadProfile.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/PayloadProfile.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.AssetProfile import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverSuccessV1Message.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverSuccessV1Message.kt index c9283a7aa4..276b2c241d 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverSuccessV1Message.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverSuccessV1Message.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateAckV1Message.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateAckV1Message.kt index 91033eac53..067d8d4584 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateAckV1Message.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateAckV1Message.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateV1Message.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateV1Message.kt index a2469113a4..3d2e0894fa 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateV1Message.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverUpdateV1Message.kt @@ -18,6 +18,7 @@ package org.openapitools.client.models import org.openapitools.client.models.OdapLocalLog import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverV1Message.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverV1Message.kt index 7a1dbfbf2c..cc371150fb 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverV1Message.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RecoverV1Message.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackAckV1Message.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackAckV1Message.kt index 266781868c..e797025122 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackAckV1Message.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackAckV1Message.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackV1Message.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackV1Message.kt index 712b3f9bb7..ddfee9c37b 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackV1Message.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/RollbackV1Message.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SessionData.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SessionData.kt index 5beebafa1e..a8602e662f 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SessionData.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/SessionData.kt @@ -19,6 +19,7 @@ import org.openapitools.client.models.AssetProfile import org.openapitools.client.models.PayloadProfile import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -279,6 +280,7 @@ data class SessionData ( * * Values: cREATE,dELETE,lOCK,uNLOCK */ + @JsonClass(generateAdapter = false) enum class RollbackActionsPerformed(val value: kotlin.String) { @Json(name = "CREATE") cREATE("CREATE"), @Json(name = "DELETE") dELETE("DELETE"), diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Request.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Request.kt index 9b92bb5f05..a2884109eb 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Request.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Request.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Response.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Response.kt index 825ab05ab7..20487e8c4a 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Response.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCommenceV1Response.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCompleteV1Request.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCompleteV1Request.kt index 53144a87a7..29e7088a28 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCompleteV1Request.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferCompleteV1Request.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Request.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Request.kt index b024d5ef7c..bb9cc888d7 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Request.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Request.kt @@ -20,6 +20,7 @@ import org.openapitools.client.models.History import org.openapitools.client.models.PayloadProfile import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -160,6 +161,7 @@ data class TransferInitializationV1Request ( * * Values: fAUCET,tIMELOCK,hASHLOCK,hASHTIMELOCK,mULTICLAIMPC,dESTROY,bURN */ + @JsonClass(generateAdapter = false) enum class EscrowType(val value: kotlin.String) { @Json(name = "FAUCET") fAUCET("FAUCET"), @Json(name = "TIMELOCK") tIMELOCK("TIMELOCK"), diff --git a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Response.kt b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Response.kt index 4f64f38fea..1e1d3c114b 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Response.kt +++ b/packages/cactus-plugin-odap-hermes/src/main/kotlin/generated/openapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/TransferInitializationV1Response.kt @@ -17,6 +17,7 @@ package org.openapitools.client.models import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass /** * @@ -77,6 +78,7 @@ data class TransferInitializationV1Response ( * * Values: transferInitialization,lockEvidenceVerification,commitmentEstablishment */ + @JsonClass(generateAdapter = false) enum class OdapPhase(val value: kotlin.String) { @Json(name = "TransferInitialization") transferInitialization("TransferInitialization"), @Json(name = "LockEvidenceVerification") lockEvidenceVerification("LockEvidenceVerification"), diff --git a/packages/cactus-plugin-odap-hermes/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-odap-hermes/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index e7e42a4b58..cd802a1ec4 100644 --- a/packages/cactus-plugin-odap-hermes/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-odap-hermes/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-persistence-ethereum/openapitools.json b/packages/cactus-plugin-persistence-ethereum/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/packages/cactus-plugin-persistence-ethereum/openapitools.json +++ b/packages/cactus-plugin-persistence-ethereum/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-persistence-ethereum/package.json b/packages/cactus-plugin-persistence-ethereum/package.json index b0fee5c929..b0cb931554 100644 --- a/packages/cactus-plugin-persistence-ethereum/package.json +++ b/packages/cactus-plugin-persistence-ethereum/package.json @@ -73,10 +73,12 @@ "@hyperledger/cactus-core-api": "2.0.0-alpha.1", "@hyperledger/cactus-plugin-ledger-connector-go-ethereum-socketio": "2.0.0-alpha.1", "@hyperledger/cactus-test-tooling": "2.0.0-alpha.1", + "@openapitools/openapi-generator-cli": "2.4.14", "@types/express": "4.17.13", "@types/pg": "8.6.5", "@types/sanitize-html": "2.9.0", "jest-extended": "4.0.1", + "npm-run-all": "4.1.5", "rxjs": "7.8.1", "web3": "1.6.1", "web3-core": "1.6.1", diff --git a/packages/cactus-plugin-persistence-ethereum/src/main/json/openapi.json b/packages/cactus-plugin-persistence-ethereum/src/main/json/openapi.json index 2f787f8b5b..dbd51877b3 100644 --- a/packages/cactus-plugin-persistence-ethereum/src/main/json/openapi.json +++ b/packages/cactus-plugin-persistence-ethereum/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Persistence Ethereum", "description": "Synchronizes state of an ethereum ledger into a DB that can later be viewed in GUI", "version": "1.0.0", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/api.ts b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/api.ts index cd1d4b3eda..a174bf7584 100644 --- a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,13 +13,15 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; /** * @@ -32,13 +34,13 @@ export interface ErrorExceptionResponseV1 { * @type {string} * @memberof ErrorExceptionResponseV1 */ - message: string; + 'message': string; /** * * @type {string} * @memberof ErrorExceptionResponseV1 */ - error: string; + 'error': string; } /** * Ethereum tokens that are being monitored by the persistence plugin. @@ -51,20 +53,22 @@ export interface MonitoredToken { * @type {TokenTypeV1} * @memberof MonitoredToken */ - type: TokenTypeV1; + 'type': TokenTypeV1; /** * Token name * @type {string} * @memberof MonitoredToken */ - name: string; + 'name': string; /** * Token symbol * @type {string} * @memberof MonitoredToken */ - symbol: string; + 'symbol': string; } + + /** * Response with plugin status report. * @export @@ -76,43 +80,43 @@ export interface StatusResponseV1 { * @type {string} * @memberof StatusResponseV1 */ - instanceId: string; + 'instanceId': string; /** * True if successfully connected to the database, false otherwise. * @type {boolean} * @memberof StatusResponseV1 */ - connected: boolean; + 'connected': boolean; /** * True if web services were correctly exported. * @type {boolean} * @memberof StatusResponseV1 */ - webServicesRegistered: boolean; + 'webServicesRegistered': boolean; /** * Total number of tokens being monitored by the plugin. * @type {number} * @memberof StatusResponseV1 */ - monitoredTokensCount: number; + 'monitoredTokensCount': number; /** * * @type {Array} * @memberof StatusResponseV1 */ - operationsRunning: Array; + 'operationsRunning': Array; /** * True if block monitoring is running, false otherwise. * @type {boolean} * @memberof StatusResponseV1 */ - monitorRunning: boolean; + 'monitorRunning': boolean; /** * Number of the last block seen by the block monitor. * @type {number} * @memberof StatusResponseV1 */ - lastSeenBlock: number; + 'lastSeenBlock': number; } /** * @@ -120,16 +124,19 @@ export interface StatusResponseV1 { * @enum {string} */ -export enum TokenTypeV1 { +export const TokenTypeV1 = { /** * EIP-20: Token Standard */ - ERC20 = 'erc20', + ERC20: 'erc20', /** * EIP-721: Non-Fungible Token Standard */ - ERC721 = 'erc721' -} + ERC721: 'erc721' +} as const; + +export type TokenTypeV1 = typeof TokenTypeV1[keyof typeof TokenTypeV1]; + /** * Persistence plugin operation that is tracked and returned in status report. @@ -142,13 +149,13 @@ export interface TrackedOperationV1 { * @type {string} * @memberof TrackedOperationV1 */ - startAt: string; + 'startAt': string; /** * Operation name. * @type {string} * @memberof TrackedOperationV1 */ - operation: string; + 'operation': string; } /** @@ -163,7 +170,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getStatusV1: async (options: any = {}): Promise => { + getStatusV1: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/v1/plugins/@hyperledger/cactus-plugin-persistence-ethereum/status`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -178,7 +185,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati - setSearchParams(localVarUrlObj, localVarQueryParameter, options.query); + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -203,7 +210,7 @@ export const DefaultApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getStatusV1(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async getStatusV1(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.getStatusV1(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -243,7 +250,7 @@ export class DefaultApi extends BaseAPI { * @throws {RequiredError} * @memberof DefaultApi */ - public getStatusV1(options?: any) { + public getStatusV1(options?: AxiosRequestConfig) { return DefaultApiFp(this.configuration).getStatusV1(options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/base.ts b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/base.ts index 6c24950d94..497c037c0d 100644 --- a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/common.ts b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/common.ts index c99f95a4ae..fe0742f1df 100644 --- a/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/packages/cactus-plugin-persistence-ethereum/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/packages/cactus-plugin-persistence-fabric/openapitools.json b/packages/cactus-plugin-persistence-fabric/openapitools.json index 601ac1d61f..225ff1aaae 100644 --- a/packages/cactus-plugin-persistence-fabric/openapitools.json +++ b/packages/cactus-plugin-persistence-fabric/openapitools.json @@ -2,6 +2,6 @@ "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "5.2.1" + "version": "6.6.0" } } diff --git a/packages/cactus-plugin-persistence-fabric/src/main/json/openapi.json b/packages/cactus-plugin-persistence-fabric/src/main/json/openapi.json index 7b103b21d4..15b469bfde 100644 --- a/packages/cactus-plugin-persistence-fabric/src/main/json/openapi.json +++ b/packages/cactus-plugin-persistence-fabric/src/main/json/openapi.json @@ -1,12 +1,12 @@ { - "openapi": "3.1.0", + "openapi": "3.0.3", "info": { "title": "Hyperledger Cactus Plugin - Block Fabrick PErsistance", "description": "Scrap fabric ledger into database. Needs administrative privileges.", "version": "0.0.1", "license": { "name": "Apache-2.0", - "identifier": "Apache-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0.html" } }, diff --git a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION index 804440660c..cd802a1ec4 100644 --- a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION +++ b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1 \ No newline at end of file +6.6.0 \ No newline at end of file diff --git a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts index b294f7e201..9799d2df62 100644 --- a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts +++ b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/api.ts @@ -13,12 +13,14 @@ */ -import { Configuration } from './configuration'; -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { Configuration } from './configuration'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; // Some imports not used depending on template conditions // @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common'; +import type { RequestArgs } from './base'; // @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; +import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base'; diff --git a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts index 483fb669b0..12466a4da4 100644 --- a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts +++ b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/base.ts @@ -13,10 +13,11 @@ */ -import { Configuration } from "./configuration"; +import type { Configuration } from './configuration'; // Some imports not used depending on template conditions // @ts-ignore -import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; +import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios'; +import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); @@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = { */ export interface RequestArgs { url: string; - options: any; + options: AxiosRequestConfig; } /** @@ -64,8 +65,8 @@ export class BaseAPI { * @extends {Error} */ export class RequiredError extends Error { - name: "RequiredError" = "RequiredError"; constructor(public field: string, msg?: string) { super(msg); + this.name = "RequiredError" } } diff --git a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts index 5cb370a6d0..7a66660663 100644 --- a/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts +++ b/packages/cactus-plugin-persistence-fabric/src/main/typescript/generated/openapi/typescript-axios/common.ts @@ -13,9 +13,10 @@ */ -import { Configuration } from "./configuration"; -import { RequiredError,　RequestArgs } from "./base"; -import { AxiosInstance } from 'axios'; +import type { Configuration } from "./configuration"; +import type { RequestArgs } from "./base"; +import type { AxiosInstance, AxiosResponse } from 'axios'; +import { RequiredError } from "./base"; /** * @@ -83,24 +84,35 @@ export const setOAuthToObject = async function (object: any, name: string, scope } } +function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void { + if (parameter == null) return; + if (typeof parameter === "object") { + if (Array.isArray(parameter)) { + (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key)); + } + else { + Object.keys(parameter).forEach(currentKey => + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) + ); + } + } + else { + if (urlSearchParams.has(key)) { + urlSearchParams.append(key, parameter); + } + else { + urlSearchParams.set(key, parameter); + } + } +} + /** * * @export */ export const setSearchParams = function (url: URL, ...objects: any[]) { const searchParams = new URLSearchParams(url.search); - for (const object of objects) { - for (const key in object) { - if (Array.isArray(object[key])) { - searchParams.delete(key); - for (const item of object[key]) { - searchParams.append(key, item); - } - } else { - searchParams.set(key, object[key]); - } - } - } + setFlattenedQueryParams(searchParams, objects); url.search = searchParams.toString(); } @@ -131,8 +143,8 @@ export const toPathString = function (url: URL) { * @export */ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs); }; } diff --git a/yarn.lock b/yarn.lock index 5c79bad76c..c6faa0d89f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7450,12 +7450,14 @@ __metadata: "@hyperledger/cactus-core-api": 2.0.0-alpha.1 "@hyperledger/cactus-plugin-ledger-connector-go-ethereum-socketio": 2.0.0-alpha.1 "@hyperledger/cactus-test-tooling": 2.0.0-alpha.1 + "@openapitools/openapi-generator-cli": 2.4.14 "@types/express": 4.17.13 "@types/pg": 8.6.5 "@types/sanitize-html": 2.9.0 async-mutex: 0.4.0 fast-safe-stringify: 2.1.1 jest-extended: 4.0.1 + npm-run-all: 4.1.5 pg: 8.8.0 run-time-error: 1.4.0 rxjs: 7.8.1 @@ -8785,6 +8787,31 @@ __metadata: languageName: node linkType: hard +"@nestjs/common@npm:8.2.0": + version: 8.2.0 + resolution: "@nestjs/common@npm:8.2.0" + dependencies: + axios: 0.24.0 + iterare: 1.2.1 + tslib: 2.3.1 + uuid: 8.3.2 + peerDependencies: + cache-manager: "*" + class-transformer: "*" + class-validator: "*" + reflect-metadata: ^0.1.12 + rxjs: ^7.1.0 + peerDependenciesMeta: + cache-manager: + optional: true + class-transformer: + optional: true + class-validator: + optional: true + checksum: d6adb3862ac4583d8ed0d71d9044db3070debac7680c4b6438b003753240ee4b4f8b885eb1d06e878fd177748b50539e760b4da08f5ea323717c768b774f1e56 + languageName: node + linkType: hard + "@nestjs/common@npm:9.3.11": version: 9.3.11 resolution: "@nestjs/common@npm:9.3.11" @@ -8809,6 +8836,35 @@ __metadata: languageName: node linkType: hard +"@nestjs/core@npm:8.2.0": + version: 8.2.0 + resolution: "@nestjs/core@npm:8.2.0" + dependencies: + "@nuxtjs/opencollective": 0.3.2 + fast-safe-stringify: 2.1.1 + iterare: 1.2.1 + object-hash: 2.2.0 + path-to-regexp: 3.2.0 + tslib: 2.3.1 + uuid: 8.3.2 + peerDependencies: + "@nestjs/common": ^8.0.0 + "@nestjs/microservices": ^8.0.0 + "@nestjs/platform-express": ^8.0.0 + "@nestjs/websockets": ^8.0.0 + reflect-metadata: ^0.1.12 + rxjs: ^7.1.0 + peerDependenciesMeta: + "@nestjs/microservices": + optional: true + "@nestjs/platform-express": + optional: true + "@nestjs/websockets": + optional: true + checksum: 31acfa500f3093905ea9d0173a20b448c93a072b46c7701f7a76089e70efc019877cdb7c2b0b11a27fc4427474aa985f2a8e2c50838e965010b96ae3ee5a1d80 + languageName: node + linkType: hard + "@nestjs/core@npm:9.3.11": version: 9.3.11 resolution: "@nestjs/core@npm:9.3.11" @@ -9599,6 +9655,31 @@ __metadata: languageName: node linkType: hard +"@openapitools/openapi-generator-cli@npm:2.4.14": + version: 2.4.14 + resolution: "@openapitools/openapi-generator-cli@npm:2.4.14" + dependencies: + "@nestjs/common": 8.2.0 + "@nestjs/core": 8.2.0 + "@nuxtjs/opencollective": 0.3.2 + chalk: 4.1.2 + commander: 8.3.0 + compare-versions: 3.6.0 + concurrently: 6.3.0 + console.table: 0.10.0 + fs-extra: 10.0.0 + glob: 7.1.6 + inquirer: 8.2.0 + lodash: 4.17.21 + reflect-metadata: 0.1.13 + rxjs: 7.4.0 + tslib: 2.0.3 + bin: + openapi-generator-cli: main.js + checksum: 619ce8ed58f917981e2c7e185ce9abbdbcf35da099521786a4c8cca6a8169e9e4b1d041c996ec01d79076fe764a752d433bb98e26489087ccacb8496764a9119 + languageName: node + linkType: hard + "@openapitools/openapi-generator-cli@npm:2.7.0": version: 2.7.0 resolution: "@openapitools/openapi-generator-cli@npm:2.7.0" @@ -17982,6 +18063,24 @@ __metadata: languageName: node linkType: hard +"concurrently@npm:6.3.0": + version: 6.3.0 + resolution: "concurrently@npm:6.3.0" + dependencies: + chalk: ^4.1.0 + date-fns: ^2.16.1 + lodash: ^4.17.21 + rxjs: ^6.6.3 + spawn-command: ^0.0.2-1 + supports-color: ^8.1.0 + tree-kill: ^1.2.2 + yargs: ^16.2.0 + bin: + concurrently: bin/concurrently.js + checksum: fb68236899259a3b0c05d27db608ee9150f11fc785552c14937e5e1421c9448d03704cdc2acb5f842a91c465d50005b4229f348eb9594d84cbef54e5a93ffde7 + languageName: node + linkType: hard + "concurrently@npm:6.5.1": version: 6.5.1 resolution: "concurrently@npm:6.5.1" @@ -24163,6 +24262,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:10.0.0": + version: 10.0.0 + resolution: "fs-extra@npm:10.0.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^6.0.1 + universalify: ^2.0.0 + checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a + languageName: node + linkType: hard + "fs-extra@npm:10.1.0, fs-extra@npm:^10.1.0": version: 10.1.0 resolution: "fs-extra@npm:10.1.0" @@ -26763,6 +26873,28 @@ __metadata: languageName: node linkType: hard +"inquirer@npm:8.2.0": + version: 8.2.0 + resolution: "inquirer@npm:8.2.0" + dependencies: + ansi-escapes: ^4.2.1 + chalk: ^4.1.1 + cli-cursor: ^3.1.0 + cli-width: ^3.0.0 + external-editor: ^3.0.3 + figures: ^3.0.0 + lodash: ^4.17.21 + mute-stream: 0.0.8 + ora: ^5.4.1 + run-async: ^2.4.0 + rxjs: ^7.2.0 + string-width: ^4.1.0 + strip-ansi: ^6.0.0 + through: ^2.3.6 + checksum: 861d1a9324ae933b49126b3541d94e4d6a2f2a25411b3f3cc00c34bf1bdab34146362d702cf289efe6d8034900dc5905bcf2ea716092a02b6fc390e5986dd236 + languageName: node + linkType: hard + "inquirer@npm:8.2.4, inquirer@npm:^8.2.4": version: 8.2.4 resolution: "inquirer@npm:8.2.4" @@ -34089,6 +34221,13 @@ __metadata: languageName: node linkType: hard +"object-hash@npm:2.2.0": + version: 2.2.0 + resolution: "object-hash@npm:2.2.0" + checksum: 55ba841e3adce9c4f1b9b46b41983eda40f854e0d01af2802d3ae18a7085a17168d6b81731d43fdf1d6bcbb3c9f9c56d22c8fea992203ad90a38d7d919bc28f1 + languageName: node + linkType: hard + "object-hash@npm:^3.0.0": version: 3.0.0 resolution: "object-hash@npm:3.0.0" @@ -38737,6 +38876,15 @@ __metadata: languageName: node linkType: hard +"rxjs@npm:7.4.0": + version: 7.4.0 + resolution: "rxjs@npm:7.4.0" + dependencies: + tslib: ~2.1.0 + checksum: 6b33172a760dcad6882fdc836ee8cf1ebe160dd7eaad95c45a12338ffdaa96eb41e48e6c25bbd3d1fdf45075949ff447954bc17a9d01c688558a67967d09c114 + languageName: node + linkType: hard + "rxjs@npm:7.8.0": version: 7.8.0 resolution: "rxjs@npm:7.8.0" @@ -38746,7 +38894,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:7.8.1, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5": +"rxjs@npm:7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -42881,6 +43029,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:~2.1.0": + version: 2.1.0 + resolution: "tslib@npm:2.1.0" + checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78 + languageName: node + linkType: hard + "tslib@npm:~2.4.0": version: 2.4.1 resolution: "tslib@npm:2.4.1"