raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Various scala-2.13.0-M5 fixes

Browse source 
fix akka-actor-tests compile errors

some tests still fail though

Fix test failures in akka-actor-test

Manually work arround missing implicit Factory[Nothing, Seq[Nothing]]

see https://github.com/scala/scala-collection-compat/issues/137

akka-remote scalafix changes

Fix shutdownAll compile error

test:akka-remote scalafix changes

akka-multi-node-testkit scalafix

Fix akka-remote-tests multi-jvm compile errors

akka-stream-tests/test:scalafix

Fix test:akka-stream-tests

Crude implementation of ByteString.map

scalafix akka-actor-typed, akka-actor-typed-tests

akka-actor-typed-tests compile and succeed

scalafix akka-camel

scalafix akka-cluster

akka-cluster compile & test

scalafix akka-cluster-metrics

Fix akka-cluster-metrics

scalafix akka-cluster-tools

akka-cluster-tools compile and test

scalafix akka-distributed-data

akka-distributed-data fixes

scalafix akka-persistence

scalafix akka-cluster-sharding

fix akka-cluster-sharding

scalafix akka-contrib

Fix akka-cluster-sharding-typed test

scalafix akka-docs

Use scala-stm 0.9 (released for M5)

akka-docs

Remove dependency on collections-compat

Cherry-pick the relevant constructs to our own
private utils

Shorten 'scala.collections.immutable' by importing it

Duplicate 'immutable' imports

Use 'foreach' on futures

Replace MapLike with regular Map

Internal API markers

Simplify ccompat by moving PackageShared into object

Since we don't currently need to differentiate between 2.11 and

Avoid relying on 'union' (and ++) being left-biased

Fix akka-actor/doc by removing -Ywarn-unused

Make more things more private

Copyright headers

Use 'unsorted' to go from SortedSet to Set

Duplicate import

Use onComplete rather than failed.foreach

Clarify why we partly duplicate scala-collection-compat
This commit is contained in:
Arnout Engelen 2018-11-22 16:18:10 +01:00 • committed by Arnout Engelen
parent 3bff646218
commit d274e039f9
No known key found for this signature in database
GPG key ID: BB8C0F854A1E2105
141 changed files with 596 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

63
akka-docs/src/test/java/jdocs/future/FutureDocTest.java
View file

@ -18,14 +18,15 @@ import akka.util.Timeout;
//#imports2
import java.time.Duration;
import akka.japi.Function;
import java.util.concurrent.*;
import scala.util.Try;
import akka.japi.Function;
import static akka.dispatch.Futures.future;
import static java.util.concurrent.TimeUnit.SECONDS;
//#imports2
//#imports3
@ -283,7 +284,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, system.dispatcher());
f.onSuccess(new PrintResult<String>(), system.dispatcher());
f.onComplete(new PrintResult<Try<String>>(), system.dispatcher());
//#future-eval
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
String result = (String) Await.result(f, timeout.duration());
@ -307,7 +308,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
f2.onSuccess(new PrintResult<Integer>(), system.dispatcher());
f2.onComplete(new PrintResult<Try<Integer>>(), system.dispatcher());
//#map
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
int result = Await.result(f2, timeout.duration());
@ -335,7 +336,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
f2.onSuccess(new PrintResult<Integer>(), system.dispatcher());
f2.onComplete(new PrintResult<Try<Integer>>(), system.dispatcher());
//#flat-map
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
int result = Await.result(f2, timeout.duration());
@ -367,7 +368,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
futureSum.onSuccess(new PrintResult<Long>(), system.dispatcher());
futureSum.onComplete(new PrintResult<Try<Long>>(), system.dispatcher());
//#sequence
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
long result = Await.result(futureSum, timeout.duration());
@ -393,7 +394,7 @@ public class FutureDocTest extends AbstractJavaTest {
}, ec);
//Returns the sequence of strings as upper case
futureResult.onSuccess(new PrintResult<Iterable<String>>(), system.dispatcher());
futureResult.onComplete(new PrintResult<Try<Iterable<String>>>(), system.dispatcher());
//#traverse
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
Iterable<String> result = Await.result(futureResult, timeout.duration());
@ -420,7 +421,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
resultFuture.onSuccess(new PrintResult<String>(), system.dispatcher());
resultFuture.onComplete(new PrintResult<Try<String>>(), system.dispatcher());
//#fold
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
String result = Await.result(resultFuture, timeout.duration());
@ -445,7 +446,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
resultFuture.onSuccess(new PrintResult<Object>(), system.dispatcher());
resultFuture.onComplete(new PrintResult<Try<Object>>(), system.dispatcher());
//#reduce
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
Object result = Await.result(resultFuture, timeout.duration());
@ -545,7 +546,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
future.onSuccess(new PrintResult<Integer>(), system.dispatcher());
future.onComplete(new PrintResult<Try<Integer>>(), system.dispatcher());
//#recover
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
int result = Await.result(future, timeout.duration());
@ -574,7 +575,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
future.onSuccess(new PrintResult<Integer>(), system.dispatcher());
future.onComplete(new PrintResult<Try<Integer>>(), system.dispatcher());
//#try-recover
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
int result = Await.result(future, timeout.duration());
@ -582,42 +583,10 @@ public class FutureDocTest extends AbstractJavaTest {
}
@Test
public void useOnSuccessOnFailureAndOnComplete() throws Exception {
public void useOnOnComplete() throws Exception {
{
Future<String> future = Futures.successful("foo");
//#onSuccess
final ExecutionContext ec = system.dispatcher();
future.onSuccess(new OnSuccess<String>() {
public void onSuccess(String result) {
if ("bar" == result) {
//Do something if it resulted in "bar"
} else {
//Do something if it was some other String
}
}
}, ec);
//#onSuccess
}
{
Future<String> future = Futures.failed(new IllegalStateException("OHNOES"));
//#onFailure
final ExecutionContext ec = system.dispatcher();
future.onFailure(new OnFailure() {
public void onFailure(Throwable failure) {
if (failure instanceof IllegalStateException) {
//Do something if it was this particular failure
} else {
//Do something if it was some other failure
}
}
}, ec);
//#onFailure
}
{
Future<String> future = Futures.successful("foo");
//#onComplete
final ExecutionContext ec = system.dispatcher();
@ -648,7 +617,7 @@ public class FutureDocTest extends AbstractJavaTest {
}
}, ec);
future3.onSuccess(new PrintResult<String>(), system.dispatcher());
future3.onComplete(new PrintResult<Try<String>>(), system.dispatcher());
//#zip
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
String result = Await.result(future3, timeout.duration());
@ -662,7 +631,7 @@ public class FutureDocTest extends AbstractJavaTest {
Future<String> future3 = Futures.successful("bar");
// Will have "bar" in this case
Future<String> future4 = future1.fallbackTo(future2).fallbackTo(future3);
future4.onSuccess(new PrintResult<String>(), system.dispatcher());
future4.onComplete(new PrintResult<Try<String>>(), system.dispatcher());
//#fallback-to
Timeout timeout = Timeout.create(Duration.ofSeconds(5));
String result = Await.result(future4, timeout.duration());