diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 90e4201..a4b6296 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -5,6 +5,5 @@ - \ No newline at end of file diff --git a/property/.husky/pre-commit b/property/.husky/pre-commit deleted file mode 100644 index 3efbda8..0000000 --- a/property/.husky/pre-commit +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - - -npx --no-install lint-staged diff --git a/property/.jhipster/Property.json b/property/.jhipster/Property.json index 49eea85..6824b4f 100644 --- a/property/.jhipster/Property.json +++ b/property/.jhipster/Property.json @@ -1,11 +1,10 @@ { "annotations": { - "changelogDate": "20240417193556" + "changelogDate": "20240420155515" }, - "applications": ["KariaMain", "property"], + "applications": ["property"], "clientRootFolder": "property", "databaseType": "sql", - "documentation": "Entities for property Microservice", "entityTableName": "property", "fields": [ { diff --git a/property/.jhipster/Review.json b/property/.jhipster/Review.json index 65e62f9..5deeee2 100644 --- a/property/.jhipster/Review.json +++ b/property/.jhipster/Review.json @@ -1,8 +1,8 @@ { "annotations": { - "changelogDate": "20240417193756" + "changelogDate": "20240420155715" }, - "applications": ["KariaMain", "property"], + "applications": ["property"], "clientRootFolder": "property", "databaseType": "sql", "entityTableName": "review", diff --git a/property/.jhipster/Tag.json b/property/.jhipster/Tag.json index e231d05..7d13874 100644 --- a/property/.jhipster/Tag.json +++ b/property/.jhipster/Tag.json @@ -1,8 +1,8 @@ { "annotations": { - "changelogDate": "20240417193656" + "changelogDate": "20240420155615" }, - "applications": ["KariaMain", "property"], + "applications": ["property"], "clientRootFolder": "property", "databaseType": "sql", "entityTableName": "tag", diff --git a/property/.lintstagedrc.cjs b/property/.lintstagedrc.cjs deleted file mode 100644 index 5946e44..0000000 --- a/property/.lintstagedrc.cjs +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - '{,**/}*.{md,json,yml,html,java}': ['prettier --write'], -}; diff --git a/property/.yo-rc.json b/property/.yo-rc.json index 9498f07..32e5067 100644 --- a/property/.yo-rc.json +++ b/property/.yo-rc.json @@ -1,6 +1,6 @@ { "generator-jhipster": { - "applicationIndex": 1, + "applicationIndex": 0, "applicationType": "microservice", "authenticationType": "jwt", "baseName": "property", @@ -8,10 +8,9 @@ "cacheProvider": "hazelcast", "entities": ["Property", "Tag", "Review"], "jhipsterVersion": "8.1.0", - "jwtSecretKey": "OTA5MjVhOGJjMzM1M2EwM2E2NDAzNzdlOWE4ZWQxZmM5ODdjMjc2MjlmNWQ2ZDk3NGFhYTRkMGJkMzBkNTM3NzMzNWJhOTk1MzhjNjU4NmE2YmNiYWNjMmFjYjkyZjczZGEyOTk4ZDI2MzFmNmRlYjVhNTkxNTY3NTdlODA1YWM=", + "jwtSecretKey": "NjgyMWRjZTE4ZjYxOWU1MGQ3NDc4Y2FlZTAyNWY0ZDZhYWE2NDhlYWYyOWU5NjVjZGVlMGE1NTU1OWFiMTI5YWQ0Y2QyZmE3NWZkZjQ0NDdkZTk3MWY5MTg0ZWJmNmU0NGI0ZjhiZDZlZWQ3ODM0MTk2ZWJiNmExZmE3Zjk4ZjU=", "languages": ["en"], - "lastLiquibaseTimestamp": 1713382676000, - "messageBroker": "kafka", + "lastLiquibaseTimestamp": 1713628635000, "monorepository": true, "nativeLanguage": "en", "packageFolder": "com/jhipster/demo/product", diff --git a/property/package-lock.json b/property/package-lock.json index 1ac4ded..4e27394 100644 --- a/property/package-lock.json +++ b/property/package-lock.json @@ -9,12 +9,7 @@ "version": "0.0.0", "license": "UNLICENSED", "devDependencies": { - "generator-jhipster": "8.1.0", - "husky": "8.0.3", - "lint-staged": "15.2.0", - "prettier": "3.1.0", - "prettier-plugin-java": "2.5.0", - "prettier-plugin-packagejson": "2.4.7" + "generator-jhipster": "8.1.0" }, "engines": { "node": ">=18.18.2" @@ -375,6 +370,18 @@ "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -1815,17 +1822,38 @@ } }, "node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, "engines": { - "node": ">=12" + "node": ">=8" }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/ansi-styles/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/ansi-styles/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "node_modules/aproba": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", @@ -2462,72 +2490,6 @@ "node": ">= 0.2.0" } }, - "node_modules/cli-truncate": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", - "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", - "dev": true, - "dependencies": { - "slice-ansi": "^5.0.0", - "string-width": "^7.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", - "dev": true - }, - "node_modules/cli-truncate/node_modules/string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", - "dev": true, - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/cli-width": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", @@ -2605,12 +2567,6 @@ "color-support": "bin.js" } }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true - }, "node_modules/colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", @@ -3672,21 +3628,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/eslint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/eslint/node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3713,24 +3654,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/eslint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/eslint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -4394,18 +4317,6 @@ } } }, - "node_modules/get-east-asian-width": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", - "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", - "dev": true, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/get-intrinsic": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", @@ -4878,21 +4789,6 @@ "node": ">=16.17.0" } }, - "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", - "dev": true, - "bin": { - "husky": "lib/bin.js" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/typicode" - } - }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -5040,21 +4936,6 @@ "node": ">=18" } }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/inquirer/node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -5090,24 +4971,6 @@ "ieee754": "^1.1.13" } }, - "node_modules/inquirer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/inquirer/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/inquirer/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -5273,21 +5136,6 @@ "node": ">=6" } }, - "node_modules/insight/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/insight/node_modules/atomically": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz", @@ -5331,24 +5179,6 @@ "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", "dev": true }, - "node_modules/insight/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/insight/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/insight/node_modules/conf": { "version": "10.2.0", "resolved": "https://registry.npmjs.org/conf/-/conf-10.2.0.tgz", @@ -5480,21 +5310,6 @@ "node": ">=4" } }, - "node_modules/insight/node_modules/inquirer/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/insight/node_modules/inquirer/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, "node_modules/insight/node_modules/inquirer/node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -5878,15 +5693,12 @@ } }, "node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/is-glob": { @@ -6229,21 +6041,6 @@ "node": ">=10" } }, - "node_modules/jake/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/jake/node_modules/async": { "version": "3.2.5", "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", @@ -6276,24 +6073,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jake/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jake/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/jake/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -6543,126 +6322,6 @@ "node": ">= 0.8.0" } }, - "node_modules/lilconfig": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", - "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", - "dev": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/lint-staged": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.0.tgz", - "integrity": "sha512-TFZzUEV00f+2YLaVPWBWGAMq7So6yQx+GG8YRMDeOEIf95Zn5RyiLMsEiX4KTNl9vq/w+NqRJkLA1kPIo15ufQ==", - "dev": true, - "dependencies": { - "chalk": "5.3.0", - "commander": "11.1.0", - "debug": "4.3.4", - "execa": "8.0.1", - "lilconfig": "3.0.0", - "listr2": "8.0.0", - "micromatch": "4.0.5", - "pidtree": "0.6.0", - "string-argv": "0.3.2", - "yaml": "2.3.4" - }, - "bin": { - "lint-staged": "bin/lint-staged.js" - }, - "engines": { - "node": ">=18.12.0" - }, - "funding": { - "url": "https://opencollective.com/lint-staged" - } - }, - "node_modules/listr2": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.0.tgz", - "integrity": "sha512-u8cusxAcyqAiQ2RhYvV7kRKNLgUvtObIbhOX2NCXqvp1UU32xIg5CT22ykS2TPKJXZWJwtK3IKLiqAGlGNE+Zg==", - "dev": true, - "dependencies": { - "cli-truncate": "^4.0.0", - "colorette": "^2.0.20", - "eventemitter3": "^5.0.1", - "log-update": "^6.0.0", - "rfdc": "^1.3.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/listr2/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/listr2/node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", - "dev": true - }, - "node_modules/listr2/node_modules/string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", - "dev": true, - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/listr2/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/listr2/node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -6718,196 +6377,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-update": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", - "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", - "dev": true, - "dependencies": { - "ansi-escapes": "^6.2.0", - "cli-cursor": "^4.0.0", - "slice-ansi": "^7.0.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/ansi-escapes": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", - "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/log-update/node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "dependencies": { - "restore-cursor": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", - "dev": true - }, - "node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", - "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", - "dev": true, - "dependencies": { - "get-east-asian-width": "^1.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/log-update/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/log-update/node_modules/slice-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", - "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/log-update/node_modules/string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", - "dev": true, - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/log-update/node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/logform": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz", @@ -8337,18 +7806,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pidtree": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", - "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", - "dev": true, - "bin": { - "pidtree": "bin/pidtree.js" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/pkg-up": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", @@ -9112,12 +8569,6 @@ "node": ">=0.10.0" } }, - "node_modules/rfdc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", - "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", - "dev": true - }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -9574,22 +9025,6 @@ "node": ">=8" } }, - "node_modules/slice-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", - "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.0.0", - "is-fullwidth-code-point": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, "node_modules/smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", @@ -9819,15 +9254,6 @@ "safe-buffer": "~5.2.0" } }, - "node_modules/string-argv": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", - "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", - "dev": true, - "engines": { - "node": ">=0.6.19" - } - }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -9857,24 +9283,6 @@ "node": ">=8" } }, - "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/string.prototype.trim": { "version": "1.2.9", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", @@ -11096,72 +10504,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/property/package.json b/property/package.json index 4184113..60f634b 100644 --- a/property/package.json +++ b/property/package.json @@ -26,8 +26,6 @@ "docker:consul:up": "docker compose -f src/main/docker/consul.yml up --wait", "docker:db:down": "docker compose -f src/main/docker/mysql.yml down -v", "docker:db:up": "docker compose -f src/main/docker/mysql.yml up --wait", - "docker:kafka:down": "docker compose -f src/main/docker/kafka.yml down -v", - "docker:kafka:up": "docker compose -f src/main/docker/kafka.yml up --wait", "java:docker": "./mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild", "java:docker:arm64": "npm run java:docker -- -Djib-maven-plugin.architecture=arm64", "java:docker:dev": "npm run java:docker -- -Pdev,webapp", diff --git a/property/pom.xml b/property/pom.xml index f8d9913..d003952 100644 --- a/property/pom.xml +++ b/property/pom.xml @@ -278,19 +278,6 @@ org.springframework.cloud spring-cloud-starter-consul-discovery - - org.springframework.cloud - spring-cloud-starter-stream-kafka - - - org.springframework.cloud - spring-cloud-stream - - - org.springframework.cloud - spring-cloud-stream-test-binder - test - org.springframework.retry spring-retry @@ -300,26 +287,11 @@ jdbc test - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - kafka - test - org.testcontainers mysql test - - org.testcontainers - testcontainers - test - diff --git a/property/src/main/docker/app.yml b/property/src/main/docker/app.yml index c06221a..aaafa64 100644 --- a/property/src/main/docker/app.yml +++ b/property/src/main/docker/app.yml @@ -11,7 +11,6 @@ services: - SPRING_CLOUD_CONSUL_PORT=8500 - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/property?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - SPRING_LIQUIBASE_URL=jdbc:mysql://mysql:3306/property?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true - - SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=kafka:9092 healthcheck: test: - CMD @@ -36,11 +35,3 @@ services: extends: file: ./consul.yml service: consul-config-loader - kafka: - extends: - file: ./kafka.yml - service: kafka - zookeeper: - extends: - file: ./kafka.yml - service: zookeeper diff --git a/property/src/main/docker/central-server-config/application.yml b/property/src/main/docker/central-server-config/application.yml index 17d4cf9..b3eb5ae 100644 --- a/property/src/main/docker/central-server-config/application.yml +++ b/property/src/main/docker/central-server-config/application.yml @@ -7,4 +7,4 @@ jhipster: authentication: jwt: # secret key which should be base64 encoded and changed in production - base64-secret: OTA5MjVhOGJjMzM1M2EwM2E2NDAzNzdlOWE4ZWQxZmM5ODdjMjc2MjlmNWQ2ZDk3NGFhYTRkMGJkMzBkNTM3NzMzNWJhOTk1MzhjNjU4NmE2YmNiYWNjMmFjYjkyZjczZGEyOTk4ZDI2MzFmNmRlYjVhNTkxNTY3NTdlODA1YWM= + base64-secret: NjgyMWRjZTE4ZjYxOWU1MGQ3NDc4Y2FlZTAyNWY0ZDZhYWE2NDhlYWYyOWU5NjVjZGVlMGE1NTU1OWFiMTI5YWQ0Y2QyZmE3NWZkZjQ0NDdkZTk3MWY5MTg0ZWJmNmU0NGI0ZjhiZDZlZWQ3ODM0MTk2ZWJiNmExZmE3Zjk4ZjU= diff --git a/property/src/main/docker/jhipster-control-center.yml b/property/src/main/docker/jhipster-control-center.yml index d2727d3..88f6fb3 100644 --- a/property/src/main/docker/jhipster-control-center.yml +++ b/property/src/main/docker/jhipster-control-center.yml @@ -42,7 +42,7 @@ services: - SPRING_PROFILES_ACTIVE=prod,api-docs,none - SPRING_SECURITY_USER_PASSWORD=admin # The token should have the same value than the one declared in you Spring configuration under the jhipster.security.authentication.jwt.base64-secret configuration's entry - - JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET=OTA5MjVhOGJjMzM1M2EwM2E2NDAzNzdlOWE4ZWQxZmM5ODdjMjc2MjlmNWQ2ZDk3NGFhYTRkMGJkMzBkNTM3NzMzNWJhOTk1MzhjNjU4NmE2YmNiYWNjMmFjYjkyZjczZGEyOTk4ZDI2MzFmNmRlYjVhNTkxNTY3NTdlODA1YWM= + - JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET=NjgyMWRjZTE4ZjYxOWU1MGQ3NDc4Y2FlZTAyNWY0ZDZhYWE2NDhlYWYyOWU5NjVjZGVlMGE1NTU1OWFiMTI5YWQ0Y2QyZmE3NWZkZjQ0NDdkZTk3MWY5MTg0ZWJmNmU0NGI0ZjhiZDZlZWQ3ODM0MTk2ZWJiNmExZmE3Zjk4ZjU= - SPRING_CLOUD_CONSUL_HOST=host.docker.internal - SPRING_CLOUD_CONSUL_PORT=8500 - LOGGING_FILE_NAME=/tmp/jhipster-control-center.log diff --git a/property/src/main/docker/kafka.yml b/property/src/main/docker/kafka.yml deleted file mode 100644 index 969088b..0000000 --- a/property/src/main/docker/kafka.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This configuration is intended for development purpose, it's **your** responsibility to harden it for production -name: property -services: - kafka: - image: confluentinc/cp-kafka:7.5.2 - # If you want to expose these ports outside your dev PC, - # remove the "127.0.0.1:" prefix - ports: - - 127.0.0.1:9092:9092 - environment: - KAFKA_BROKER_ID: 1 - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT - KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 - KAFKA_ADVERTISED_HOST_NAME: kafka - zookeeper: - image: confluentinc/cp-zookeeper:7.5.2 - environment: - ZOOKEEPER_CLIENT_PORT: 2181 - ZOOKEEPER_TICK_TIME: 2000 diff --git a/property/src/main/docker/services.yml b/property/src/main/docker/services.yml index 771d06a..fa72471 100644 --- a/property/src/main/docker/services.yml +++ b/property/src/main/docker/services.yml @@ -13,11 +13,3 @@ services: extends: file: ./consul.yml service: consul-config-loader - kafka: - extends: - file: ./kafka.yml - service: kafka - zookeeper: - extends: - file: ./kafka.yml - service: zookeeper diff --git a/property/src/main/java/com/jhipster/demo/product/ApplicationWebXml.java b/property/src/main/java/com/jhipster/demo/product/ApplicationWebXml.java index 653f4fc..59ec52d 100644 --- a/property/src/main/java/com/jhipster/demo/product/ApplicationWebXml.java +++ b/property/src/main/java/com/jhipster/demo/product/ApplicationWebXml.java @@ -10,6 +10,7 @@ */ public class ApplicationWebXml extends SpringBootServletInitializer { + @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { // set a default to use when no profile is configured. diff --git a/property/src/main/java/com/jhipster/demo/product/broker/KafkaConsumer.java b/property/src/main/java/com/jhipster/demo/product/broker/KafkaConsumer.java deleted file mode 100644 index d0ea898..0000000 --- a/property/src/main/java/com/jhipster/demo/product/broker/KafkaConsumer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.jhipster.demo.product.broker; - -import static org.springframework.web.servlet.mvc.method.annotation.SseEmitter.event; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.function.Consumer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; - -@Component -public class KafkaConsumer implements Consumer { - - private final Logger log = LoggerFactory.getLogger(KafkaConsumer.class); - - private Map emitters = new HashMap<>(); - - public SseEmitter register(String key) { - log.debug("Registering sse client for {}", key); - SseEmitter emitter = new SseEmitter(); - emitter.onCompletion(() -> emitters.remove(key)); - emitters.put(key, emitter); - return emitter; - } - - public void unregister(String key) { - log.debug("Unregistering sse emitter for: {}", key); - Optional.ofNullable(emitters.get(key)).ifPresent(SseEmitter::complete); - } - - @Override - public void accept(String input) { - log.debug("Got message from kafka stream: {}", input); - emitters - .entrySet() - .stream() - .map(Map.Entry::getValue) - .forEach((SseEmitter emitter) -> { - try { - emitter.send(event().data(input, MediaType.TEXT_PLAIN)); - } catch (IOException e) { - log.debug("error sending sse message, {}", input); - } - }); - } -} diff --git a/property/src/main/java/com/jhipster/demo/product/broker/KafkaProducer.java b/property/src/main/java/com/jhipster/demo/product/broker/KafkaProducer.java deleted file mode 100644 index df4428a..0000000 --- a/property/src/main/java/com/jhipster/demo/product/broker/KafkaProducer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jhipster.demo.product.broker; - -import java.util.function.Supplier; -import org.springframework.stereotype.Component; - -@Component -public class KafkaProducer implements Supplier { - - @Override - public String get() { - return "kakfa_producer"; - } -} diff --git a/property/src/main/java/com/jhipster/demo/product/broker/package-info.java b/property/src/main/java/com/jhipster/demo/product/broker/package-info.java deleted file mode 100644 index 60e5cfa..0000000 --- a/property/src/main/java/com/jhipster/demo/product/broker/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring cloud consumers and providers - */ -package com.jhipster.demo.product.broker; diff --git a/property/src/main/java/com/jhipster/demo/product/domain/Property.java b/property/src/main/java/com/jhipster/demo/product/domain/Property.java index 95c16e9..245e3f1 100644 --- a/property/src/main/java/com/jhipster/demo/product/domain/Property.java +++ b/property/src/main/java/com/jhipster/demo/product/domain/Property.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jhipster.demo.product.domain.enumeration.PropertyState; import com.jhipster.demo.product.domain.enumeration.Visibility; -import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import jakarta.validation.constraints.*; import java.io.Serializable; @@ -13,9 +12,8 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; /** - * Entities for property Microservice + * A Property. */ -@Schema(description = "Entities for property Microservice") @Entity @Table(name = "property") @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) diff --git a/property/src/main/java/com/jhipster/demo/product/web/rest/PropertyKafkaResource.java b/property/src/main/java/com/jhipster/demo/product/web/rest/PropertyKafkaResource.java deleted file mode 100644 index 021dd3b..0000000 --- a/property/src/main/java/com/jhipster/demo/product/web/rest/PropertyKafkaResource.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.jhipster.demo.product.web.rest; - -import com.jhipster.demo.product.broker.KafkaConsumer; -import java.security.Principal; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.stream.function.StreamBridge; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter; - -@RestController -@RequestMapping("/api/property-kafka") -public class PropertyKafkaResource { - - private static final String PRODUCER_BINDING_NAME = "binding-out-0"; - - private final Logger log = LoggerFactory.getLogger(PropertyKafkaResource.class); - private final KafkaConsumer kafkaConsumer; - private final StreamBridge streamBridge; - - public PropertyKafkaResource(StreamBridge streamBridge, KafkaConsumer kafkaConsumer) { - this.streamBridge = streamBridge; - this.kafkaConsumer = kafkaConsumer; - } - - @PostMapping("/publish") - public void publish(@RequestParam("message") String message) { - log.debug("REST request the message : {} to send to Kafka topic ", message); - streamBridge.send(PRODUCER_BINDING_NAME, message); - } - - @GetMapping("/register") - public ResponseBodyEmitter register(Principal principal) { - return kafkaConsumer.register(principal.getName()); - } - - @GetMapping("/unregister") - public void unregister(Principal principal) { - kafkaConsumer.unregister(principal.getName()); - } -} diff --git a/property/src/main/resources/config/application-dev.yml b/property/src/main/resources/config/application-dev.yml index 7c58032..d6953f6 100644 --- a/property/src/main/resources/config/application-dev.yml +++ b/property/src/main/resources/config/application-dev.yml @@ -102,7 +102,7 @@ jhipster: authentication: jwt: # This token must be encoded using Base64 and be at least 256 bits long (you can type `openssl rand -base64 64` on your command line to generate a 512 bits one) - base64-secret: OTA5MjVhOGJjMzM1M2EwM2E2NDAzNzdlOWE4ZWQxZmM5ODdjMjc2MjlmNWQ2ZDk3NGFhYTRkMGJkMzBkNTM3NzMzNWJhOTk1MzhjNjU4NmE2YmNiYWNjMmFjYjkyZjczZGEyOTk4ZDI2MzFmNmRlYjVhNTkxNTY3NTdlODA1YWM= + base64-secret: NjgyMWRjZTE4ZjYxOWU1MGQ3NDc4Y2FlZTAyNWY0ZDZhYWE2NDhlYWYyOWU5NjVjZGVlMGE1NTU1OWFiMTI5YWQ0Y2QyZmE3NWZkZjQ0NDdkZTk3MWY5MTg0ZWJmNmU0NGI0ZjhiZDZlZWQ3ODM0MTk2ZWJiNmExZmE3Zjk4ZjU= # Token is valid 24 hours token-validity-in-seconds: 86400 token-validity-in-seconds-for-remember-me: 2592000 diff --git a/property/src/main/resources/config/application-prod.yml b/property/src/main/resources/config/application-prod.yml index c8a8baf..fecac21 100644 --- a/property/src/main/resources/config/application-prod.yml +++ b/property/src/main/resources/config/application-prod.yml @@ -111,7 +111,7 @@ jhipster: # - In the Consul configserver # - In a separate `application-prod.yml` file, in the same folder as your executable JAR file # - In the `JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET` environment variable - base64-secret: OTA5MjVhOGJjMzM1M2EwM2E2NDAzNzdlOWE4ZWQxZmM5ODdjMjc2MjlmNWQ2ZDk3NGFhYTRkMGJkMzBkNTM3NzMzNWJhOTk1MzhjNjU4NmE2YmNiYWNjMmFjYjkyZjczZGEyOTk4ZDI2MzFmNmRlYjVhNTkxNTY3NTdlODA1YWM= + base64-secret: NjgyMWRjZTE4ZjYxOWU1MGQ3NDc4Y2FlZTAyNWY0ZDZhYWE2NDhlYWYyOWU5NjVjZGVlMGE1NTU1OWFiMTI5YWQ0Y2QyZmE3NWZkZjQ0NDdkZTk3MWY5MTg0ZWJmNmU0NGI0ZjhiZDZlZWQ3ODM0MTk2ZWJiNmExZmE3Zjk4ZjU= # Token is valid 24 hours token-validity-in-seconds: 86400 token-validity-in-seconds-for-remember-me: 2592000 diff --git a/property/src/main/resources/config/application.yml b/property/src/main/resources/config/application.yml index 92eea80..e6c0647 100644 --- a/property/src/main/resources/config/application.yml +++ b/property/src/main/resources/config/application.yml @@ -97,8 +97,6 @@ management: enabled: true spring: - autoconfigure: - exclude: org.springframework.boot.actuate.autoconfigure.metrics.jdbc.DataSourcePoolMetricsAutoConfiguration application: name: property cloud: @@ -110,25 +108,6 @@ spring: config: watch: enabled: false - function: - definition: kafkaConsumer;kafkaProducer - stream: - kafka: - binder: - replicationFactor: 1 - auto-create-topics: true - brokers: localhost:9092 - bindings: - binding-out-0: - content-type: text/plain - group: property - kafkaConsumer-in-0: - destination: sse-topic - content-type: text/plain - group: property - kafkaProducer-out-0: - content-type: text/plain - group: property profiles: # The commented value for `active` can be replaced with valid Spring profiles to load. # Otherwise, it will be filled in by maven when building the JAR file diff --git a/property/src/main/resources/config/liquibase/changelog/20240417193556_added_entity_constraints_Property.xml b/property/src/main/resources/config/liquibase/changelog/20240417193556_added_entity_constraints_Property.xml deleted file mode 100644 index 1f5b689..0000000 --- a/property/src/main/resources/config/liquibase/changelog/20240417193556_added_entity_constraints_Property.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/property/src/main/resources/config/liquibase/changelog/20240417193656_added_entity_Tag.xml b/property/src/main/resources/config/liquibase/changelog/20240417193656_added_entity_Tag.xml deleted file mode 100644 index a23efab..0000000 --- a/property/src/main/resources/config/liquibase/changelog/20240417193656_added_entity_Tag.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/property/src/main/resources/config/liquibase/changelog/20240417193756_added_entity_constraints_Review.xml b/property/src/main/resources/config/liquibase/changelog/20240417193756_added_entity_constraints_Review.xml deleted file mode 100644 index 1cb56f6..0000000 --- a/property/src/main/resources/config/liquibase/changelog/20240417193756_added_entity_constraints_Review.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/property/src/main/resources/config/liquibase/changelog/20240418162935_added_entity_Property.xml b/property/src/main/resources/config/liquibase/changelog/20240418162935_added_entity_Property.xml deleted file mode 100644 index 8606a9b..0000000 --- a/property/src/main/resources/config/liquibase/changelog/20240418162935_added_entity_Property.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/property/src/main/resources/config/liquibase/changelog/20240418163135_added_entity_Review.xml b/property/src/main/resources/config/liquibase/changelog/20240418163135_added_entity_Review.xml deleted file mode 100644 index 787c02b..0000000 --- a/property/src/main/resources/config/liquibase/changelog/20240418163135_added_entity_Review.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/property/src/main/resources/config/liquibase/changelog/20240417193556_added_entity_Property.xml b/property/src/main/resources/config/liquibase/changelog/20240420155515_added_entity_Property.xml similarity index 95% rename from property/src/main/resources/config/liquibase/changelog/20240417193556_added_entity_Property.xml rename to property/src/main/resources/config/liquibase/changelog/20240420155515_added_entity_Property.xml index a689032..6b7096b 100644 --- a/property/src/main/resources/config/liquibase/changelog/20240417193556_added_entity_Property.xml +++ b/property/src/main/resources/config/liquibase/changelog/20240420155515_added_entity_Property.xml @@ -9,8 +9,8 @@ - - + + @@ -69,7 +69,7 @@ - + @@ -93,7 +93,7 @@ This can be customized by adding or removing 'faker' in the 'spring.liquibase.contexts' Spring Boot configuration key. --> - + - + - + @@ -31,7 +31,7 @@ This can be customized by adding or removing 'faker' in the 'spring.liquibase.contexts' Spring Boot configuration key. --> - + - + @@ -40,7 +40,7 @@ This can be customized by adding or removing 'faker' in the 'spring.liquibase.contexts' Spring Boot configuration key. --> - + - + - - - + + + - - + + diff --git a/property/src/main/resources/config/tls/keystore.p12 b/property/src/main/resources/config/tls/keystore.p12 index efd1f78..4adf6c5 100644 Binary files a/property/src/main/resources/config/tls/keystore.p12 and b/property/src/main/resources/config/tls/keystore.p12 differ diff --git a/property/src/main/resources/logback-spring.xml b/property/src/main/resources/logback-spring.xml index 3ce1f22..78111cd 100644 --- a/property/src/main/resources/logback-spring.xml +++ b/property/src/main/resources/logback-spring.xml @@ -64,7 +64,6 @@ - diff --git a/property/src/test/java/com/jhipster/demo/product/IntegrationTest.java b/property/src/test/java/com/jhipster/demo/product/IntegrationTest.java index 77a02ef..b39f862 100644 --- a/property/src/test/java/com/jhipster/demo/product/IntegrationTest.java +++ b/property/src/test/java/com/jhipster/demo/product/IntegrationTest.java @@ -1,7 +1,6 @@ package com.jhipster.demo.product; import com.jhipster.demo.product.config.AsyncSyncConfiguration; -import com.jhipster.demo.product.config.EmbeddedKafka; import com.jhipster.demo.product.config.EmbeddedSQL; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -18,6 +17,5 @@ @SpringBootTest(classes = { PropertyApp.class, AsyncSyncConfiguration.class }) @EmbeddedSQL @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -@EmbeddedKafka public @interface IntegrationTest { } diff --git a/property/src/test/java/com/jhipster/demo/product/config/EmbeddedKafka.java b/property/src/test/java/com/jhipster/demo/product/config/EmbeddedKafka.java deleted file mode 100644 index 8ea0315..0000000 --- a/property/src/test/java/com/jhipster/demo/product/config/EmbeddedKafka.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jhipster.demo.product.config; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface EmbeddedKafka { -} diff --git a/property/src/test/java/com/jhipster/demo/product/config/KafkaTestContainer.java b/property/src/test/java/com/jhipster/demo/product/config/KafkaTestContainer.java deleted file mode 100644 index 0a7ca85..0000000 --- a/property/src/test/java/com/jhipster/demo/product/config/KafkaTestContainer.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jhipster.demo.product.config; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; -import org.testcontainers.containers.KafkaContainer; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import org.testcontainers.utility.DockerImageName; - -public class KafkaTestContainer implements InitializingBean, DisposableBean { - - private KafkaContainer kafkaContainer; - private static final Logger log = LoggerFactory.getLogger(KafkaTestContainer.class); - - @Override - public void destroy() { - if (null != kafkaContainer && kafkaContainer.isRunning()) { - kafkaContainer.close(); - } - } - - @Override - public void afterPropertiesSet() { - if (null == kafkaContainer) { - kafkaContainer = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.5.2")) - .withLogConsumer(new Slf4jLogConsumer(log)) - .withReuse(true); - } - if (!kafkaContainer.isRunning()) { - kafkaContainer.start(); - } - } - - public KafkaContainer getKafkaContainer() { - return kafkaContainer; - } -} diff --git a/property/src/test/java/com/jhipster/demo/product/config/KafkaTestContainersSpringContextCustomizerFactory.java b/property/src/test/java/com/jhipster/demo/product/config/KafkaTestContainersSpringContextCustomizerFactory.java deleted file mode 100644 index 04b3bb6..0000000 --- a/property/src/test/java/com/jhipster/demo/product/config/KafkaTestContainersSpringContextCustomizerFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jhipster.demo.product.config; - -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.boot.test.util.TestPropertyValues; -import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.test.context.ContextConfigurationAttributes; -import org.springframework.test.context.ContextCustomizer; -import org.springframework.test.context.ContextCustomizerFactory; -import org.testcontainers.containers.KafkaContainer; - -public class KafkaTestContainersSpringContextCustomizerFactory implements ContextCustomizerFactory { - - private Logger log = LoggerFactory.getLogger(KafkaTestContainersSpringContextCustomizerFactory.class); - - private static KafkaTestContainer kafkaBean; - - @Override - public ContextCustomizer createContextCustomizer(Class testClass, List configAttributes) { - return (context, mergedConfig) -> { - ConfigurableListableBeanFactory beanFactory = context.getBeanFactory(); - TestPropertyValues testValues = TestPropertyValues.empty(); - EmbeddedKafka kafkaAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedKafka.class); - if (null != kafkaAnnotation) { - log.debug("detected the EmbeddedKafka annotation on class {}", testClass.getName()); - log.info("Warming up the kafka broker"); - if (null == kafkaBean) { - kafkaBean = beanFactory.createBean(KafkaTestContainer.class); - beanFactory.registerSingleton(KafkaTestContainer.class.getName(), kafkaBean); - } - testValues = - testValues.and( - "spring.cloud.stream.kafka.binder.brokers=" + - kafkaBean.getKafkaContainer().getHost() + - ':' + - kafkaBean.getKafkaContainer().getMappedPort(KafkaContainer.KAFKA_PORT) - ); - } - testValues.applyTo(context); - }; - } -} diff --git a/property/src/test/java/com/jhipster/demo/product/web/rest/PropertyKafkaResourceIT.java b/property/src/test/java/com/jhipster/demo/product/web/rest/PropertyKafkaResourceIT.java deleted file mode 100644 index 171e8f8..0000000 --- a/property/src/test/java/com/jhipster/demo/product/web/rest/PropertyKafkaResourceIT.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jhipster.demo.product.web.rest; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.fail; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - -import com.jhipster.demo.product.IntegrationTest; -import com.jhipster.demo.product.config.EmbeddedKafka; -import java.util.HashMap; -import java.util.Map; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.cloud.stream.binder.test.InputDestination; -import org.springframework.cloud.stream.binder.test.OutputDestination; -import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHeaders; -import org.springframework.messaging.support.GenericMessage; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.util.MimeTypeUtils; - -@IntegrationTest -@AutoConfigureMockMvc -@WithMockUser -@EmbeddedKafka -@ImportAutoConfiguration(TestChannelBinderConfiguration.class) -class PropertyKafkaResourceIT { - - @Autowired - private MockMvc restMockMvc; - - @Autowired - private InputDestination input; - - @Autowired - private OutputDestination output; - - @Test - void producesMessages() throws Exception { - restMockMvc.perform(post("/api/property-kafka/publish?message=value-produce")).andExpect(status().isOk()); - assertThat(output.receive(1000, "binding-out-0").getPayload()).isEqualTo("value-produce".getBytes()); - } - - @Test - void producesPooledMessages() throws Exception { - assertThat(output.receive(1500, "kafkaProducer-out-0").getPayload()).isEqualTo("kakfa_producer".getBytes()); - } - - @Test - void consumesMessages() throws Exception { - Map map = new HashMap<>(); - map.put(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN_VALUE); - MessageHeaders headers = new MessageHeaders(map); - Message testMessage = new GenericMessage<>("value-consume", headers); - MvcResult mvcResult = restMockMvc - .perform(get("/api/property-kafka/register")) - .andExpect(status().isOk()) - .andExpect(request().asyncStarted()) - .andReturn(); - for (int i = 0; i < 100; i++) { - input.send(testMessage); - Thread.sleep(100); - String content = mvcResult.getResponse().getContentAsString(); - if (content.contains("data:value-consume")) { - restMockMvc.perform(get("/api/property-kafka/unregister")); - return; - } - } - fail("Expected content data:value-consume not received"); - } -} diff --git a/property/src/test/resources/META-INF/spring.factories b/property/src/test/resources/META-INF/spring.factories index f823d1c..ca93f2b 100644 --- a/property/src/test/resources/META-INF/spring.factories +++ b/property/src/test/resources/META-INF/spring.factories @@ -1,3 +1,2 @@ org.springframework.test.context.ContextCustomizerFactory = com.jhipster.demo.\ - product.config.SqlTestContainersSpringContextCustomizerFactory,com.jhipster.\ - demo.product.config.KafkaTestContainersSpringContextCustomizerFactory \ No newline at end of file + product.config.SqlTestContainersSpringContextCustomizerFactory \ No newline at end of file diff --git a/property/src/test/resources/config/application.yml b/property/src/test/resources/config/application.yml index c80dd9e..371cb34 100644 --- a/property/src/test/resources/config/application.yml +++ b/property/src/test/resources/config/application.yml @@ -24,24 +24,6 @@ spring: config: enabled: false enabled: false - function: - definition: kafkaConsumer;kafkaProducer - stream: - kafka: - binder: - replicationFactor: 1 - auto-create-topics: true - bindings: - binding-out-0: - content-type: text/plain - group: property - kafkaConsumer-in-0: - destination: sse-topic - content-type: text/plain - group: property - kafkaProducer-out-0: - content-type: text/plain - group: property # Replace by 'prod, faker' to add the faker context and have sample data loaded in production liquibase: contexts: test @@ -95,7 +77,7 @@ jhipster: authentication: jwt: # This token must be encoded using Base64 (you can type `echo 'secret-key'|base64` on your command line) - base64-secret: OTA5MjVhOGJjMzM1M2EwM2E2NDAzNzdlOWE4ZWQxZmM5ODdjMjc2MjlmNWQ2ZDk3NGFhYTRkMGJkMzBkNTM3NzMzNWJhOTk1MzhjNjU4NmE2YmNiYWNjMmFjYjkyZjczZGEyOTk4ZDI2MzFmNmRlYjVhNTkxNTY3NTdlODA1YWM= + base64-secret: NjgyMWRjZTE4ZjYxOWU1MGQ3NDc4Y2FlZTAyNWY0ZDZhYWE2NDhlYWYyOWU5NjVjZGVlMGE1NTU1OWFiMTI5YWQ0Y2QyZmE3NWZkZjQ0NDdkZTk3MWY5MTg0ZWJmNmU0NGI0ZjhiZDZlZWQ3ODM0MTk2ZWJiNmExZmE3Zjk4ZjU= # Token is valid 24 hours token-validity-in-seconds: 86400 token-validity-in-seconds-for-remember-me: 86400 diff --git a/property/src/test/resources/logback.xml b/property/src/test/resources/logback.xml index 6314a1e..96100f5 100644 --- a/property/src/test/resources/logback.xml +++ b/property/src/test/resources/logback.xml @@ -42,8 +42,6 @@ - - diff --git a/property/test.txt b/property/test.txt new file mode 100644 index 0000000..e69de29