Type: differ between a full and simple string representation

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/items/events/GroupItemStateChangedEvent.java

@@ -46,8 +46,6 @@ public String getType() {
 
     @Override
     public String toString() {
-        return itemName + " changed from " + oldItemState.toString() + " to " + itemState.toString() + " through "
-                + memberName;
-
+        return String.format("%s through %s", super.toString(), memberName);
     }
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemEventFactory.java

@@ -218,7 +218,8 @@ public static ItemCommandEvent createCommandEvent(String itemName, Command comma
     public static ItemStateEvent createStateEvent(String itemName, State state, String source) {
         assertValidArguments(itemName, state, "state");
         String topic = buildTopic(ITEM_STATE_EVENT_TOPIC, itemName);
-        ItemEventPayloadBean bean = new ItemEventPayloadBean(state.getClass().getSimpleName(), state.toString());
+        ItemEventPayloadBean bean = new ItemEventPayloadBean(state.getClass().getSimpleName(),
+                state.toFullString());
         String payload = serializePayload(bean);
         return new ItemStateEvent(topic, payload, itemName, state, source);
     }
@@ -252,8 +253,8 @@ public static ItemStateChangedEvent createStateChangedEvent(String itemName, Sta
         assertValidArguments(itemName, newState, "state");
         String topic = buildTopic(ITEM_STATE_CHANGED_EVENT_TOPIC, itemName);
         ItemStateChangedEventPayloadBean bean = new ItemStateChangedEventPayloadBean(
-                newState.getClass().getSimpleName(), newState.toString(), oldState.getClass().getSimpleName(),
-                oldState.toString());
+                newState.getClass().getSimpleName(), newState.toFullString(), oldState.getClass().getSimpleName(),
+                oldState.toFullString());
         String payload = serializePayload(bean);
         return new ItemStateChangedEvent(topic, payload, itemName, newState, oldState);
     }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStateChangedEvent.java

@@ -81,7 +81,7 @@ public State getOldItemState() {
 
     @Override
     public String toString() {
-        return itemName + " changed from " + oldItemState.toString() + " to " + itemState.toString();
+        return String.format("%s changed from %s to %s", itemName, oldItemState, itemState);
     }
 
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStateEvent.java

@@ -13,7 +13,7 @@
 /**
  * {@link ItemStateEvent}s can be used to deliver item status updates through the Eclipse SmartHome event bus.
  * State events must be created with the {@link ItemEventFactory}.
- * 
+ *
  * @author Stefan Bußweiler - Initial contribution
  */
 public class ItemStateEvent extends AbstractEvent {
@@ -29,7 +29,7 @@ public class ItemStateEvent extends AbstractEvent {
 
     /**
      * Constructs a new item state event.
-     * 
+     *
      * @param topic the topic
      * @param payload the payload
      * @param itemName the item name
@@ -49,7 +49,7 @@ public String getType() {
 
     /**
      * Gets the item name.
-     * 
+     *
      * @return the item name
      */
     public String getItemName() {
@@ -58,7 +58,7 @@ public String getItemName() {
 
     /**
      * Gets the item state.
-     * 
+     *
      * @return the item state
      */
     public State getItemState() {
@@ -67,7 +67,7 @@ public State getItemState() {
 
     @Override
     public String toString() {
-        return itemName + " updated to " + itemState.toString();
+        return String.format("%s updated to %s", itemName, itemState);
     }
 
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeType.java

@@ -84,6 +84,11 @@ public String format(Locale locale, String pattern) {
 
     @Override
     public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
         return new SimpleDateFormat(DATE_PATTERN_WITH_TZ_AND_MS).format(calendar.getTime());
     }
 

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/DecimalType.java

@@ -51,6 +51,11 @@ public DecimalType(String value) {
 
     @Override
     public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
         return value.toPlainString();
     }
 
@@ -90,18 +95,23 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (!(obj instanceof DecimalType))
+        }
+        if (!(obj instanceof DecimalType)) {
             return false;
+        }
         DecimalType other = (DecimalType) obj;
         if (value == null) {
-            if (other.value != null)
+            if (other.value != null) {
                 return false;
-        } else if (value.compareTo(other.value) != 0)
+            }
+        } else if (value.compareTo(other.value) != 0) {
             return false;
+        }
         return true;
     }
 

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/HSBType.java

@@ -162,6 +162,11 @@ public int getRGB() {
 
     @Override
     public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
         return getHue() + "," + getSaturation() + "," + getBrightness();
     }
 

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/IncreaseDecreaseType.java

@@ -11,11 +11,22 @@
 import org.eclipse.smarthome.core.types.PrimitiveType;
 
 public enum IncreaseDecreaseType implements PrimitiveType, Command {
-    INCREASE, DECREASE;
+    INCREASE,
+    DECREASE;
 
     @Override
     public String format(String pattern) {
         return String.format(pattern, this.toString());
     }
 
+    @Override
+    public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
+        return super.toString();
+    }
+
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/NextPreviousType.java

@@ -17,11 +17,22 @@
  * @author Alex Tugarev
  */
 public enum NextPreviousType implements PrimitiveType, Command {
-    NEXT, PREVIOUS;
+    NEXT,
+    PREVIOUS;
 
     @Override
     public String format(String pattern) {
         return String.format(pattern, this.toString());
     }
 
+    @Override
+    public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
+        return super.toString();
+    }
+
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/OnOffType.java

@@ -12,11 +12,22 @@
 import org.eclipse.smarthome.core.types.State;
 
 public enum OnOffType implements PrimitiveType, State, Command {
-    ON, OFF;
+    ON,
+    OFF;
 
     @Override
     public String format(String pattern) {
         return String.format(pattern, this.toString());
     }
 
+    @Override
+    public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
+        return super.toString();
+    }
+
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/OpenClosedType.java

@@ -12,11 +12,22 @@
 import org.eclipse.smarthome.core.types.State;
 
 public enum OpenClosedType implements PrimitiveType, State, Command {
-    OPEN, CLOSED;
+    OPEN,
+    CLOSED;
 
     @Override
     public String format(String pattern) {
         return String.format(pattern, this.toString());
     }
 
+    @Override
+    public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
+        return super.toString();
+    }
+
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/PlayPauseType.java

@@ -18,11 +18,22 @@
  * @author Alex Tugarev
  */
 public enum PlayPauseType implements PrimitiveType, State, Command {
-    PLAY, PAUSE;
+    PLAY,
+    PAUSE;
 
     @Override
     public String format(String pattern) {
         return String.format(pattern, this.toString());
     }
 
+    @Override
+    public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
+        return super.toString();
+    }
+
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/PointType.java

@@ -156,6 +156,11 @@ public static PointType valueOf(String value) {
 
     @Override
     public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
         StringBuilder sb = new StringBuilder(latitude.toPlainString());
         sb.append(',');
         sb.append(longitude.toPlainString());

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/RawType.java

@@ -42,12 +42,17 @@ public static RawType valueOf(String value) {
 
     @Override
     public String toString() {
+        return String.format("raw type: %d bytes", bytes.length);
+    }
+
+    @Override
+    public String toFullString() {
         return PortableBase64.getEncoder().encode(bytes);
     }
 
     @Override
     public String format(String pattern) {
-        return toString();
+        return toFullString();
     }
 
     @Override
@@ -60,15 +65,19 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         RawType other = (RawType) obj;
-        if (!Arrays.equals(bytes, other.bytes))
+        if (!Arrays.equals(bytes, other.bytes)) {
             return false;
+        }
         return true;
     }
 

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/RewindFastforwardType.java

@@ -18,11 +18,22 @@
  * @author Alex Tugarev
  */
 public enum RewindFastforwardType implements PrimitiveType, State, Command {
-    REWIND, FASTFORWARD;
+    REWIND,
+    FASTFORWARD;
 
     @Override
     public String format(String pattern) {
         return String.format(pattern, this.toString());
     }
 
+    @Override
+    public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
+        return super.toString();
+    }
+
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/StopMoveType.java

@@ -11,11 +11,22 @@
 import org.eclipse.smarthome.core.types.PrimitiveType;
 
 public enum StopMoveType implements PrimitiveType, Command {
-    STOP, MOVE;
+    STOP,
+    MOVE;
 
     @Override
     public String format(String pattern) {
         return String.format(pattern, this.toString());
     }
 
+    @Override
+    public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
+        return super.toString();
+    }
+
 }

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/StringListType.java

@@ -84,6 +84,11 @@ public String format(String pattern) {
 
     @Override
     public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
         StringBuilder sb = new StringBuilder();
         for (String row : typeDetails) {
             sb.append(row.replace(DELIMITER, ESCAPED_DELIMITER));

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/library/types/StringType.java

@@ -27,6 +27,11 @@ public StringType(String value) {
 
     @Override
     public String toString() {
+        return toFullString();
+    }
+
+    @Override
+    public String toFullString() {
         return value;
     }