diff --git a/.eslintignore b/.eslintignore index 6a6c455b..c9269e48 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,7 +2,8 @@ node_modules/ src/main/docker/ src/main/resources/static/jdl-studio/ src/test/javascript/protractor.conf.js -src/test/javascript/jest.conf.js +jest.conf.js +coverage/ webpack/ target/ build/ diff --git a/.eslintrc.json b/.eslintrc.json index 2e225991..f4ef4013 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,16 +1,65 @@ { - "plugins": ["@typescript-eslint/tslint"], - "extends": ["jhipster"], + "parser": "@typescript-eslint/parser", + "plugins": ["@angular-eslint/eslint-plugin", "@typescript-eslint"], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended", + "plugin:@typescript-eslint/recommended-requiring-type-checking", + "plugin:@angular-eslint/recommended", + "prettier", + "eslint-config-prettier" + ], + "env": { + "browser": true, + "es6": true, + "commonjs": true + }, "parserOptions": { - "project": "./tsconfig.json" + "ecmaVersion": 2018, + "sourceType": "module", + "project": ["./tsconfig.json"] }, "rules": { - "@typescript-eslint/tslint/config": [ + "@typescript-eslint/no-unsafe-member-access": "off", + "@typescript-eslint/no-unsafe-assignment": "off", + "@typescript-eslint/no-unsafe-call": "off", + "@typescript-eslint/no-unsafe-return": "off", + "@typescript-eslint/explicit-module-boundary-types": "off", + "@typescript-eslint/restrict-plus-operands": "off", + "@typescript-eslint/no-floating-promises": "off", + "@typescript-eslint/restrict-template-expressions": "off", + "@typescript-eslint/no-unsafe-argument": "off", + "no-shadow": "off", + + "@typescript-eslint/member-ordering": [ "error", { - "lintFile": "./tslint.json" + "default": ["static-field", "instance-field", "constructor", "static-method", "instance-method"] } ], + "@typescript-eslint/no-parameter-properties": ["warn", { "allows": ["public", "private", "protected"] }], + "@typescript-eslint/explicit-member-accessibility": "off", + "@typescript-eslint/explicit-function-return-type": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/ban-types": "off", + "@typescript-eslint/interface-name-prefix": "off", + "@typescript-eslint/no-empty-function": "off", + "@typescript-eslint/unbound-method": "off", + "spaced-comment": ["warn", "always"], + "guard-for-in": "error", + "no-labels": "error", + "no-caller": "error", + "no-bitwise": "error", + "no-console": ["error", { "allow": ["warn", "error"] }], + "no-new-wrappers": "error", + "no-eval": "error", + "no-new": "error", + "no-var": "error", + "radix": "error", + "eqeqeq": ["error", "always", { "null": "ignore" }], + "prefer-const": "error", + "object-shorthand": ["error", "always", { "avoidExplicitReturnArrows": true }], "@typescript-eslint/no-unused-vars": [ "warn", { diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 27bcee3f..6c6858f1 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1,21 @@ +# +# Copyright the original author or authors from the JHipster project. +# +# This file is part of the JHipster project, see https://www.jhipster.tech/ +# for more information. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + template: | ## What’s Changed diff --git a/.github/workflows/copyright-update.yml b/.github/workflows/copyright-update.yml index ccb75211..8c60db3b 100644 --- a/.github/workflows/copyright-update.yml +++ b/.github/workflows/copyright-update.yml @@ -1,5 +1,5 @@ # -# Copyright 2017-2022 the original author or authors from the JHipster project. +# Copyright the original author or authors from the JHipster project. # # This file is part of the JHipster project, see https://www.jhipster.tech/ # for more information. @@ -20,29 +20,38 @@ name: Copyright Update on: schedule: - cron: '0 0 31 12 *' # Repeats December 31st every year + +permissions: + contents: read + jobs: - pipeline: + build: + permissions: + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR name: copyright update + if: github.repository == 'jhipster/jhipster-online' runs-on: ubuntu-latest timeout-minutes: 40 - steps: # Checkout - - uses: actions/checkout@v2 - + - uses: actions/checkout@v3 + with: + ref: main + fetch-depth: 0 # Update the copyright headers - name: Find and Replace run: | CURRENT_YEAR=$(date +'%Y') NEW_YEAR=$(($CURRENT_YEAR + 1)) - grep -rlZ "Copyright 2017-$CURRENT_YEAR" . | xargs -0 sed -i "s/Copyright 2017-$CURRENT_YEAR/Copyright 2017-$NEW_YEAR/g" - + grep -rlZE "Copyright ([0-9]+)-$CURRENT_YEAR" . | xargs -0 sed -i -E "s/Copyright ([0-9]+)-$CURRENT_YEAR/Copyright \1-$NEW_YEAR/g" # Create PR - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: - commit-message: 'feat: update copyright headers' - author: 'jhipster-bot ' - branch: 'copyright-header-update' + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: 'Update copyright headers' title: 'Update Copyright Headers' body: 'This is an automated pull request to update the copyright headers' + branch: 'copyright-date-update' + author: 'jhipster-bot ' diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 71bcef56..21eee2dc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,5 +1,5 @@ # -# Copyright 2017-2022 the original author or authors from the JHipster project. +# Copyright the original author or authors from the JHipster project. # # This file is part of the JHipster project, see https://www.jhipster.tech/ # for more information. @@ -28,7 +28,7 @@ jobs: steps: # Checkout with all submodules - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: 'true' @@ -54,12 +54,16 @@ jobs: env_variables.GITLAB_CLIENT_SECRET: ${{ secrets.GITLAB_CLIENT_SECRET }} env_variables.GITLAB_REDIRECT_URI: ${{ secrets.GITLAB_REDIRECT_URI }} - # Setup gcloud CLI - - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@main + # Setup Google Cloud + - name: Authenticate to Google Cloud + uses: 'google-github-actions/auth@v1' with: - version: '290.0.1' - service_account_key: ${{ secrets.GCP_SA_KEY }} + credentials_json: ${{ secrets.GCP_SA_KEY }} + + - name: Set up Google Cloud SDK + uses: google-github-actions/setup-gcloud@v1 + with: + version: '418.0.0' project_id: ${{ secrets.GCP_PROJECT_ID }} # Authenticate and push docker image to Artifact registry diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3af13504..6ac8c181 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,5 +1,5 @@ # -# Copyright 2013-2022 the original author or authors from the JHipster project. +# Copyright the original author or authors from the JHipster project. # # This file is part of the JHipster project, see https://www.jhipster.tech/ # for more information. @@ -29,18 +29,20 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest permissions: contents: read packages: write steps: - name: Checkout repository - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3 + with: + submodules: 'true' - name: Login to GitHub Container Registry if: github.event_name != 'pull_request' - uses: docker/login-action@v1.10.0 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -48,12 +50,12 @@ jobs: - name: Extract Docker metadata id: meta - uses: docker/metadata-action@v3.5.0 + uses: docker/metadata-action@v4 with: images: ghcr.io/${{ github.repository }} - name: Build and push Docker image - uses: docker/build-push-action@v2.7.0 + uses: docker/build-push-action@v4 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index dccb45cd..df030fea 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -1,5 +1,5 @@ # -# Copyright 2017-2022 the original author or authors from the JHipster project. +# Copyright the original author or authors from the JHipster project. # # This file is part of the JHipster project, see https://www.jhipster.tech/ # for more information. @@ -25,21 +25,24 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.pull_request.title, '[skip ci]') && !contains(github.event.pull_request.title, '[ci skip]')" timeout-minutes: 40 env: - NODE_VERSION: 14.17.6 + NODE_VERSION: 16.19.0 SPRING_OUTPUT_ANSI_ENABLED: DETECT SPRING_JPA_SHOW_SQL: false JHI_DISABLE_WEBPACK_LOGS: true NG_CLI_ANALYTICS: false steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: - node-version: 14.17.6 + node-version: 16.19.0 - - uses: actions/setup-java@v1 + - name: Set up Java + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: '11' + cache: 'maven' - name: Stop MySQL server run: sudo /etc/init.d/mysql stop diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 4ddf5a2e..cfc9d88f 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -1,3 +1,21 @@ +# +# Copyright the original author or authors from the JHipster project. +# +# This file is part of the JHipster project, see https://www.jhipster.tech/ +# for more information. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + name: Release Drafter on: diff --git a/.gitignore b/.gitignore index 3bf145ee..ea657ebf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.angular/cache ###################### # Project Specific ###################### @@ -130,6 +131,7 @@ Desktop.ini *.*~ *~ .merge_file* +coverage/ ###################### # Gradle Wrapper diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..c1dd12f1 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index abd303b6..b74bf7fc 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/Dockerfile b/Dockerfile index 144fff98..40db592d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jhipster/jhipster:v7.9.2 +FROM jhipster/jhipster:v8.0.0-beta.2 USER jhipster COPY --chown=jhipster:jhipster . /home/jhipster/jhipster-online/ RUN \ @@ -10,6 +10,10 @@ RUN \ mv /home/jhipster/jhipster-online/target/*.war /home/jhipster && \ rm -Rf /home/jhipster/jhipster-online/ /home/jhipster/.m2 /home/jhipster/.cache /tmp/* /var/tmp/* +USER root +RUN \ + npm install -g generator-jhipster-azure-spring-apps + ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ JHIPSTER_SLEEP=0 \ JAVA_OPTS="" diff --git a/LICENSE.txt b/LICENSE.txt index 3b1c3647..39d39dd4 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ - Copyright 2017-2022 the original author or authors from the JHipster project + Copyright 2017-2023 the original author or authors from the JHipster project Apache License Version 2.0, January 2004 diff --git a/NOTICE b/NOTICE index ca8b65f7..904293e8 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ JHipster -Copyright 2017-2022 the original author or authors from the JHipster project. +Copyright 2017-2023 the original author or authors from the JHipster project. For more information on the JHipster project, see https://www.jhipster.tech/ diff --git a/README.md b/README.md index 5f35a95a..f3f491dd 100644 --- a/README.md +++ b/README.md @@ -174,13 +174,13 @@ You can also fully dockerize your application and all the services that it depen To achieve this, first build a docker image of your app by running: ``` -./mvnw package -Pprod dockerfile:build +docker build -t jhonline . ``` Then run: ``` -docker-compose -f src/main/docker/app.yml up -d +docker compose -f src/main/docker/app.yml up -d ``` ## Deployment to Google App Engine (GAE) Flexible Environment diff --git a/angular.json b/angular.json index c3bae433..b46099c2 100644 --- a/angular.json +++ b/angular.json @@ -26,11 +26,92 @@ } }, "prefix": "jhi", - "architect": {} + "architect": { + "build": { + "builder": "@angular-builders/custom-webpack:browser", + "options": { + "customWebpackConfig": { + "path": "./webpack/webpack.custom.js" + }, + "outputPath": "target/classes/static/", + "index": "src/main/webapp/index.html", + "main": "src/main/webapp/app/app.main.ts", + "polyfills": "src/main/webapp/app/polyfills.ts", + "tsConfig": "tsconfig.app.json", + "inlineStyleLanguage": "scss", + "assets": [ + "src/main/webapp/content", + "src/main/webapp/favicon.ico", + "src/main/webapp/manifest.webapp", + "src/main/webapp/robots.txt" + ], + "styles": ["src/main/webapp/content/scss/vendor.scss", "src/main/webapp/content/scss/global.scss"], + "scripts": [] + }, + "configurations": { + "production": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "500kb", + "maximumError": "2mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "2kb", + "maximumError": "4kb" + } + ] + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "builder": "@angular-builders/custom-webpack:dev-server", + "options": { + "browserTarget": "jhonline:build:development", + "port": 4200 + }, + "configurations": { + "production": { + "browserTarget": "jhonline:build:production" + }, + "development": { + "browserTarget": "jhonline:build:development" + } + }, + "defaultConfiguration": "development" + }, + "test": { + "builder": "@angular-builders/jest:run", + "options": { + "configPath": "jest.conf.js" + } + } + } } }, - "defaultProject": "jhonline", "cli": { + "cache": { + "enabled": true, + "path": "./target/angular/", + "environment": "all" + }, "packageManager": "yarn" } } diff --git a/checkstyle.xml b/checkstyle.xml index 6e3dbafe..4666f08a 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -9,8 +9,7 @@ - + 3.3.9 11 - v14.17.6 - v1.22.4 + v16.19.1 + v1.22.19 UTF-8 UTF-8 ${project.build.directory}/test-results @@ -40,45 +40,49 @@ - 3.6.0 + 7.9.3 - 2.2.5.RELEASE + https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/${jhipster-dependencies.version} --> + 2.7.3 - 5.4.12.Final - - 3.24.0-GA + 5.6.10.Final - 3.8.7 - 3.8 + 4.15.0 + 4.15.0 2.0.1.Final - 2.3.2 - 0.13.1 - 1.3.1.Final + 4.0.0 + 0.22.0 + 1.5.2.Final - 3.1.0 - 3.8.1 - 3.1.1 + 3.2.0 + 3.12.1 + 3.10.1 + 3.4.1 2.10 - 3.0.0-M3 - 3.0.0-M4 + 3.1.0 + 3.0.0-M7 + 3.2.2 2.2.1 - 3.1.0 - 3.0.0-M4 - 3.2.3 - 3.1.1 - 1.4.3 - 8.29 - 0.0.4.RELEASE - 1.9.1 - 4.0.0 - 0.8.5 + 3.3.0 + 3.0.0-M7 + 3.3.2 + 3.1.2 + 10.3.2 + 0.0.10 + 1.12.1 + 1.11 + 3.1.0 + 5.0.0 + 2.4.0 + 0.8.8 + 3.2.1 + eclipse-temurin:11-jre-focal + amd64 1.0.0 - 1.0.0 - 3.7.0.1746 + 1.1.0 + 3.9.1.2184 ${project.build.directory}/jacoco/test ${jacoco.utReportFolder}/test.exec ${project.build.directory}/jacoco/integrationTest @@ -86,18 +90,25 @@ ${project.testresult.directory}/test ${project.testresult.directory}/integrationTest - 1.0.16 + 1.10.0 - io.github.jhipster + tech.jhipster jhipster-dependencies ${jhipster-dependencies.version} pom import + + org.testcontainers + testcontainers-bom + 1.17.3 + pom + import + @@ -106,25 +117,25 @@ org.kohsuke github-api - 1.116 + 1.313 org.gitlab java-gitlab-api - 4.0.0 + 4.1.1 org.zeroturnaround zt-zip - 1.11 + 1.15 org.eclipse.jgit org.eclipse.jgit - 4.8.0.201706111038-r + 6.4.0.202211300538-r - io.github.jhipster + tech.jhipster jhipster-framework @@ -152,27 +163,10 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - - com.fasterxml.jackson.module - jackson-module-afterburner - - - com.h2database - h2 - test - com.jayway.jsonpath json-path - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-bean-validators - com.zaxxer HikariCP @@ -274,6 +268,11 @@ org.springframework.boot spring-boot-starter-thymeleaf + + com.google.guava + guava + 31.1-jre + org.springframework.boot spring-boot-starter-web @@ -289,6 +288,21 @@ + + org.testcontainers + testcontainers + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mysql + test + org.springframework.boot spring-boot-test @@ -332,10 +346,6 @@ runtime - - org.springframework.boot - spring-boot-starter-cloud-connectors - org.springframework.security spring-security-data @@ -417,7 +427,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${maven-checkstyle.version} com.puppycrawl.tools @@ -427,7 +436,7 @@ io.spring.nohttp nohttp-checkstyle - ${spring-nohttp-checkstyle.version} + ${nohttp-checkstyle.version} @@ -537,7 +546,7 @@ - pl.project13.maven + io.github.git-commit-id git-commit-id-plugin ${git-commit-id-plugin.version} @@ -647,11 +656,6 @@ validation-api ${validation-api.version} - - org.javassist - javassist - ${javassist.version} - @@ -699,7 +703,7 @@ You are running an incompatible version of Java. JHipster supports JDK 8 to 13. - [1.8,14) + [1.8,20) @@ -840,60 +844,6 @@ - - com.spotify - dockerfile-maven-plugin - ${dockerfile-maven-plugin.version} - - - - tag-latest - none - - build - tag - push - - - - version - none - - build - tag - push - - - ${project.version} - - - - commit - none - - build - tag - push - - - ${git.commit.id.describe} - - - - - jhonline - ${project.build.directory} - - @@ -953,7 +903,7 @@ generate-resources - run webpack:build + run webapp:build ${project.version} @@ -1051,7 +1001,7 @@ test - run webpack:test + run webapp:test false @@ -1062,7 +1012,7 @@ generate-resources - run webpack:prod + run webapp:prod ${project.version} @@ -1148,7 +1098,7 @@ test - run webpack:test + run webapp:test false @@ -1159,7 +1109,7 @@ generate-resources - run webpack:prod + run webapp:prod ${project.version} diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index b0f214d5..00000000 --- a/postcss.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - plugins: [require('autoprefixer')] -}; diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile deleted file mode 100644 index 44db7565..00000000 --- a/src/main/docker/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM adoptopenjdk:11-jre-hotspot - -ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ - JHIPSTER_SLEEP=0 \ - JAVA_OPTS="" - -RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - && \ - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update && \ - apt-get install -y nodejs yarn && \ - yarn global add generator-jhipster@7.9.2 - -CMD echo "The application will start in ${JHIPSTER_SLEEP}s..." && \ - sleep ${JHIPSTER_SLEEP} && \ - java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /app.war - -EXPOSE 8080 - -ADD *.war /app.war diff --git a/src/main/docker/mysql.yml b/src/main/docker/mysql.yml index 66c6fbdf..f6834b11 100644 --- a/src/main/docker/mysql.yml +++ b/src/main/docker/mysql.yml @@ -1,11 +1,10 @@ version: '2' services: jhonline-mysql: - image: mysql:5.7.20 + image: mysql:8 # volumes: # - ~/volumes/jhipster/jhonline/mysql/:/var/lib/mysql/ environment: - - MYSQL_USER=root - MYSQL_ALLOW_EMPTY_PASSWORD=yes - MYSQL_DATABASE=jhipster-online ports: diff --git a/src/main/java/io/github/jhipster/online/ApplicationWebXml.java b/src/main/java/io/github/jhipster/online/ApplicationWebXml.java index 3e9d6c2d..92b65105 100644 --- a/src/main/java/io/github/jhipster/online/ApplicationWebXml.java +++ b/src/main/java/io/github/jhipster/online/ApplicationWebXml.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,9 +18,9 @@ */ package io.github.jhipster.online; -import io.github.jhipster.config.DefaultProfileUtil; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import tech.jhipster.config.DefaultProfileUtil; /** * This is a helper Java class that provides an alternative to creating a {@code web.xml}. diff --git a/src/main/java/io/github/jhipster/online/JhonlineApp.java b/src/main/java/io/github/jhipster/online/JhonlineApp.java index 013d3f7e..4d667e35 100644 --- a/src/main/java/io/github/jhipster/online/JhonlineApp.java +++ b/src/main/java/io/github/jhipster/online/JhonlineApp.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,8 +18,6 @@ */ package io.github.jhipster.online; -import io.github.jhipster.config.DefaultProfileUtil; -import io.github.jhipster.config.JHipsterConstants; import io.github.jhipster.online.config.ApplicationProperties; import java.net.InetAddress; import java.net.UnknownHostException; @@ -34,6 +32,8 @@ import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.core.env.Environment; +import tech.jhipster.config.DefaultProfileUtil; +import tech.jhipster.config.JHipsterConstants; @SpringBootApplication @EnableConfigurationProperties({ LiquibaseProperties.class, ApplicationProperties.class }) diff --git a/src/main/java/io/github/jhipster/online/aop/logging/LoggingAspect.java b/src/main/java/io/github/jhipster/online/aop/logging/LoggingAspect.java index d4d6c196..ae81c307 100644 --- a/src/main/java/io/github/jhipster/online/aop/logging/LoggingAspect.java +++ b/src/main/java/io/github/jhipster/online/aop/logging/LoggingAspect.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,7 +18,6 @@ */ package io.github.jhipster.online.aop.logging; -import io.github.jhipster.config.JHipsterConstants; import java.util.Arrays; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -30,6 +29,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.Profiles; +import tech.jhipster.config.JHipsterConstants; /** * Aspect for logging execution of service and repository Spring components. diff --git a/src/main/java/io/github/jhipster/online/config/ApplicationProperties.java b/src/main/java/io/github/jhipster/online/config/ApplicationProperties.java index eb8570b9..2844322f 100644 --- a/src/main/java/io/github/jhipster/online/config/ApplicationProperties.java +++ b/src/main/java/io/github/jhipster/online/config/ApplicationProperties.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/AsyncConfiguration.java b/src/main/java/io/github/jhipster/online/config/AsyncConfiguration.java index df38423e..9e48319c 100644 --- a/src/main/java/io/github/jhipster/online/config/AsyncConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/AsyncConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,7 +18,6 @@ */ package io.github.jhipster.online.config; -import io.github.jhipster.async.ExceptionHandlingAsyncTaskExecutor; import java.util.concurrent.Executor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +30,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import tech.jhipster.async.ExceptionHandlingAsyncTaskExecutor; @Configuration @EnableAsync diff --git a/src/main/java/io/github/jhipster/online/config/CacheConfiguration.java b/src/main/java/io/github/jhipster/online/config/CacheConfiguration.java index 1da48093..db1ec226 100644 --- a/src/main/java/io/github/jhipster/online/config/CacheConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/CacheConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -19,7 +19,6 @@ package io.github.jhipster.online.config; -import io.github.jhipster.config.JHipsterProperties; import java.time.Duration; import javax.cache.CacheManager; import org.ehcache.config.builders.CacheConfigurationBuilder; @@ -32,6 +31,7 @@ import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import tech.jhipster.config.JHipsterProperties; @Configuration @EnableCaching diff --git a/src/main/java/io/github/jhipster/online/config/CloudDatabaseConfiguration.java b/src/main/java/io/github/jhipster/online/config/CloudDatabaseConfiguration.java deleted file mode 100644 index 7dbb5424..00000000 --- a/src/main/java/io/github/jhipster/online/config/CloudDatabaseConfiguration.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright 2017-2022 the original author or authors from the JHipster project. - * - * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online - * for more information. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.github.jhipster.online.config; - -import io.github.jhipster.config.JHipsterConstants; -import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.config.java.AbstractCloudConfig; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; - -@Configuration -@Profile(JHipsterConstants.SPRING_PROFILE_CLOUD) -public class CloudDatabaseConfiguration extends AbstractCloudConfig { - - private final Logger log = LoggerFactory.getLogger(CloudDatabaseConfiguration.class); - - private static final String CLOUD_CONFIGURATION_HIKARI_PREFIX = "spring.datasource.hikari"; - - @Bean - @ConfigurationProperties(CLOUD_CONFIGURATION_HIKARI_PREFIX) - public DataSource dataSource() { - log.info("Configuring JDBC datasource from a cloud provider"); - return connectionFactory().dataSource(); - } -} diff --git a/src/main/java/io/github/jhipster/online/config/Constants.java b/src/main/java/io/github/jhipster/online/config/Constants.java index bc1b7881..ae26789c 100644 --- a/src/main/java/io/github/jhipster/online/config/Constants.java +++ b/src/main/java/io/github/jhipster/online/config/Constants.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/DatabaseConfiguration.java b/src/main/java/io/github/jhipster/online/config/DatabaseConfiguration.java index 9894f589..f5f29e23 100644 --- a/src/main/java/io/github/jhipster/online/config/DatabaseConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/DatabaseConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/DateTimeFormatConfiguration.java b/src/main/java/io/github/jhipster/online/config/DateTimeFormatConfiguration.java index e719a7d7..88ff5a3e 100644 --- a/src/main/java/io/github/jhipster/online/config/DateTimeFormatConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/DateTimeFormatConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/JacksonConfiguration.java b/src/main/java/io/github/jhipster/online/config/JacksonConfiguration.java index f8c1e8c9..7da2cd48 100644 --- a/src/main/java/io/github/jhipster/online/config/JacksonConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/JacksonConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -21,10 +21,9 @@ import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.module.afterburner.AfterburnerModule; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.violations.ConstraintViolationProblemModule; @Configuration @@ -52,14 +51,6 @@ public Hibernate5Module hibernate5Module() { return new Hibernate5Module(); } - /* - * Jackson Afterburner module to speed up serialization/deserialization. - */ - @Bean - public AfterburnerModule afterburnerModule() { - return new AfterburnerModule(); - } - /* * Module for serialization/deserialization of RFC7807 Problem. */ diff --git a/src/main/java/io/github/jhipster/online/config/LiquibaseConfiguration.java b/src/main/java/io/github/jhipster/online/config/LiquibaseConfiguration.java index e57a1403..36591dee 100644 --- a/src/main/java/io/github/jhipster/online/config/LiquibaseConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/LiquibaseConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -19,8 +19,6 @@ package io.github.jhipster.online.config; -import io.github.jhipster.config.JHipsterConstants; -import io.github.jhipster.config.liquibase.SpringLiquibaseUtil; import java.util.concurrent.Executor; import javax.sql.DataSource; import liquibase.integration.spring.SpringLiquibase; @@ -35,6 +33,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.core.env.Profiles; +import tech.jhipster.config.JHipsterConstants; +import tech.jhipster.config.liquibase.SpringLiquibaseUtil; @Configuration public class LiquibaseConfiguration { diff --git a/src/main/java/io/github/jhipster/online/config/LocaleConfiguration.java b/src/main/java/io/github/jhipster/online/config/LocaleConfiguration.java index 22ae3b74..64aead25 100644 --- a/src/main/java/io/github/jhipster/online/config/LocaleConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/LocaleConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,13 +18,13 @@ */ package io.github.jhipster.online.config; -import io.github.jhipster.config.locale.AngularCookieLocaleResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; +import tech.jhipster.config.locale.AngularCookieLocaleResolver; @Configuration public class LocaleConfiguration implements WebMvcConfigurer { diff --git a/src/main/java/io/github/jhipster/online/config/LoggingAspectConfiguration.java b/src/main/java/io/github/jhipster/online/config/LoggingAspectConfiguration.java index d7560822..cc2bd65e 100644 --- a/src/main/java/io/github/jhipster/online/config/LoggingAspectConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/LoggingAspectConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,13 +18,13 @@ */ package io.github.jhipster.online.config; -import io.github.jhipster.config.JHipsterConstants; import io.github.jhipster.online.aop.logging.LoggingAspect; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; +import tech.jhipster.config.JHipsterConstants; @Configuration @EnableAspectJAutoProxy diff --git a/src/main/java/io/github/jhipster/online/config/LoggingConfiguration.java b/src/main/java/io/github/jhipster/online/config/LoggingConfiguration.java index f3a54382..01b4ed33 100644 --- a/src/main/java/io/github/jhipster/online/config/LoggingConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/LoggingConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,17 +18,17 @@ */ package io.github.jhipster.online.config; -import static io.github.jhipster.config.logging.LoggingUtils.*; +import static tech.jhipster.config.logging.LoggingUtils.*; import ch.qos.logback.classic.LoggerContext; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.jhipster.config.JHipsterProperties; import java.util.HashMap; import java.util.Map; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +import tech.jhipster.config.JHipsterProperties; /* * Configures the console and Logstash log appenders from the app properties @@ -62,8 +62,5 @@ public LoggingConfiguration( if (loggingProperties.isUseJsonFormat() || logstashProperties.isEnabled()) { addContextListener(context, customFields, loggingProperties); } - if (jHipsterProperties.getMetrics().getLogs().isEnabled()) { - setMetricsMarkerLogbackFilter(context, loggingProperties.isUseJsonFormat()); - } } } diff --git a/src/main/java/io/github/jhipster/online/config/MDCConfiguration.java b/src/main/java/io/github/jhipster/online/config/MDCConfiguration.java index 3b540c5e..2bd440bf 100644 --- a/src/main/java/io/github/jhipster/online/config/MDCConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/MDCConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/SecurityConfiguration.java b/src/main/java/io/github/jhipster/online/config/SecurityConfiguration.java index 5f3d6704..e06b63bb 100644 --- a/src/main/java/io/github/jhipster/online/config/SecurityConfiguration.java +++ b/src/main/java/io/github/jhipster/online/config/SecurityConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/WebConfigurer.java b/src/main/java/io/github/jhipster/online/config/WebConfigurer.java index 285860f7..038f4d71 100644 --- a/src/main/java/io/github/jhipster/online/config/WebConfigurer.java +++ b/src/main/java/io/github/jhipster/online/config/WebConfigurer.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,34 +20,23 @@ import static java.net.URLDecoder.decode; -import io.github.jhipster.config.JHipsterConstants; -import io.github.jhipster.config.JHipsterProperties; -import io.github.jhipster.web.filter.CachingHttpHeadersFilter; import java.io.File; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.nio.file.Paths; -import java.util.EnumSet; -import java.util.List; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import javax.servlet.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.server.MimeMappings; -import org.springframework.boot.web.server.WebServerFactory; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.boot.web.server.*; import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; -import org.springframework.core.env.Profiles; -import org.springframework.http.MediaType; +import org.springframework.util.CollectionUtils; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; +import tech.jhipster.config.JHipsterProperties; /** * Configuration of web application with Servlet 3.0 APIs. @@ -71,10 +60,6 @@ public void onStartup(ServletContext servletContext) throws ServletException { if (env.getActiveProfiles().length != 0) { log.info("Web application configuration, using profiles: {}", (Object[]) env.getActiveProfiles()); } - EnumSet disps = EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.ASYNC); - if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_PRODUCTION))) { - initCachingHttpHeadersFilter(servletContext, disps); - } log.info("Web application fully configured"); } @@ -83,23 +68,10 @@ public void onStartup(ServletContext servletContext) throws ServletException { */ @Override public void customize(WebServerFactory server) { - setMimeMappings(server); // When running in an IDE or with ./mvnw spring-boot:run, set location of the static web assets. setLocationForStaticAssets(server); } - private void setMimeMappings(WebServerFactory server) { - if (server instanceof ConfigurableServletWebServerFactory) { - MimeMappings mappings = new MimeMappings(MimeMappings.DEFAULT); - // IE issue, see https://github.com/jhipster/generator-jhipster/pull/711 - mappings.add("html", MediaType.TEXT_HTML_VALUE + ";charset=" + StandardCharsets.UTF_8.name().toLowerCase()); - // CloudFoundry issue, see https://github.com/cloudfoundry/gorouter/issues/64 - mappings.add("json", MediaType.TEXT_HTML_VALUE + ";charset=" + StandardCharsets.UTF_8.name().toLowerCase()); - ConfigurableServletWebServerFactory servletWebServer = (ConfigurableServletWebServerFactory) server; - servletWebServer.setMimeMappings(mappings); - } - } - private void setLocationForStaticAssets(WebServerFactory server) { if (server instanceof ConfigurableServletWebServerFactory) { ConfigurableServletWebServerFactory servletWebServer = (ConfigurableServletWebServerFactory) server; @@ -116,13 +88,7 @@ private void setLocationForStaticAssets(WebServerFactory server) { * Resolve path prefix to static resources. */ private String resolvePathPrefix() { - String fullExecutablePath; - try { - fullExecutablePath = decode(this.getClass().getResource("").getPath(), StandardCharsets.UTF_8.name()); - } catch (UnsupportedEncodingException e) { - /* try without decoding if this ever happens */ - fullExecutablePath = this.getClass().getResource("").getPath(); - } + String fullExecutablePath = decode(this.getClass().getResource("").getPath(), StandardCharsets.UTF_8); String rootPath = Paths.get(".").toUri().normalize().getPath(); String extractedPath = fullExecutablePath.replace(rootPath, ""); int extractionEndIndex = extractedPath.indexOf("target/"); @@ -132,31 +98,16 @@ private String resolvePathPrefix() { return extractedPath.substring(0, extractionEndIndex); } - /** - * Initializes the caching HTTP Headers Filter. - */ - private void initCachingHttpHeadersFilter(ServletContext servletContext, EnumSet disps) { - log.debug("Registering Caching HTTP Headers Filter"); - FilterRegistration.Dynamic cachingHttpHeadersFilter = servletContext.addFilter( - "cachingHttpHeadersFilter", - new CachingHttpHeadersFilter(jHipsterProperties) - ); - - cachingHttpHeadersFilter.addMappingForUrlPatterns(disps, true, "/content/*"); - cachingHttpHeadersFilter.addMappingForUrlPatterns(disps, true, "/app/*"); - cachingHttpHeadersFilter.setAsyncSupported(true); - } - @Bean public CorsFilter corsFilter() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = jHipsterProperties.getCors(); - List allowedOrigins = config.getAllowedOrigins(); - if (allowedOrigins != null && !allowedOrigins.isEmpty()) { + if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || !CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) { log.debug("Registering CORS filter"); source.registerCorsConfiguration("/api/**", config); source.registerCorsConfiguration("/management/**", config); - source.registerCorsConfiguration("/v2/api-docs", config); + source.registerCorsConfiguration("/v3/api-docs", config); + source.registerCorsConfiguration("/swagger-ui/**", config); } return new CorsFilter(source); } diff --git a/src/main/java/io/github/jhipster/online/config/audit/AuditEventConverter.java b/src/main/java/io/github/jhipster/online/config/audit/AuditEventConverter.java index 05fc9262..758d92d6 100644 --- a/src/main/java/io/github/jhipster/online/config/audit/AuditEventConverter.java +++ b/src/main/java/io/github/jhipster/online/config/audit/AuditEventConverter.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/audit/package-info.java b/src/main/java/io/github/jhipster/online/config/audit/package-info.java index c8460123..1418a896 100644 --- a/src/main/java/io/github/jhipster/online/config/audit/package-info.java +++ b/src/main/java/io/github/jhipster/online/config/audit/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/config/package-info.java b/src/main/java/io/github/jhipster/online/config/package-info.java index 48480590..969cb95a 100644 --- a/src/main/java/io/github/jhipster/online/config/package-info.java +++ b/src/main/java/io/github/jhipster/online/config/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/AbstractAuditingEntity.java b/src/main/java/io/github/jhipster/online/domain/AbstractAuditingEntity.java index 77541275..8ba19106 100644 --- a/src/main/java/io/github/jhipster/online/domain/AbstractAuditingEntity.java +++ b/src/main/java/io/github/jhipster/online/domain/AbstractAuditingEntity.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/Authority.java b/src/main/java/io/github/jhipster/online/domain/Authority.java index 80233388..8e86d626 100644 --- a/src/main/java/io/github/jhipster/online/domain/Authority.java +++ b/src/main/java/io/github/jhipster/online/domain/Authority.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/EntityStats.java b/src/main/java/io/github/jhipster/online/domain/EntityStats.java index 098fbcd4..5ad9915c 100644 --- a/src/main/java/io/github/jhipster/online/domain/EntityStats.java +++ b/src/main/java/io/github/jhipster/online/domain/EntityStats.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/GeneratorIdentity.java b/src/main/java/io/github/jhipster/online/domain/GeneratorIdentity.java index 13409e6e..57ce2f30 100644 --- a/src/main/java/io/github/jhipster/online/domain/GeneratorIdentity.java +++ b/src/main/java/io/github/jhipster/online/domain/GeneratorIdentity.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/GitCompany.java b/src/main/java/io/github/jhipster/online/domain/GitCompany.java index 69e2cd74..3ca033ed 100644 --- a/src/main/java/io/github/jhipster/online/domain/GitCompany.java +++ b/src/main/java/io/github/jhipster/online/domain/GitCompany.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/Jdl.java b/src/main/java/io/github/jhipster/online/domain/Jdl.java index 3ad3f4b5..1d67e9c9 100644 --- a/src/main/java/io/github/jhipster/online/domain/Jdl.java +++ b/src/main/java/io/github/jhipster/online/domain/Jdl.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/JdlMetadata.java b/src/main/java/io/github/jhipster/online/domain/JdlMetadata.java index fc83c96a..601198f6 100644 --- a/src/main/java/io/github/jhipster/online/domain/JdlMetadata.java +++ b/src/main/java/io/github/jhipster/online/domain/JdlMetadata.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/PersistentAuditEvent.java b/src/main/java/io/github/jhipster/online/domain/PersistentAuditEvent.java index c9e56697..9df0147f 100644 --- a/src/main/java/io/github/jhipster/online/domain/PersistentAuditEvent.java +++ b/src/main/java/io/github/jhipster/online/domain/PersistentAuditEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/SubGenEvent.java b/src/main/java/io/github/jhipster/online/domain/SubGenEvent.java index 84510900..9fdd8340 100644 --- a/src/main/java/io/github/jhipster/online/domain/SubGenEvent.java +++ b/src/main/java/io/github/jhipster/online/domain/SubGenEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/User.java b/src/main/java/io/github/jhipster/online/domain/User.java index d401473d..84f5ca49 100644 --- a/src/main/java/io/github/jhipster/online/domain/User.java +++ b/src/main/java/io/github/jhipster/online/domain/User.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/YoRC.java b/src/main/java/io/github/jhipster/online/domain/YoRC.java index 093644a8..34b4702e 100644 --- a/src/main/java/io/github/jhipster/online/domain/YoRC.java +++ b/src/main/java/io/github/jhipster/online/domain/YoRC.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/deserializer/YoRCDeserializer.java b/src/main/java/io/github/jhipster/online/domain/deserializer/YoRCDeserializer.java index 5708e55a..6d0c071f 100644 --- a/src/main/java/io/github/jhipster/online/domain/deserializer/YoRCDeserializer.java +++ b/src/main/java/io/github/jhipster/online/domain/deserializer/YoRCDeserializer.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/enums/EntityStatColumn.java b/src/main/java/io/github/jhipster/online/domain/enums/EntityStatColumn.java index 027eefba..c076d4c4 100644 --- a/src/main/java/io/github/jhipster/online/domain/enums/EntityStatColumn.java +++ b/src/main/java/io/github/jhipster/online/domain/enums/EntityStatColumn.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/enums/GitProvider.java b/src/main/java/io/github/jhipster/online/domain/enums/GitProvider.java index aecc6629..d44b3a75 100644 --- a/src/main/java/io/github/jhipster/online/domain/enums/GitProvider.java +++ b/src/main/java/io/github/jhipster/online/domain/enums/GitProvider.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/enums/SubGenEventType.java b/src/main/java/io/github/jhipster/online/domain/enums/SubGenEventType.java index 4f1140cd..ea26db6e 100644 --- a/src/main/java/io/github/jhipster/online/domain/enums/SubGenEventType.java +++ b/src/main/java/io/github/jhipster/online/domain/enums/SubGenEventType.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/enums/YoRCColumn.java b/src/main/java/io/github/jhipster/online/domain/enums/YoRCColumn.java index 45704499..593a5035 100644 --- a/src/main/java/io/github/jhipster/online/domain/enums/YoRCColumn.java +++ b/src/main/java/io/github/jhipster/online/domain/enums/YoRCColumn.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/interfaces/CompleteDate.java b/src/main/java/io/github/jhipster/online/domain/interfaces/CompleteDate.java index f2326fe8..40031de4 100644 --- a/src/main/java/io/github/jhipster/online/domain/interfaces/CompleteDate.java +++ b/src/main/java/io/github/jhipster/online/domain/interfaces/CompleteDate.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/interfaces/DatabaseColumn.java b/src/main/java/io/github/jhipster/online/domain/interfaces/DatabaseColumn.java index 15f731ae..3fc692e2 100644 --- a/src/main/java/io/github/jhipster/online/domain/interfaces/DatabaseColumn.java +++ b/src/main/java/io/github/jhipster/online/domain/interfaces/DatabaseColumn.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/domain/package-info.java b/src/main/java/io/github/jhipster/online/domain/package-info.java index 17b2b09f..10b7bf11 100644 --- a/src/main/java/io/github/jhipster/online/domain/package-info.java +++ b/src/main/java/io/github/jhipster/online/domain/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/mdc/logging/MDCInterceptor.java b/src/main/java/io/github/jhipster/online/mdc/logging/MDCInterceptor.java index 7e0120f9..1cc32e1f 100644 --- a/src/main/java/io/github/jhipster/online/mdc/logging/MDCInterceptor.java +++ b/src/main/java/io/github/jhipster/online/mdc/logging/MDCInterceptor.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/AuthorityRepository.java b/src/main/java/io/github/jhipster/online/repository/AuthorityRepository.java index 5d6aaa4f..bcb5ffeb 100644 --- a/src/main/java/io/github/jhipster/online/repository/AuthorityRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/AuthorityRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/CustomAuditEventRepository.java b/src/main/java/io/github/jhipster/online/repository/CustomAuditEventRepository.java index 75775da5..d1c0cf93 100644 --- a/src/main/java/io/github/jhipster/online/repository/CustomAuditEventRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/CustomAuditEventRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/EntityStatsRepository.java b/src/main/java/io/github/jhipster/online/repository/EntityStatsRepository.java index 4bf254d3..c732badf 100644 --- a/src/main/java/io/github/jhipster/online/repository/EntityStatsRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/EntityStatsRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/GeneratorIdentityRepository.java b/src/main/java/io/github/jhipster/online/repository/GeneratorIdentityRepository.java index 0a7ceedc..3e1d6cc7 100644 --- a/src/main/java/io/github/jhipster/online/repository/GeneratorIdentityRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/GeneratorIdentityRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/GitCompanyRepository.java b/src/main/java/io/github/jhipster/online/repository/GitCompanyRepository.java index 4dcdb05c..932ce4af 100644 --- a/src/main/java/io/github/jhipster/online/repository/GitCompanyRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/GitCompanyRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/JdlMetadataRepository.java b/src/main/java/io/github/jhipster/online/repository/JdlMetadataRepository.java index 6dbc542e..7d08a4af 100644 --- a/src/main/java/io/github/jhipster/online/repository/JdlMetadataRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/JdlMetadataRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/JdlRepository.java b/src/main/java/io/github/jhipster/online/repository/JdlRepository.java index 66e372d9..d9e132f0 100644 --- a/src/main/java/io/github/jhipster/online/repository/JdlRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/JdlRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/PersistenceAuditEventRepository.java b/src/main/java/io/github/jhipster/online/repository/PersistenceAuditEventRepository.java index bb7d5996..73f9b23f 100644 --- a/src/main/java/io/github/jhipster/online/repository/PersistenceAuditEventRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/PersistenceAuditEventRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/SubGenEventRepository.java b/src/main/java/io/github/jhipster/online/repository/SubGenEventRepository.java index 6bd0b145..fe789648 100644 --- a/src/main/java/io/github/jhipster/online/repository/SubGenEventRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/SubGenEventRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/UserRepository.java b/src/main/java/io/github/jhipster/online/repository/UserRepository.java index 1b54ac6e..11abf1b7 100644 --- a/src/main/java/io/github/jhipster/online/repository/UserRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/UserRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/YoRCRepository.java b/src/main/java/io/github/jhipster/online/repository/YoRCRepository.java index 6787534a..477a21df 100644 --- a/src/main/java/io/github/jhipster/online/repository/YoRCRepository.java +++ b/src/main/java/io/github/jhipster/online/repository/YoRCRepository.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/repository/package-info.java b/src/main/java/io/github/jhipster/online/repository/package-info.java index 6cb777a5..cbf9874e 100644 --- a/src/main/java/io/github/jhipster/online/repository/package-info.java +++ b/src/main/java/io/github/jhipster/online/repository/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/AuthoritiesConstants.java b/src/main/java/io/github/jhipster/online/security/AuthoritiesConstants.java index 8bc81874..2b1a83a6 100644 --- a/src/main/java/io/github/jhipster/online/security/AuthoritiesConstants.java +++ b/src/main/java/io/github/jhipster/online/security/AuthoritiesConstants.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/DomainUserDetailsService.java b/src/main/java/io/github/jhipster/online/security/DomainUserDetailsService.java index d3c1cd05..bea0df87 100644 --- a/src/main/java/io/github/jhipster/online/security/DomainUserDetailsService.java +++ b/src/main/java/io/github/jhipster/online/security/DomainUserDetailsService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/SecurityUtils.java b/src/main/java/io/github/jhipster/online/security/SecurityUtils.java index a0298c5f..6b726f41 100644 --- a/src/main/java/io/github/jhipster/online/security/SecurityUtils.java +++ b/src/main/java/io/github/jhipster/online/security/SecurityUtils.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/SpringSecurityAuditorAware.java b/src/main/java/io/github/jhipster/online/security/SpringSecurityAuditorAware.java index 24d96079..140aee4d 100644 --- a/src/main/java/io/github/jhipster/online/security/SpringSecurityAuditorAware.java +++ b/src/main/java/io/github/jhipster/online/security/SpringSecurityAuditorAware.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/UserNotActivatedException.java b/src/main/java/io/github/jhipster/online/security/UserNotActivatedException.java index 7e18099a..f76bb37d 100644 --- a/src/main/java/io/github/jhipster/online/security/UserNotActivatedException.java +++ b/src/main/java/io/github/jhipster/online/security/UserNotActivatedException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/jwt/JWTConfigurer.java b/src/main/java/io/github/jhipster/online/security/jwt/JWTConfigurer.java index 3e20dd0e..c84c6b67 100644 --- a/src/main/java/io/github/jhipster/online/security/jwt/JWTConfigurer.java +++ b/src/main/java/io/github/jhipster/online/security/jwt/JWTConfigurer.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/jwt/JWTFilter.java b/src/main/java/io/github/jhipster/online/security/jwt/JWTFilter.java index 76e3168b..294d226b 100644 --- a/src/main/java/io/github/jhipster/online/security/jwt/JWTFilter.java +++ b/src/main/java/io/github/jhipster/online/security/jwt/JWTFilter.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/security/jwt/TokenProvider.java b/src/main/java/io/github/jhipster/online/security/jwt/TokenProvider.java index e7930d17..830a41dd 100644 --- a/src/main/java/io/github/jhipster/online/security/jwt/TokenProvider.java +++ b/src/main/java/io/github/jhipster/online/security/jwt/TokenProvider.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,7 +18,6 @@ */ package io.github.jhipster.online.security.jwt; -import io.github.jhipster.config.JHipsterProperties; import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; @@ -37,6 +36,7 @@ import org.springframework.security.core.userdetails.User; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; +import tech.jhipster.config.JHipsterProperties; @Component public class TokenProvider { diff --git a/src/main/java/io/github/jhipster/online/security/package-info.java b/src/main/java/io/github/jhipster/online/security/package-info.java index fd31be92..de3e6ea4 100644 --- a/src/main/java/io/github/jhipster/online/security/package-info.java +++ b/src/main/java/io/github/jhipster/online/security/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/AuditEventService.java b/src/main/java/io/github/jhipster/online/service/AuditEventService.java index 15bdbfc7..bc02e216 100644 --- a/src/main/java/io/github/jhipster/online/service/AuditEventService.java +++ b/src/main/java/io/github/jhipster/online/service/AuditEventService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -19,7 +19,6 @@ package io.github.jhipster.online.service; -import io.github.jhipster.config.JHipsterProperties; import io.github.jhipster.online.config.audit.AuditEventConverter; import io.github.jhipster.online.repository.PersistenceAuditEventRepository; import java.time.Instant; @@ -33,6 +32,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import tech.jhipster.config.JHipsterProperties; /** * Service for managing audit events. diff --git a/src/main/java/io/github/jhipster/online/service/CiCdService.java b/src/main/java/io/github/jhipster/online/service/CiCdService.java index ef8736f4..03df55ca 100644 --- a/src/main/java/io/github/jhipster/online/service/CiCdService.java +++ b/src/main/java/io/github/jhipster/online/service/CiCdService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/EmailAlreadyUsedException.java b/src/main/java/io/github/jhipster/online/service/EmailAlreadyUsedException.java index c71d4598..75185282 100644 --- a/src/main/java/io/github/jhipster/online/service/EmailAlreadyUsedException.java +++ b/src/main/java/io/github/jhipster/online/service/EmailAlreadyUsedException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/EntityStatsService.java b/src/main/java/io/github/jhipster/online/service/EntityStatsService.java index 7317849d..e2e9e02d 100644 --- a/src/main/java/io/github/jhipster/online/service/EntityStatsService.java +++ b/src/main/java/io/github/jhipster/online/service/EntityStatsService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/GeneratorIdentityService.java b/src/main/java/io/github/jhipster/online/service/GeneratorIdentityService.java index 38810283..98a12338 100644 --- a/src/main/java/io/github/jhipster/online/service/GeneratorIdentityService.java +++ b/src/main/java/io/github/jhipster/online/service/GeneratorIdentityService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/GeneratorService.java b/src/main/java/io/github/jhipster/online/service/GeneratorService.java index 6567807d..2845dc42 100644 --- a/src/main/java/io/github/jhipster/online/service/GeneratorService.java +++ b/src/main/java/io/github/jhipster/online/service/GeneratorService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/GitService.java b/src/main/java/io/github/jhipster/online/service/GitService.java index 67efc70c..cdfd0b8c 100644 --- a/src/main/java/io/github/jhipster/online/service/GitService.java +++ b/src/main/java/io/github/jhipster/online/service/GitService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/GithubService.java b/src/main/java/io/github/jhipster/online/service/GithubService.java index cd94ca7a..ee39e9e4 100644 --- a/src/main/java/io/github/jhipster/online/service/GithubService.java +++ b/src/main/java/io/github/jhipster/online/service/GithubService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/GitlabService.java b/src/main/java/io/github/jhipster/online/service/GitlabService.java index 6ccf751d..9e67495d 100644 --- a/src/main/java/io/github/jhipster/online/service/GitlabService.java +++ b/src/main/java/io/github/jhipster/online/service/GitlabService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -201,7 +201,7 @@ public User getSyncedUserFromGitProvider(User user) throws IOException { List projectList = gitlab.getGroupProjects(group); List projects = projectList.stream().map(GitlabProject::getName).collect(Collectors.toList()); company.setGitProjects(projects); - } catch (IOException e) { + } catch (Exception e) { log.error("Could not sync GitLab repositories for user `{}`: {}", user.getLogin(), e.getMessage()); } } diff --git a/src/main/java/io/github/jhipster/online/service/InvalidPasswordException.java b/src/main/java/io/github/jhipster/online/service/InvalidPasswordException.java index 58a27b71..001bddb4 100644 --- a/src/main/java/io/github/jhipster/online/service/InvalidPasswordException.java +++ b/src/main/java/io/github/jhipster/online/service/InvalidPasswordException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/JHipsterService.java b/src/main/java/io/github/jhipster/online/service/JHipsterService.java index f6904a76..4d498728 100644 --- a/src/main/java/io/github/jhipster/online/service/JHipsterService.java +++ b/src/main/java/io/github/jhipster/online/service/JHipsterService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. *

* This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/JdlMetadataService.java b/src/main/java/io/github/jhipster/online/service/JdlMetadataService.java index 77c72029..ae1be00b 100644 --- a/src/main/java/io/github/jhipster/online/service/JdlMetadataService.java +++ b/src/main/java/io/github/jhipster/online/service/JdlMetadataService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/JdlService.java b/src/main/java/io/github/jhipster/online/service/JdlService.java index 26d315f4..54684b00 100644 --- a/src/main/java/io/github/jhipster/online/service/JdlService.java +++ b/src/main/java/io/github/jhipster/online/service/JdlService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/LogsService.java b/src/main/java/io/github/jhipster/online/service/LogsService.java index 6c9fe083..18a219c5 100644 --- a/src/main/java/io/github/jhipster/online/service/LogsService.java +++ b/src/main/java/io/github/jhipster/online/service/LogsService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/MailService.java b/src/main/java/io/github/jhipster/online/service/MailService.java index 5191f2a0..f2966518 100644 --- a/src/main/java/io/github/jhipster/online/service/MailService.java +++ b/src/main/java/io/github/jhipster/online/service/MailService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -19,7 +19,6 @@ package io.github.jhipster.online.service; -import io.github.jhipster.config.JHipsterProperties; import io.github.jhipster.online.domain.User; import java.nio.charset.StandardCharsets; import java.util.Locale; @@ -35,6 +34,7 @@ import org.springframework.stereotype.Service; import org.thymeleaf.context.Context; import org.thymeleaf.spring5.SpringTemplateEngine; +import tech.jhipster.config.JHipsterProperties; /** * Service for sending emails. diff --git a/src/main/java/io/github/jhipster/online/service/StatisticsService.java b/src/main/java/io/github/jhipster/online/service/StatisticsService.java index 215c905f..494c9e12 100644 --- a/src/main/java/io/github/jhipster/online/service/StatisticsService.java +++ b/src/main/java/io/github/jhipster/online/service/StatisticsService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/SubGenEventService.java b/src/main/java/io/github/jhipster/online/service/SubGenEventService.java index 093fb5ca..1d2633e4 100644 --- a/src/main/java/io/github/jhipster/online/service/SubGenEventService.java +++ b/src/main/java/io/github/jhipster/online/service/SubGenEventService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/UserService.java b/src/main/java/io/github/jhipster/online/service/UserService.java index 4328ac72..3fcd6980 100644 --- a/src/main/java/io/github/jhipster/online/service/UserService.java +++ b/src/main/java/io/github/jhipster/online/service/UserService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -19,7 +19,6 @@ package io.github.jhipster.online.service; -import io.github.jhipster.config.JHipsterProperties; import io.github.jhipster.online.config.CacheConfiguration; import io.github.jhipster.online.config.Constants; import io.github.jhipster.online.domain.Authority; @@ -33,7 +32,6 @@ import io.github.jhipster.online.security.AuthoritiesConstants; import io.github.jhipster.online.security.SecurityUtils; import io.github.jhipster.online.service.dto.UserDTO; -import io.github.jhipster.security.RandomUtil; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.*; @@ -49,6 +47,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import tech.jhipster.config.JHipsterProperties; +import tech.jhipster.security.RandomUtil; /** * Service class for managing users. diff --git a/src/main/java/io/github/jhipster/online/service/UsernameAlreadyUsedException.java b/src/main/java/io/github/jhipster/online/service/UsernameAlreadyUsedException.java index 25282864..fe14a56a 100644 --- a/src/main/java/io/github/jhipster/online/service/UsernameAlreadyUsedException.java +++ b/src/main/java/io/github/jhipster/online/service/UsernameAlreadyUsedException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/YoRCService.java b/src/main/java/io/github/jhipster/online/service/YoRCService.java index 053d5e32..d482518d 100644 --- a/src/main/java/io/github/jhipster/online/service/YoRCService.java +++ b/src/main/java/io/github/jhipster/online/service/YoRCService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/EntityStatsDTO.java b/src/main/java/io/github/jhipster/online/service/dto/EntityStatsDTO.java index 6aef9873..09c65a0b 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/EntityStatsDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/EntityStatsDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/GeneratorIdentityDTO.java b/src/main/java/io/github/jhipster/online/service/dto/GeneratorIdentityDTO.java index baf5eeac..3218ffbf 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/GeneratorIdentityDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/GeneratorIdentityDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/GitConfigurationDTO.java b/src/main/java/io/github/jhipster/online/service/dto/GitConfigurationDTO.java index ccf8345e..90d34061 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/GitConfigurationDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/GitConfigurationDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/JdlMetadataDTO.java b/src/main/java/io/github/jhipster/online/service/dto/JdlMetadataDTO.java index d3499d8e..966c5ae2 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/JdlMetadataDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/JdlMetadataDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/PasswordChangeDTO.java b/src/main/java/io/github/jhipster/online/service/dto/PasswordChangeDTO.java index b2d9526e..635aec7c 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/PasswordChangeDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/PasswordChangeDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/RawSQL.java b/src/main/java/io/github/jhipster/online/service/dto/RawSQL.java index 5f23b839..69f238f3 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/RawSQL.java +++ b/src/main/java/io/github/jhipster/online/service/dto/RawSQL.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/RawSQLField.java b/src/main/java/io/github/jhipster/online/service/dto/RawSQLField.java index 0235aaf9..f367bbb0 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/RawSQLField.java +++ b/src/main/java/io/github/jhipster/online/service/dto/RawSQLField.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/SubGenEventDTO.java b/src/main/java/io/github/jhipster/online/service/dto/SubGenEventDTO.java index c2d60720..1c3c6c4e 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/SubGenEventDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/SubGenEventDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/TemporalCountDTO.java b/src/main/java/io/github/jhipster/online/service/dto/TemporalCountDTO.java index 33c93573..cae3237a 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/TemporalCountDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/TemporalCountDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/TemporalDistributionDTO.java b/src/main/java/io/github/jhipster/online/service/dto/TemporalDistributionDTO.java index 9bb3ee3b..15635d67 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/TemporalDistributionDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/TemporalDistributionDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/UserDTO.java b/src/main/java/io/github/jhipster/online/service/dto/UserDTO.java index 79ad8570..93d7b60f 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/UserDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/UserDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/YoRCDTO.java b/src/main/java/io/github/jhipster/online/service/dto/YoRCDTO.java index 102936f3..7ca865eb 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/YoRCDTO.java +++ b/src/main/java/io/github/jhipster/online/service/dto/YoRCDTO.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/dto/package-info.java b/src/main/java/io/github/jhipster/online/service/dto/package-info.java index 2e7c48e7..cadd0d7b 100644 --- a/src/main/java/io/github/jhipster/online/service/dto/package-info.java +++ b/src/main/java/io/github/jhipster/online/service/dto/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java b/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java index 0cf797c6..e37bab86 100644 --- a/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java +++ b/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/enums/TemporalValueType.java b/src/main/java/io/github/jhipster/online/service/enums/TemporalValueType.java index b1a2c9f5..a4be254a 100644 --- a/src/main/java/io/github/jhipster/online/service/enums/TemporalValueType.java +++ b/src/main/java/io/github/jhipster/online/service/enums/TemporalValueType.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/interfaces/GitProviderService.java b/src/main/java/io/github/jhipster/online/service/interfaces/GitProviderService.java index 42ce400e..3bcdd48f 100644 --- a/src/main/java/io/github/jhipster/online/service/interfaces/GitProviderService.java +++ b/src/main/java/io/github/jhipster/online/service/interfaces/GitProviderService.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/EntityMapper.java b/src/main/java/io/github/jhipster/online/service/mapper/EntityMapper.java index f1231de0..2f988979 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/EntityMapper.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/EntityMapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/EntityStatsMapper.java b/src/main/java/io/github/jhipster/online/service/mapper/EntityStatsMapper.java index 7d716573..9b01b857 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/EntityStatsMapper.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/EntityStatsMapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/GeneratorIdentityMapper.java b/src/main/java/io/github/jhipster/online/service/mapper/GeneratorIdentityMapper.java index cb3c55c8..cafa1d7b 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/GeneratorIdentityMapper.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/GeneratorIdentityMapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/JdlMetadataMapper.java b/src/main/java/io/github/jhipster/online/service/mapper/JdlMetadataMapper.java index 4a998061..a5c1c648 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/JdlMetadataMapper.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/JdlMetadataMapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/SubGenEventMapper.java b/src/main/java/io/github/jhipster/online/service/mapper/SubGenEventMapper.java index d04232c4..5dbf4b35 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/SubGenEventMapper.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/SubGenEventMapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/UserMapper.java b/src/main/java/io/github/jhipster/online/service/mapper/UserMapper.java index 401f037b..307fcd44 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/UserMapper.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/UserMapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online for more * information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/YoRCMapper.java b/src/main/java/io/github/jhipster/online/service/mapper/YoRCMapper.java index 1cad00e7..6aac53b7 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/YoRCMapper.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/YoRCMapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/mapper/package-info.java b/src/main/java/io/github/jhipster/online/service/mapper/package-info.java index 222b89ef..f5115aff 100644 --- a/src/main/java/io/github/jhipster/online/service/mapper/package-info.java +++ b/src/main/java/io/github/jhipster/online/service/mapper/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/package-info.java b/src/main/java/io/github/jhipster/online/service/package-info.java index bca11783..f5d50080 100644 --- a/src/main/java/io/github/jhipster/online/service/package-info.java +++ b/src/main/java/io/github/jhipster/online/service/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/service/util/QueryUtil.java b/src/main/java/io/github/jhipster/online/service/util/QueryUtil.java index d71b1867..baf5df84 100644 --- a/src/main/java/io/github/jhipster/online/service/util/QueryUtil.java +++ b/src/main/java/io/github/jhipster/online/service/util/QueryUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/util/DateUtil.java b/src/main/java/io/github/jhipster/online/util/DateUtil.java index 44be5346..7f9414ee 100644 --- a/src/main/java/io/github/jhipster/online/util/DateUtil.java +++ b/src/main/java/io/github/jhipster/online/util/DateUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/util/SanitizeInputs.java b/src/main/java/io/github/jhipster/online/util/SanitizeInputs.java index a875380c..d5cf3249 100644 --- a/src/main/java/io/github/jhipster/online/util/SanitizeInputs.java +++ b/src/main/java/io/github/jhipster/online/util/SanitizeInputs.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/JdlStudio.java b/src/main/java/io/github/jhipster/online/web/JdlStudio.java index 108a63a1..afb7a347 100644 --- a/src/main/java/io/github/jhipster/online/web/JdlStudio.java +++ b/src/main/java/io/github/jhipster/online/web/JdlStudio.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/AccountResource.java b/src/main/java/io/github/jhipster/online/web/rest/AccountResource.java index f26008e4..6428c8ec 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/AccountResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/AccountResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/AuditResource.java b/src/main/java/io/github/jhipster/online/web/rest/AuditResource.java index 800b5885..4f1c2ebe 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/AuditResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/AuditResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,8 +20,6 @@ package io.github.jhipster.online.web.rest; import io.github.jhipster.online.service.AuditEventService; -import io.github.jhipster.web.util.PaginationUtil; -import io.github.jhipster.web.util.ResponseUtil; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; @@ -34,6 +32,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import tech.jhipster.web.util.PaginationUtil; +import tech.jhipster.web.util.ResponseUtil; /** * REST controller for getting the {@link AuditEvent}s. diff --git a/src/main/java/io/github/jhipster/online/web/rest/CiCdResource.java b/src/main/java/io/github/jhipster/online/web/rest/CiCdResource.java index a0acb9ba..6fd2ee43 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/CiCdResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/CiCdResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/ClientForwardController.java b/src/main/java/io/github/jhipster/online/web/rest/ClientForwardController.java index 898ad2e9..e86887fb 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/ClientForwardController.java +++ b/src/main/java/io/github/jhipster/online/web/rest/ClientForwardController.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/EntityStatsResource.java b/src/main/java/io/github/jhipster/online/web/rest/EntityStatsResource.java index 057157fe..8d8f3120 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/EntityStatsResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/EntityStatsResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -24,8 +24,6 @@ import io.github.jhipster.online.service.EntityStatsService; import io.github.jhipster.online.service.dto.EntityStatsDTO; import io.github.jhipster.online.web.rest.errors.BadRequestAlertException; -import io.github.jhipster.web.util.HeaderUtil; -import io.github.jhipster.web.util.ResponseUtil; import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -36,6 +34,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.annotation.Secured; import org.springframework.web.bind.annotation.*; +import tech.jhipster.web.util.HeaderUtil; +import tech.jhipster.web.util.ResponseUtil; /** * REST controller for managing EntityStats. diff --git a/src/main/java/io/github/jhipster/online/web/rest/GeneratorIdentityResource.java b/src/main/java/io/github/jhipster/online/web/rest/GeneratorIdentityResource.java index 1fa7c516..cf97db50 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/GeneratorIdentityResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/GeneratorIdentityResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -24,8 +24,6 @@ import io.github.jhipster.online.service.UserService; import io.github.jhipster.online.service.dto.GeneratorIdentityDTO; import io.github.jhipster.online.web.rest.errors.BadRequestAlertException; -import io.github.jhipster.web.util.HeaderUtil; -import io.github.jhipster.web.util.ResponseUtil; import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -35,6 +33,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import tech.jhipster.web.util.HeaderUtil; +import tech.jhipster.web.util.ResponseUtil; /** * REST controller for managing GeneratorIdentity. diff --git a/src/main/java/io/github/jhipster/online/web/rest/GeneratorResource.java b/src/main/java/io/github/jhipster/online/web/rest/GeneratorResource.java index ea38652e..9199447d 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/GeneratorResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/GeneratorResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/GitResource.java b/src/main/java/io/github/jhipster/online/web/rest/GitResource.java index d9803f49..4160df03 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/GitResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/GitResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/JdlMetadataResource.java b/src/main/java/io/github/jhipster/online/web/rest/JdlMetadataResource.java index 81459599..0deafb5b 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/JdlMetadataResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/JdlMetadataResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -24,8 +24,6 @@ import io.github.jhipster.online.service.JdlMetadataService; import io.github.jhipster.online.service.UserService; import io.github.jhipster.online.service.dto.JdlMetadataDTO; -import io.github.jhipster.web.util.HeaderUtil; -import io.github.jhipster.web.util.ResponseUtil; import java.util.List; import java.util.Optional; import javax.validation.Valid; @@ -36,6 +34,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.annotation.Secured; import org.springframework.web.bind.annotation.*; +import tech.jhipster.web.util.HeaderUtil; +import tech.jhipster.web.util.ResponseUtil; /** * REST controller for managing JdlMetadata. diff --git a/src/main/java/io/github/jhipster/online/web/rest/JdlResource.java b/src/main/java/io/github/jhipster/online/web/rest/JdlResource.java index 99459dc9..2aaa1ac7 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/JdlResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/JdlResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/StatisticsResource.java b/src/main/java/io/github/jhipster/online/web/rest/StatisticsResource.java index 4dbb2208..e003b94a 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/StatisticsResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/StatisticsResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/SubGenEventResource.java b/src/main/java/io/github/jhipster/online/web/rest/SubGenEventResource.java index cd97029d..a7e19bd5 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/SubGenEventResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/SubGenEventResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -24,8 +24,6 @@ import io.github.jhipster.online.service.SubGenEventService; import io.github.jhipster.online.service.dto.SubGenEventDTO; import io.github.jhipster.online.web.rest.errors.BadRequestAlertException; -import io.github.jhipster.web.util.HeaderUtil; -import io.github.jhipster.web.util.ResponseUtil; import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -36,6 +34,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.annotation.Secured; import org.springframework.web.bind.annotation.*; +import tech.jhipster.web.util.HeaderUtil; +import tech.jhipster.web.util.ResponseUtil; /** * REST controller for managing SubGenEvent. diff --git a/src/main/java/io/github/jhipster/online/web/rest/UserJWTController.java b/src/main/java/io/github/jhipster/online/web/rest/UserJWTController.java index 88ba2258..4715253b 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/UserJWTController.java +++ b/src/main/java/io/github/jhipster/online/web/rest/UserJWTController.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/UserResource.java b/src/main/java/io/github/jhipster/online/web/rest/UserResource.java index 31d3f31c..d047d625 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/UserResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/UserResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -29,9 +29,6 @@ import io.github.jhipster.online.web.rest.errors.BadRequestAlertException; import io.github.jhipster.online.web.rest.errors.EmailAlreadyUsedException; import io.github.jhipster.online.web.rest.errors.LoginAlreadyUsedException; -import io.github.jhipster.web.util.HeaderUtil; -import io.github.jhipster.web.util.PaginationUtil; -import io.github.jhipster.web.util.ResponseUtil; import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -48,6 +45,9 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import tech.jhipster.web.util.HeaderUtil; +import tech.jhipster.web.util.PaginationUtil; +import tech.jhipster.web.util.ResponseUtil; /** * REST controller for managing users. diff --git a/src/main/java/io/github/jhipster/online/web/rest/YoRCResource.java b/src/main/java/io/github/jhipster/online/web/rest/YoRCResource.java index 0509d78e..34a0b417 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/YoRCResource.java +++ b/src/main/java/io/github/jhipster/online/web/rest/YoRCResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -24,8 +24,6 @@ import io.github.jhipster.online.service.YoRCService; import io.github.jhipster.online.service.dto.YoRCDTO; import io.github.jhipster.online.web.rest.errors.BadRequestAlertException; -import io.github.jhipster.web.util.HeaderUtil; -import io.github.jhipster.web.util.ResponseUtil; import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -36,6 +34,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.annotation.Secured; import org.springframework.web.bind.annotation.*; +import tech.jhipster.web.util.HeaderUtil; +import tech.jhipster.web.util.ResponseUtil; /** * REST controller for managing YoRC. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/BadRequestAlertException.java b/src/main/java/io/github/jhipster/online/web/rest/errors/BadRequestAlertException.java index 54f7143f..7d081881 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/BadRequestAlertException.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/BadRequestAlertException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/EmailAlreadyUsedException.java b/src/main/java/io/github/jhipster/online/web/rest/errors/EmailAlreadyUsedException.java index 204fcc3e..b15ccc8a 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/EmailAlreadyUsedException.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/EmailAlreadyUsedException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/ErrorConstants.java b/src/main/java/io/github/jhipster/online/web/rest/errors/ErrorConstants.java index 9a6e485a..2eaf348d 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/ErrorConstants.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/ErrorConstants.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/ExceptionTranslator.java b/src/main/java/io/github/jhipster/online/web/rest/errors/ExceptionTranslator.java index b1a7dd39..f661bacd 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/ExceptionTranslator.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/ExceptionTranslator.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -19,7 +19,6 @@ package io.github.jhipster.online.web.rest.errors; -import io.github.jhipster.web.util.HeaderUtil; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; @@ -40,6 +39,7 @@ import org.zalando.problem.spring.web.advice.ProblemHandling; import org.zalando.problem.spring.web.advice.security.SecurityAdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblem; +import tech.jhipster.web.util.HeaderUtil; /** * Controller advice to translate the server side exceptions to client-friendly json structures. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/FieldErrorVM.java b/src/main/java/io/github/jhipster/online/web/rest/errors/FieldErrorVM.java index bc7aedbb..59ab514d 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/FieldErrorVM.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/FieldErrorVM.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/InvalidPasswordException.java b/src/main/java/io/github/jhipster/online/web/rest/errors/InvalidPasswordException.java index 2cd947d2..9298e24c 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/InvalidPasswordException.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/InvalidPasswordException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/LoginAlreadyUsedException.java b/src/main/java/io/github/jhipster/online/web/rest/errors/LoginAlreadyUsedException.java index fc9f1ca9..90c63735 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/LoginAlreadyUsedException.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/LoginAlreadyUsedException.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/package-info.java b/src/main/java/io/github/jhipster/online/web/rest/errors/package-info.java index 6427aa26..02456af7 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/errors/package-info.java +++ b/src/main/java/io/github/jhipster/online/web/rest/errors/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/package-info.java b/src/main/java/io/github/jhipster/online/web/rest/package-info.java index 13ef2be6..28f48c80 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/package-info.java +++ b/src/main/java/io/github/jhipster/online/web/rest/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/vm/JdlVM.java b/src/main/java/io/github/jhipster/online/web/rest/vm/JdlVM.java index 60a1becc..cb2ab643 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/vm/JdlVM.java +++ b/src/main/java/io/github/jhipster/online/web/rest/vm/JdlVM.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/vm/KeyAndPasswordVM.java b/src/main/java/io/github/jhipster/online/web/rest/vm/KeyAndPasswordVM.java index 6e2ce3cf..0b0bfb55 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/vm/KeyAndPasswordVM.java +++ b/src/main/java/io/github/jhipster/online/web/rest/vm/KeyAndPasswordVM.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/vm/LoginVM.java b/src/main/java/io/github/jhipster/online/web/rest/vm/LoginVM.java index 867dfabd..6f5dd2f9 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/vm/LoginVM.java +++ b/src/main/java/io/github/jhipster/online/web/rest/vm/LoginVM.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/vm/ManagedUserVM.java b/src/main/java/io/github/jhipster/online/web/rest/vm/ManagedUserVM.java index 116ee7eb..70f7fb5e 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/vm/ManagedUserVM.java +++ b/src/main/java/io/github/jhipster/online/web/rest/vm/ManagedUserVM.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/java/io/github/jhipster/online/web/rest/vm/package-info.java b/src/main/java/io/github/jhipster/online/web/rest/vm/package-info.java index 16667c4d..cd2f4854 100644 --- a/src/main/java/io/github/jhipster/online/web/rest/vm/package-info.java +++ b/src/main/java/io/github/jhipster/online/web/rest/vm/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 469130ca..a6878a31 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -20,12 +20,6 @@ logging: io.github.jhipster.online: DEBUG spring: - profiles: - active: dev - include: - - swagger - # Uncomment to activate TLS for the dev profile - #- tls devtools: restart: enabled: true @@ -56,7 +50,7 @@ spring: hibernate.cache.use_second_level_cache: true hibernate.cache.use_query_cache: false hibernate.generate_statistics: false - # hibernate.cache.region.factory_class: io.github.jhipster.config.jcache.NoDefaultJCacheRegionFactory + # hibernate.cache.region.factory_class: tech.jhipster.config.jcache.NoDefaultJCacheRegionFactory liquibase: contexts: dev mail: @@ -103,10 +97,6 @@ jhipster: enabled: true from: jhipster-online@jhipster.tech base-url: http://127.0.0.1:8080 - metrics: - logs: # Reports metrics in the logs - enabled: false - report-frequency: 60 # in seconds logging: use-json-format: false # By default, logs are not in Json format logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml index fe25e0ce..68c55941 100644 --- a/src/main/resources/config/application-prod.yml +++ b/src/main/resources/config/application-prod.yml @@ -56,7 +56,6 @@ spring: password: thymeleaf: cache: true - prefix: classpath:/templates # =================================================================== # To enable TLS in production, generate a certificate using: @@ -78,12 +77,12 @@ spring: # ciphers: TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 ,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 ,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,TLS_RSA_WITH_CAMELLIA_128_CBC_SHA # =================================================================== server: - use-forward-headers: true port: 8080 compression: enabled: true mime-types: text/html,text/xml,text/plain,text/css, application/javascript, application/json min-response-size: 1024 + forward-headers-strategy: framework # =================================================================== # JHipster specific properties @@ -114,10 +113,6 @@ jhipster: mail: # specific JHipster mail property, for standard properties see MailProperties from: jhipster-online@jhipster.tech base-url: http://my-server-url-to-change # Modify according to your server's URL - metrics: - logs: # Reports metrics in the logs - enabled: false - report-frequency: 60 # in seconds logging: use-json-format: false # By default, logs are not in Json format logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 2d1eac83..ecc9de39 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -65,6 +65,12 @@ spring: # Otherwise, it will be filled in by maven when building the JAR file # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS` active: #spring.profiles.active# + group: + dev: + - dev + - api-docs + # Uncomment to activate TLS for the dev profile + #- tls jmx: enabled: false data: @@ -96,8 +102,8 @@ spring: main: allow-bean-definition-overriding: true mvc: - favicon: - enabled: false + pathmatch: + matching-strategy: ant_path_matcher task: execution: thread-name-prefix: jhonline-task- @@ -146,17 +152,6 @@ jhipster: # max-age: 1800 mail: from: no-reply@jhipster.tech - swagger: - default-include-pattern: /api/.* - title: jhonline API - description: jhonline API documentation - version: 0.0.1 - terms-of-service-url: - contact-name: - contact-url: - contact-email: - license: - license-url: # =================================================================== # Application specific properties # Add your own application properties here, see the ApplicationProperties class diff --git a/src/main/resources/config/liquibase/changelog/20230216080000_update_column_types.xml b/src/main/resources/config/liquibase/changelog/20230216080000_update_column_types.xml new file mode 100644 index 00000000..98e5d477 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20230216080000_update_column_types.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index a9d4fffe..3d0a36e6 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -24,4 +24,5 @@ + diff --git a/src/main/webapp/app/account/account.module.ts b/src/main/webapp/app/account/account.module.ts index a2331e06..8c2cd6fc 100644 --- a/src/main/webapp/app/account/account.module.ts +++ b/src/main/webapp/app/account/account.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -42,7 +42,6 @@ import { accountState } from './account.route'; PasswordResetFinishComponent, SettingsComponent, DeleteAccountDialogComponent - ], - entryComponents: [DeleteAccountDialogComponent] + ] }) export class AccountModule {} diff --git a/src/main/webapp/app/account/account.route.ts b/src/main/webapp/app/account/account.route.ts index 10e18adc..bc91b27c 100644 --- a/src/main/webapp/app/account/account.route.ts +++ b/src/main/webapp/app/account/account.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/account/activate/activate.component.ts b/src/main/webapp/app/account/activate/activate.component.ts index fcccee5c..ff119863 100644 --- a/src/main/webapp/app/account/activate/activate.component.ts +++ b/src/main/webapp/app/account/activate/activate.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,7 +18,7 @@ */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { flatMap } from 'rxjs/operators'; +import { mergeMap } from 'rxjs/operators'; import { LoginModalService } from 'app/core/login/login-modal.service'; import { ActivateService } from './activate.service'; @@ -34,7 +34,7 @@ export class ActivateComponent implements OnInit { constructor(private activateService: ActivateService, private loginModalService: LoginModalService, private route: ActivatedRoute) {} ngOnInit(): void { - this.route.queryParams.pipe(flatMap(params => this.activateService.get(params.key))).subscribe( + this.route.queryParams.pipe(mergeMap(params => this.activateService.get(params.key))).subscribe( () => (this.success = true), () => (this.error = true) ); diff --git a/src/main/webapp/app/account/activate/activate.route.ts b/src/main/webapp/app/account/activate/activate.route.ts index 9cf74e6f..881b6db4 100644 --- a/src/main/webapp/app/account/activate/activate.route.ts +++ b/src/main/webapp/app/account/activate/activate.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/account/activate/activate.service.ts b/src/main/webapp/app/account/activate/activate.service.ts index 209a4784..5a5ad081 100644 --- a/src/main/webapp/app/account/activate/activate.service.ts +++ b/src/main/webapp/app/account/activate/activate.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,8 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; - @Injectable({ providedIn: 'root' }) export class ActivateService { constructor(private http: HttpClient) {} diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts index b046e669..d69d54ce 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -17,7 +17,7 @@ * limitations under the License. */ import { Component, OnInit, AfterViewInit, ElementRef, ViewChild } from '@angular/core'; -import { FormBuilder, Validators } from '@angular/forms'; +import { UntypedFormBuilder, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { LoginModalService } from 'app/core/login/login-modal.service'; @@ -46,7 +46,7 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit { private passwordResetFinishService: PasswordResetFinishService, private loginModalService: LoginModalService, private route: ActivatedRoute, - private fb: FormBuilder + private fb: UntypedFormBuilder ) {} ngOnInit(): void { diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts index 8dc16015..2fd99572 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts index 4009da80..299e3cd6 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,8 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; - @Injectable({ providedIn: 'root' }) export class PasswordResetFinishService { constructor(private http: HttpClient) {} diff --git a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts index 624b0c80..330c98d3 100644 --- a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts +++ b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -17,7 +17,7 @@ * limitations under the License. */ import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core'; -import { FormBuilder, Validators } from '@angular/forms'; +import { UntypedFormBuilder, Validators } from '@angular/forms'; import { PasswordResetInitService } from './password-reset-init.service'; @@ -34,7 +34,7 @@ export class PasswordResetInitComponent implements AfterViewInit { email: ['', [Validators.required, Validators.minLength(5), Validators.maxLength(254), Validators.email]] }); - constructor(private passwordResetInitService: PasswordResetInitService, private fb: FormBuilder) {} + constructor(private passwordResetInitService: PasswordResetInitService, private fb: UntypedFormBuilder) {} ngAfterViewInit(): void { if (this.email) { diff --git a/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts b/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts index 87bf11fd..cc41b52c 100644 --- a/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts +++ b/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts b/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts index 4904c3d9..b192bef9 100644 --- a/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts +++ b/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,8 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; - @Injectable({ providedIn: 'root' }) export class PasswordResetInitService { constructor(private http: HttpClient) {} diff --git a/src/main/webapp/app/account/password/password-strength-bar.component.ts b/src/main/webapp/app/account/password/password-strength-bar.component.ts index b2510879..52acfe94 100644 --- a/src/main/webapp/app/account/password/password-strength-bar.component.ts +++ b/src/main/webapp/app/account/password/password-strength-bar.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -44,7 +44,7 @@ export class PasswordStrengthBarComponent { const regex = /[$-/:-?{-~!"^_`[\]]/g; // " const lowerLetters = /[a-z]+/.test(p); const upperLetters = /[A-Z]+/.test(p); - const numbers = /[0-9]+/.test(p); + const numbers = /\d+/.test(p); const symbols = regex.test(p); const flags = [lowerLetters, upperLetters, numbers, symbols]; diff --git a/src/main/webapp/app/account/password/password.component.ts b/src/main/webapp/app/account/password/password.component.ts index bc0000c8..4552e2f4 100644 --- a/src/main/webapp/app/account/password/password.component.ts +++ b/src/main/webapp/app/account/password/password.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -17,7 +17,7 @@ * limitations under the License. */ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, Validators } from '@angular/forms'; +import { UntypedFormBuilder, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; import { AccountService } from 'app/core/auth/account.service'; @@ -39,7 +39,7 @@ export class PasswordComponent implements OnInit { confirmPassword: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]] }); - constructor(private passwordService: PasswordService, private accountService: AccountService, private fb: FormBuilder) {} + constructor(private passwordService: PasswordService, private accountService: AccountService, private fb: UntypedFormBuilder) {} ngOnInit(): void { this.account$ = this.accountService.identity(); diff --git a/src/main/webapp/app/account/password/password.route.ts b/src/main/webapp/app/account/password/password.route.ts index 86b97856..eef4b524 100644 --- a/src/main/webapp/app/account/password/password.route.ts +++ b/src/main/webapp/app/account/password/password.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/account/password/password.service.ts b/src/main/webapp/app/account/password/password.service.ts index 7694c829..55131e03 100644 --- a/src/main/webapp/app/account/password/password.service.ts +++ b/src/main/webapp/app/account/password/password.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,8 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; - @Injectable({ providedIn: 'root' }) export class PasswordService { constructor(private http: HttpClient) {} diff --git a/src/main/webapp/app/account/register/register.component.ts b/src/main/webapp/app/account/register/register.component.ts index 77996d49..7820c40f 100644 --- a/src/main/webapp/app/account/register/register.component.ts +++ b/src/main/webapp/app/account/register/register.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -18,7 +18,7 @@ */ import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; -import { FormBuilder, Validators } from '@angular/forms'; +import { UntypedFormBuilder, Validators } from '@angular/forms'; import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/shared/constants/error.constants'; import { LoginModalService } from 'app/core/login/login-modal.service'; @@ -49,7 +49,7 @@ export class RegisterComponent implements AfterViewInit { constructor( private loginModalService: LoginModalService, private registerService: RegisterService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private passwordResetService: PasswordResetService ) {} diff --git a/src/main/webapp/app/account/register/register.route.ts b/src/main/webapp/app/account/register/register.route.ts index 02829d3d..ea12fbd5 100644 --- a/src/main/webapp/app/account/register/register.route.ts +++ b/src/main/webapp/app/account/register/register.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/account/register/register.service.ts b/src/main/webapp/app/account/register/register.service.ts index bba518d8..4a66a0ff 100644 --- a/src/main/webapp/app/account/register/register.service.ts +++ b/src/main/webapp/app/account/register/register.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,7 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; import { IUser } from 'app/core/user/user.model'; @Injectable({ providedIn: 'root' }) diff --git a/src/main/webapp/app/account/settings/delete-account-dialog.component.ts b/src/main/webapp/app/account/settings/delete-account-dialog.component.ts index 6ee8f7e6..79071947 100644 --- a/src/main/webapp/app/account/settings/delete-account-dialog.component.ts +++ b/src/main/webapp/app/account/settings/delete-account-dialog.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/account/settings/settings.component.ts b/src/main/webapp/app/account/settings/settings.component.ts index 9d3fe814..4d856602 100644 --- a/src/main/webapp/app/account/settings/settings.component.ts +++ b/src/main/webapp/app/account/settings/settings.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -17,7 +17,7 @@ * limitations under the License. */ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, Validators } from '@angular/forms'; +import { UntypedFormBuilder, Validators } from '@angular/forms'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; @@ -36,7 +36,7 @@ export class SettingsComponent implements OnInit { email: [undefined, [Validators.required, Validators.minLength(5), Validators.maxLength(254), Validators.email]] }); - constructor(private accountService: AccountService, private fb: FormBuilder, private modalService: NgbModal) {} + constructor(private accountService: AccountService, private fb: UntypedFormBuilder, private modalService: NgbModal) {} ngOnInit(): void { this.accountService.identity().subscribe(account => { diff --git a/src/main/webapp/app/account/settings/settings.route.ts b/src/main/webapp/app/account/settings/settings.route.ts index c0390e5b..0b416a71 100644 --- a/src/main/webapp/app/account/settings/settings.route.ts +++ b/src/main/webapp/app/account/settings/settings.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/admin-routing.module.ts b/src/main/webapp/app/admin/admin-routing.module.ts index 8a83f895..9530bb43 100644 --- a/src/main/webapp/app/admin/admin-routing.module.ts +++ b/src/main/webapp/app/admin/admin-routing.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/audits/audit-data.model.ts b/src/main/webapp/app/admin/audits/audit-data.model.ts index 8d386bd2..b7cbd868 100644 --- a/src/main/webapp/app/admin/audits/audit-data.model.ts +++ b/src/main/webapp/app/admin/audits/audit-data.model.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/audits/audit.model.ts b/src/main/webapp/app/admin/audits/audit.model.ts index 55cbd8cc..77ff11f2 100644 --- a/src/main/webapp/app/admin/audits/audit.model.ts +++ b/src/main/webapp/app/admin/audits/audit.model.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/audits/audits.component.ts b/src/main/webapp/app/admin/audits/audits.component.ts index 2287fe8d..7272db34 100644 --- a/src/main/webapp/app/admin/audits/audits.component.ts +++ b/src/main/webapp/app/admin/audits/audits.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -123,6 +123,6 @@ export class AuditsComponent implements OnInit { private onSuccess(audits: Audit[] | null, headers: HttpHeaders): void { this.totalItems = Number(headers.get('X-Total-Count')); - this.audits = audits || []; + this.audits = audits ?? []; } } diff --git a/src/main/webapp/app/admin/audits/audits.module.ts b/src/main/webapp/app/admin/audits/audits.module.ts index d1ff93e1..c5186567 100644 --- a/src/main/webapp/app/admin/audits/audits.module.ts +++ b/src/main/webapp/app/admin/audits/audits.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/audits/audits.route.ts b/src/main/webapp/app/admin/audits/audits.route.ts index d9dc96a2..f09d8085 100644 --- a/src/main/webapp/app/admin/audits/audits.route.ts +++ b/src/main/webapp/app/admin/audits/audits.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/audits/audits.service.ts b/src/main/webapp/app/admin/audits/audits.service.ts index 1d0c64ac..482d9f05 100644 --- a/src/main/webapp/app/admin/audits/audits.service.ts +++ b/src/main/webapp/app/admin/audits/audits.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -21,7 +21,6 @@ import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { createRequestOption, Pagination } from 'app/shared/util/request-util'; -import { SERVER_API_URL } from 'app/app.constants'; import { Audit } from './audit.model'; export interface AuditsQuery extends Pagination { diff --git a/src/main/webapp/app/admin/configuration/configuration.component.ts b/src/main/webapp/app/admin/configuration/configuration.component.ts index 7af3a3c0..bc0fb6de 100644 --- a/src/main/webapp/app/admin/configuration/configuration.component.ts +++ b/src/main/webapp/app/admin/configuration/configuration.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/configuration/configuration.module.ts b/src/main/webapp/app/admin/configuration/configuration.module.ts index e81a9e4a..74fba497 100644 --- a/src/main/webapp/app/admin/configuration/configuration.module.ts +++ b/src/main/webapp/app/admin/configuration/configuration.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/configuration/configuration.route.ts b/src/main/webapp/app/admin/configuration/configuration.route.ts index a64c1e5d..7fb70c90 100644 --- a/src/main/webapp/app/admin/configuration/configuration.route.ts +++ b/src/main/webapp/app/admin/configuration/configuration.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/configuration/configuration.service.ts b/src/main/webapp/app/admin/configuration/configuration.service.ts index 42dba3aa..bdf33505 100644 --- a/src/main/webapp/app/admin/configuration/configuration.service.ts +++ b/src/main/webapp/app/admin/configuration/configuration.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -21,8 +21,6 @@ import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { SERVER_API_URL } from 'app/app.constants'; - export interface ConfigProps { contexts: Contexts; } diff --git a/src/main/webapp/app/admin/docs/docs.component.ts b/src/main/webapp/app/admin/docs/docs.component.ts index bfea7697..cc2e0454 100644 --- a/src/main/webapp/app/admin/docs/docs.component.ts +++ b/src/main/webapp/app/admin/docs/docs.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/docs/docs.module.ts b/src/main/webapp/app/admin/docs/docs.module.ts index d14cd4fb..10f34672 100644 --- a/src/main/webapp/app/admin/docs/docs.module.ts +++ b/src/main/webapp/app/admin/docs/docs.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/docs/docs.route.ts b/src/main/webapp/app/admin/docs/docs.route.ts index 09d3c43a..19dc11eb 100644 --- a/src/main/webapp/app/admin/docs/docs.route.ts +++ b/src/main/webapp/app/admin/docs/docs.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/docs/docs.scss b/src/main/webapp/app/admin/docs/docs.scss index 541c3d79..bb9a6cc8 100644 --- a/src/main/webapp/app/admin/docs/docs.scss +++ b/src/main/webapp/app/admin/docs/docs.scss @@ -1,5 +1,5 @@ -@import '~bootstrap/scss/functions'; -@import '~bootstrap/scss/variables'; +@import 'bootstrap/scss/functions'; +@import 'bootstrap/scss/variables'; iframe { background: white; diff --git a/src/main/webapp/app/admin/health/health-modal.component.ts b/src/main/webapp/app/admin/health/health-modal.component.ts index ee8d93ce..107203bb 100644 --- a/src/main/webapp/app/admin/health/health-modal.component.ts +++ b/src/main/webapp/app/admin/health/health-modal.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/health/health.component.ts b/src/main/webapp/app/admin/health/health.component.ts index a8d7b023..7edc5c0c 100644 --- a/src/main/webapp/app/admin/health/health.component.ts +++ b/src/main/webapp/app/admin/health/health.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/health/health.module.ts b/src/main/webapp/app/admin/health/health.module.ts index ca9119a6..1d550a72 100644 --- a/src/main/webapp/app/admin/health/health.module.ts +++ b/src/main/webapp/app/admin/health/health.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -27,7 +27,6 @@ import { healthRoute } from './health.route'; @NgModule({ imports: [JhonlineSharedModule, RouterModule.forChild([healthRoute])], - declarations: [HealthComponent, HealthModalComponent], - entryComponents: [HealthModalComponent] + declarations: [HealthComponent, HealthModalComponent] }) export class HealthModule {} diff --git a/src/main/webapp/app/admin/health/health.route.ts b/src/main/webapp/app/admin/health/health.route.ts index d76d9a85..52ce41d7 100644 --- a/src/main/webapp/app/admin/health/health.route.ts +++ b/src/main/webapp/app/admin/health/health.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/health/health.service.ts b/src/main/webapp/app/admin/health/health.service.ts index 2b65b12b..baa93c3b 100644 --- a/src/main/webapp/app/admin/health/health.service.ts +++ b/src/main/webapp/app/admin/health/health.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,8 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; - export type HealthStatus = 'UP' | 'DOWN' | 'UNKNOWN' | 'OUT_OF_SERVICE'; export type HealthKey = 'diskSpace' | 'mail' | 'ping' | 'db'; diff --git a/src/main/webapp/app/admin/logs/log.model.ts b/src/main/webapp/app/admin/logs/log.model.ts index ae924902..70d38283 100644 --- a/src/main/webapp/app/admin/logs/log.model.ts +++ b/src/main/webapp/app/admin/logs/log.model.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/logs/logs.component.ts b/src/main/webapp/app/admin/logs/logs.component.ts index f3e2a1f7..2b6bb2e6 100644 --- a/src/main/webapp/app/admin/logs/logs.component.ts +++ b/src/main/webapp/app/admin/logs/logs.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/logs/logs.module.ts b/src/main/webapp/app/admin/logs/logs.module.ts index 6de3d074..4ff7751a 100644 --- a/src/main/webapp/app/admin/logs/logs.module.ts +++ b/src/main/webapp/app/admin/logs/logs.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/logs/logs.route.ts b/src/main/webapp/app/admin/logs/logs.route.ts index 726d6a86..1a10c69e 100644 --- a/src/main/webapp/app/admin/logs/logs.route.ts +++ b/src/main/webapp/app/admin/logs/logs.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/logs/logs.service.ts b/src/main/webapp/app/admin/logs/logs.service.ts index b70e9f42..d4076b2b 100644 --- a/src/main/webapp/app/admin/logs/logs.service.ts +++ b/src/main/webapp/app/admin/logs/logs.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,7 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; import { LoggersResponse, Level } from './log.model'; @Injectable({ providedIn: 'root' }) diff --git a/src/main/webapp/app/admin/metrics/metrics.component.ts b/src/main/webapp/app/admin/metrics/metrics.component.ts index 5bdb0574..46841cd4 100644 --- a/src/main/webapp/app/admin/metrics/metrics.component.ts +++ b/src/main/webapp/app/admin/metrics/metrics.component.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -17,9 +17,9 @@ * limitations under the License. */ import { Component, OnInit, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; -import { flatMap } from 'rxjs/operators'; +import { combineLatest } from 'rxjs'; -import { MetricsService, Metrics, MetricsKey, ThreadDump, Thread } from './metrics.service'; +import { MetricsService, Metrics, MetricsKey, Thread } from './metrics.service'; @Component({ selector: 'jhi-metrics', @@ -39,27 +39,19 @@ export class MetricsComponent implements OnInit { refresh(): void { this.updatingMetrics = true; - this.metricsService - .getMetrics() - .pipe( - flatMap( - () => this.metricsService.threadDump(), - (metrics: Metrics, threadDump: ThreadDump) => { - this.metrics = metrics; - this.threads = threadDump.threads; - this.updatingMetrics = false; - this.changeDetector.detectChanges(); - } - ) - ) - .subscribe(); + combineLatest([this.metricsService.getMetrics(), this.metricsService.threadDump()]).subscribe(([metrics, threadDump]) => { + this.metrics = metrics; + this.threads = threadDump.threads; + this.updatingMetrics = false; + this.changeDetector.markForCheck(); + }); } metricsKeyExists(key: MetricsKey): boolean { - return this.metrics && this.metrics[key]; + return this?.metrics && this.metrics[key]; } metricsKeyExistsAndObjectNotEmpty(key: MetricsKey): boolean { - return this.metrics && this.metrics[key] && JSON.stringify(this.metrics[key]) !== '{}'; + return this?.metrics && this.metrics[key] && JSON.stringify(this.metrics[key]) !== '{}'; } } diff --git a/src/main/webapp/app/admin/metrics/metrics.module.ts b/src/main/webapp/app/admin/metrics/metrics.module.ts index 22012e36..6fb54544 100644 --- a/src/main/webapp/app/admin/metrics/metrics.module.ts +++ b/src/main/webapp/app/admin/metrics/metrics.module.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/metrics/metrics.route.ts b/src/main/webapp/app/admin/metrics/metrics.route.ts index 4a018862..af73e2ef 100644 --- a/src/main/webapp/app/admin/metrics/metrics.route.ts +++ b/src/main/webapp/app/admin/metrics/metrics.route.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. diff --git a/src/main/webapp/app/admin/metrics/metrics.service.ts b/src/main/webapp/app/admin/metrics/metrics.service.ts index fcd85737..0913e82d 100644 --- a/src/main/webapp/app/admin/metrics/metrics.service.ts +++ b/src/main/webapp/app/admin/metrics/metrics.service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2017-2022 the original author or authors from the JHipster project. + * Copyright 2017-2023 the original author or authors from the JHipster project. * * This file is part of the JHipster Online project, see https://github.com/jhipster/jhipster-online * for more information. @@ -20,8 +20,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { SERVER_API_URL } from 'app/app.constants'; - export type MetricsKey = 'jvm' | 'http.server.requests' | 'cache' | 'services' | 'databases' | 'garbageCollector' | 'processMetrics'; export type Metrics = { [key in MetricsKey]: any }; export type Thread = any; diff --git a/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html b/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html index d6f82135..4307e763 100644 --- a/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html +++ b/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html @@ -1,4 +1,4 @@ -

+