Fixes #360 - updated reflect-config.json reachability metadata (#362)

petruki · web-flow · commit 8578707c77ff · 2025-08-14T22:15:22.000-07:00
* Fixes #360 - updated reflect-config.json reachability metadata (#361) * test: increased shouldStartAndKillWorker delay * test: increased shouldStartAndKillWorker delay * test-ci: update maven cache * test-ci: add coverage phase for matrix * test-ci: updated matrix to use ubuntu-22.04 * test-ci: updated all matrices to use ubuntu-22.04 * test-ci: updated release to use ubuntu-22.04
diff --git a/.github/workflows/master-2.yml b/.github/workflows/master-2.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build-scan:
     name: SonarCloud Scan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['11', '17', '21']
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build-scan:
     name: SonarCloud Scan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['8', '11', '17', '21']
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['8', '11', '17', '21']
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -40,7 +40,7 @@ jobs:
   publish:
     name: Publish Release
     needs: [build-test]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   sonar-analysis:
     name: SonarCloud Analysis for PR
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Get PR details
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -9,7 +9,7 @@ on:
         required: true
         default: '17'
       os:
-        description: 'Operating System (ubuntu-20.04, ubuntu-latest, windows-latest)'
+        description: 'Operating System (ubuntu-22.04, ubuntu-latest, windows-latest)'
         required: true
         default: 'ubuntu-latest'
 
diff --git a/README.md b/README.md
@@ -171,8 +171,8 @@ Loading information into the switcher can be made by using *prepareEntry*, in ca
 
 ```java
 List<Entry> entries = new ArrayList<>();
-entries.add(Entry.build(StrategyValidator.DATE, "2019-12-10"));
-entries.add(Entry.build(StrategyValidator.DATE, "2020-12-10"));
+entries.add(Entry.of(StrategyValidator.DATE, "2019-12-10"));
+entries.add(Entry.of(StrategyValidator.DATE, "2020-12-10"));
 
 switcher.prepareEntry(entries);
 switcher.isItOn();
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	<groupId>com.switcherapi</groupId>
 	<artifactId>switcher-client</artifactId>
 	<packaging>jar</packaging>
-	<version>1.8.0</version>
+	<version>1.8.1-SNAPSHOT</version>
 
 	<name>Switcher Client</name>
 	<description>Switcher Client SDK for working with Switcher API</description>
@@ -73,7 +73,7 @@
 		<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
 		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
 		<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
-		<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
 		<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
 		<sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
 		<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
@@ -228,7 +228,6 @@
 					<plugin>
 						<groupId>org.sonarsource.scanner.maven</groupId>
 						<artifactId>sonar-maven-plugin</artifactId>
-						<version>${sonar-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<phase>verify</phase>
diff --git a/src/main/java/com/switcherapi/client/model/Entry.java b/src/main/java/com/switcherapi/client/model/Entry.java
@@ -11,27 +11,29 @@ public class Entry {
 	private final String strategy;
 	
 	private final String input;
-	
-	private Entry(final String strategy, final String input) {
+
+	public Entry(String strategy, String input) {
 		this.strategy = strategy;
 		this.input = input;
 	}
-	
-	private Entry(final StrategyValidator strategy, final String input) {
+
+	public Entry(StrategyValidator strategy, String input) {
 		this(strategy.toString(), input);
 	}
 	
 	/**
+	 * Creates a new Entry with the given strategy and input.
+	 *
 	 * @param strategy Validator used to evaluate the Switcher
 	 * @param input follow the required format documented into each strategy type
 	 * @return new Entry
 	 * @see StrategyValidator
 	 */
-	public static Entry build(final StrategyValidator strategy, final String input) {
+	public static Entry of(StrategyValidator strategy, String input) {
 		return new Entry(strategy, input);
 	}
-	
-	public static Entry build(final String strategy, final String input) {
+
+	public static Entry of(String strategy, String input) {
 		return new Entry(strategy, input);
 	}
 	
diff --git a/src/main/java/com/switcherapi/client/model/SwitcherBuilder.java b/src/main/java/com/switcherapi/client/model/SwitcherBuilder.java
@@ -95,7 +95,7 @@ public SwitcherBuilder restrictRelay(boolean restrictRelay) {
 	 */
 	public SwitcherBuilder check(StrategyValidator strategy, String input) {
 		if (StringUtils.isNotBlank(input)) {
-			entry.add(Entry.build(strategy, input));
+			entry.add(Entry.of(strategy, input));
 		}
 		
 		return this;
diff --git a/src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/reflect-config.json b/src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/reflect-config.json
@@ -8,7 +8,10 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": []
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.String"
+        ]
       }
     ]
   },
@@ -21,7 +24,9 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": []
+        "parameterTypes": [
+          "com.switcherapi.client.model.Entry[]"
+        ]
       }
     ]
   },
@@ -34,7 +39,14 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": []
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.String",
+          "boolean",
+          "com.switcherapi.client.model.criteria.StrategyConfig[]",
+          "java.lang.String[]",
+          "com.switcherapi.client.model.criteria.Relay"
+        ]
       }
     ]
   },
@@ -73,7 +85,12 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": []
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.String",
+          "boolean",
+          "com.switcherapi.client.model.criteria.Config[]"
+        ]
       }
     ]
   },
@@ -99,7 +116,29 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": []
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.String",
+          "java.lang.String",
+          "boolean",
+          "java.lang.String[]"
+        ]
+      }
+    ]
+  },
+  {
+    "name": "com.switcherapi.client.model.criteria.Relay",
+    "condition": {
+      "typeReachable": "com.switcherapi.client.model.criteria.Snapshot"
+    },
+    "allDeclaredFields": true,
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": [
+          "java.lang.String",
+          "boolean"
+        ]
       }
     ]
   },
diff --git a/src/test/java/com/switcherapi/client/SwitcherLocal1Test.java b/src/test/java/com/switcherapi/client/SwitcherLocal1Test.java
@@ -115,7 +115,7 @@ static Stream<Arguments> dateTestArguments() {
 	@MethodSource("dateTestArguments")
 	void localShouldTest_dateValidation(String useCaseKey, String input, boolean expected) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		Entry entry = Entry.build(StrategyValidator.DATE, input);
+		Entry entry = Entry.of(StrategyValidator.DATE, input);
 
 		assertEquals(expected, switcher.prepareEntry(entry).isItOn());
 	}
@@ -130,7 +130,7 @@ void localShouldTestChained_dateValidation(String useCaseKey, String input, bool
 	@Test
 	void localShouldReturnFalse_dateValidationWrongFormat() {
 		SwitcherRequest switcher = Switchers.getSwitcher(Switchers.USECASE33);
-		Entry input = Entry.build(StrategyValidator.DATE, "2019/121/13");
+		Entry input = Entry.of(StrategyValidator.DATE, "2019/121/13");
 		
 		switcher.prepareEntry(input);
 		assertThrows(SwitcherInvalidTimeFormat.class, switcher::isItOn);
@@ -157,7 +157,7 @@ static Stream<Arguments> valueTestArguments() {
 	@MethodSource("valueTestArguments")
 	void localShouldTest_valueValidation(String useCaseKey, String input, boolean expected) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		Entry entry = Entry.build(StrategyValidator.VALUE, input);
+		Entry entry = Entry.of(StrategyValidator.VALUE, input);
 		
 		switcher.prepareEntry(entry);
 		assertEquals(expected, switcher.isItOn());
@@ -198,7 +198,7 @@ static Stream<Arguments> numericTestArguments() {
 	@MethodSource("numericTestArguments")
 	void localShouldTest_numericValidation(String useCaseKey, String input, boolean expected) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		Entry entry = Entry.build(StrategyValidator.NUMERIC, input);
+		Entry entry = Entry.of(StrategyValidator.NUMERIC, input);
 		
 		switcher.prepareEntry(entry);
 		assertEquals(expected, switcher.isItOn());
@@ -215,7 +215,7 @@ void localShouldTestChained_numericValidation(String useCaseKey, String input, b
 	@Test
 	void localShouldReturnException_invalidNumericInput() {
 		SwitcherRequest switcher = Switchers.getSwitcher(Switchers.USECASE81);
-		Entry input = Entry.build(StrategyValidator.NUMERIC, "INVALID_NUMBER");
+		Entry input = Entry.of(StrategyValidator.NUMERIC, "INVALID_NUMBER");
 		
 		switcher.prepareEntry(input);
 		assertThrows(SwitcherInvalidNumericFormat.class, switcher::isItOn);
@@ -239,7 +239,7 @@ static Stream<Arguments> timeTestArguments() {
 	@MethodSource("timeTestArguments")
 	void localShouldTest_timeValidation(String useCaseKey, String input, boolean expected) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		Entry entry = Entry.build(StrategyValidator.TIME, input);
+		Entry entry = Entry.of(StrategyValidator.TIME, input);
 		
 		switcher.prepareEntry(entry);
 		assertEquals(expected, switcher.isItOn());
@@ -255,7 +255,7 @@ void localShouldTestChained_timeValidation(String useCaseKey, String input, bool
 	@Test
 	void localShouldReturnFalse_timeValidationWrongFormat() {
 		SwitcherRequest switcher = Switchers.getSwitcher(Switchers.USECASE53);
-		Entry input = Entry.build(StrategyValidator.TIME, "2019-12-10");
+		Entry input = Entry.of(StrategyValidator.TIME, "2019-12-10");
 		
 		switcher.prepareEntry(input);
 		assertThrows(SwitcherInvalidTimeFormat.class, switcher::isItOn);
@@ -279,7 +279,7 @@ static Stream<Arguments> networkTestArguments() {
 	@MethodSource("networkTestArguments")
 	void localShouldTest_networkValidation(String useCaseKey, String input, boolean expected) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		Entry entry = Entry.build(StrategyValidator.NETWORK, input);
+		Entry entry = Entry.of(StrategyValidator.NETWORK, input);
 		
 		switcher.prepareEntry(entry);
 		assertEquals(expected, switcher.isItOn());
@@ -301,7 +301,7 @@ void localShouldReturnFalse_strategyRequiresInput() {
 	@Test
 	void localShouldReturnFalse_invalidStrategyInput() {
 		SwitcherRequest switcher = Switchers.getSwitcher(Switchers.USECASE33);
-		switcher.prepareEntry(Entry.build(StrategyValidator.INVALID, "Value"));
+		switcher.prepareEntry(Entry.of(StrategyValidator.INVALID, "Value"));
 		assertFalse(switcher.isItOn());
 	}
 	
@@ -328,7 +328,7 @@ static Stream<Arguments> regexTestArguments() {
 	@MethodSource("regexTestArguments")
 	void localShouldTest_regexValidation(String useCaseKey, String input, boolean expected) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		Entry entry = Entry.build(StrategyValidator.REGEX, input);
+		Entry entry = Entry.of(StrategyValidator.REGEX, input);
 		
 		switcher.prepareEntry(entry);
 		assertEquals(expected, switcher.isItOn());
@@ -357,7 +357,7 @@ static Stream<Arguments> payloadTestArguments() {
 	@MethodSource("payloadTestArguments")
 	void localShouldTest_payloadValidation(String useCaseKey, String input, boolean expected) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		Entry entry = Entry.build(StrategyValidator.PAYLOAD, input);
+		Entry entry = Entry.of(StrategyValidator.PAYLOAD, input);
 		
 		switcher.prepareEntry(entry);
 		assertEquals(expected, switcher.isItOn());
diff --git a/src/test/java/com/switcherapi/client/SwitcherLocal3Test.java b/src/test/java/com/switcherapi/client/SwitcherLocal3Test.java
@@ -79,7 +79,7 @@ static Stream<Arguments> failTestArguments() {
 	void localShouldReturnError(String useCaseKey, String strategyValidator,
 			String input, Class<SwitcherException> error) {
 		SwitcherRequest switcher = Switchers.getSwitcher(useCaseKey);
-		switcher.prepareEntry(Entry.build(strategyValidator, input));
+		switcher.prepareEntry(Entry.of(strategyValidator, input));
 		
 		assertThrows(error, switcher::isItOn);
 	}
diff --git a/src/test/java/com/switcherapi/client/model/ModelTest.java b/src/test/java/com/switcherapi/client/model/ModelTest.java
@@ -9,8 +9,8 @@ class ModelTest {
 	
 	@Test
 	void testModelEntry() {
-		Entry entry1 = Entry.build(StrategyValidator.DATE, "2019-12-10");
-		Entry entry2 = Entry.build(StrategyValidator.VALUE, "Value");
+		Entry entry1 = Entry.of(StrategyValidator.DATE, "2019-12-10");
+		Entry entry2 = Entry.of(StrategyValidator.VALUE, "Value");
 		
 		assertNotEquals(true, entry1.equals(entry2));
 		assertNotNull(entry1.toString());
diff --git a/src/test/java/com/switcherapi/client/validator/RegexValidatorV8Test.java b/src/test/java/com/switcherapi/client/validator/RegexValidatorV8Test.java
diff --git a/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java b/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public SwitcherBuilder restrictRelay(boolean restrictRelay) {`
`95`	`95`	`*/`
`96`	`96`	`public SwitcherBuilder check(StrategyValidator strategy, String input) {`
`97`	`97`	`if (StringUtils.isNotBlank(input)) {`
`98`		`- entry.add(Entry.build(strategy, input));`
	`98`	`+ entry.add(Entry.of(strategy, input));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`return this;`