diff --git a/client/src/main/java/com/networknt/client/Http2Client.java b/client/src/main/java/com/networknt/client/Http2Client.java index 477657b36c..5a24440c46 100644 --- 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/utility/src/main/java/com/networknt/utility/TlsUtil.java b/config/src/main/java/com/networknt/config/TlsUtil.java similarity index 96% rename from utility/src/main/java/com/networknt/utility/TlsUtil.java rename to config/src/main/java/com/networknt/config/TlsUtil.java index ebb2281dfd..d00cb71207 100644 --- a/utility/src/main/java/com/networknt/utility/TlsUtil.java +++ b/config/src/main/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/utility/src/test/java/com/networknt/utility/TlsUtilTest.java b/config/src/test/java/com/networknt/config/TlsUtilTest.java similarity index 96% rename from utility/src/test/java/com/networknt/utility/TlsUtilTest.java rename to config/src/test/java/com/networknt/config/TlsUtilTest.java index 200b0b9a6b..3f83a4488b 100644 --- a/utility/src/test/java/com/networknt/utility/TlsUtilTest.java +++ b/config/src/test/java/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/utility/src/test/resources/config/client.keystore b/config/src/test/resources/config/client.keystore similarity index 100% rename from utility/src/test/resources/config/client.keystore rename to config/src/test/resources/config/client.keystore diff --git a/utility/src/test/resources/config/client.truststore b/config/src/test/resources/config/client.truststore similarity index 100% rename from utility/src/test/resources/config/client.truststore rename to config/src/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 index 79f5fbf45d..0b9d8cacd2 100644 --- 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 index 8a6a76700c..e33a0663b6 100644 --- 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 index c7b40cdfca..b8787a2096 100644 --- a/utility/pom.xml +++ b/utility/pom.xml @@ -30,10 +30,6 @@ A utility module that contains all the utilities shared across other modules. - - com.networknt - config - org.slf4j slf4j-api @@ -48,11 +44,17 @@ logback-classic test + junit junit test + + com.networknt + config + test +