fixes #2249 merge token-config to router-config (#2250)

networknt · May 17, 2024 · 405b391 · 405b391
1 parent 39acee5
commit 405b391
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 13 deletions.
diff --git a/client/src/test/java/com/networknt/client/oauth/TokenResponseTest.java b/client/src/test/java/com/networknt/client/oauth/TokenResponseTest.java
@@ -41,8 +41,7 @@ public void testErrorStatus() throws IOException {
         TokenResponse tokenResponse = Config.getInstance().getMapper().readValue(s, TokenResponse.class);
     }
 
-
-    @Test(expected = UnrecognizedPropertyException.class)
+    @Test
     public void testExtraFields() throws IOException {
         String s = "{\"access_token\":\"access_token\",\"token_type\":\"token_type\",\"expires_in\":3600,\"scope\":\"scope\",\"state\":\"state\",\"refresh_token\":\"refresh_token\",\"example_parameter\":\"example_parameter\",\"extra\":\"extra\"}";
         TokenResponse tokenResponse = Config.getInstance().getMapper().readValue(s, TokenResponse.class);

diff --git a/egress-router/pom.xml b/egress-router/pom.xml
@@ -38,10 +38,6 @@
             <groupId>com.networknt</groupId>
             <artifactId>proxy-handler</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>token-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>router-config</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
         <version.jsr305>3.0.2</version.jsr305>
         <version.json-schema-validator>1.0.65</version.json-schema-validator>
         <version.yaml-rule>1.0.3</version.yaml-rule>
-        <version.http-client>1.0.10</version.http-client>
+        <version.http-client>1.0.11</version.http-client>
         <version.snakeyaml>2.2</version.snakeyaml>
         <version.caffeine>3.1.5</version.caffeine>
         <version.prometheus>0.16.0</version.prometheus>
@@ -175,7 +175,6 @@
         <module>logger-config</module>
         <module>logger-handler</module>
         <module>http-entity</module>
-        <module>token-config</module>
         <module>router-config</module>
         <module>egress-router</module>
         <module>ingress-proxy</module>
@@ -497,11 +496,6 @@
                 <artifactId>http-entity</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.networknt</groupId>
-                <artifactId>token-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>router-config</artifactId>

diff --git a/...worknt/router/middleware/TokenConfig.java → ...worknt/router/middleware/TokenConfig.java b/...worknt/router/middleware/TokenConfig.java → ...worknt/router/middleware/TokenConfig.java
diff --git a/...nt/router/middleware/TokenConfigTest.java → ...nt/router/middleware/TokenConfigTest.java b/...nt/router/middleware/TokenConfigTest.java → ...nt/router/middleware/TokenConfigTest.java
diff --git a/...onfig/src/main/resources/config/token.yml → ...onfig/src/test/resources/config/token.yml b/...onfig/src/main/resources/config/token.yml → ...onfig/src/test/resources/config/token.yml