http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java index 87529ad..5838df9 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java @@ -116,7 +116,7 @@ public class Boxing { Array.setShort(target, index, (Short)value); else if (type.equals(Void.TYPE)) - Array.set(target, index, (Void)value); + Array.set(target, index, value); else // should not happen!
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java index b57625a..e8e84b7 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java @@ -52,7 +52,7 @@ public class EnumTypeCoercions { @SuppressWarnings({ "unchecked", "rawtypes" }) public static <T> Function<String, T> stringToEnumUntyped(final Class<? super T> type, @Nullable final T defaultValue) { if (!type.isEnum()) return new Functionals.ConstantFunction<String,T>(null); - return (Function<String, T>) new StringToEnumFunction((Class<Enum>)type, (Enum)defaultValue); + return new StringToEnumFunction((Class<Enum>)type, (Enum)defaultValue); } private static class StringToEnumFunction<E extends Enum<E>> implements Function<String, E> { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java index 9812d93..0b2a636 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java @@ -96,7 +96,7 @@ public class PrimitiveStringTypeCoercions { // (we could say 0=false, nonzero=true, but there is no compelling use case so better // to encourage users to write as boolean) if (sourceWrapType == Character.class) - return (T) stringToPrimitive(value.toString(), targetType); + return stringToPrimitive(value.toString(), targetType); throw new ClassCoercionException("Cannot cast "+sourceWrapType+" ("+value+") to "+targetType); } else if (sourceWrapType == Boolean.class) { @@ -109,13 +109,13 @@ public class PrimitiveStringTypeCoercions { long v = 0; boolean islong = true; if (sourceWrapType == Character.class) { - v = (long) ((Character)value).charValue(); + v = ((Character)value).charValue(); } else if (sourceWrapType == Byte.class) { - v = (long) ((Byte)value).byteValue(); + v = ((Byte)value).byteValue(); } else if (sourceWrapType == Short.class) { - v = (long) ((Short)value).shortValue(); + v = ((Short)value).shortValue(); } else if (sourceWrapType == Integer.class) { - v = (long) ((Integer)value).intValue(); + v = ((Integer)value).intValue(); } else if (sourceWrapType == Long.class) { v = ((Long)value).longValue(); } else { @@ -126,9 +126,9 @@ public class PrimitiveStringTypeCoercions { if (targetWrapType == Byte.class) return (T) Byte.valueOf((byte)v); if (targetWrapType == Short.class) return (T) Short.valueOf((short)v); if (targetWrapType == Integer.class) return (T) Integer.valueOf((int)v); - if (targetWrapType == Long.class) return (T) Long.valueOf((long)v); - if (targetWrapType == Float.class) return (T) Float.valueOf((float)v); - if (targetWrapType == Double.class) return (T) Double.valueOf((double)v); + if (targetWrapType == Long.class) return (T) Long.valueOf(v); + if (targetWrapType == Float.class) return (T) Float.valueOf(v); + if (targetWrapType == Double.class) return (T) Double.valueOf(v); throw new IllegalStateException("Unexpected: sourceType="+sourceWrapType+"; targetType="+targetWrapType); } @@ -136,9 +136,9 @@ public class PrimitiveStringTypeCoercions { double d = 0; boolean isdouble = true; if (sourceWrapType == Float.class) { - d = (double) ((Float)value).floatValue(); + d = ((Float)value).floatValue(); } else if (sourceWrapType == Double.class) { - d = (double) ((Double)value).doubleValue(); + d = ((Double)value).doubleValue(); } else { isdouble = false; } @@ -149,7 +149,7 @@ public class PrimitiveStringTypeCoercions { if (targetWrapType == Integer.class) return (T) Integer.valueOf((int)d); if (targetWrapType == Long.class) return (T) Long.valueOf((long)d); if (targetWrapType == Float.class) return (T) Float.valueOf((float)d); - if (targetWrapType == Double.class) return (T) Double.valueOf((double)d); + if (targetWrapType == Double.class) return (T) Double.valueOf(d); throw new IllegalStateException("Unexpected: sourceType="+sourceWrapType+"; targetType="+targetWrapType); } else { throw new IllegalStateException("Unexpected: sourceType="+sourceWrapType+"; targetType="+targetWrapType); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java b/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java index 39bb15f..7df03c1 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java @@ -451,7 +451,7 @@ public class Time { } /** @deprecated since 0.7.0 see {@link #parseElapsedTime(String)} */ @Deprecated public static long parseTimeString(String timeString) { - return (long) parseElapsedTime(timeString); + return parseElapsedTime(timeString); } /** @deprecated since 0.7.0 see {@link #parseElapsedTimeAsDouble(String)} */ @Deprecated public static double parseTimeStringAsDouble(String timeString) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java b/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java index 8230676..efe1ffc 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java @@ -163,14 +163,14 @@ public class Yamls { @SuppressWarnings("unchecked") public static Iterable<Object> parseAll(String yaml) { Iterable<Object> result = newYaml().loadAll(yaml); - return (List<Object>) getAs(result, List.class); + return getAs(result, List.class); } /** as {@link #parseAll(String)} */ @SuppressWarnings("unchecked") public static Iterable<Object> parseAll(Reader yaml) { Iterable<Object> result = newYaml().loadAll(yaml); - return (List<Object>) getAs(result, List.class); + return getAs(result, List.class); } public static Object removeMultinameAttribute(Map<String,Object> obj, String ...equivalentNames) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java index b7d3975..52aee8c 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java @@ -101,7 +101,7 @@ public class ReflectionsTest { public CI1(String x, int y0, int y1, int ...yy) { constructorArgs = Lists.newArrayList(); constructorArgs.addAll(ImmutableList.of(x, y0, y1)); - for (int yi: yy) constructorArgs.add((Integer)yi); + for (int yi: yy) constructorArgs.add(yi); } public static String m1(String x, int y) { return x+y; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/test/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercionsTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercionsTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercionsTest.java index a1dc5a5..0492ac5 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercionsTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercionsTest.java @@ -73,8 +73,8 @@ public class TypeCoercionsTest { assertEquals(coerce("1", Short.class), (Short)((short)1)); assertEquals(coerce("1", Integer.class), (Integer)1); assertEquals(coerce("1", Long.class), (Long)1l); - assertEquals(coerce("1", Float.class), (Float)1f); - assertEquals(coerce("1", Double.class), (Double)1d); + assertEquals(coerce("1", Float.class), 1f); + assertEquals(coerce("1", Double.class), 1d); assertEquals(coerce("true", Boolean.class), (Boolean)true); assertEquals(coerce("False", Boolean.class), (Boolean)false); assertEquals(coerce("true ", Boolean.class), (Boolean)true); @@ -84,8 +84,8 @@ public class TypeCoercionsTest { assertEquals(coerce("1", short.class), (Short)((short)1)); assertEquals(coerce("1", int.class), (Integer)1); assertEquals(coerce("1", long.class), (Long)1l); - assertEquals(coerce("1", float.class), (Float)1f); - assertEquals(coerce("1", double.class), (Double)1d); + assertEquals(coerce("1", float.class), 1f); + assertEquals(coerce("1", double.class), 1d); assertEquals(coerce("TRUE", boolean.class), (Boolean)true); assertEquals(coerce("false", boolean.class), (Boolean)false); } @@ -96,8 +96,8 @@ public class TypeCoercionsTest { assertEquals(coerce((short)1, Short.class), (Short)((short)1)); assertEquals(coerce(1, Integer.class), (Integer)1); assertEquals(coerce(1l, Long.class), (Long)1l); - assertEquals(coerce(1f, Float.class), (Float)1f); - assertEquals(coerce(1d, Double.class), (Double)1d); + assertEquals(coerce(1f, Float.class), 1f); + assertEquals(coerce(1d, Double.class), 1d); assertEquals(coerce(true, Boolean.class), (Boolean)true); } @@ -108,21 +108,21 @@ public class TypeCoercionsTest { assertEquals(coerce(1L, Short.class), (Short)(short)1); assertEquals(coerce(1L, Integer.class), (Integer)1); assertEquals(coerce(1L, Long.class), (Long)(long)1); - assertEquals(coerce(1L, Float.class), (Float)(float)1); - assertEquals(coerce(1L, Double.class), (Double)(double)1); + assertEquals(coerce(1L, Float.class), (float)1); + assertEquals(coerce(1L, Double.class), (double)1); assertEquals(coerce(1L, char.class), (Character)(char)1); assertEquals(coerce(1L, byte.class), (Byte)(byte)1); assertEquals(coerce(1L, short.class), (Short)(short)1); assertEquals(coerce(1L, int.class), (Integer)1); assertEquals(coerce(1L, long.class), (Long)(long)1); - assertEquals(coerce(1L, float.class), (Float)(float)1); - assertEquals(coerce(1L, double.class), (Double)(double)1); + assertEquals(coerce(1L, float.class), (float)1); + assertEquals(coerce(1L, double.class), (double)1); assertEquals(coerce((char)1, Integer.class), (Integer)1); assertEquals(coerce((byte)1, Integer.class), (Integer)1); assertEquals(coerce((short)1, Integer.class), (Integer)1); - assertEquals(coerce((int)1, Integer.class), (Integer)1); + assertEquals(coerce(1, Integer.class), (Integer)1); assertEquals(coerce((long)1, Integer.class), (Integer)1); assertEquals(coerce((float)1, Integer.class), (Integer)1); assertEquals(coerce((double)1, Integer.class), (Integer)1); @@ -398,8 +398,8 @@ public class TypeCoercionsTest { @Test public void testCoerceStringToNumber() { - assertEquals(coerce("1", Number.class), (Number) Double.valueOf(1)); - assertEquals(coerce("1.0", Number.class), (Number) Double.valueOf(1.0)); + assertEquals(coerce("1", Number.class), Double.valueOf(1)); + assertEquals(coerce("1.0", Number.class), Double.valueOf(1.0)); } @Test(expectedExceptions = org.apache.brooklyn.util.javalang.coerce.ClassCoercionException.class)
