Support Java 7

drrb · drrb · commit 98079b0340e7 · 2015-02-14T23:19:34.000+11:00
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ An example project showing how to call into Rust code from Java.
 ## Requirements
 
 - Tested on OSX and Linux. May also work on Windows!
-- Java 8
+- Java 7+
 - Rust (tested againts post-alpha nightlies)
 
 ## Contents
diff --git a/pom.xml b/pom.xml
@@ -72,8 +72,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
 
diff --git a/src/main/java/com/github/drrb/javarust/Main.java b/src/main/java/com/github/drrb/javarust/Main.java
@@ -18,7 +18,6 @@
 
 import static java.util.Arrays.asList;
 import java.util.List;
-import static java.util.stream.Collectors.joining;
 
 /**
  * An entry point that says hello from Rust code
@@ -32,7 +31,7 @@ public static void main(String[] args) {
         if (arguments.isEmpty()) {
             name = "World";
         } else {
-            name = arguments.stream().collect(joining(" "));
+            name = arguments.get(0);
         }
         Greetings.INSTANCE.printGreeting(name);
     }
diff --git a/src/test/java/com/github/drrb/javarust/GreetingsTest.java b/src/test/java/com/github/drrb/javarust/GreetingsTest.java
@@ -16,12 +16,13 @@
  */
 package com.github.drrb.javarust;
 
+import com.github.drrb.javarust.Greetings.GreetingCallback;
+import com.github.drrb.javarust.Greetings.GreetingSetCallback;
 import static com.github.drrb.javarust.test.Matchers.*;
 import com.github.drrb.javarust.test.MethodPrintingRule;
 import static java.util.Arrays.asList;
 import java.util.LinkedList;
 import java.util.List;
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertThat;
 import org.junit.Before;
 import org.junit.Rule;
@@ -79,31 +80,41 @@ public void shouldGetAStructFromRustByReference() {
     @Test
     public void shouldGetAStringFromRustInACallback() {
         final List<String> greetings = new LinkedList<>();
-        library.callMeBack((greeting) -> {
-            greetings.add(greeting);
+        library.callMeBack(new GreetingCallback() {
+            public void apply(String greeting) {
+                greetings.add(greeting);
+            }
         });
         assertThat(greetings, is(asList("Hello there!")));
     }
 
     @Test
     public void shouldGetListOfStringsFromRustInACallback() {
         final List<Greeting> greetings = new LinkedList<>();
-        library.sendGreetings((greetingSet) -> {
-            greetings.addAll(greetingSet.getGreetings());
+        library.sendGreetings(new GreetingSetCallback() {
+            public void apply(GreetingSet.ByReference greetingSet) {
+                greetings.addAll(greetingSet.getGreetings());
+            }
         });
-        List<String> greetingStrings = greetings.stream().map(Greeting::getText).collect(toList());
+
+        List<String> greetingStrings = new LinkedList<>();
+        for (Greeting greeting: greetings) {
+            greetingStrings.add(greeting.getText());
+        }
 
         assertThat(greetingStrings, is(asList("Hello!", "Hello again!")));
-        greetings.stream().forEach((greeting) -> library.dropGreeting(greeting));
+        for (Greeting greeting: greetings) {
+            library.dropGreeting(greeting);
+        }
     }
 
     @Test
     public void shouldGetAStructFromRustContainingAnArrayOfStructs() {
         GreetingSet result = library.renderGreetings();
-        List<String> greetings = result.getGreetings()
-                .stream()
-                .map(Greeting::getText)
-                .collect(toList());
+        List<String> greetings = new LinkedList<>();
+        for (Greeting greeting: result.getGreetings()) {
+            greetings.add(greeting.getText());
+        }
 
         assertThat(greetings, is(asList("Hello!", "Hello again!")));
         library.dropGreetingSet(result);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`
`19`	`19`	`import static java.util.Arrays.asList;`
`20`	`20`	`import java.util.List;`
`21`		`-import static java.util.stream.Collectors.joining;`
`22`	`21`
`23`	`22`	`/**`
`24`	`23`	`* An entry point that says hello from Rust code`
`@@ -32,7 +31,7 @@ public static void main(String[] args) {`
`32`	`31`	`if (arguments.isEmpty()) {`
`33`	`32`	`name = "World";`
`34`	`33`	`} else {`
`35`		`- name = arguments.stream().collect(joining(" "));`
	`34`	`+ name = arguments.get(0);`
`36`	`35`	`}`
`37`	`36`	`Greetings.INSTANCE.printGreeting(name);`
`38`	`37`	`}`