This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch revert-10748-tri-flow-3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 024b65f25db51cf1bd5be3fbdf29badc4b554d76 Author: Albumen Kevin <[email protected]> AuthorDate: Mon Oct 24 12:42:21 2022 +0800 Revert "triple flowcontrol" --- .github/workflows/build-and-test-pr.yml | 74 ++++++++++------------ .github/workflows/build-and-test-scheduled-3.0.yml | 55 ++++++++-------- .github/workflows/build-and-test-scheduled-3.1.yml | 71 ++++++++++----------- .github/workflows/build-and-test-scheduled-3.2.yml | 71 ++++++++++----------- .../common/constants/LoggerCodeConstants.java | 2 - .../apache/dubbo/config/context/ConfigManager.java | 8 --- .../dubbo/config/utils/ConfigValidationUtils.java | 14 +--- .../config/utils/ConfigValidationUtilsTest.java | 67 +------------------- .../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 4 -- .../src/main/resources/dubbo.properties | 4 +- .../dubbo/remoting/transport/AbstractServer.java | 2 +- ...aultPropertiesEnvironmentPostProcessorTest.java | 12 ++-- ...oDefaultPropertiesEnvironmentPostProcessor.java | 2 +- ...aultPropertiesEnvironmentPostProcessorTest.java | 12 ++-- 14 files changed, 149 insertions(+), 249 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 32c485cf2e..a1673482de 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -19,26 +19,25 @@ env: jobs: license: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Check License uses: apache/skywalking-eyes@main env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-source: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v1 with: - distribution: 'zulu' java-version: 8 - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -47,7 +46,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -60,7 +59,7 @@ jobs: run: 7z a ${{ github.workspace }}/rat.zip *rat.txt -r - name: "Upload rat file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "rat-file" path: ${{ github.workspace }}/rat.zip @@ -69,7 +68,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -77,18 +76,18 @@ jobs: id: dubbo-version run: | REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' ./dubbo/pom.xml` - echo "version=$REVISION" >> $GITHUB_OUTPUT + echo "::set-output name=version::$REVISION" echo "dubbo version: $REVISION" unit-test-prepare: name: "Preparation for Unit Test" - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false env: ZOOKEEPER_VERSION: 3.6.3 steps: - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache zookeeper binary archive" id: "cache-zookeeper" with: @@ -115,21 +114,20 @@ jobs: unit-test: needs: [build-source, unit-test-prepare] - name: "Unit Test On ubuntu-latest" - runs-on: ubuntu-latest + name: "Unit Test On ubuntu-20.04" + runs-on: ubuntu-20.04 strategy: fail-fast: false env: DISABLE_FILE_SYSTEM_TEST: true CURRENT_ROLE: ${{ matrix.case-role }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: "Set up JDK ${{ matrix.jdk }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v1 with: - distribution: 'zulu' java-version: 17 - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -144,11 +142,11 @@ jobs: uses: codecov/codecov-action@v1 integration-test-prepare: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JOB_COUNT: 3 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master @@ -156,15 +154,15 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-list path: test/jobs integration-test-job: needs: [build-source, integration-test-prepare] - name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})" - runs-on: ubuntu-latest + name: "Integration Test on ubuntu-20.04 (JobId: ${{matrix.job_id}})" + runs-on: ubuntu-20.04 timeout-minutes: 30 env: JAVA_VER: 8 @@ -174,12 +172,12 @@ jobs: matrix: job_id: [1, 2, 3] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Cache local Maven repository" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ github.run_id }} @@ -187,7 +185,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Restore Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -195,14 +193,13 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-list path: test/jobs/ - name: "Set up JDK 8" - uses: actions/setup-java@v3 + uses: actions/setup-java@v1 with: - distribution: 'zulu' java-version: 8 - name: "Init Candidate Versions" run: | @@ -216,7 +213,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-result path: test/jobs/*-result* @@ -224,16 +221,16 @@ jobs: integration-test-result: needs: [integration-test-job] if: always() - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JAVA_VER: 8 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-result path: test/jobs/ @@ -243,20 +240,19 @@ jobs: error-code-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-test-tools' ref: main path: "./dubbo-test-tools" - name: "Set up JDK 17" - uses: actions/setup-java@v3 + uses: actions/setup-java@v1 with: - distribution: 'zulu' java-version: 17 - name: "Compile Dubbo (Linux)" @@ -271,7 +267,7 @@ jobs: ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt diff --git a/.github/workflows/build-and-test-scheduled-3.0.yml b/.github/workflows/build-and-test-scheduled-3.0.yml index 5cf10ee2a2..c0735e6eee 100644 --- a/.github/workflows/build-and-test-scheduled-3.0.yml +++ b/.github/workflows/build-and-test-scheduled-3.0.yml @@ -2,7 +2,7 @@ name: Build and Test Scheduled On 3.0 on: schedule: - - cron: '0 0/6 * * *' + - cron: '0 0 */6 * *' workflow_dispatch: permissions: @@ -22,19 +22,18 @@ env: jobs: build-source: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.0" path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v1 with: - distribution: 'zulu' java-version: 8 - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -43,7 +42,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -56,7 +55,7 @@ jobs: run: 7z a ${{ github.workspace }}/rat.zip *rat.txt -r - name: "Upload rat file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "rat-file" path: ${{ github.workspace }}/rat.zip @@ -65,7 +64,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -73,7 +72,7 @@ jobs: id: dubbo-version run: | REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' ./dubbo/pom.xml` - echo "version=$REVISION" >> $GITHUB_OUTPUT + echo "::set-output name=version::$REVISION" echo "dubbo version: $REVISION" unit-test-prepare: @@ -82,11 +81,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] env: ZOOKEEPER_VERSION: 3.6.3 steps: - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache zookeeper binary archive" id: "cache-zookeeper" with: @@ -132,19 +131,19 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] jdk: [ 8, 11, 17 ] env: DISABLE_FILE_SYSTEM_TEST: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.0" - name: "Set up JDK ${{ matrix.jdk }}" uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -164,11 +163,11 @@ jobs: uses: codecov/codecov-action@v1 integration-test-prepare: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JOB_COUNT: 3 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master @@ -176,15 +175,15 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-list path: test/jobs integration-test-job: needs: [build-source, integration-test-prepare] - name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})" - runs-on: ubuntu-latest + name: "Integration Test on ubuntu-20.04 (JobId: ${{matrix.job_id}})" + runs-on: ubuntu-20.04 timeout-minutes: 30 env: JAVA_VER: 8 @@ -194,12 +193,12 @@ jobs: matrix: job_id: [1, 2, 3] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Cache local Maven repository" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ github.run_id }} @@ -207,7 +206,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Restore Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -215,7 +214,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-list path: test/jobs/ @@ -235,7 +234,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-result path: test/jobs/*-result* @@ -243,16 +242,16 @@ jobs: integration-test-result: needs: [integration-test-job] if: always() - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JAVA_VER: 8 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-result path: test/jobs/ diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index 0188237e0c..e29e30d575 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -2,7 +2,7 @@ name: Build and Test Scheduled On 3.1 on: schedule: - - cron: '0 0/6 * * *' + - cron: '0 0 */6 * *' workflow_dispatch: permissions: @@ -22,9 +22,9 @@ env: jobs: license: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.1" - name: Check License @@ -32,19 +32,18 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-source: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.1" path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v1 with: - distribution: 'zulu' java-version: 8 - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -53,7 +52,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -66,7 +65,7 @@ jobs: run: 7z a ${{ github.workspace }}/rat.zip *rat.txt -r - name: "Upload rat file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "rat-file" path: ${{ github.workspace }}/rat.zip @@ -75,7 +74,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -83,7 +82,7 @@ jobs: id: dubbo-version run: | REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' ./dubbo/pom.xml` - echo "version=$REVISION" >> $GITHUB_OUTPUT + echo "::set-output name=version::$REVISION" echo "dubbo version: $REVISION" unit-test-prepare: @@ -92,11 +91,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] env: ZOOKEEPER_VERSION: 3.6.3 steps: - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache zookeeper binary archive" id: "cache-zookeeper" with: @@ -142,19 +141,19 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] jdk: [ 8, 11, 17, 19 ] env: DISABLE_FILE_SYSTEM_TEST: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.1" - name: "Set up JDK ${{ matrix.jdk }}" uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -180,21 +179,21 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] jdk: [ 8, 11, 17, 19 ] env: DISABLE_FILE_SYSTEM_TEST: true DUBBO_DEFAULT_SERIALIZATION: fastjson2 MAVEN_SUREFIRE_ADD_OPENS: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.1" - name: "Set up JDK ${{ matrix.jdk }}" uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -214,11 +213,11 @@ jobs: uses: codecov/codecov-action@v1 integration-test-prepare: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JOB_COUNT: 3 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master @@ -226,15 +225,15 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-list path: test/jobs integration-test-job: needs: [build-source, integration-test-prepare] - name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})" - runs-on: ubuntu-latest + name: "Integration Test on ubuntu-20.04 (JobId: ${{matrix.job_id}})" + runs-on: ubuntu-20.04 timeout-minutes: 30 env: JAVA_VER: 8 @@ -244,12 +243,12 @@ jobs: matrix: job_id: [1, 2, 3] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Cache local Maven repository" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ github.run_id }} @@ -257,7 +256,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Restore Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -265,7 +264,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-list path: test/jobs/ @@ -285,7 +284,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-result path: test/jobs/*-result* @@ -293,16 +292,16 @@ jobs: integration-test-result: needs: [integration-test-job] if: always() - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JAVA_VER: 8 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-result path: test/jobs/ @@ -313,11 +312,11 @@ jobs: error-code-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-test-tools' ref: main @@ -340,7 +339,7 @@ jobs: ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index a43e7b769d..3b305051f9 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -2,7 +2,7 @@ name: Build and Test Scheduled On 3.2 on: schedule: - - cron: '0 0/6 * * *' + - cron: '0 0 */6 * *' workflow_dispatch: permissions: @@ -22,9 +22,9 @@ env: jobs: license: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.2" - name: Check License @@ -32,19 +32,18 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-source: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.2" path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v1 with: - distribution: 'zulu' java-version: 8 - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -53,7 +52,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -66,7 +65,7 @@ jobs: run: 7z a ${{ github.workspace }}/rat.zip *rat.txt -r - name: "Upload rat file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "rat-file" path: ${{ github.workspace }}/rat.zip @@ -75,7 +74,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -83,7 +82,7 @@ jobs: id: dubbo-version run: | REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' ./dubbo/pom.xml` - echo "version=$REVISION" >> $GITHUB_OUTPUT + echo "::set-output name=version::$REVISION" echo "dubbo version: $REVISION" unit-test-prepare: @@ -92,11 +91,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] env: ZOOKEEPER_VERSION: 3.6.3 steps: - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache zookeeper binary archive" id: "cache-zookeeper" with: @@ -142,19 +141,19 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] jdk: [ 8, 11, 17, 19 ] env: DISABLE_FILE_SYSTEM_TEST: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.2" - name: "Set up JDK ${{ matrix.jdk }}" uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -180,21 +179,21 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-20.04, windows-2019 ] jdk: [ 8, 11, 17, 19 ] env: DISABLE_FILE_SYSTEM_TEST: true DUBBO_DEFAULT_SERIALIZATION: fastjson2 MAVEN_SUREFIRE_ADD_OPENS: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: ref: "3.2" - name: "Set up JDK ${{ matrix.jdk }}" uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - - uses: actions/cache@v3 + - uses: actions/cache@v2 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -214,11 +213,11 @@ jobs: uses: codecov/codecov-action@v1 integration-test-prepare: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JOB_COUNT: 3 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master @@ -226,15 +225,15 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-list path: test/jobs integration-test-job: needs: [build-source, integration-test-prepare] - name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})" - runs-on: ubuntu-latest + name: "Integration Test on ubuntu-20.04 (JobId: ${{matrix.job_id}})" + runs-on: ubuntu-20.04 timeout-minutes: 30 env: JAVA_VER: 8 @@ -244,12 +243,12 @@ jobs: matrix: job_id: [1, 2, 3] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Cache local Maven repository" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ github.run_id }} @@ -257,7 +256,7 @@ jobs: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven- - name: "Restore Dubbo cache" - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2/repository/org/apache/dubbo key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{ github.run_id }} @@ -265,7 +264,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-list path: test/jobs/ @@ -285,7 +284,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: test-result path: test/jobs/*-result* @@ -293,16 +292,16 @@ jobs: integration-test-result: needs: [integration-test-job] if: always() - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: JAVA_VER: 8 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: test-result path: test/jobs/ @@ -312,11 +311,11 @@ jobs: error-code-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: repository: 'apache/dubbo-test-tools' ref: main @@ -339,7 +338,7 @@ jobs: ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java index f3ead4f3f6..78b141db94 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java @@ -170,8 +170,6 @@ public interface LoggerCodeConstants { String INTERNAL_SERVICE_CONFIG_ERROR = "6-3"; - // Internal unknown error. - String INTERNAL_ERROR = "99-0"; String INTERNAL_INTERRUPTED = "99-1"; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java index 140f9b1a3f..e599eb75cf 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java @@ -295,14 +295,6 @@ public class ConfigManager extends AbstractConfigManager implements ApplicationE } protocolPortMap.put(port, protocol); } - - // Log the current configurations. - logger.info("The current configurations or effective configurations are as follows:"); - for (Class<? extends AbstractConfig> configType : multipleConfigTypes) { - getConfigs(configType).stream().forEach((config) -> { - logger.info(config.toString()); - }); - } } public ConfigMode getConfigMode() { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java index a716800abb..17c73636d3 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java @@ -26,7 +26,6 @@ import org.apache.dubbo.common.serialize.Serialization; import org.apache.dubbo.common.status.StatusChecker; import org.apache.dubbo.common.status.reporter.FrameworkStatusReportService; import org.apache.dubbo.common.threadpool.ThreadPool; -import org.apache.dubbo.common.utils.ClassUtils; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.ConfigUtils; import org.apache.dubbo.common.utils.NetUtils; @@ -145,7 +144,7 @@ import static org.apache.dubbo.rpc.Constants.TOKEN_KEY; import static org.apache.dubbo.rpc.cluster.Constants.REFER_KEY; public class ConfigValidationUtils { - private static ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(ConfigValidationUtils.class); + private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(ConfigValidationUtils.class); /** * The maximum length of a <b>parameter's value</b> */ @@ -490,17 +489,6 @@ public class ConfigValidationUtils { checkName(ARCHITECTURE, config.getArchitecture()); checkName(ENVIRONMENT, config.getEnvironment()); checkParameterName(config.getParameters()); - checkQosDependency(config); - } - - private static void checkQosDependency(ApplicationConfig config) { - if (!Boolean.FALSE.equals(config.getQosEnable())) { - try { - ClassUtils.forName("org.apache.dubbo.qos.protocol.QosProtocolWrapper"); - } catch (ClassNotFoundException e) { - logger.warn("No QosProtocolWrapper class was found. Please check the dependency of dubbo-qos whether was imported correctly.", e); - } - } } public static void validateModuleConfig(ModuleConfig config) { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/ConfigValidationUtilsTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/ConfigValidationUtilsTest.java index 03d4ce58c4..8112d5c9dc 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/ConfigValidationUtilsTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/ConfigValidationUtilsTest.java @@ -16,27 +16,14 @@ */ package org.apache.dubbo.config.utils; -import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.config.AbstractInterfaceConfig; -import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.config.MetadataReportConfig; import org.apache.dubbo.config.api.Greeting; import org.apache.dubbo.config.mock.GreetingMock1; import org.apache.dubbo.config.mock.GreetingMock2; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.mockito.MockedStatic; -import org.mockito.Mockito; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; public class ConfigValidationUtilsTest { @@ -95,58 +82,6 @@ public class ConfigValidationUtilsTest { }); } - @Test - public void testValidateApplicationConfig() throws Exception { - try (MockedStatic<ConfigValidationUtils> mockedStatic = Mockito.mockStatic(ConfigValidationUtils.class);) { - mockedStatic.when(() -> ConfigValidationUtils.validateApplicationConfig(any())).thenCallRealMethod(); - ApplicationConfig config = new ApplicationConfig(); - Assertions.assertThrows(IllegalStateException.class,() -> { - ConfigValidationUtils.validateApplicationConfig(config); - }); - - config.setName("testName"); - config.setOwner("testOwner"); - config.setOrganization("testOrg"); - config.setArchitecture("testArchitecture"); - config.setEnvironment("test"); - Map<String, String> map = new HashMap(); - map.put("k1", "v1"); - map.put("k2", "v2"); - config.setParameters(map); - ConfigValidationUtils.validateApplicationConfig(config); - mockedStatic.verify(() -> { - ConfigValidationUtils.checkName(any(), any()); - }, times(4)); - mockedStatic.verify(() -> { - ConfigValidationUtils.checkMultiName(any(), any()); - }, times(1)); - mockedStatic.verify(() -> { - ConfigValidationUtils.checkParameterName(any()); - }, times(1)); - } - } - - @Test - public void testCheckQosInApplicationConfig() throws Exception { - ConfigValidationUtils mock = Mockito.mock(ConfigValidationUtils.class); - ErrorTypeAwareLogger loggerMock = Mockito.mock(ErrorTypeAwareLogger.class); - injectField(mock.getClass().getDeclaredField("logger"), loggerMock); - ApplicationConfig config = new ApplicationConfig(); - config.setName("testName"); - config.setQosEnable(false); - mock.validateApplicationConfig(config); - verify(loggerMock, never()).warn(any(), any()); - - config.setQosEnable(true); - mock.validateApplicationConfig(config); - verify(loggerMock).warn(eq("No QosProtocolWrapper class was found. Please check the dependency of dubbo-qos whether was imported correctly."), any()); - } - - private void injectField(Field field, Object newValue) throws Exception { - field.setAccessible(true); - field.set(null, newValue); - } - public static class InterfaceConfig extends AbstractInterfaceConfig { } diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml index f20ae0eafd..4237066e30 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml @@ -115,9 +115,5 @@ <groupId>org.apache.dubbo</groupId> <artifactId>dubbo-rpc-triple</artifactId> </dependency> - <dependency> - <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-qos</artifactId> - </dependency> </dependencies> </project> diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/resources/dubbo.properties b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/resources/dubbo.properties index dde68cbdf0..ad602baa94 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/resources/dubbo.properties +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/resources/dubbo.properties @@ -1,3 +1 @@ -dubbo.application.qos-enable=true -dubbo.application.qos-port=22222 -dubbo.application.qos-accept-foreign-ip=true +dubbo.application.qos.port=22222 diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java index bd6a91b72d..ef03daa137 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java @@ -72,7 +72,7 @@ public abstract class AbstractServer extends AbstractEndpoint implements Remotin } } catch (Throwable t) { throw new RemotingException(url.toInetSocketAddress(), null, "Failed to bind " + getClass().getSimpleName() - + " on " + bindAddress + ", cause: " + t.getMessage(), t); + + " on " + getLocalAddress() + ", cause: " + t.getMessage(), t); } executors.add(executorRepository.createExecutorIfAbsent(url)); } diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java index bde4c383a7..9e2de9a822 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java +++ b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java @@ -53,7 +53,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { PropertySource defaultPropertySource = propertySources.get("defaultProperties"); Assert.assertNotNull(defaultPropertySource); Assert.assertEquals("true", defaultPropertySource.getProperty("dubbo.config.multiple")); - Assert.assertEquals("true", defaultPropertySource.getProperty("dubbo.application.qos-enable")); + Assert.assertEquals("false", defaultPropertySource.getProperty("dubbo.application.qos-enable")); // Case 2 : Only set property "spring.application.name" environment.setProperty("spring.application.name", "demo-dubbo-application"); @@ -63,7 +63,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { Assert.assertEquals("demo-dubbo-application", dubboApplicationName); // Case 3 : Only set property "dubbo.application.name" - // Reset environment + // Rest environment environment = new MockEnvironment(); propertySources = environment.getPropertySources(); environment.setProperty("dubbo.application.name", "demo-dubbo-application"); @@ -74,7 +74,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { Assert.assertEquals("demo-dubbo-application", dubboApplicationName); // Case 4 : If "defaultProperties" PropertySource is present in PropertySources - // Reset environment + // Rest environment environment = new MockEnvironment(); propertySources = environment.getPropertySources(); propertySources.addLast(new MapPropertySource("defaultProperties", new HashMap<String, Object>())); @@ -84,14 +84,14 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { dubboApplicationName = defaultPropertySource.getProperty("dubbo.application.name"); Assert.assertEquals("demo-dubbo-application", dubboApplicationName); - // Case 5 : Reset dubbo.config.multiple and dubbo.application.qos-enable + // Case 5 : Rest dubbo.config.multiple and dubbo.application.qos-enable environment = new MockEnvironment(); propertySources = environment.getPropertySources(); propertySources.addLast(new MapPropertySource("defaultProperties", new HashMap<String, Object>())); environment.setProperty("dubbo.config.multiple", "false"); - environment.setProperty("dubbo.application.qos-enable", "false"); + environment.setProperty("dubbo.application.qos-enable", "true"); instance.postProcessEnvironment(environment, springApplication); Assert.assertEquals("false", environment.getProperty("dubbo.config.multiple")); - Assert.assertEquals("false", environment.getProperty("dubbo.application.qos-enable")); + Assert.assertEquals("true", environment.getProperty("dubbo.application.qos-enable")); } } diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java index 44a0ae59de..9c3ff97031 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java +++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java @@ -91,7 +91,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessor implements Environme } private void setDubboApplicationQosEnableProperty(Map<String, Object> defaultProperties) { - defaultProperties.put(DUBBO_APPLICATION_QOS_ENABLE_PROPERTY, Boolean.TRUE.toString()); + defaultProperties.put(DUBBO_APPLICATION_QOS_ENABLE_PROPERTY, Boolean.FALSE.toString()); } /** diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java index bde4c383a7..9e2de9a822 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java +++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java @@ -53,7 +53,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { PropertySource defaultPropertySource = propertySources.get("defaultProperties"); Assert.assertNotNull(defaultPropertySource); Assert.assertEquals("true", defaultPropertySource.getProperty("dubbo.config.multiple")); - Assert.assertEquals("true", defaultPropertySource.getProperty("dubbo.application.qos-enable")); + Assert.assertEquals("false", defaultPropertySource.getProperty("dubbo.application.qos-enable")); // Case 2 : Only set property "spring.application.name" environment.setProperty("spring.application.name", "demo-dubbo-application"); @@ -63,7 +63,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { Assert.assertEquals("demo-dubbo-application", dubboApplicationName); // Case 3 : Only set property "dubbo.application.name" - // Reset environment + // Rest environment environment = new MockEnvironment(); propertySources = environment.getPropertySources(); environment.setProperty("dubbo.application.name", "demo-dubbo-application"); @@ -74,7 +74,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { Assert.assertEquals("demo-dubbo-application", dubboApplicationName); // Case 4 : If "defaultProperties" PropertySource is present in PropertySources - // Reset environment + // Rest environment environment = new MockEnvironment(); propertySources = environment.getPropertySources(); propertySources.addLast(new MapPropertySource("defaultProperties", new HashMap<String, Object>())); @@ -84,14 +84,14 @@ public class DubboDefaultPropertiesEnvironmentPostProcessorTest { dubboApplicationName = defaultPropertySource.getProperty("dubbo.application.name"); Assert.assertEquals("demo-dubbo-application", dubboApplicationName); - // Case 5 : Reset dubbo.config.multiple and dubbo.application.qos-enable + // Case 5 : Rest dubbo.config.multiple and dubbo.application.qos-enable environment = new MockEnvironment(); propertySources = environment.getPropertySources(); propertySources.addLast(new MapPropertySource("defaultProperties", new HashMap<String, Object>())); environment.setProperty("dubbo.config.multiple", "false"); - environment.setProperty("dubbo.application.qos-enable", "false"); + environment.setProperty("dubbo.application.qos-enable", "true"); instance.postProcessEnvironment(environment, springApplication); Assert.assertEquals("false", environment.getProperty("dubbo.config.multiple")); - Assert.assertEquals("false", environment.getProperty("dubbo.application.qos-enable")); + Assert.assertEquals("true", environment.getProperty("dubbo.application.qos-enable")); } }
