chore: fixes code smells unused checked exceptions, deprecated methods (#353) (#355)

petruki · web-flow · commit 9ca45dec91e1 · 2025-07-12T16:13:55.000-07:00
* chore: fixes code smells unused checked exceptions, deprecated methods

* ci: fixes secret check

* ci: moved secret check to step

* ci: fix secret check
diff --git a/.github/workflows/master-2.yml b/.github/workflows/master-2.yml
@@ -10,7 +10,6 @@ jobs:
   build-scan:
     name: SonarCloud Scan
     runs-on: ubuntu-latest
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
 
     steps:
       - uses: actions/checkout@v4
@@ -25,6 +24,9 @@ jobs:
           cache: maven
 
       - name: Build/Test & SonarCloud Scan
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        if: env.SONAR_TOKEN != ''
         run: mvn -B clean verify -Pcoverage,sonar -Dsonar.token=${{ secrets.SONAR_TOKEN }}
 
   build-test:
@@ -35,7 +37,6 @@ jobs:
         java: ['11', '17', '21']
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -10,7 +10,6 @@ jobs:
   build-scan:
     name: SonarCloud Scan
     runs-on: ubuntu-latest
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
 
     steps:
       - uses: actions/checkout@v4
@@ -25,6 +24,9 @@ jobs:
           cache: maven
 
       - name: Build/Test & SonarCloud Scan
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        if: env.SONAR_TOKEN != ''
         run: mvn -B clean verify -Pcoverage,sonar -Dsonar.token=${{ secrets.SONAR_TOKEN }}
 
   build-test:
@@ -35,7 +37,6 @@ jobs:
         java: ['8', '11', '17', '21']
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -0,0 +1,52 @@
+name: Manual SonarCloud Analysis
+
+on:
+  workflow_dispatch:
+    inputs:
+      pr_id:
+        description: 'Pull Request ID to analyze'
+        required: true
+        type: string
+
+jobs:
+  sonar-analysis:
+    name: SonarCloud Analysis for PR
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get PR details
+        id: pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: ${{ inputs.pr_id }}
+            });
+            core.setOutput('head_ref', pr.data.head.ref);
+            core.setOutput('base_ref', pr.data.base.ref);
+            core.setOutput('head_sha', pr.data.head.sha);
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.pr.outputs.head_sha }}
+          fetch-depth: 0
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build/Test & SonarCloud Scan
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        if: env.SONAR_TOKEN != ''
+        run: |
+          mvn -B clean verify -Pcoverage,sonar \
+            -Dsonar.token=${{ secrets.SONAR_TOKEN }} \
+            -Dsonar.pullrequest.key=${{ inputs.pr_id }} \
+            -Dsonar.pullrequest.branch=${{ steps.pr.outputs.head_ref }} \
+            -Dsonar.pullrequest.base=${{ steps.pr.outputs.base_ref }}
diff --git a/src/main/java/com/github/switcherapi/client/service/validators/DateTimeValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/DateTimeValidator.java
@@ -19,7 +19,7 @@ public abstract class DateTimeValidator extends Validator {
 	protected String getFullDate(final String date) {
 		SwitcherUtils.debug(logger, LOG_DATE, date);
 
-		final String time = RegExUtils.removePattern(date, FULL_DATE_REGEX).trim();
+		final String time = RegExUtils.removePattern((CharSequence) date, FULL_DATE_REGEX).trim();
 		return getFullTime(date, time);
 	}
 
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherBasicCriteriaResponseTest.java b/src/test/java/com/github/switcherapi/client/SwitcherBasicCriteriaResponseTest.java
@@ -37,7 +37,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
     }
 	
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherBasicTest.java b/src/test/java/com/github/switcherapi/client/SwitcherBasicTest.java
@@ -35,7 +35,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
     }
 	
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherConfigNativeTest.java b/src/test/java/com/github/switcherapi/client/SwitcherConfigNativeTest.java
@@ -20,7 +20,7 @@ static void setup() throws IOException {
 	}
 
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
 	}
 
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherContextRemoteExecutorTest.java b/src/test/java/com/github/switcherapi/client/SwitcherContextRemoteExecutorTest.java
@@ -21,7 +21,7 @@ static void setup() throws IOException {
 	}
 
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
 	}
 
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherFail1Test.java b/src/test/java/com/github/switcherapi/client/SwitcherFail1Test.java
@@ -28,7 +28,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
         
         //clean generated outputs
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherFail2Test.java b/src/test/java/com/github/switcherapi/client/SwitcherFail2Test.java
@@ -28,7 +28,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
     }
 	
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherForceResolveTest.java b/src/test/java/com/github/switcherapi/client/SwitcherForceResolveTest.java
@@ -35,7 +35,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
     }
 	
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSilentModeTest.java b/src/test/java/com/github/switcherapi/client/SwitcherSilentModeTest.java
@@ -29,7 +29,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
     }
 	
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationFailTest.java b/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationFailTest.java
@@ -31,7 +31,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
         
         //clean generated outputs
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationTest.java b/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationTest.java
@@ -28,7 +28,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
         
         //clean generated outputs
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherThrottleTest.java b/src/test/java/com/github/switcherapi/client/SwitcherThrottleTest.java
@@ -26,7 +26,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
     }
 	
diff --git a/src/test/java/com/github/switcherapi/client/SwitcherValidateTest.java b/src/test/java/com/github/switcherapi/client/SwitcherValidateTest.java
@@ -27,7 +27,7 @@ static void setup() throws IOException {
     }
 	
 	@AfterAll
-	static void tearDown() throws IOException {
+	static void tearDown() {
 		MockWebServerHelper.tearDownMockServer();
         
         //clean generated outputs
diff --git a/src/test/java/com/github/switcherapi/client/remote/ClientRemoteTest.java b/src/test/java/com/github/switcherapi/client/remote/ClientRemoteTest.java
@@ -50,7 +50,7 @@ static void setup() throws IOException {
     }
 
     @AfterAll
-    static void tearDown() throws IOException {
+    static void tearDown() {
         MockWebServerHelper.tearDownMockServer();
         executorService.shutdown();
     }
diff --git a/src/test/java/com/github/switcherapi/client/remote/ClientWSTest.java b/src/test/java/com/github/switcherapi/client/remote/ClientWSTest.java
@@ -32,7 +32,7 @@ static void setup() throws IOException {
     }
 
     @AfterAll
-    static void tearDown() throws IOException {
+    static void tearDown() {
         MockWebServerHelper.tearDownMockServer();
         executorService.shutdown();
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public abstract class DateTimeValidator extends Validator {`
`19`	`19`	`protected String getFullDate(final String date) {`
`20`	`20`	`SwitcherUtils.debug(logger, LOG_DATE, date);`
`21`	`21`
`22`		`- final String time = RegExUtils.removePattern(date, FULL_DATE_REGEX).trim();`
	`22`	`+ final String time = RegExUtils.removePattern((CharSequence) date, FULL_DATE_REGEX).trim();`
`23`	`23`	`return getFullTime(date, time);`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static void setup() throws IOException {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@AfterAll`
`40`		`- static void tearDown() throws IOException {`
	`40`	`+ static void tearDown() {`
`41`	`41`	`MockWebServerHelper.tearDownMockServer();`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static void setup() throws IOException {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@AfterAll`
`38`		`- static void tearDown() throws IOException {`
	`38`	`+ static void tearDown() {`
`39`	`39`	`MockWebServerHelper.tearDownMockServer();`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static void setup() throws IOException {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@AfterAll`
`23`		`- static void tearDown() throws IOException {`
	`23`	`+ static void tearDown() {`
`24`	`24`	`MockWebServerHelper.tearDownMockServer();`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ static void setup() throws IOException {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@AfterAll`
`24`		`- static void tearDown() throws IOException {`
	`24`	`+ static void tearDown() {`
`25`	`25`	`MockWebServerHelper.tearDownMockServer();`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static void setup() throws IOException {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@AfterAll`
`31`		`- static void tearDown() throws IOException {`
	`31`	`+ static void tearDown() {`
`32`	`32`	`MockWebServerHelper.tearDownMockServer();`
`33`	`33`
`34`	`34`	`//clean generated outputs`