Commit graph

20524 commits

Author SHA1 Message Date
Konrad Malawski
6f89251810 Merge pull request #19484 from bwmcadams/master
Corrected several misspellings of the word "losing".
2016-01-16 12:39:28 +01:00
Brendan McAdams
269a3b3647 Corrected several misspellings of the word "losing". 2016-01-15 20:20:15 -08:00
Konrad Malawski
b21f2ff292 Merge pull request #19473 from sbrunk/typos
Fix a few typos in akka-stream docs
2016-01-15 22:45:55 +01:00
Sören Brunk
a39078d450 Fix a few typos in akka-stream docs 2016-01-15 17:45:09 +01:00
Endre Sándor Varga
57c1dfde8a 19441: Use Optional instead of Option in http core javadsl 2016-01-15 16:20:46 +01:00
Endre Sándor Varga
7a39063f2e #19441: Use Optional instead of Option in javadsl 2016-01-15 14:38:05 +01:00
galarragas
c79966a2f0 Post review changes: converted reference to circuit-breaker into a rst ref. Renamed the section into circuit-breaker-proxy to avoid section ID conflicts 2016-01-15 10:47:27 +00:00
Martynas Mickevičius
edc119dd6f #19271 Eager pull for Concat and Interleave 2016-01-15 08:44:27 +02:00
Wojciech Jurczyk
edf0d6cb21 +htp: #16651 Add formFieldMap, formFieldMultiMap & formFieldSeq Directives 2016-01-14 23:16:00 +01:00
drewhk
ecc916abfd Merge pull request #19459 from drewhk/wip-19457-fwd-port-drewhk
#19457: emitMultiple should handle empty iterator (fwd port)
2016-01-14 19:57:54 +01:00
Konrad Malawski
ba1240e28f Merge pull request #19455 from 2beaucoup/remove-java6-compat
Remove java6 compat
2016-01-14 18:50:53 +01:00
Konrad Malawski
2925beace9 Merge pull request #19460 from ktoso/wip-contettype-ktoso
=htc #19418 avoid LUB problem in javadsl.model.ContentType, see SI-9621
2016-01-14 18:33:26 +01:00
Konrad Malawski
745ae25f47 =htc #19418 add compile test for accessing javadsl content/media type 2016-01-14 18:32:14 +01:00
Konrad Malawski
2cd552294d =htc #19418 avoid LUB problem in javadsl.model.ContentType, see SI-9621 2016-01-14 17:05:08 +01:00
Endre Sándor Varga
d5b802bfdc #19457: emitMultiple should handle empty iterator
(cherry picked from commit 96e24c8)
2016-01-14 16:56:31 +01:00
Konrad Malawski
30103888cc Merge pull request #19454 from ktoso/wip-mediatype-java-problem
(master) =htc #19418 avoid LUB calculation problem, see SI-9621
2016-01-14 16:05:06 +01:00
2beaucoup
f7a5151bbb #19447 remove compatibility fallbacks for Java < 8 2016-01-14 15:52:13 +01:00
2beaucoup
aed67715af #18860 add back @SafeVarargs annotations 2016-01-14 15:41:44 +01:00
drewhk
d4b146588a Merge pull request #19450 from drewhk/wip-19440-add-scala-compat-java8-drewhk
#19440 Added scala-java8-compat as a dependency to streams
2016-01-14 15:21:33 +01:00
Konrad Malawski
49776649e3 Merge pull request #19436 from ktoso/wip-docs-streams
+doc #19429 initial merge of docs-dev and docs
2016-01-14 14:55:54 +01:00
Konrad Malawski
9fd543bff0 =htc #19418 avoid LUB calculation problem, see SI-9621 2016-01-14 14:25:43 +01:00
Konrad Malawski
f46f9edb17 =doc fix github link as in #19434 2016-01-14 13:13:02 +01:00
Endre Sándor Varga
b217e2e480 #19440 Added scala-java8-compat as a dependency to streams 2016-01-14 12:01:36 +01:00
Martynas Mickevičius
02a933bd87 #19271 Eager Zip and Merge Preferred 2016-01-14 09:56:11 +02:00
Roland Kuhn
e92429dab9 Merge pull request #19424 from drewhk/wip-19338-fwd-port-drewhk
str #19338: NPE in ActorGraphInterpreter (fwd port)
2016-01-14 08:09:33 +01:00
Roland Kuhn
3267d58e5d Merge pull request #19407 from akka/wip-optimize-repeat-√
=str - Change implementation of Source.repeat to use unfold
2016-01-14 08:09:04 +01:00
Roland Kuhn
3583e21066 Merge pull request #19406 from akka/wip-improve-unfoldInf-√
Wip improve unfold inf √
2016-01-14 08:08:43 +01:00
Konrad Malawski
5a18d43435 +doc #19429 initial merge of docs-dev and docs 2016-01-14 00:31:03 +01:00
Roland Kuhn
be0c8af4c0 Merge pull request #19425 from akka/wip-19094-fix-double-pull-PoolConductor-RK
Wip 19094 fix double pull pool conductor rk
2016-01-13 20:29:27 +01:00
galarragas
0b32023ac8 Post review changes:
- Moved `CircuitBreakerInternalEvents` inside `CircuitBreakerProxy` companion object,
- changed logs messages to be consistent with the state name case,
- used the correct log level for the case of unexpected self-sending of `CircuitOpenFailure`
- Converted the  `OpenCircuitException` class into an object implementing the sealed class `OpenCircuitException`
- `CircuitBreakerAwareFuture` is a final class
- Using Given-When-Then consistently across all tests (can remove them all if we prefer to keep consistency with the rest of the project)
- Using Given-When-Then consistently across all tests (can remove them all if we prefer to keep consistency with the rest of the project)
2016-01-13 19:19:32 +00:00
Konrad Malawski
55d9605dae Merge pull request #19416 from ktoso/wip-add-streams-to-build-ktoso
+pro add Akka Streams HTTP to master build
2016-01-13 18:37:14 +01:00
Konrad Malawski
2a2da4a4a7 =str #19431 fixes remaining usage in FlowSlidingSpec 2016-01-13 18:35:49 +01:00
Roland Kuhn
6fa6e39c22 #19326 do not call TestKit.remaining for Akka 2.4 compatibility 2016-01-13 16:39:52 +01:00
Konrad Malawski
86504ec4e2 =str #19377 improve expectNext() error reporting (if no element signaled) 2016-01-13 16:39:46 +01:00
Konrad Malawski
3f9b8f6dd3 =pro fix stream tests tck project ref 2016-01-13 15:06:14 +01:00
Konrad Malawski
6122fe43a3 =pro disable docs in http core for now 2016-01-13 14:49:11 +01:00
Konrad Malawski
098ef546d7 =pro fix unidoc/javadoc settings 2016-01-13 14:36:58 +01:00
Roland Kuhn
e1922dad45 #19417 fix empty.head error in WebSocket termination
also fixes related issues in HTTP Server and OutgoingConnection and
addresses one flaw in Websocket.BypassRouter
2016-01-13 13:40:02 +01:00
Roland Kuhn
ba282d2e3b fix actor leak in streams
The leak could happen if using sub-materializer and the substream
terminates during its initial runBatch() already.
2016-01-13 13:39:56 +01:00
Roland Kuhn
bc4800149f #19094 fix double pull in PoolConductor 2016-01-13 12:00:17 +01:00
Endre Sándor Varga
fc6f2a1bfb str #19338: NPE in ActorGraphInterpreter due to race with publisher shutdown and subscription
(cherry picked from commit 161e01e)
2016-01-13 11:51:04 +01:00
Konrad Malawski
7efc6e7a27 =pro fix aggregates 2016-01-13 01:58:29 +01:00
Konrad Malawski
00380d5488 =pro osgi cleanup 2016-01-13 01:28:59 +01:00
Konrad Malawski
e6448dfd05 =pro merge akka-http-tests-java8 with akka-http-tests (raw) 2016-01-13 01:25:55 +01:00
Konrad Malawski
f6147972d7 +pro add Akka Streams HTTP to master build
> merged akka-bench-jmh-dev with akka-bench-jmh
> renamed akka-stream-tck to more correctly named akka-stream-tests-tck
> merged java8 tests with normal tests in http
2016-01-13 01:25:04 +01:00
Brian Topping
2a7e44d32c =htp #19331 Make FileAndResourceDirectives work in OSGi environments 2016-01-12 08:56:18 -07:00
Viktor Klang
2b1d22a785 =str - Change implementation of Source.repeat to use unfold 2016-01-12 10:52:09 +01:00
Konrad Malawski
0763a150e2 -pro remove unused build stats tooling 2016-01-12 10:26:36 +01:00
Viktor Klang
d65efc35c7 -str - Removes Source.unfoldInf
Motivation: Since it can be easily implemented inline on top of unfold
2016-01-12 10:22:19 +01:00
Viktor Klang
22ccbcea39 =str - Significant simplification of the implementation of Source.unfoldInf 2016-01-12 10:22:12 +01:00