fixes networknt#866 move TlsUtil to config module from utility to rem…

…ove config dependency (networknt#867)
younggwon1 · Dec 15, 2020 · c7b3349 · c7b3349
1 parent 54516c3
commit c7b3349
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 15 deletions.
diff --git a/client/src/main/java/com/networknt/client/Http2Client.java b/client/src/main/java/com/networknt/client/Http2Client.java
@@ -27,7 +27,6 @@
 import com.networknt.client.ssl.ClientX509ExtendedTrustManager;
 import com.networknt.client.ssl.TLSConfig;
 import com.networknt.cluster.Cluster;
-import com.networknt.common.SecretConstants;
 import com.networknt.config.Config;
 import com.networknt.httpstring.AttachmentConstants;
 import com.networknt.exception.ClientException;
@@ -37,7 +36,7 @@
 import com.networknt.service.SingletonServiceFactory;
 import com.networknt.status.Status;
 import com.networknt.utility.ModuleRegistry;
-import com.networknt.utility.TlsUtil;
+import com.networknt.config.TlsUtil;
 import io.opentracing.Tracer;
 import io.opentracing.propagation.Format;
 import io.opentracing.tag.Tags;

diff --git a/...n/java/com/networknt/utility/TlsUtil.java → ...in/java/com/networknt/config/TlsUtil.java b/...n/java/com/networknt/utility/TlsUtil.java → ...in/java/com/networknt/config/TlsUtil.java
@@ -1,6 +1,5 @@
-package com.networknt.utility;
+package com.networknt.config;
 
-import com.networknt.config.Config;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...va/com/networknt/utility/TlsUtilTest.java → ...ava/com/networknt/config/TlsUtilTest.java b/...va/com/networknt/utility/TlsUtilTest.java → ...ava/com/networknt/config/TlsUtilTest.java
@@ -1,5 +1,6 @@
-package com.networknt.utility;
+package com.networknt.config;
 
+import com.networknt.config.TlsUtil;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...src/test/resources/config/client.keystore → ...src/test/resources/config/client.keystore b/...src/test/resources/config/client.keystore → ...src/test/resources/config/client.keystore
diff --git a/...c/test/resources/config/client.truststore → ...c/test/resources/config/client.truststore b/...c/test/resources/config/client.truststore → ...c/test/resources/config/client.truststore
diff --git a/server/src/main/java/com/networknt/server/DefaultConfigLoader.java b/server/src/main/java/com/networknt/server/DefaultConfigLoader.java
@@ -23,14 +23,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.client.Http2Client;
 import com.networknt.config.Config;
-import com.networknt.utility.TlsUtil;
 import io.undertow.UndertowOptions;
 import io.undertow.client.ClientConnection;
 import io.undertow.client.ClientRequest;
 import io.undertow.client.ClientResponse;
 import io.undertow.util.Headers;
 import io.undertow.util.Methods;
-import org.owasp.encoder.Encode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xnio.IoUtils;
@@ -40,11 +38,9 @@
 
 import javax.net.ssl.*;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

diff --git a/server/src/main/java/com/networknt/server/Server.java b/server/src/main/java/com/networknt/server/Server.java
@@ -30,8 +30,7 @@
 import com.networknt.switcher.SwitcherUtil;
 import com.networknt.utility.Constants;
 import com.networknt.utility.NetUtils;
-import com.networknt.utility.TlsUtil;
-import com.networknt.utility.Util;
+import com.networknt.config.TlsUtil;
 import io.undertow.Handlers;
 import io.undertow.Undertow;
 import io.undertow.UndertowOptions;

diff --git a/utility/pom.xml b/utility/pom.xml
@@ -30,10 +30,6 @@
     <description>A utility module that contains all the utilities shared across other modules.</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -48,11 +44,17 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>config</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>