use AemObjectReflectionToStringBuilder from wcm commons

wcm-io · Jun 18, 2024 · 91a387f · 91a387f
1 parent 02fb329
commit 91a387f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 192 deletions.
diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.commons</artifactId>
-      <version>1.10.0</version>
+      <version>1.10.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/main/java/io/wcm/handler/media/Media.java b/src/main/java/io/wcm/handler/media/Media.java
@@ -284,6 +284,7 @@ public void setMediaInvalidReasonCustomMessage(@Nullable String mediaInvalidReas
   @Override
   public String toString() {
     ToStringBuilder sb = new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    sb.append("valid", isValid());
     if (isValid()) {
       sb.append("url", getUrl());
     }

diff --git a/src/main/java/io/wcm/handler/media/MediaArgs.java b/src/main/java/io/wcm/handler/media/MediaArgs.java
@@ -37,12 +37,12 @@
 import org.osgi.annotation.versioning.ProviderType;
 
 import io.wcm.handler.media.format.MediaFormat;
-import io.wcm.handler.media.impl.AemObjectsReflectionToStringBuilder;
 import io.wcm.handler.media.markup.DragDropSupport;
 import io.wcm.handler.media.markup.IPERatioCustomize;
 import io.wcm.handler.mediasource.dam.AemRenditionType;
 import io.wcm.handler.url.UrlMode;
 import io.wcm.wcm.commons.contenttype.FileExtension;
+import io.wcm.wcm.commons.util.AemObjectReflectionToStringBuilder;
 
 /**
  * Holds parameters to influence the media resolving process.
@@ -844,7 +844,7 @@ public String toString() {
       sb.append("webOptimizedImageDeliveryDisabled", webOptimizedImageDeliveryDisabled);
     }
     if (properties != null && !properties.isEmpty()) {
-      sb.append("properties", AemObjectsReflectionToStringBuilder.filteredValueMap(properties));
+      sb.append("properties", AemObjectReflectionToStringBuilder.filteredValueMap(properties));
     }
     return sb.build();
   }

diff --git a/src/main/java/io/wcm/handler/media/MediaRequest.java b/src/main/java/io/wcm/handler/media/MediaRequest.java
@@ -29,7 +29,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.osgi.annotation.versioning.ProviderType;
 
-import io.wcm.handler.media.impl.AemObjectsReflectionToStringBuilder;
+import io.wcm.wcm.commons.util.AemObjectReflectionToStringBuilder;
 
 /**
  * Holds all properties that are part of a media handling request.
@@ -123,7 +123,7 @@ public String toString() {
         io.wcm.wcm.commons.util.ToStringStyle.SHORT_PREFIX_OMIT_NULL_STYLE);
     if (resource != null) {
       sb.append("resource", resource.getPath());
-      sb.append("resourceProperties", AemObjectsReflectionToStringBuilder.filteredValueMap(resource.getValueMap()));
+      sb.append("resourceProperties", AemObjectReflectionToStringBuilder.filteredValueMap(resource.getValueMap()));
     }
     if (mediaRef != null) {
       sb.append("mediaRef", mediaRef);

diff --git a/src/main/java/io/wcm/handler/media/impl/AemObjectsReflectionToStringBuilder.java b/src/main/java/io/wcm/handler/media/impl/AemObjectsReflectionToStringBuilder.java
diff --git a/src/main/java/io/wcm/handler/mediasource/dam/impl/DamAsset.java b/src/main/java/io/wcm/handler/mediasource/dam/impl/DamAsset.java
@@ -40,11 +40,11 @@
 import io.wcm.handler.media.Rendition;
 import io.wcm.handler.media.UriTemplate;
 import io.wcm.handler.media.UriTemplateType;
-import io.wcm.handler.media.impl.AemObjectsReflectionToStringBuilder;
 import io.wcm.handler.media.spi.MediaHandlerConfig;
 import io.wcm.handler.mediasource.dam.AssetRendition;
 import io.wcm.handler.mediasource.dam.impl.dynamicmedia.DynamicMediaSupportService;
 import io.wcm.handler.mediasource.dam.impl.weboptimized.WebOptimizedImageDeliveryService;
+import io.wcm.wcm.commons.util.AemObjectReflectionToStringBuilder;
 
 /**
  * {@link Asset} implementation for DAM assets.
@@ -224,7 +224,7 @@ public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
 
   @Override
   public String toString() {
-    return new AemObjectsReflectionToStringBuilder(this,
+    return new AemObjectReflectionToStringBuilder(this,
         io.wcm.wcm.commons.util.ToStringStyle.SHORT_PREFIX_OMIT_NULL_STYLE).build();
   }
 

diff --git a/src/main/java/io/wcm/handler/mediasource/inline/InlineAsset.java b/src/main/java/io/wcm/handler/mediasource/inline/InlineAsset.java
@@ -35,8 +35,8 @@
 import io.wcm.handler.media.Rendition;
 import io.wcm.handler.media.UriTemplate;
 import io.wcm.handler.media.UriTemplateType;
-import io.wcm.handler.media.impl.AemObjectsReflectionToStringBuilder;
 import io.wcm.handler.media.spi.MediaHandlerConfig;
+import io.wcm.wcm.commons.util.AemObjectReflectionToStringBuilder;
 
 /**
  * {@link Asset} implementation for inline media objects stored in a node in a content page.
@@ -168,7 +168,7 @@ public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
 
   @Override
   public String toString() {
-    return new AemObjectsReflectionToStringBuilder(this,
+    return new AemObjectReflectionToStringBuilder(this,
         io.wcm.wcm.commons.util.ToStringStyle.SHORT_PREFIX_OMIT_NULL_STYLE).build();
   }
 

diff --git a/src/test/java/io/wcm/handler/media/impl/AemObjectsReflectionToStringBuilderTest.java b/src/test/java/io/wcm/handler/media/impl/AemObjectsReflectionToStringBuilderTest.java