Build Java libs via Travis

.gitignore

@@ -162,7 +162,13 @@ include/ola/base/Version.h
 include/ola/plugin_id.h
 include/ola/rdm/RDMResponseCodes.h
 include/ola/timecode/TimeCodeEnums.h
-java/src/main/java/ola/rpc/Rpc.java
+java/classes/
+java/generated-src/main/java/ola/proto/Ola.java
+java/generated-src/main/java/ola/rpc/Rpc.java
+java/maven-archiver/
+java/ola-java-client-*.*.*.jar
+java/surefire-reports/
+java/test-classes/
 javascript/compiler.jar
 javascript/trunk/
 libs/acn/e131_loadtest

.travis-ci.sh

@@ -130,7 +130,7 @@ elif [[ $TASK = 'pychecker-wip' ]]; then
   pychecker --quiet --limit 500 --blacklist $PYCHECKER_BLACKLIST $(find ./ -name "*.py" -and ! \( -name "*_pb2.py" -or -name "OlaClient.py" -or -name "ola_candidate_ports.py" \) | xargs)
 else
   # Otherwise compile and check as normal
-  export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133'
+  export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-java-libs --enable-ja-rule --enable-e133'
   autoreconf -i;
   ./configure $DISTCHECK_CONFIGURE_FLAGS;
   make distcheck;

.travis.yml

@@ -198,8 +198,8 @@ before_install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 #Fix a broken homebrew libtool install
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall -s libtool; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache cppunit bison flex protobuf@3.1 libftdi libftdi0 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link -f protobuf@3.1; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache cppunit bison flex protobuf@2.6 libftdi libftdi0 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link -f protobuf@2.6; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@2.6/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p ${HOME}/Library/Python/2.7/lib/python/site-packages; echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/homebrew.pth; fi
 #Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that
  - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-6" CC="ccache gcc-6"; fi

Makefile.am

@@ -66,7 +66,8 @@ if FATAL_WARNINGS
   COMMON_CXXFLAGS += -Werror
   COMMON_PROTOBUF_CXXFLAGS += -Werror -Wno-error=unused-parameter \
                               -Wno-error=deprecated-declarations \
-                              -Wno-error=sign-compare
+                              -Wno-error=sign-compare \
+                              -Wno-error=ignored-qualifiers
   COMMON_TESTING_FLAGS += -Werror
   COMMON_TESTING_PROTOBUF_FLAGS += -Werror -Wno-error=unused-parameter \
                                    -Wno-error=deprecated-declarations

java/Makefile.am

@@ -4,19 +4,30 @@ EXTRA_DIST = pom.xml \
              src/main/java/ola/OlaClient.java \
              src/main/java/ola/rpc/SimpleRpcController.java \
              src/main/java/ola/rpc/StreamRpcChannel.java \
-             src/test/java/ola/OlaClientTest.java
+             src/test/java/ola/OlaClientTest.java \
+             src/test/java/ola/OlaClientUtilsTest.java
 
-src/main/java/ola/proto/Ola.java: ${top_srcdir}/common/protocol/Ola.proto
-	$(PROTOC) --java_out=src/main/java --proto_path=${top_srcdir}/common/protocol ${top_srcdir}/common/protocol/Ola.proto
+generated-src/main/java/ola/proto/Ola.java: ${top_srcdir}/common/protocol/Ola.proto
+	mkdir -p $(top_builddir)/java/generated-src/main/java
+	$(PROTOC) --java_out=$(top_builddir)/java/generated-src/main/java --proto_path=${top_srcdir}/common/protocol ${top_srcdir}/common/protocol/Ola.proto
 
-src/main/java/ola/rpc/Rpc.java: ${top_srcdir}/common/rpc/Rpc.proto
-	$(PROTOC) --java_out=src/main/java --proto_path=${top_srcdir}/common/rpc ${top_srcdir}/common/rpc/Rpc.proto
+generated-src/main/java/ola/rpc/Rpc.java: ${top_srcdir}/common/rpc/Rpc.proto
+	mkdir -p $(top_builddir)/java/generated-src/main/java
+	$(PROTOC) --java_out=$(top_builddir)/java/generated-src/main/java --proto_path=${top_srcdir}/common/rpc ${top_srcdir}/common/rpc/Rpc.proto
 
-ola.jar: src/main/java/ola/proto/Ola.java src/main/java/ola/rpc/Rpc.java
-	mvn package
+ola.jar: generated-src/main/java/ola/proto/Ola.java generated-src/main/java/ola/rpc/Rpc.java
+	cd ${top_builddir}/java && mvn --file ${top_srcdir}/java/pom.xml -DbuildDir=${abs_top_builddir}/java -DprotobufGeneratedSource=$(abs_top_builddir)/java/generated-src/main/java package
 
-CLEANFILES = src/main/java/ola/proto/Ola.java \
-             src/main/java/ola/rpc/Rpc.java
+CLEANFILES = generated-src/main/java/ola/proto/Ola.java \
+             generated-src/main/java/ola/rpc/Rpc.java \
+             classes/ola/proto/*.class \
+             classes/ola/rpc/*.class \
+             classes/ola/*.class \
+             test-classes/ola/*.class \
+             maven-archiver/pom.properties \
+	     surefire-reports/ola.*.txt \
+	     surefire-reports/TEST-*.xml \
+             ola-java-client-0.0.1.jar
 
 if BUILD_JAVA_LIBS
 # .jars aren't really data, but it sure ain't a program.

java/pom.xml

@@ -4,8 +4,33 @@
   <artifactId>ola-java-client</artifactId>
   <version>0.0.1</version>
   <description>Java implementation of OLA RPC</description>
+  <properties>
+   <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+   <buildDir>${user.dir}</buildDir>
+   <protobufGeneratedSource>${user.dir}</protobufGeneratedSource>
+  </properties>
   <build>
+   <directory>${buildDir}</directory>
    <plugins>
+     <plugin>
+       <groupId>org.codehaus.mojo</groupId>
+       <artifactId>build-helper-maven-plugin</artifactId>
+       <version>1.7</version>
+       <executions>
+        <execution>
+         <id>add-source</id>
+         <phase>generate-sources</phase>
+         <goals>
+          <goal>add-source</goal>
+         </goals>
+         <configuration>
+          <sources>
+           <source>${protobufGeneratedSource}</source>
+          </sources>
+         </configuration>
+        </execution>
+       </executions>
+     </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
@@ -19,14 +44,46 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.12</version>
-        <configuration>
-          <excludes>
-            <exclude>**/OlaClientTest.java</exclude>
-          </excludes>
-        </configuration>
       </plugin>
    </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>normal</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/OlaClientTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>oladServerAvailable</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <includes combine.children="append">
+                <include>**/OlaClientTest.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <dependencies>
     <dependency>
       <groupId>com.google.protobuf</groupId>

java/src/main/java/ola/OlaClient.java

@@ -407,7 +407,7 @@ public void streamDmx(int universe, short[] values) {
     /**
      * Convert short array to bytestring
      */
-    public ByteString convertToUnsigned(short[] values) {
+    public static ByteString convertToUnsigned(short[] values) {
         byte[] unsigned = new byte[values.length];
         for (int i = 0; i < values.length; i++) {
             unsigned[i] = (byte) values[i];
@@ -419,7 +419,7 @@ public ByteString convertToUnsigned(short[] values) {
     /**
      * Convert bytestring to short array.
      */
-    public short[] convertFromUnsigned(ByteString data) {
+    public static short[] convertFromUnsigned(ByteString data) {
         byte[] values = data.toByteArray();
         short[] signed = new short[values.length];
         for (int i = 0; i < values.length; i++) {

java/src/test/java/ola/OlaClientUtilsTest.java

@@ -0,0 +1,41 @@
+package ola;
+
+import static org.junit.Assert.assertArrayEquals;
+import com.google.protobuf.ByteString;
+import ola.OlaClient;
+
+import org.junit.Test;
+
+/**
+ * Test standalone OlaClient code.
+ * Does not require an ola daemon to be running.
+ */
+public class OlaClientUtilsTest {
+
+    @Test
+    public void testConvertToUnsigned() {
+        assertArrayEquals(
+            OlaClient.convertToUnsigned(
+                new short[]{0, 1, 2}).toByteArray(),
+            ByteString.copyFrom(new byte[]{0, 1, 2}).toByteArray());
+
+        assertArrayEquals(
+            OlaClient.convertToUnsigned(
+                new short[]{0xff, 128, 0}).toByteArray(),
+            ByteString.copyFrom(
+                new byte[]{(byte)0xff, (byte)128, 0}).toByteArray());
+    }
+
+    @Test
+    public void testConvertFromUnsigned() {
+        assertArrayEquals(
+            OlaClient.convertFromUnsigned(
+                ByteString.copyFrom(new byte[]{0, 1, 2})),
+            new short[]{0, 1, 2});
+
+        assertArrayEquals(
+            OlaClient.convertFromUnsigned(
+                ByteString.copyFrom(new byte[]{(byte)0xff, (byte)128, 0})),
+            new short[]{0xff, 128, 0});
+    }
+}