From 22f69a7ce0e1d35166cad211c7a4a196ab98fd49 Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 8 Aug 2023 20:59:06 +0800 Subject: [PATCH 1/3] Customize template --- .github/workflows/ci-cd.yml | 8 +-- .yamllint | 2 +- ...> Astraios-Project-intellij-code-style.xml | 6 +- Dockerfile | 4 +- README.md | 66 ++++++++--------- checkstyle.xml | 2 +- docs/README.md | 2 +- docs/blog/authors.yml | 2 +- docs/docs/ci-cd.md | 18 ++--- docs/docs/development.md | 28 ++++---- docs/docs/intro.md | 4 +- docs/docs/sentry.md | 29 +------- docs/docs/setup.md | 36 ++++------ docs/docusaurus.config.js | 22 +++--- hashicorp/images/aws-jersey-ws.pkr.hcl | 26 ++----- hashicorp/images/nginx-ssl.conf | 40 ----------- hashicorp/instances/main.tf | 21 ++---- hashicorp/scripts/setup.sh | 8 +-- markdownlint.rb | 2 +- pom.xml | 14 ++-- .../application/ApplicationConfig.java | 4 +- .../astraios}/application/BinderFactory.java | 4 +- .../astraios}/application/ResourceConfig.java | 8 +-- .../astraios}/web/endpoints/DataServlet.java | 4 +- .../astraios}/web/filters/CorsFilter.java | 4 +- .../ws/jersey/template/cache/LruCache.java | 70 ------------------- src/main/resources/logback.xml | 2 +- .../astraios}/DataServletITSpec.groovy | 4 +- .../astraios}/JettyServerFactorySpec.groovy | 6 +- .../web/endpoints/DataServletSpec.groovy | 8 +-- .../web/filters/CorsFilterSpec.groovy | 4 +- .../jersey/template/cache/LruCacheSpec.groovy | 50 ------------- .../astraios}/JettyServerFactory.java | 4 +- .../astraios}/resource/TestEndpoint.java | 10 +-- 34 files changed, 143 insertions(+), 379 deletions(-) rename Jersey-WS-Template-Project-intellij-code-style.xml => Astraios-Project-intellij-code-style.xml (96%) delete mode 100644 hashicorp/images/nginx-ssl.conf rename src/main/java/com/{qubitpi/ws/jersey/template => paiondata/astraios}/application/ApplicationConfig.java (96%) rename src/main/java/com/{qubitpi/ws/jersey/template => paiondata/astraios}/application/BinderFactory.java (95%) rename src/main/java/com/{qubitpi/ws/jersey/template => paiondata/astraios}/application/ResourceConfig.java (84%) rename src/main/java/com/{qubitpi/ws/jersey/template => paiondata/astraios}/web/endpoints/DataServlet.java (95%) rename src/main/java/com/{qubitpi/ws/jersey/template => paiondata/astraios}/web/filters/CorsFilter.java (95%) delete mode 100755 src/main/java/com/qubitpi/ws/jersey/template/cache/LruCache.java rename src/test/groovy/com/{qubitpi/ws/jersey/template => paiondata/astraios}/DataServletITSpec.groovy (97%) rename src/test/groovy/com/{qubitpi/ws/jersey/template => paiondata/astraios}/JettyServerFactorySpec.groovy (92%) rename src/test/groovy/com/{qubitpi/ws/jersey/template => paiondata/astraios}/web/endpoints/DataServletSpec.groovy (86%) rename src/test/groovy/com/{qubitpi/ws/jersey/template => paiondata/astraios}/web/filters/CorsFilterSpec.groovy (95%) delete mode 100644 src/test/groovy/com/qubitpi/ws/jersey/template/cache/LruCacheSpec.groovy rename src/test/java/com/{qubitpi/ws/jersey/template => paiondata/astraios}/JettyServerFactory.java (98%) rename src/test/java/com/{qubitpi/ws/jersey/template => paiondata/astraios}/resource/TestEndpoint.java (81%) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 2e015cee..e0935624 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -1,4 +1,4 @@ -# Copyright Jiaqi Liu +# Copyright Paion Data # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -85,7 +85,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -B -Pcoverage sonar:sonar org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.java.binaries=target/classes -Dsonar.projectKey=QubitPi_jersey-ws-template + run: mvn -B -Pcoverage sonar:sonar org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.java.binaries=target/classes -Dsonar.projectKey=paion-data_astraios documentation: name: Test & Release Documentation (including Javadoc) @@ -151,11 +151,11 @@ jobs: with: context: . push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/jersey-ws-template:latest + tags: ${{ secrets.DOCKERHUB_USERNAME }}/astraios:latest hashicorp: name: Publish Jersey WS AMI Image and Deploy it to EC2 through HashiCorp - if: ${{ github.event.repository.name != 'jersey-ws-template' }} + if: ${{ github.event.repository.name != 'astraios' }} needs: tests runs-on: ubuntu-latest defaults: diff --git a/.yamllint b/.yamllint index f99238f4..13565611 100644 --- a/.yamllint +++ b/.yamllint @@ -1,4 +1,4 @@ -# Copyright Jiaqi Liu +# Copyright Paion Data # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/Jersey-WS-Template-Project-intellij-code-style.xml b/Astraios-Project-intellij-code-style.xml similarity index 96% rename from Jersey-WS-Template-Project-intellij-code-style.xml rename to Astraios-Project-intellij-code-style.xml index 5eba5f80..8d3d4497 100644 --- a/Jersey-WS-Template-Project-intellij-code-style.xml +++ b/Astraios-Project-intellij-code-style.xml @@ -1,4 +1,4 @@ - +