fix #945

yegor256 · Dec 14, 2024 · a89631f · a89631f
1 parent 2f7bc6c
commit a89631f
Show file tree

Hide file tree

Showing 30 changed files with 281 additions and 228 deletions.
diff --git a/src/main/java/org/takes/facets/auth/PsBasic.java b/src/main/java/org/takes/facets/auth/PsBasic.java
@@ -45,7 +45,7 @@
 import org.takes.facets.forward.RsForward;
 import org.takes.misc.Opt;
 import org.takes.rq.RqHeaders;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.rs.RsWithHeader;
 
 /**
@@ -99,7 +99,7 @@ public Opt<Identity> enter(final Request request) throws IOException {
                     )
                 ),
                 HttpURLConnection.HTTP_UNAUTHORIZED,
-                new RqHref.Base(request).href()
+                new RqHrefBase(request).href()
             );
         }
         final String decoded = new IoCheckedText(
@@ -126,7 +126,7 @@ public Opt<Identity> enter(final Request request) throws IOException {
                     )
                 ),
                 HttpURLConnection.HTTP_UNAUTHORIZED,
-                new RqHref.Base(request).href()
+                new RqHrefBase(request).href()
             );
         }
         return identity;

diff --git a/src/main/java/org/takes/facets/auth/PsByFlag.java b/src/main/java/org/takes/facets/auth/PsByFlag.java
@@ -33,7 +33,7 @@
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 
 /**
  * Passes by flag.
@@ -94,7 +94,7 @@ public PsByFlag(final String flg, final Map<Pattern, Pass> map) {
 
     @Override
     public Opt<Identity> enter(final Request req) throws Exception {
-        final Iterator<String> flg = new RqHref.Base(req).href()
+        final Iterator<String> flg = new RqHrefBase(req).href()
             .param(this.flag).iterator();
         Opt<Identity> user = new Opt.Empty<>();
         if (flg.hasNext()) {

diff --git a/src/main/java/org/takes/facets/auth/XeLogoutLink.java b/src/main/java/org/takes/facets/auth/XeLogoutLink.java
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import lombok.EqualsAndHashCode;
 import org.takes.Request;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.rs.xe.XeLink;
 import org.takes.rs.xe.XeWrap;
 
@@ -62,7 +62,7 @@ public XeLogoutLink(final Request req, final String rel,
         super(
             new XeLink(
                 rel,
-                new RqHref.Base(req).href().with(
+                new RqHrefBase(req).href().with(
                     flag, PsLogout.class.getSimpleName()
                 ).toString()
         )

diff --git a/src/main/java/org/takes/facets/auth/social/PsFacebook.java b/src/main/java/org/takes/facets/auth/social/PsFacebook.java
@@ -46,7 +46,7 @@
 import org.takes.facets.auth.Pass;
 import org.takes.misc.Href;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 
 /**
  * Facebook OAuth landing/callback page.
@@ -142,7 +142,7 @@ public PsFacebook(final String fapp, final String fkey) {
     @Override
     public Opt<Identity> enter(final Request trequest)
         throws IOException {
-        final Href href = new RqHref.Base(trequest).href();
+        final Href href = new RqHrefBase(trequest).href();
         final Iterator<String> code = href.param(PsFacebook.CODE).iterator();
         if (!code.hasNext()) {
             throw new HttpException(

diff --git a/src/main/java/org/takes/facets/auth/social/PsGithub.java b/src/main/java/org/takes/facets/auth/social/PsGithub.java
@@ -41,7 +41,7 @@
 import org.takes.facets.auth.Pass;
 import org.takes.misc.Href;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 
 /**
  * Github OAuth landing/callback page.
@@ -116,7 +116,7 @@ public PsGithub(final String gapp, final String gkey) {
     @Override
     public Opt<Identity> enter(final Request request)
         throws IOException {
-        final Href href = new RqHref.Base(request).href();
+        final Href href = new RqHrefBase(request).href();
         final Iterator<String> code = href.param(PsGithub.CODE).iterator();
         if (!code.hasNext()) {
             throw new HttpException(

diff --git a/src/main/java/org/takes/facets/auth/social/PsGoogle.java b/src/main/java/org/takes/facets/auth/social/PsGoogle.java
@@ -40,7 +40,7 @@
 import org.takes.facets.auth.Pass;
 import org.takes.misc.Href;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 
 /**
  * Google OAuth landing/callback page.
@@ -145,7 +145,7 @@ public PsGoogle(final String gapp, final String gkey,
     @Override
     public Opt<Identity> enter(final Request request)
         throws IOException {
-        final Href href = new RqHref.Base(request).href();
+        final Href href = new RqHrefBase(request).href();
         final Iterator<String> code = href.param(PsGoogle.CODE).iterator();
         if (!code.hasNext()) {
             throw new HttpException(

diff --git a/src/main/java/org/takes/facets/auth/social/PsLinkedin.java b/src/main/java/org/takes/facets/auth/social/PsLinkedin.java
@@ -41,7 +41,7 @@
 import org.takes.facets.auth.Pass;
 import org.takes.misc.Href;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 
 /**
  * Linkedin OAuth landing/callback page.
@@ -110,7 +110,7 @@ public PsLinkedin(final Href thref, final Href ahref,
     @Override
     public Opt<Identity> enter(final Request request)
         throws IOException {
-        final Href href = new RqHref.Base(request).href();
+        final Href href = new RqHrefBase(request).href();
         final Iterator<String> code = href.param(PsLinkedin.CODE).iterator();
         if (!code.hasNext()) {
             throw new HttpException(

diff --git a/src/main/java/org/takes/facets/auth/social/XeFacebookLink.java b/src/main/java/org/takes/facets/auth/social/XeFacebookLink.java
@@ -28,7 +28,7 @@
 import org.takes.Request;
 import org.takes.facets.auth.PsByFlag;
 import org.takes.misc.Href;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.rs.xe.XeLink;
 import org.takes.rs.xe.XeSource;
 import org.takes.rs.xe.XeWrap;
@@ -86,7 +86,7 @@ private static XeSource make(final Request req, final CharSequence app,
                 .with("client_id", app)
                 .with(
                     "redirect_uri",
-                    new RqHref.Base(req).href()
+                    new RqHrefBase(req).href()
                         .with(flag, PsFacebook.class.getSimpleName())
                 )
         );

diff --git a/src/main/java/org/takes/facets/auth/social/XeGithubLink.java b/src/main/java/org/takes/facets/auth/social/XeGithubLink.java
@@ -28,7 +28,7 @@
 import org.takes.Request;
 import org.takes.facets.auth.PsByFlag;
 import org.takes.misc.Href;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.rs.xe.XeLink;
 import org.takes.rs.xe.XeSource;
 import org.takes.rs.xe.XeWrap;
@@ -86,7 +86,7 @@ private static XeSource make(final Request req, final CharSequence app,
                 .with("client_id", app)
                 .with(
                     "redirect_uri",
-                    new RqHref.Base(req).href()
+                    new RqHrefBase(req).href()
                         .with(flag, PsGithub.class.getSimpleName())
                 )
         );

diff --git a/src/main/java/org/takes/facets/auth/social/XeGoogleLink.java b/src/main/java/org/takes/facets/auth/social/XeGoogleLink.java
@@ -27,7 +27,8 @@
 import lombok.EqualsAndHashCode;
 import org.takes.Request;
 import org.takes.misc.Href;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
+import org.takes.rq.RqHrefSmart;
 import org.takes.rs.xe.XeLink;
 import org.takes.rs.xe.XeSource;
 import org.takes.rs.xe.XeWrap;
@@ -50,7 +51,7 @@ public final class XeGoogleLink extends XeWrap {
      */
     public XeGoogleLink(final Request req, final CharSequence app)
         throws IOException {
-        this(req, app, new RqHref.Smart(new RqHref.Base(req)).home());
+        this(req, app, new RqHrefSmart(new RqHrefBase(req)).home());
     }
 
     /**
@@ -100,7 +101,7 @@ private static XeSource make(final Request req, final CharSequence app,
                 .with("client_id", app)
                 .with("redirect_uri", redir)
                 .with("response_type", "code")
-                .with("state", new RqHref.Base(req).href())
+                .with("state", new RqHrefBase(req).href())
                 .with(
                     "scope",
                     "https://www.googleapis.com/auth/userinfo.profile"

diff --git a/src/main/java/org/takes/facets/fallback/FbLog4j.java b/src/main/java/org/takes/facets/fallback/FbLog4j.java
@@ -29,7 +29,7 @@
 import org.cactoos.bytes.BytesOf;
 import org.cactoos.text.TextOf;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.rq.RqMethod;
 
 /**
@@ -61,7 +61,7 @@ private static void log(final RqFallback req) throws IOException {
             String.format(
                 "%s %s failed with %s: %s",
                 new RqMethod.Base(req).method(),
-                new RqHref.Base(req).href(),
+                new RqHrefBase(req).href(),
                 req.code(),
                 new TextOf(new BytesOf(req.throwable()))
             )

diff --git a/src/main/java/org/takes/facets/fallback/FbSlf4j.java b/src/main/java/org/takes/facets/fallback/FbSlf4j.java
@@ -30,7 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.rq.RqMethod;
 
 /**
@@ -69,7 +69,7 @@ private static void log(final RqFallback req) throws IOException {
         FbSlf4j.LOGGER.error(
             "{} {} failed with {}: {}",
             new RqMethod.Base(req).method(),
-            new RqHref.Base(req).href(),
+            new RqHrefBase(req).href(),
             req.code(),
             new TextOf(new BytesOf(req.throwable()))
         );

diff --git a/src/main/java/org/takes/facets/fallback/TkFallback.java b/src/main/java/org/takes/facets/fallback/TkFallback.java
@@ -34,7 +34,7 @@
 import org.takes.Response;
 import org.takes.Take;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.rq.RqMethod;
 import org.takes.rs.ResponseOf;
 import org.takes.tk.TkWrap;
@@ -232,7 +232,7 @@ private static Throwable error(final Throwable exp, final Request req,
             String.format(
                 "[%s %s] failed in %s: %s",
                 new RqMethod.Base(req).method(),
-                new RqHref.Base(req).href(),
+                new RqHrefBase(req).href(),
                 time, TkFallback.msg(exp)
             ),
             exp

diff --git a/src/main/java/org/takes/facets/fork/FkParams.java b/src/main/java/org/takes/facets/fork/FkParams.java
@@ -30,7 +30,7 @@
 import org.takes.Response;
 import org.takes.Take;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 
 /**
  * Fork by query params and their values, matched by regular express.
@@ -82,7 +82,7 @@ public FkParams(final String param, final Pattern ptn, final Take tke) {
 
     @Override
     public Opt<Response> route(final Request req) throws Exception {
-        final Iterator<String> params = new RqHref.Base(req).href()
+        final Iterator<String> params = new RqHrefBase(req).href()
             .param(this.name).iterator();
         final Opt<Response> resp;
         if (params.hasNext()

diff --git a/src/main/java/org/takes/facets/fork/FkRegex.java b/src/main/java/org/takes/facets/fork/FkRegex.java
@@ -33,7 +33,7 @@
 import org.takes.Response;
 import org.takes.Take;
 import org.takes.misc.Opt;
-import org.takes.rq.RqHref;
+import org.takes.rq.RqHrefBase;
 import org.takes.tk.TkFixed;
 import org.takes.tk.TkText;
 
@@ -202,7 +202,7 @@ public FkRegex setRemoveTrailingSlash(final boolean enabled) {
 
     @Override
     public Opt<Response> route(final Request req) throws Exception {
-        String path = new RqHref.Base(req).href().path();
+        String path = new RqHrefBase(req).href().path();
         if (
             this.removeslash
                 && path.length() > 1