Removed references to CompactLinkedMapp

src/main/java/com/cedarsoftware/util/CompactLinkedMap.java

@@ -11,14 +11,13 @@
  * <p>
  * Example replacement:<br>
  * Instead of: {@code Map<String, String> map = new CompactLinkedMap<>();}<br>
- * Use: {@code Map<String, String> map = CompactMap.newMap(80, true, 16, CompactMap.INSERTION);}
+ * Use: {@code Map<String, String> map = CompactMap.<String, Object>builder().insertionOrder().build();}
  * </p>
  * <p>
  * This creates a CompactMap with:
  * <ul>
- *   <li>compactSize = 80 (same as CompactLinkedMap)</li>
+ *   <li>compactSize = 70</li>
  *   <li>caseSensitive = true (default behavior)</li>
- *   <li>capacity = 16 (default initial capacity)</li>
  *   <li>ordering = INSERTION (maintains insertion order)</li>
  * </ul>
  * </p>

src/main/java/com/cedarsoftware/util/convert/CalendarConversions.java

@@ -15,7 +15,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow ([email protected])
@@ -122,7 +122,7 @@ static OffsetDateTime toOffsetDateTime(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Calendar cal = (Calendar) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, LocalDate.of(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH)).toString());
         target.put(MapConversions.TIME, LocalTime.of(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND) * 1_000_000).toString());
         target.put(MapConversions.ZONE, cal.getTimeZone().toZoneId().toString());

src/main/java/com/cedarsoftware/util/convert/DateConversions.java

@@ -17,7 +17,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow ([email protected])
@@ -149,7 +149,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Date date = (Date) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         ZonedDateTime zdt = toZonedDateTime(date, converter);
         map.put(MapConversions.DATE, zdt.toLocalDate().toString());
         map.put(MapConversions.TIME, zdt.toLocalTime().toString());

src/main/java/com/cedarsoftware/util/convert/DurationConversions.java

@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -34,7 +34,7 @@ private DurationConversions() {}
     static Map toMap(Object from, Converter converter) {
         long sec = ((Duration) from).getSeconds();
         int nanos = ((Duration) from).getNano();
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("seconds", sec);
         target.put("nanos", nanos);
         return target;

src/main/java/com/cedarsoftware/util/convert/EnumConversions.java

@@ -5,7 +5,7 @@
 import java.util.EnumSet;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -30,7 +30,7 @@ private EnumConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Enum<?> enumInstance = (Enum<?>) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("name", enumInstance.name());
         return target;
     }

src/main/java/com/cedarsoftware/util/convert/InstantConversions.java

@@ -16,7 +16,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow ([email protected])
@@ -42,7 +42,7 @@ private InstantConversions() {}
     static Map toMap(Object from, Converter converter) {
         long sec = ((Instant) from).getEpochSecond();
         int nanos = ((Instant) from).getNano();
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("seconds", sec);
         target.put("nanos", nanos);
         return target;

src/main/java/com/cedarsoftware/util/convert/LocalDateConversions.java

@@ -17,7 +17,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow ([email protected])
@@ -109,7 +109,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         LocalDate localDate = (LocalDate) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, localDate.toString());
         return target;
     }

src/main/java/com/cedarsoftware/util/convert/LocalDateTimeConversions.java

@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow ([email protected])
@@ -116,7 +116,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<?, ?> toMap(Object from, Converter converter) {
         LocalDateTime localDateTime = (LocalDateTime) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, localDateTime.toLocalDate().toString());
         target.put(MapConversions.TIME, localDateTime.toLocalTime().toString());
         return target;

src/main/java/com/cedarsoftware/util/convert/LocalTimeConversions.java

@@ -10,7 +10,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -36,7 +36,7 @@ private LocalTimeConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         LocalTime localTime = (LocalTime) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.TIME, localTime.toString());
         return target;
     }

src/main/java/com/cedarsoftware/util/convert/LocaleConversions.java

@@ -3,7 +3,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 import com.cedarsoftware.util.StringUtilities;
 
 import static com.cedarsoftware.util.convert.MapConversions.COUNTRY;
@@ -20,7 +20,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<?, ?> toMap(Object from, Converter converter) {
         Locale locale = (Locale) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
 
         String language = locale.getLanguage();
         map.put(LANGUAGE, language);

src/main/java/com/cedarsoftware/util/convert/MapConversions.java

@@ -37,7 +37,7 @@
 
 import com.cedarsoftware.util.ClassUtilities;
 import com.cedarsoftware.util.CollectionUtilities;
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 import com.cedarsoftware.util.DateUtilities;
 import com.cedarsoftware.util.ReflectionUtils;
 import com.cedarsoftware.util.StringUtilities;
@@ -702,7 +702,7 @@ static URI toURI(Object from, Converter converter) {
     }
 
     static Map<String, ?> initMap(Object from, Converter converter) {
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         map.put(V, from);
         return map;
     }

src/main/java/com/cedarsoftware/util/convert/MonthDayConversions.java

@@ -3,7 +3,7 @@
 import java.time.MonthDay;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -28,7 +28,7 @@ private MonthDayConversions() {}
 
     static Map toMap(Object from, Converter converter) {
         MonthDay monthDay = (MonthDay) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("day", monthDay.getDayOfMonth());
         target.put("month", monthDay.getMonthValue());
         return target;

src/main/java/com/cedarsoftware/util/convert/OffsetDateTimeConversions.java

@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow ([email protected])
@@ -110,7 +110,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         ZonedDateTime zdt = toZonedDateTime(from, converter);
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, zdt.toLocalDate().toString());
         target.put(MapConversions.TIME, zdt.toLocalTime().toString());
         target.put(MapConversions.OFFSET, zdt.getOffset().toString());

src/main/java/com/cedarsoftware/util/convert/OffsetTimeConversions.java

@@ -4,7 +4,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -33,7 +33,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         OffsetTime offsetTime = (OffsetTime) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         map.put(MapConversions.TIME, offsetTime.toString());
         return map;
     }

src/main/java/com/cedarsoftware/util/convert/PeriodConversions.java

@@ -3,7 +3,7 @@
 import java.time.Period;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -28,7 +28,7 @@ private PeriodConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Period period = (Period) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.YEARS, period.getYears());
         target.put(MapConversions.MONTHS, period.getMonths());
         target.put(MapConversions.DAYS, period.getDays());

src/main/java/com/cedarsoftware/util/convert/ThrowableConversions.java

@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.CAUSE;
 import static com.cedarsoftware.util.convert.MapConversions.CAUSE_MESSAGE;
@@ -32,7 +32,7 @@ private ThrowableConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Throwable throwable = (Throwable) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(CLASS, throwable.getClass().getName());
         target.put(MESSAGE, throwable.getMessage());
         if (throwable.getCause() != null) {

src/main/java/com/cedarsoftware/util/convert/TimeZoneConversions.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.ZONE;
 
@@ -39,7 +39,7 @@ static ZoneId toZoneId(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         TimeZone tz = (TimeZone) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(ZONE, tz.getID());
         return target;
     }

src/main/java/com/cedarsoftware/util/convert/TimestampConversions.java

@@ -12,7 +12,7 @@
 import java.util.Date;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -76,7 +76,7 @@ static Calendar toCalendar(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Date date = (Date) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         OffsetDateTime odt = toOffsetDateTime(date, converter);
         map.put(MapConversions.DATE, odt.toLocalDate().toString());
         map.put(MapConversions.TIME, odt.toLocalTime().toString());

src/main/java/com/cedarsoftware/util/convert/UUIDConversions.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt ([email protected])
@@ -40,7 +40,7 @@ static BigInteger toBigInteger(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         UUID uuid = (UUID) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.UUID, uuid.toString());
         return target;
     }

src/main/java/com/cedarsoftware/util/convert/UriConversions.java

@@ -4,7 +4,7 @@
 import java.net.URL;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.URI_KEY;
 
@@ -31,7 +31,7 @@ private UriConversions() {}
 
     static Map toMap(Object from, Converter converter) {
         URI uri = (URI) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(URI_KEY, uri.toString());
         return target;
     }

src/main/java/com/cedarsoftware/util/convert/UrlConversions.java

@@ -4,7 +4,7 @@
 import java.net.URL;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.URL_KEY;
 
@@ -31,7 +31,7 @@ private UrlConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         URL url = (URL) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(URL_KEY, url.toString());
         return target;
     }

src/main/java/com/cedarsoftware/util/convert/YearConversions.java

@@ -8,7 +8,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.YEAR;
 
@@ -78,7 +78,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<?, ?> toMap(Object from, Converter converter) {
         Year year = (Year) from;
-        Map<String, Integer> map = new CompactLinkedMap<>();
+        Map<String, Integer> map = CompactMap.<String, Integer>builder().insertionOrder().build();
         map.put(YEAR, year.getValue());
         return map;
     }