Merge pull request #4 from cljohnso/TAB-9567

TAB-9567 Remove unsynchronized DecimalFormat

Author: Gary Keim

src/main/java/com/tc/util/Conversion.java

@@ -13,15 +13,13 @@
 import com.tc.exception.TCRuntimeException;
 
 import java.io.UnsupportedEncodingException;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * Data conversion algorithms and whatnot can be found in java.io.DataInput and java.io.DataOutput. Contains methods for
  * converting from one kind of thing to another.
- * 
+ *
  * @author orion
  */
 public class Conversion {
@@ -31,11 +29,7 @@ public class Conversion {
 
   private static final Pattern MEMORY_SIZE_PATTERN  = Pattern.compile("[0-9]*([.][0-9]+)? *([bkmg])?");
   private static final Pattern SIZE_MODIFIER_PATTERN = Pattern.compile("[bkmg]");
-  private final static DecimalFormat twoDForm = new DecimalFormat();
   private static final byte[]        EMPTY_BYTE_ARRAY      = new byte[] {};
-  static {
-    twoDForm.applyLocalizedPattern("#" + new DecimalFormatSymbols().getDecimalSeparator() + "##");
-  }
 
   private static int makeInt(byte b3, byte b2, byte b1, byte b0) {
     return ((((b3 & 0xff) << 24) | ((b2 & 0xff) << 16) | ((b1 & 0xff) << 8) | ((b0 & 0xff) << 0)));
@@ -110,7 +104,7 @@ public static long bytes2uint(byte b[], int offset, int length) {
 
   /**
    * Helper method to write a 4 byte unsigned integer value into a given byte array at a given offset
-   * 
+   *
    * @param l the unsigned int value to write
    * @param dest the byte array to write the uint into
    * @param index starting offset into the destination byte array
@@ -128,7 +122,7 @@ public static void writeUint(long l, byte[] dest, int index) {
 
   /**
    * Helper method to write a 4 byte java (signed) integer value into a given byte array at a given offset
-   * 
+   *
    * @param i the signed int value to write
    * @param dest the byte array to write the uint into
    * @param index starting offset into the destination byte array
@@ -314,7 +308,7 @@ public static String bytesToHex(byte[] b) {
 
   /**
    * Converts a single byte to a hex string representation, can be decoded with Byte.parseByte().
-   * 
+   *
    * @param b the byte to encode
    * @return a
    */
@@ -421,13 +415,13 @@ public static String memoryBytesAsSize(final long bytes) throws NumberFormatExce
       return bytes + "b";
     } else if (bytes < MEGA.asBytes()) {
       double rv = (bytes / (KILO.asBytes() * 1.0));
-      return twoDForm.format(rv) + 'k';
+      return String.format("%.2fk", rv);
     } else if (bytes < GIGA.asBytes()) {
       double rv = (bytes / (MEGA.asBytes() * 1.0));
-      return twoDForm.format(rv) + 'm';
+      return String.format("%.2fm", rv);
     } else {
       double rv = (bytes / (GIGA.asBytes() * 1.0));
-      return twoDForm.format(rv) + 'g';
+      return String.format("%.2fg", rv);
     }
   }
 

src/test/java/com/tc/util/ConversionTest.java

@@ -23,7 +23,7 @@
  * JUnit TestCase to exercise the Conversion class.
  * <p>
  * TODO: change tests to use min and max values where appropriate.
- * 
+ *
  * @see Conversion
  * @author orion
  */
@@ -294,16 +294,16 @@ public void testMemoryBytesAsSize() {
 
     char dfs = new DecimalFormatSymbols().getDecimalSeparator();
     try {
-      Assert.assertEquals("1k", Conversion.memoryBytesAsSize(MemorySizeUnits.KILO.asBytes()));
-      Assert.assertEquals("1m", Conversion.memoryBytesAsSize(MemorySizeUnits.MEGA.asBytes()));
-      Assert.assertEquals("1g", Conversion.memoryBytesAsSize(MemorySizeUnits.GIGA.asBytes()));
+      Assert.assertEquals("1" + dfs + "00k", Conversion.memoryBytesAsSize(MemorySizeUnits.KILO.asBytes()));
+      Assert.assertEquals("1" + dfs + "00m", Conversion.memoryBytesAsSize(MemorySizeUnits.MEGA.asBytes()));
+      Assert.assertEquals("1" + dfs + "00g", Conversion.memoryBytesAsSize(MemorySizeUnits.GIGA.asBytes()));
 
-      Assert.assertEquals("4k", Conversion.memoryBytesAsSize(MemorySizeUnits.KILO.asBytes() * 4));
-      Assert.assertEquals("8m", Conversion.memoryBytesAsSize(MemorySizeUnits.MEGA.asBytes() * 8));
-      Assert.assertEquals("10g", Conversion.memoryBytesAsSize(MemorySizeUnits.GIGA.asBytes() * 10));
+      Assert.assertEquals("4" + dfs + "00k", Conversion.memoryBytesAsSize(MemorySizeUnits.KILO.asBytes() * 4));
+      Assert.assertEquals("8" + dfs + "00m", Conversion.memoryBytesAsSize(MemorySizeUnits.MEGA.asBytes() * 8));
+      Assert.assertEquals("10" + dfs + "00g", Conversion.memoryBytesAsSize(MemorySizeUnits.GIGA.asBytes() * 10));
 
       Assert.assertEquals("924b", Conversion.memoryBytesAsSize(MemorySizeUnits.KILO.asBytes() - 100));
-      Assert.assertEquals("1024m", Conversion.memoryBytesAsSize(MemorySizeUnits.GIGA.asBytes() - 100));
+      Assert.assertEquals("1024" + dfs + "00m", Conversion.memoryBytesAsSize(MemorySizeUnits.GIGA.asBytes() - 100));
       Assert.assertEquals("901b", Conversion.memoryBytesAsSize(MemorySizeUnits.KILO.asBytes() - 123));
       Assert.assertEquals("1021" + dfs + "71k", Conversion.memoryBytesAsSize(MemorySizeUnits.MEGA.asBytes() - 2344));
       Assert.assertEquals("933" + dfs + "84m",