[Java]: Fix warnings and style.

Author: mjpt777

main/java/uk/co/real_logic/sbe/codec/java/GroupOrder.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2013 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package uk.co.real_logic.sbe.codec.java;
 
 import java.lang.annotation.ElementType;
@@ -6,7 +21,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Daneel Yaitskov
+ * Group order for repeating groups in encoded messages.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})

main/java/uk/co/real_logic/sbe/codec/java/MethodSelector.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2013 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package uk.co.real_logic.sbe.codec.java;
 
 import java.lang.reflect.Method;
@@ -12,78 +27,81 @@
 import java.util.Map;
 import java.util.Set;
 
-/**
- * Daneel Yaitskov
- */
 public class MethodSelector
 {
  private final Set<String> ignoredMethods;
  private final Map<Class, Set<String>> sortedMethods = new HashMap<>();
 
  public static Set<String> objectAndIteratorMethods()
  {
- return new HashSet<>(Arrays.asList("hashCode", "clone", "toString", "getClass",
-   "next", "hasNext", "remove", "iterator"));
+ return new HashSet<>(
+ Arrays.asList("hashCode", "clone", "toString", "getClass", "next", "hasNext", "remove", "iterator"));
  }
 
- public MethodSelector(Set<String> ignoredMethods)
+ public MethodSelector(final Set<String> ignoredMethods)
  {
  this.ignoredMethods = ignoredMethods;
  }
 
- public List<Method> select(Class clazz)
+ public List<Method> select(final Class clazz)
  {
  final Method[] methods = clazz.getMethods();
- final Set<String> sortedMethNames = getSortedMethods(clazz, methods);
- final Map<String, Method> sortedMethods = new HashMap<String, Method>();
- final List<Method> unsortedMethods = new ArrayList<Method>();
- for (Method method : methods)
+ final Set<String> sortedMethodNames = getSortedMethods(clazz, methods);
+ final Map<String, Method> sortedMethods = new HashMap<>();
+ final List<Method> unsortedMethods = new ArrayList<>();
+
+ for (final Method method : methods)
  {
- selectMethod(sortedMethNames, sortedMethods, unsortedMethods, method);
+ selectMethod(sortedMethodNames, sortedMethods, unsortedMethods, method);
  }
- for (String name : sortedMethNames)
+
+ for (final String name : sortedMethodNames)
  {
  unsortedMethods.add(sortedMethods.get(name));
  }
+
  return unsortedMethods;
  }
 
- private Set<String> getSortedMethods(Class clazz, Method[] methods)
+ private Set<String> getSortedMethods(final Class clazz, final Method[] methods)
  {
- final Set<String> sortedMethNames = sortedMethods.get(clazz);
- if (sortedMethNames == null)
+ final Set<String> sortedMethodNames = sortedMethods.get(clazz);
+ if (sortedMethodNames == null)
  {
- GroupOrder order = (GroupOrder) clazz.getAnnotation(GroupOrder.class);
+ final GroupOrder order = (GroupOrder)clazz.getAnnotation(GroupOrder.class);
  if (order == null)
  {
  sortedMethods.put(clazz, Collections.<String>emptySet());
+
  return Collections.emptySet();
  }
  else
  {
- Set<String> result = new LinkedHashSet<>();
- for (Class groupClazz : order.value())
+ final Set<String> result = new LinkedHashSet<>();
+ for (final Class groupClazz : order.value())
  {
- for (Method method : methods)
+ for (final Method method : methods)
  {
- if (method.getReturnType() == groupClazz
- && method.getParameterTypes().length == 0)
+ if (method.getReturnType() == groupClazz && method.getParameterTypes().length == 0)
  {
  result.add(method.getName());
  }
  }
  }
  sortedMethods.put(clazz, result);
+
  return result;
  }
  }
- return sortedMethNames;
+
+ return sortedMethodNames;
  }
 
- private void selectMethod(Set<String> sortedMethNames,
- Map<String, Method> sortedMethods,
- List<Method> unsortedMethods,
- Method method)
+ private void selectMethod(
+ final Set<String> sortedMethodNames,
+ final Map<String, Method> sortedMethods,
+ final List<Method> unsortedMethods,
+ final Method method)
  {
  final int mods = method.getModifiers();
  if (!Modifier.isPublic(mods))
@@ -102,18 +120,20 @@ private void selectMethod(Set<String> sortedMethNames,
  {
  return;
  }
+
  final String name = method.getName();
  if (ignoredMethods.contains(name))
  {
  return;
  }
- if (sortedMethNames == null)
+
+ if (sortedMethodNames == null)
  {
  unsortedMethods.add(method);
  }
  else
  {
- if (sortedMethNames.contains(name))
+ if (sortedMethodNames.contains(name))
  {
  sortedMethods.put(name, method);
  }

main/java/uk/co/real_logic/sbe/codec/java/MethodValuesSerializer.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2013 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package uk.co.real_logic.sbe.codec.java;
 
 import com.google.gson.JsonArray;
@@ -12,75 +27,76 @@
 import java.util.Iterator;
 import java.util.Map;
 
-/**
- * Daneel Yaitskov
- */
 public class MethodValuesSerializer
 {
  private final MethodSelector methodSelector;
 
- public MethodValuesSerializer(MethodSelector methodSelector)
+ public MethodValuesSerializer(final MethodSelector methodSelector)
  {
  this.methodSelector = methodSelector;
  }
 
- public JsonElement serialize(Object object)
-  throws InvocationTargetException, IllegalAccessException
+ public JsonElement serialize(final Object object)
+ throws InvocationTargetException, IllegalAccessException
  {
  return serialize(object, true);
  }
 
- JsonElement serialize(Object object, boolean visitIterable)
-  throws InvocationTargetException, IllegalAccessException
+ JsonElement serialize(final Object object, final boolean visitIterable)
+ throws InvocationTargetException, IllegalAccessException
  {
  if (object == null)
  {
  return JsonNull.INSTANCE;
  }
- Class clazz = object.getClass();
+
+ final Class clazz = object.getClass();
  if (Number.class.isAssignableFrom(clazz))
  {
- return new JsonPrimitive((Number) object);
+ return new JsonPrimitive((Number)object);
  }
  else if (clazz == String.class)
  {
- return new JsonPrimitive((String) object);
+ return new JsonPrimitive((String)object);
  }
  else if (clazz == Boolean.class)
  {
- return new JsonPrimitive((Boolean) object);
+ return new JsonPrimitive((Boolean)object);
  }
  else if (object instanceof Enum)
  {
- return new JsonPrimitive(((Enum) object).name());
+ return new JsonPrimitive(((Enum)object).name());
  }
  else if (clazz.isArray())
  {
- JsonArray result = new JsonArray();
- int len = Array.getLength(object);
+ final JsonArray result = new JsonArray();
+ final int len = Array.getLength(object);
  for (int i = 0; i < len; ++i)
  {
  result.add(serialize(Array.get(object, i)));
  }
+
  return result;
  }
  else if (visitIterable && Iterable.class.isAssignableFrom(clazz))
  {
- Iterator iter = ((Iterable) object).iterator();
- JsonArray result = new JsonArray();
+ final Iterator iter = ((Iterable)object).iterator();
+ final JsonArray result = new JsonArray();
  while (iter.hasNext())
  {
  result.add(serialize(iter.next(), false));
  }
+
  return result;
  }
  else if (Map.class.isAssignableFrom(clazz))
  {
- JsonObject result = new JsonObject();
- for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) object).entrySet())
+ final JsonObject result = new JsonObject();
+ for (final Map.Entry<?, ?> entry : ((Map<?, ?>)object).entrySet())
  {
  result.add(entry.getKey().toString(), serialize(entry.getValue()));
  }
+
  return result;
  }
  else
@@ -89,19 +105,21 @@ else if (Map.class.isAssignableFrom(clazz))
  }
  }
 
- private JsonElement serializeObject(Object object, Class clazz)
-  throws InvocationTargetException, IllegalAccessException
+ private JsonElement serializeObject(final Object object, final Class clazz)
+ throws InvocationTargetException, IllegalAccessException
  {
- JsonObject result = new JsonObject();
+ final JsonObject jsonObject = new JsonObject();
  for (Method method : methodSelector.select(clazz))
  {
- Object re = method.invoke(object);
- if (re == object)
+ final Object result = method.invoke(object);
+ if (result == object)
  {
  continue;
  }
- result.add(method.getName(), serialize(re));
+
+ jsonObject.add(method.getName(), serialize(result));
  }
- return result;
+
+ return jsonObject;
  }
 }

main/java/uk/co/real_logic/sbe/generation/cpp98/Cpp98Generator.java

@@ -845,7 +845,7 @@ private CharSequence generatePrimitiveFieldMetaData(final String propertyName, f
  final PrimitiveType primitiveType = encoding.primitiveType();
  final String cpp98TypeName = cpp98TypeName(primitiveType);
  final CharSequence nullValueString = generateNullValueLiteral(primitiveType, encoding);
- 
+
  sb.append(String.format(
  "\n" +
  indent + " static const %1$s %2$sNullValue()\n" +

test/java/uk/co/real_logic/sbe/codec/java/MethodValuesSerializerTest.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2013 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package uk.co.real_logic.sbe.codec.java;
 
 import com.google.gson.JsonArray;
@@ -12,9 +27,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * Daneel Yaitskov
- */
 public class MethodValuesSerializerTest
 {
  enum E1
@@ -75,7 +87,7 @@ public E1 publicEnum()
 
  public int[] publicIntArr()
  {
- return new int[] { 1 };
+ return new int[]{1};
  }
 
  public String publicString()
@@ -103,7 +115,7 @@ public static int staticPublicIntIgnored()
  public void test() throws InvocationTargetException, IllegalAccessException
  {
  MethodValuesSerializer serializer = new MethodValuesSerializer(
-  new MethodSelector(MethodSelector.objectAndIteratorMethods()));
+ new MethodSelector(MethodSelector.objectAndIteratorMethods()));
  JsonObject expected = new JsonObject();
  expected.add("publicInt", new JsonPrimitive(1));
  expected.add("publicString", new JsonPrimitive("hello"));