From 4625a8ae4dc9206c0aea2cad54fe33908288077f Mon Sep 17 00:00:00 2001 From: Peter Thomas Date: Wed, 15 Jan 2025 14:26:47 +0530 Subject: [PATCH] avoid duplicate package name relevant when using karate as a dependency for a java-module project --- .../main/java/com/intuit/karate/http/ApacheHttpClient.java | 2 +- .../ssl => nodebug}/LenientSslConnectionSocketFactory.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) rename karate-core/src/main/java/{org/apache/http/conn/ssl => nodebug}/LenientSslConnectionSocketFactory.java (87%) diff --git a/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java b/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java index 3b2833964..f6ecf5822 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java +++ b/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java @@ -69,7 +69,7 @@ import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.config.SocketConfig; -import org.apache.http.conn.ssl.LenientSslConnectionSocketFactory; +import nodebug.LenientSslConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.conn.ssl.TrustAllStrategy; diff --git a/karate-core/src/main/java/org/apache/http/conn/ssl/LenientSslConnectionSocketFactory.java b/karate-core/src/main/java/nodebug/LenientSslConnectionSocketFactory.java similarity index 87% rename from karate-core/src/main/java/org/apache/http/conn/ssl/LenientSslConnectionSocketFactory.java rename to karate-core/src/main/java/nodebug/LenientSslConnectionSocketFactory.java index 0441f6a2d..5b24830e6 100644 --- a/karate-core/src/main/java/org/apache/http/conn/ssl/LenientSslConnectionSocketFactory.java +++ b/karate-core/src/main/java/nodebug/LenientSslConnectionSocketFactory.java @@ -21,16 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.apache.http.conn.ssl; +package nodebug; import java.io.IOException; import java.net.Socket; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; + +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.protocol.HttpContext; /** - * in a separate package just for log level config consistency + * in a package that is NOT in the karate package, else it will add un-necessary debug logging + * the parent class is third-party code that unfortunately calls getClass() for logger name * * @author pthomas3 */