Merge pull request #229 from switcherapi/staging

Removed RegexValidator Java 8 support

Author: petruki

.github/workflows/master-2.yml

@@ -17,10 +17,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'temurin'
           cache: maven
 
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '17', '18']
+        java: [ '11', '17', '18']
         os: [ ubuntu-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"

pom.xml

@@ -46,7 +46,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>17</java.version>
+		<java.version>11</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 
@@ -166,12 +166,6 @@
 				<artifactId>junit</artifactId>
 				<version>4.13.1</version>
 			</dependency>
-
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>2.14.2</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

src/main/java/com/github/switcherapi/client/model/Entry.java

@@ -60,7 +60,8 @@ public int hashCode() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof Entry entry) {
+		if (obj instanceof Entry) {
+			Entry entry = (Entry) obj;
 			if (!this.strategy.equals(entry.getStrategy())) {
 				return false;
 			}

src/main/java/com/github/switcherapi/client/service/ValidatorService.java

@@ -26,7 +26,7 @@ private void initializeValidators() {
 		registerValidator(PayloadValidator.class);
 		registerValidator(TimeValidator.class);
 		registerValidator(ValueValidator.class);
-		registerValidator(RegexValidatorV8.getPlatformValidator());
+		registerValidator(RegexValidator.class);
 	}
 
 	private StrategyValidator getStrategyValidator(Class<? extends Validator> validatorClass) {