Revert "DefaultCredentialsProvider moved from package 'org.htmlunit' …

…into 'org.htmlunit.httpclient' (issue #764)" This reverts commit c08361f.
HtmlUnit · Apr 6, 2024 · e65c193 · e65c193
1 parent f7cab73
commit e65c193
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 14 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,11 +8,6 @@
 
     <body>
         <release version="4.1.0" date="April xx, 2024" description="Bugfixes">
-            <action type="update" dev="rbri">
-                INCOMPATIBLE CHANGE: DefaultCredentialsProvider moved from package 'org.htmlunit' into 'org.htmlunit.httpclient'.
-            </action>
-
-
             <action type="fix" dev="rbri">
                 Wrong script encoding was uses in some cases (regression in 4.0.0).
             </action>

diff --git a/...ttpclient/DefaultCredentialsProvider.java → .../htmlunit/DefaultCredentialsProvider.java b/...ttpclient/DefaultCredentialsProvider.java → .../htmlunit/DefaultCredentialsProvider.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.htmlunit.httpclient;
+package org.htmlunit;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -28,6 +28,7 @@
 import org.apache.http.auth.NTCredentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
+import org.htmlunit.httpclient.HtmlUnitUsernamePasswordCredentials;
 
 /**
  * Default HtmlUnit implementation of the <code>CredentialsProvider</code> interface. Provides

diff --git a/src/main/java/org/htmlunit/WebClient.java b/src/main/java/org/htmlunit/WebClient.java
@@ -76,7 +76,6 @@
 import org.htmlunit.html.XHtmlPage;
 import org.htmlunit.html.parser.HTMLParser;
 import org.htmlunit.html.parser.HTMLParserListener;
-import org.htmlunit.httpclient.DefaultCredentialsProvider;
 import org.htmlunit.httpclient.HttpClientConverter;
 import org.htmlunit.javascript.AbstractJavaScriptEngine;
 import org.htmlunit.javascript.DefaultJavaScriptErrorListener;

diff --git a/...ient/DefaultCredentialsProvider2Test.java → ...unit/DefaultCredentialsProvider2Test.java b/...ient/DefaultCredentialsProvider2Test.java → ...unit/DefaultCredentialsProvider2Test.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.htmlunit.httpclient;
+package org.htmlunit;
 
 import static org.junit.Assert.fail;
 
@@ -26,8 +26,6 @@
 import org.apache.logging.log4j.core.appender.WriterAppender;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.htmlunit.FailingHttpStatusCodeException;
-import org.htmlunit.WebServerTestCase;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.junit.BrowserRunner;
 import org.htmlunit.junit.BrowserRunner.Alerts;

diff --git a/...ient/DefaultCredentialsProvider3Test.java → ...unit/DefaultCredentialsProvider3Test.java b/...ient/DefaultCredentialsProvider3Test.java → ...unit/DefaultCredentialsProvider3Test.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.htmlunit.httpclient;
+package org.htmlunit;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

diff --git a/...lient/DefaultCredentialsProviderTest.java → ...lunit/DefaultCredentialsProviderTest.java b/...lient/DefaultCredentialsProviderTest.java → ...lunit/DefaultCredentialsProviderTest.java
@@ -12,13 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.htmlunit.httpclient;
+package org.htmlunit;
 
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
 import org.apache.http.impl.auth.BasicScheme;
-import org.htmlunit.HttpHeader;
-import org.htmlunit.SimpleWebTestCase;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.junit.BrowserRunner;
 import org.junit.Test;

diff --git a/src/test/java/org/htmlunit/archunit/ArchitectureTest.java b/src/test/java/org/htmlunit/archunit/ArchitectureTest.java
@@ -349,6 +349,7 @@ public void check(final JavaMethod method, final ConditionEvents events) {
             .and().doNotHaveFullyQualifiedName("org.htmlunit.WebClient")
             .and().doNotHaveFullyQualifiedName("org.htmlunit.WebRequest")
             .and().doNotHaveFullyQualifiedName("org.htmlunit.util.Cookie")
+            .and().doNotHaveFullyQualifiedName("org.htmlunit.DefaultCredentialsProvider")
             .and().resideOutsideOfPackage("org.htmlunit.httpclient..")
         .should().dependOnClassesThat().resideInAnyPackage("org.apache.http..");