Skip to content

Commit 4625a8a

Browse files
committed
avoid duplicate package name
relevant when using karate as a dependency for a java-module project
1 parent 459aac2 commit 4625a8a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import org.apache.http.config.Registry;
7070
import org.apache.http.config.RegistryBuilder;
7171
import org.apache.http.config.SocketConfig;
72-
import org.apache.http.conn.ssl.LenientSslConnectionSocketFactory;
72+
import nodebug.LenientSslConnectionSocketFactory;
7373
import org.apache.http.conn.ssl.NoopHostnameVerifier;
7474
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
7575
import org.apache.http.conn.ssl.TrustAllStrategy;

karate-core/src/main/java/org/apache/http/conn/ssl/LenientSslConnectionSocketFactory.java karate-core/src/main/java/nodebug/LenientSslConnectionSocketFactory.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.apache.http.conn.ssl;
24+
package nodebug;
2525

2626
import java.io.IOException;
2727
import java.net.Socket;
2828
import javax.net.ssl.HostnameVerifier;
2929
import javax.net.ssl.SSLContext;
30+
31+
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
3032
import org.apache.http.protocol.HttpContext;
3133

3234
/**
33-
* in a separate package just for log level config consistency
35+
* in a package that is NOT in the karate package, else it will add un-necessary debug logging
36+
* the parent class is third-party code that unfortunately calls getClass() for logger name
3437
*
3538
* @author pthomas3
3639
*/

0 commit comments

Comments
 (0)