Skip to content

chore(deps): bump gson@2.15.0, commons-lang3@3.21.0, others, fixed test #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petruki merged 2 commits into from
Oct 27, 2026
Merged

chore(deps): bump gson@2.15.0, commons-lang3@3.21.0, others, fixed test #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d5c5e
chore(deps): bump gson@2.15.0, commons-lang3@3.21.0, others, fixed test
petruki Oct 27, 2026
85b86e1
fix(pom): removed unnecessary sonar settings
petruki Oct 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ko_fi: petruki
github: [petruki]
6 changes: 3 additions & 3 deletions .github/workflows/master-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
java-version: 17
distribution: 'temurin'
Expand All @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v7

- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -51,7 +51,7 @@ jobs:
run: mvn -version

- name: Cache Maven packages
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ matrix.java }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
java-version: 17
distribution: 'temurin'
Expand All @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v7

- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -51,7 +51,7 @@ jobs:
run: mvn -version

- name: Cache Maven packages
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ matrix.java }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v7

- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -27,7 +27,7 @@ jobs:
run: mvn -version

- name: Cache Maven packages
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ matrix.java }}
Expand All @@ -44,7 +44,7 @@ jobs:
steps:
- uses: actions/checkout@v7
- name: Set up Apache Maven Central
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
java-version: 17
distribution: 'temurin'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ github.event.inputs.jdk }}
Expand All @@ -35,7 +35,7 @@ jobs:
run: mvn -version

- name: Cache Maven packages
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ matrix.java }}
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,8 @@ local.properties
## OS X
##############################
.DS_Store

##############################
## Sonar
##############################
.sonar/
22 changes: 12 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,26 @@
<argLine />

<!-- utils -->
<gson.version>2.14.0</gson.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<gson.version>2.15.0</gson.version>
<commons-lang3.version>3.21.0</commons-lang3.version>
<commons-net.version>3.13.0</commons-net.version>
<slf4j-api.version>2.0.18</slf4j-api.version>
<slf4j-api.version>2.0.20</slf4j-api.version>

<!-- test -->
<okhttp.version>5.4.0</okhttp.version>
<junit-jupiter.version>6.1.2</junit-jupiter.version>
<okhttp.version>5.5.1</okhttp.version>
<junit-jupiter.version>6.1.3</junit-jupiter.version>
<junit-platform-launcher.version>6.1.3</junit-platform-launcher.version>
<junit-pioneer.version>2.3.0</junit-pioneer.version>
<junit-platform-launcher.version>6.1.2</junit-platform-launcher.version>

<!-- Plugins -->
<maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.16.0</maven-compiler-plugin.version>
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.6.0</maven-surefire-plugin.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<sonar-maven-plugin.version>5.7.0.6970</sonar-maven-plugin.version>
<sonar-maven-plugin.version>5.8.0.7211</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.15</jacoco-maven-plugin.version>
<central-publishing-maven-plugin.version>0.11.0</central-publishing-maven-plugin.version>
<central-publishing-maven-plugin.version>0.12.0</central-publishing-maven-plugin.version>

<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
Expand Down Expand Up @@ -184,6 +184,8 @@
<sonar.organization>switcherapi</sonar.organization>
<sonar.projectKey>switcherapi_switcher-client</sonar.projectKey>
<sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
<sonar.java.binaries>${project.build.outputDirectory}</sonar.java.binaries>
<sonar.java.test.binaries>${project.build.testOutputDirectory}</sonar.java.test.binaries>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/switcherapi/client/model/SwitcherRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public boolean isBypassMetrics() {
}

private boolean canUseAsync() {
return super.delay > 0 && !this.executionsMap.isEmpty();
return super.delay > 0L && !this.executionsMap.isEmpty();
}

@Override
Expand Down
13 changes: 9 additions & 4 deletions src/test/java/com/switcherapi/client/SwitcherThrottle1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import static com.switcherapi.client.remote.Constants.DEFAULT_ENV;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

class SwitcherThrottle1Test extends MockWebServerHelper {
Expand Down Expand Up @@ -40,26 +41,30 @@ static void tearDown() {
void shouldReturnTrue_withThrottle() {
// Initial remote call
givenResponse(generateMockAuth(10)); //auth
givenResponse(generateCriteriaResponse("true", false)); //criteria - sync (cached)
givenResponse(generateCriteriaResponse("true", false)); //criteria - sync

// Throttle period - should use cache
givenResponse(generateCriteriaResponse("false", false)); //criteria - async (background)
givenResponse(generateCriteriaResponse("false", false)); //criteria - async after 1 sec (background)
givenResponse(generateCriteriaResponse("true", false)); //criteria - async (cached)
givenResponse(generateCriteriaResponse("false", false)); //criteria - async after 1.5 sec (background)

//test
Switcher switcher = SwitchersBase
.getSwitcher(SwitchersBase.USECASE11)
.flushExecutions()
.resetInputs()
.checkValue("value")
.throttle(1000);
.throttle(1500);

for (int i = 0; i < 50; i++) {
assertTrue(switcher.isItOn());
}

assertEquals(Boolean.FALSE,
CountDownHelper.waitUntil(10, false, switcher::isItOn));

for (int i = 0; i < 50; i++) {
assertFalse(switcher.isItOn());
}
}

}
8 changes: 4 additions & 4 deletions src/test/java/com/switcherapi/client/SwitcherThrottle2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ static void tearDown() {
void shouldRetrieveNewResponse_whenStrategyInputChanged() {
// Initial remote call
givenResponse(generateMockAuth(10)); //auth
givenResponse(generateCriteriaResponse("true", false)); //criteria - sync (cached)
givenResponse(generateCriteriaResponse("false", false)); //criteria - async (cached)
givenResponse(generateCriteriaResponse("true", false)); //criteria - sync

// Throttle period - should use cache
givenResponse(generateCriteriaResponse("false", false)); //criteria - async after 1 sec (background)
givenResponse(generateCriteriaResponse("true", false)); //criteria - async (cached)
givenResponse(generateCriteriaResponse("false", false)); //criteria - async after 1.5 sec (background)

//test
SwitcherBuilder switcher = SwitchersBase
.getSwitcher(SwitchersBase.USECASE11)
.flushExecutions()
.resetInputs()
.throttle(1000);
.throttle(1500);

for (int i = 0; i < 100; i++) {
assertTrue(switcher.checkValue("value").isItOn());
Expand Down
Loading