generics from HtmlElement and ImageMapArea is removed

wcm-io · Jan 20, 2024 · 77707dc · 77707dc
1 parent 65513f1
commit 77707dc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/...es/core/src/main/java/io/wcm/wcm/core/components/impl/models/helpers/ImageAreaV1Impl.java b/...es/core/src/main/java/io/wcm/wcm/core/components/impl/models/helpers/ImageAreaV1Impl.java
@@ -33,12 +33,12 @@
 /**
  * Implementation of {@link ImageArea}.
  */
-public class ImageAreaV1Impl extends ImageAreaV2Impl {
+public final class ImageAreaV1Impl extends ImageAreaV2Impl {
 
   /**
    * @param delegate Delegate
    */
-  public ImageAreaV1Impl(ImageMapArea<io.wcm.handler.link.Link> delegate) {
+  public ImageAreaV1Impl(ImageMapArea delegate) {
     super(delegate);
   }
 

diff --git a/...es/core/src/main/java/io/wcm/wcm/core/components/impl/models/helpers/ImageAreaV2Impl.java b/...es/core/src/main/java/io/wcm/wcm/core/components/impl/models/helpers/ImageAreaV2Impl.java
@@ -38,15 +38,15 @@
  */
 public class ImageAreaV2Impl implements ImageArea {
 
-  private final ImageMapArea<io.wcm.handler.link.Link> delegate;
+  private final ImageMapArea delegate;
   private final LinkWrapper link;
 
   /**
    * @param delegate Delegate
    */
-  public ImageAreaV2Impl(ImageMapArea<io.wcm.handler.link.Link> delegate) {
+  public ImageAreaV2Impl(ImageMapArea delegate) {
     this.delegate = delegate;
-    io.wcm.handler.link.Link delegateLink = delegate.getLink();
+    io.wcm.handler.link.Link delegateLink = toLink(delegate.getLink());
     if (delegateLink != null) {
       this.link = new LinkWrapper(delegateLink);
     }
@@ -55,6 +55,15 @@ public ImageAreaV2Impl(ImageMapArea<io.wcm.handler.link.Link> delegate) {
     }
   }
 
+  private io.wcm.handler.link.Link toLink(Object linkObject) {
+    if (linkObject instanceof io.wcm.handler.link.Link) {
+      return (io.wcm.handler.link.Link)linkObject;
+    }
+    else {
+      return null;
+    }
+  }
+
   @Override
   public String getShape() {
     return delegate.getShape();

diff --git a/.../src/main/java/io/wcm/wcm/core/components/impl/models/wcmio/v1/ResponsiveImageV1Impl.java b/.../src/main/java/io/wcm/wcm/core/components/impl/models/wcmio/v1/ResponsiveImageV1Impl.java
@@ -175,16 +175,16 @@ private void initPropertiesFromDamAsset(ValueMap properties) {
   }
 
   @SuppressWarnings("unchecked")
-  private static void setImageTitle(HtmlElement<?> element, String title) {
+  private static void setImageTitle(HtmlElement element, String title) {
     if (element == null) {
       return;
     }
     if (element instanceof Picture || element instanceof Image) {
       element.setTitle(title);
     }
     else {
-      List<HtmlElement<?>> children = (List)element.getChildren();
-      for (HtmlElement<?> child : children) {
+      List<HtmlElement> children = (List)element.getChildren();
+      for (HtmlElement child : children) {
         setImageTitle(child, title);
       }
     }

diff --git a/bundles/core/src/test/java/io/wcm/wcm/core/components/testcontext/ImageAreaTestData.java b/bundles/core/src/test/java/io/wcm/wcm/core/components/testcontext/ImageAreaTestData.java
@@ -68,7 +68,7 @@ public static List<ImageArea> getExpectedAreasV1(AemContext context) {
 
   private static ImageArea areaV1(@NotNull String shape, @NotNull String coordinates, @Nullable String relativeCoordinates,
       @Nullable Link link, @NotNull String linkUrl, @Nullable String linkWindowTarget, @Nullable String altText) {
-    return new ImageAreaV1Impl(new ImageMapAreaImpl<Link>(shape, coordinates, relativeCoordinates,
+    return new ImageAreaV1Impl(new ImageMapAreaImpl(shape, coordinates, relativeCoordinates,
         link, linkUrl, linkWindowTarget, altText));
   }