Merge pull request aeron-io#228 from csoroiu/master

A bunch of small changes after gson addition (mostly android)

Author: mjpt777

build.xml

@@ -16,7 +16,6 @@
 
  <property name="dir.main.src" location="main/java"/>
  <property name="dir.main.build" location="target/main/java/classes"/>
- <property name="dir.main.lib" location="main/lib"/>
 
  <property name="dir.test.src" location="test/java"/>
  <property name="dir.test.build" location="target/test/java/classes"/>
@@ -83,12 +82,6 @@
  <property name="ossrh.staging.repository.url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2"/>
  <property name="ossrh.server.id" value="ossrh"/>
 
- <path id="build.classpath">
- <fileset dir="${dir.main.lib}">
- <include name="gson.jar"/>
- </fileset>
- </path>
-
  <path id="test.classpath">
  <pathelement path="${dir.main.build}"/>
  <pathelement path="${dir.test.build}"/>
@@ -245,7 +238,6 @@
 
  <target name="build" depends="init" description="Build the main source">
  <javac srcdir="${dir.main.src}" destdir="${dir.main.build}" includeAntRuntime="false" debug="true">
- <classpath refid="build.classpath" />
  <compilerarg value="-Xlint:unchecked"/>
  <compilerarg value="-XDignore.symbol.file"/>
  </javac>
@@ -388,12 +380,17 @@
  <attribute name="outputproperty" default=""/>
  <attribute name="resultproperty" default=""/>
  <attribute name="failonerror" default="true"/>
+ <attribute name="silent" default="false"/>
  <element name="args" implicit="yes" />
  <sequential>
+ <local name="shouldLog"/>
+ <condition property="shouldLog" value="true">
+ <isfalse value="@{silent}"/>
+ </condition>
  <echo taskname="adb" message="Running @{command}: @{description}"/>
  <exec taskname="adb" executable="${adb.exe}" failonerror="@{failonerror}"
  resultproperty="@{resultproperty}">
- <redirector outputproperty="@{outputproperty}" alwayslog="true"/>
+ <redirector outputproperty="@{outputproperty}" alwayslog="${shouldLog}"/>
  <arg value="@{command}"/>
  <args/>
  </exec>
@@ -435,6 +432,7 @@
  <dex src="${dir.test.lib}/android/dexmaker-1.1.jar" destfile="${dir.test.android.dexedLibs}/dexmaker-1.1-dexed.jar"/>
  <dex src="${dir.test.lib}/android/dexmaker-mockito-1.1.jar" destfile="${dir.test.android.dexedLibs}/dexmaker-mockito-1.1-dexed.jar"/>
  <dex src="${dir.test.lib}/objenesis-2.1.jar" destfile="${dir.test.android.dexedLibs}/objenesis-2.1-dexed.jar"/>
+ <dex src="${dir.test.lib}/gson-2.3.1.jar" destfile="${dir.test.android.dexedLibs}/gson-2.3.1-dexed.jar"/>
  <dex src="${dir.test.android.build}" destfile="${dir.test.android.dexedLibs}/sbe-test-dexed.jar"/>
  <dex src="${dir.main.android.build}" destfile="${dir.test.android.dexedLibs}/sbe-main-dexed.jar"/>
  <dex src="${dir.test.android.dexedLibs}" destfile="${dir.test.android.testpackage}/classes.dex"/>
@@ -488,8 +486,10 @@
  <property name="test-results"
  value="/data/data/uk.co.real_logic.sbe.android.test/files/test-results.xml"
  unless:true="${FILE_ON_EXTERNAL_STORAGE}"/>
- <adb command="shell">
- <arg line="run-as ${project.app.package} chmod 644 ${test-results}"/>
+ <!-- ignoring the output, this migth fail on non-rooted devices -->
+ <!-- but if removed, we won't be able to get the file for rooted devices :) -->
+ <adb command="shell" description="chmod 644 ${test-results}">
+ <arg line="run-as ${project.app.package} chmod 644 ${test-results} >/dev/null 2>&amp;1 &amp;&amp; echo true (device might be rooted) || echo failed (device is not rooted)"/>
  </adb>
  <adb command="pull" description="Pulling the test results from: ${test-results}">
  <arg value="${test-results}"/>

examples/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java

@@ -15,7 +15,13 @@
  */
 package uk.co.real_logic.sbe.examples;
 
-import baseline.*;
+import baseline.Car;
+import baseline.Engine;
+import baseline.BooleanType;
+import baseline.Model;
+import baseline.OptionalExtras;
+import baseline.MetaAttribute;
+import baseline.MessageHeader;
 import uk.co.real_logic.sbe.codec.java.DirectBuffer;
 
 import java.io.FileOutputStream;

main/android/uk/co/real_logic/sbe/codec/java/BitUtil.java

@@ -25,8 +25,6 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
-import android.os.MemoryFile;
-
 /**
  * Miscellaneous useful functions for dealing with low level bits and bytes.
  */
@@ -53,8 +51,6 @@ final class BitUtil
  private static final MemoryAccess MEMORY_ACCESS;
  private static final boolean USE_LONG_ADDRESS;
 
- private static final Field MEMORYFILE_ADDRESS_FIELD;
- private static final boolean USE_LONG_MEMORYFILE_ADDRESS;
  private static final Constructor<?> DIRECT_BYTE_BUFFER_CONSTRUCTOR;
 
  static
@@ -66,9 +62,6 @@ final class BitUtil
  USE_LONG_ADDRESS = EFFECTIVE_DIRECT_ADDRESS_FIELD.getType() == long.class;
  MEMORY_ACCESS = USE_LONG_ADDRESS ? new MemoryAccessLongAddress() : new MemoryAccessIntAddress();
 
- MEMORYFILE_ADDRESS_FIELD = getField(MemoryFile.class, "mAddress");
- USE_LONG_MEMORYFILE_ADDRESS = MEMORYFILE_ADDRESS_FIELD.getType() == long.class;
-
  final PrivilegedExceptionAction<Constructor<?>> action = new PrivilegedExceptionAction<Constructor<?>>()
  {
  public Constructor<?> run() throws Exception
@@ -125,29 +118,6 @@ static long getEffectiveDirectAddress(final ByteBuffer buffer)
  }
  }
 
- /**
- * Returns the memory address of a {@link MemoryFile}
- *
- * @param memoryFile the {@link MemoryFile}
- * @return the memory address of the {@link MemoryFile}
- */
- static long getMemoryFileAddress(final MemoryFile memoryFile)
- {
- try
- {
- return USE_LONG_MEMORYFILE_ADDRESS ? MEMORYFILE_ADDRESS_FIELD
- .getLong(memoryFile) : MEMORYFILE_ADDRESS_FIELD.getInt(memoryFile);
- }
- catch (final IllegalArgumentException ignore)
- {
- return 0;
- }
- catch (final IllegalAccessException ignore)
- {
- return 0;
- }
- }
-
  /**
  * Get the instance of {@link MemoryAccess}.
  *

main/android/uk/co/real_logic/sbe/codec/java/DirectBuffer.java

@@ -19,7 +19,6 @@
 import java.nio.ByteOrder;
 import java.util.Locale;
 
-import android.os.MemoryFile;
 import libcore.io.Memory;
 
 /**
@@ -37,9 +36,6 @@ public final class DirectBuffer
  private int capacity;
 
  private ByteBuffer byteBuffer;
- //we keep this reference to avoid being cleaned by GC
- @SuppressWarnings("unused")
- private MemoryFile memoryFile;
 
  /**
  * Attach a view to a byte[] for providing direct access.
@@ -75,16 +71,6 @@ public DirectBuffer(final long address, final int capacity)
  wrap(address, capacity);
  }
 
- /**
- * Attach a view to a {@link MemoryFile} for providing direct access.
- *
- * @param memoryFile to which the view is attached.
- */
- public DirectBuffer(final MemoryFile memoryFile)
- {
- wrap(memoryFile);
- }
-
  /**
  * Attach a view to a byte[] for providing direct access.
  *
@@ -97,7 +83,6 @@ public void wrap(final byte[] buffer)
  capacity = buffer.length;
  byteArray = buffer;
  byteBuffer = null;
- memoryFile = null;
  }
 
  /**
@@ -125,7 +110,6 @@ public void wrap(final ByteBuffer buffer)
  offset = 0;
  effectiveDirectAddress = BitUtil.getEffectiveDirectAddress(buffer);
  }
- memoryFile = null;
  capacity = buffer.capacity();
  }
 
@@ -145,18 +129,6 @@ public void wrap(final long address, final int capacity)
  //Memory.memmove needs either a bytebuffer or a bytearray
  //it could only work with memory addresses, but it doesn't
  byteBuffer = BitUtil.newDirectByteBuffer(effectiveDirectAddress, this.capacity);
- memoryFile = null;
- }
-
- /**
- * Attach a view to a {@link MemoryFile} for providing direct access.
- *
- * @param memoryFile to which the view is attached.
- */
- public void wrap(final MemoryFile memoryFile)
- {
- wrap(BitUtil.getMemoryFileAddress(memoryFile), memoryFile.length());
- this.memoryFile = memoryFile;
  }
 
  /**

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

@@ -0,0 +1,31 @@
+/*
+ * 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;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Group order for repeating groups in encoded messages.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface GroupOrder
+{
+ Class<?>[] value();
+}

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

@@ -0,0 +1,146 @@
+/*
+ * 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;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+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"));
+ }
+
+ public MethodSelector(final Set<String> ignoredMethods)
+ {
+ this.ignoredMethods = ignoredMethods;
+ }
+
+ public List<Method> select(final Class<?> clazz)
+ {
+ final Method[] methods = clazz.getMethods();
+ 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(sortedMethodNames, sortedMethods, unsortedMethods, method);
+ }
+
+ for (final String name : sortedMethodNames)
+ {
+ unsortedMethods.add(sortedMethods.get(name));
+ }
+
+ return unsortedMethods;
+ }
+
+ private Set<String> getSortedMethods(final Class<?> clazz, final Method[] methods)
+ {
+ final Set<String> sortedMethodNames = sortedMethods.get(clazz);
+ if (sortedMethodNames == null)
+ {
+ final GroupOrder order = (GroupOrder)clazz.getAnnotation(GroupOrder.class);
+ if (order == null)
+ {
+ sortedMethods.put(clazz, Collections.<String>emptySet());
+
+ return Collections.emptySet();
+ }
+ else
+ {
+ final Set<String> result = new LinkedHashSet<>();
+ for (final Class<?> groupClazz : order.value())
+ {
+ for (final Method method : methods)
+ {
+ if (method.getReturnType() == groupClazz && method.getParameterTypes().length == 0)
+ {
+ result.add(method.getName());
+ }
+ }
+ }
+ sortedMethods.put(clazz, result);
+
+ return result;
+ }
+ }
+
+ return sortedMethodNames;
+ }
+
+ 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))
+ {
+ return;
+ }
+ if (Modifier.isStatic(mods))
+ {
+ return;
+ }
+ if (method.getParameterTypes().length != 0)
+ {
+ return;
+ }
+ if (method.getReturnType().equals(Void.TYPE))
+ {
+ return;
+ }
+
+ final String name = method.getName();
+ if (ignoredMethods.contains(name))
+ {
+ return;
+ }
+
+ if (sortedMethodNames == null)
+ {
+ unsortedMethods.add(method);
+ }
+ else
+ {
+ if (sortedMethodNames.contains(name))
+ {
+ sortedMethods.put(name, method);
+ }
+ else
+ {
+ unsortedMethods.add(method);
+ }
+ }
+ }
+}

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

@@ -27,5 +27,5 @@
 @Target({ElementType.TYPE})
 public @interface GroupOrder
 {
- Class[] value();
+ Class<?>[] value();
 }