with building anchor lazily, it's not longer required to set anchor u…

…rl explicitly in AbstractInternalLinkInheritUrlParamLinkPostProcessor mark Link#setAnchor as deprecated
wcm-io · Dec 9, 2022 · 0a94994 · 0a94994
1 parent f96a0f1
commit 0a94994
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/io/wcm/handler/link/Link.java b/src/main/java/io/wcm/handler/link/Link.java
@@ -141,7 +141,9 @@ public Map<String, String> getAnchorAttributes() {
 
   /**
    * @param anchor Anchor element
+   * @deprecated Use {@link #setAnchorBuilder(Function)} to build anchor on-demand
    */
+  @Deprecated
   public void setAnchor(Anchor anchor) {
     this.anchor = anchor;
   }

diff --git a/...a/io/wcm/handler/link/processor/AbstractInternalLinkInheritUrlParamLinkPostProcessor.java b/...a/io/wcm/handler/link/processor/AbstractInternalLinkInheritUrlParamLinkPostProcessor.java
@@ -75,9 +75,6 @@ protected AbstractInternalLinkInheritUrlParamLinkPostProcessor(Set<String> inher
             .fragment(uri.getFragment())
             .build();
         link.setUrl(url);
-        if (link.getAnchor() != null) {
-          link.getAnchor().setAttribute("href", url);
-        }
       }
       catch (URISyntaxException ex) {
         log.warn("Skipping post-processing or URL: {}", url, ex);

diff --git a/src/test/java/io/wcm/handler/link/LinkTest.java b/src/test/java/io/wcm/handler/link/LinkTest.java
@@ -67,6 +67,7 @@ void testLinkReferenceInvalid() {
   }
 
   @Test
+  @SuppressWarnings("deprecation")
   void testAnchor() {
     assertNull(underTest.getAnchorAttributes());
     assertNull(underTest.getMarkup());

diff --git a/.../java/io/wcm/handler/link/processor/InternalLinkInheritUrlParamLinkPostProcessorTest.java b/.../java/io/wcm/handler/link/processor/InternalLinkInheritUrlParamLinkPostProcessorTest.java
@@ -60,7 +60,7 @@ void testInternalLinkWithDefaultParameterList() {
 
     Link link = new Link(new InternalLinkType(), null);
     link.setUrl("/sample.html");
-    link.setAnchor(new Anchor().setHRef("/sample.html"));
+    link.setAnchorBuilder(l -> new Anchor().setHRef(l.getUrl()));
 
     // test without url parameters
     postProcessor.process(link);
@@ -84,7 +84,7 @@ void testInternalLinkFragment() {
 
     Link link = new Link(new InternalLinkType(), null);
     link.setUrl("/sample.html#fragment1");
-    link.setAnchor(new Anchor().setHRef("/sample.html#fragment1"));
+    link.setAnchorBuilder(l -> new Anchor().setHRef(l.getUrl()));
 
     // test without url parameters
     postProcessor.process(link);
@@ -108,7 +108,7 @@ void testInternalLinkFullUrl() {
 
     Link link = new Link(new InternalLinkType(), null);
     link.setUrl("https://host1/sample.html#fragment1");
-    link.setAnchor(new Anchor().setHRef("/sample.html#fragment1"));
+    link.setAnchorBuilder(l -> new Anchor().setHRef(l.getUrl()));
 
     // test without url parameters
     postProcessor.process(link);
@@ -132,7 +132,7 @@ void testInternalLinkFullUrlWithPort() {
 
     Link link = new Link(new InternalLinkType(), null);
     link.setUrl("https://host1:8080/sample.html#fragment1");
-    link.setAnchor(new Anchor().setHRef("/sample.html#fragment1"));
+    link.setAnchorBuilder(l -> new Anchor().setHRef(l.getUrl()));
 
     // test without url parameters
     postProcessor.process(link);
@@ -156,7 +156,7 @@ void testInternalLinkWithCustomParameterList() {
 
     Link link = new Link(new InternalLinkType(), null);
     link.setUrl("/sample.html");
-    link.setAnchor(new Anchor().setHRef("/sample.html"));
+    link.setAnchorBuilder(l -> new Anchor().setHRef(l.getUrl()));
 
     // test without url parameters
     postProcessor.process(link);
@@ -180,7 +180,7 @@ void testExternalLinkWithDefaultParameterList() {
 
     Link link = new Link(new ExternalLinkType(), null);
     link.setUrl("/sample.html");
-    link.setAnchor(new Anchor().setHRef("/sample.html"));
+    link.setAnchorBuilder(l -> new Anchor().setHRef(l.getUrl()));
 
     // test without url parameters
     postProcessor.process(link);
@@ -199,7 +199,7 @@ void testInternalCrossContextLinkWithDefaultParameterList() {
 
     Link link = new Link(new InternalCrossContextLinkType(), null);
     link.setUrl("/sample.html");
-    link.setAnchor(new Anchor().setHRef("/sample.html"));
+    link.setAnchorBuilder(l -> new Anchor().setHRef(l.getUrl()));
 
     // test without url parameters
     postProcessor.process(link);