Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit98079b0

Browse files
committed
Support Java 7
1 parent1e48ec4 commit98079b0

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ An example project showing how to call into Rust code from Java.
77
##Requirements
88

99
- Tested on OSX and Linux. May also work on Windows!
10-
- Java8
10+
- Java7+
1111
- Rust (tested againts post-alpha nightlies)
1212

1313
##Contents

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
7272
<artifactId>maven-compiler-plugin</artifactId>
7373
<version>3.1</version>
7474
<configuration>
75-
<source>1.8</source>
76-
<target>1.8</target>
75+
<source>1.7</source>
76+
<target>1.7</target>
7777
</configuration>
7878
</plugin>
7979

‎src/main/java/com/github/drrb/javarust/Main.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
importstaticjava.util.Arrays.asList;
2020
importjava.util.List;
21-
importstaticjava.util.stream.Collectors.joining;
2221

2322
/**
2423
* An entry point that says hello from Rust code
@@ -32,7 +31,7 @@ public static void main(String[] args) {
3231
if (arguments.isEmpty()) {
3332
name ="World";
3433
}else {
35-
name =arguments.stream().collect(joining(" "));
34+
name =arguments.get(0);
3635
}
3736
Greetings.INSTANCE.printGreeting(name);
3837
}

‎src/test/java/com/github/drrb/javarust/GreetingsTest.java

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
*/
1717
packagecom.github.drrb.javarust;
1818

19+
importcom.github.drrb.javarust.Greetings.GreetingCallback;
20+
importcom.github.drrb.javarust.Greetings.GreetingSetCallback;
1921
importstaticcom.github.drrb.javarust.test.Matchers.*;
2022
importcom.github.drrb.javarust.test.MethodPrintingRule;
2123
importstaticjava.util.Arrays.asList;
2224
importjava.util.LinkedList;
2325
importjava.util.List;
24-
importstaticjava.util.stream.Collectors.toList;
2526
importstaticorg.junit.Assert.assertThat;
2627
importorg.junit.Before;
2728
importorg.junit.Rule;
@@ -79,31 +80,41 @@ public void shouldGetAStructFromRustByReference() {
7980
@Test
8081
publicvoidshouldGetAStringFromRustInACallback() {
8182
finalList<String>greetings =newLinkedList<>();
82-
library.callMeBack((greeting) -> {
83-
greetings.add(greeting);
83+
library.callMeBack(newGreetingCallback() {
84+
publicvoidapply(Stringgreeting) {
85+
greetings.add(greeting);
86+
}
8487
});
8588
assertThat(greetings,is(asList("Hello there!")));
8689
}
8790

8891
@Test
8992
publicvoidshouldGetListOfStringsFromRustInACallback() {
9093
finalList<Greeting>greetings =newLinkedList<>();
91-
library.sendGreetings((greetingSet) -> {
92-
greetings.addAll(greetingSet.getGreetings());
94+
library.sendGreetings(newGreetingSetCallback() {
95+
publicvoidapply(GreetingSet.ByReferencegreetingSet) {
96+
greetings.addAll(greetingSet.getGreetings());
97+
}
9398
});
94-
List<String>greetingStrings =greetings.stream().map(Greeting::getText).collect(toList());
99+
100+
List<String>greetingStrings =newLinkedList<>();
101+
for (Greetinggreeting:greetings) {
102+
greetingStrings.add(greeting.getText());
103+
}
95104

96105
assertThat(greetingStrings,is(asList("Hello!","Hello again!")));
97-
greetings.stream().forEach((greeting) ->library.dropGreeting(greeting));
106+
for (Greetinggreeting:greetings) {
107+
library.dropGreeting(greeting);
108+
}
98109
}
99110

100111
@Test
101112
publicvoidshouldGetAStructFromRustContainingAnArrayOfStructs() {
102113
GreetingSetresult =library.renderGreetings();
103-
List<String>greetings =result.getGreetings()
104-
.stream()
105-
.map(Greeting::getText)
106-
.collect(toList());
114+
List<String>greetings =newLinkedList<>();
115+
for (Greetinggreeting:result.getGreetings()) {
116+
greetings.add(greeting.getText());
117+
}
107118

108119
assertThat(greetings,is(asList("Hello!","Hello again!")));
109120
library.dropGreetingSet(result);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp