Commit graph

2583 commits

Author SHA1 Message Date
Johan Andrén
bcc3525bd9 !str #19156 Source/Flow/Sink-Stage removed 2015-12-14 15:29:04 +01:00
Konrad Malawski
b16b1692e3 Merge pull request #19146 from ktoso/release-2.3-dev
Port commits to the right branch (http)
2015-12-13 15:07:33 +00:00
Roland Kuhn
faf352a189 Merge pull request #19148 from akka/wip-19145-fix-FlowGroupBySpec-RK
#19145 fix FlowGroupBySpec
2015-12-13 15:19:57 +01:00
Roland Kuhn
d5d099725a Merge pull request #19038 from agolubev/agolubev-#18807-range-Source-for-Java-DSL
+str #18807 add Source.range for Java DSL
2015-12-12 17:38:12 +01:00
Roland Kuhn
149e783363 #19145 fix FlowGroupBySpec
also fix concatSubstreams to have right semantics on groupBy and
introduce mergeSubstreamsWithLimit
2015-12-12 17:35:15 +01:00
Roland Kuhn
8e62368afe Merge branch 'release-2.3-dev' of github.com:akka/akka into release-2.3-dev 2015-12-12 16:59:53 +01:00
Roland Kuhn
819c1ef504 Merge remote-tracking branch 'pr/18985' into release-2.3-dev 2015-12-12 16:59:05 +01:00
Roland Kuhn
7379fe4d9f Merge pull request #19102 from lolski/lolski-issue-18736
GraphStage-based intersperse
2015-12-12 16:38:09 +01:00
Roland Kuhn
414f05f0d0 Merge pull request #18773 from agolubev/agolubev-#17967-Sink.actorRef-with-Acking
Agolubev #17967 sink.actor ref with acking
2015-12-12 16:31:15 +01:00
Alexander Golubev
87b94202a3 +str #17967 add Sink.actorRefWithAck 2015-12-11 23:09:14 -05:00
lolski
967c17e7d1 adding stage completion test to intersperse 2015-12-11 23:57:56 +08:00
Konrad Malawski
d1607c35c8 =htc amend CodingDirectivesSpec to match rebased code 2015-12-11 02:04:48 +00:00
Anton Karamanov
1530248480 =htp #19099 make sure headers are always written on finish in GzipCompressor 2015-12-10 19:29:38 +00:00
Anton Karamanov
3dbb553b0e =htp #19099 fix encoding of empty stings 2015-12-10 19:29:30 +00:00
Roland Kuhn
15cc65ce9d Merge pull request #19006 from akka/wip-stream-of-streams-RK
groupBy shall emit SubFlow
2015-12-10 14:35:21 +01:00
Roland Kuhn
1500d1f36d !str #19005 make groupBy et al return a SubFlow
A SubFlow (or SubSource) is not a Graph, it is an unfinished builder
that accepts transformations. This allows us to capture the substreams’
transformations before materializing the flow, which will be very
helpful in fully fusing all operators.

Another change is that groupBy now requires a maxSubstreams parameter in
order to bound its resource usage. In exchange the matching merge can be
unbounded. This trades silent deadlock for explicit stream failure.

This commit also changes all uses of Predef.identity to use `conforms`
and removes the HTTP impl.util.identityFunc.
2015-12-10 12:27:16 +01:00
Viktor Klang (√)
2dfbf29e2e Merge pull request #19136 from akka/wip-avoid-npe-√
=str - Avoids an NPE in LocalSource.pull
2015-12-09 22:20:55 +01:00
Viktor Klang
1f17b1ddcc =str - Avoids an NPE in LocalSource.pull 2015-12-09 20:48:01 +01:00
Roland Kuhn
2779e6034f Merge pull request #19098 from akka/wip-adding-finals-etc-√
=str - Adds finals and reorganizes some StreamOfStreams code
2015-12-09 20:26:06 +01:00
Viktor Klang
38fa306fbc =str - Adds finals and reorganizes some StreamOfStreams code 2015-12-09 18:30:47 +01:00
Roland Kuhn
654fa41443 Merge pull request #19132 from akka/wip-19072-fix-FlattenMerge-race-RK
=str #19072 fix FlattenMerge init race
2015-12-09 15:54:22 +01:00
Roland Kuhn
e3eec6dec8 =str #19072 fix FlattenMerge init race 2015-12-09 14:44:22 +01:00
lolski
3152a6d15f fixed typo call to emitMultiple 2015-12-09 01:26:42 +08:00
lolski
fca478c763 code restructure to enhance readability 2015-12-09 01:21:59 +08:00
lolski
e253593535 working GraphStage-based intersperse implementation 2015-12-09 01:21:59 +08:00
lolski
0d04d3bf5c WIP - Base intersperse on GraphStage instead of StatefulStage. TODO: handle logic to add last element 2015-12-09 01:21:59 +08:00
Viktor Klang (√)
108688de99 Merge pull request #19116 from akka/wip-19028-require-min-ports-√
!str - 19028 - Adds requirements for minimum ports
2015-12-08 14:40:24 +01:00
Konrad Malawski
851034769b Merge pull request #19124 from ktoso/wip-fix
=str remove unneeded test marker
2015-12-08 12:49:57 +01:00
Viktor Klang (√)
cdddd3aa95 Merge pull request #19121 from 2m/wip-input-stream-pub-alloc
=str remove unused buffer pool
2015-12-08 12:14:19 +01:00
Viktor Klang (√)
8da42322d6 Merge pull request #19123 from akka/wip-19109-unbreak-sinkforeachparallelspec-√
=str - 19109 - Unbreaking SinkForeachParallelSpec
2015-12-08 12:13:54 +01:00
Viktor Klang (√)
f7b67907fd Merge pull request #19120 from akka/wip-19091-remove-buffer-in-blueprint-√
=http - 19091 - Removes the buffer(1, Backpressure) from the Http blu…
2015-12-08 12:13:22 +01:00
Martynas Mickevicius
511a55f562 =str remove unused buffer pool 2015-12-08 12:11:34 +01:00
Konrad Malawski
5f540d8e07 =str remove unneeded test marker 2015-12-08 12:09:24 +01:00
Viktor Klang
72545142e6 =str - 19109 - Unbreaking SinkForeachParallelSpec 2015-12-08 11:17:28 +01:00
Konrad Malawski
721bf5f7bf Merge pull request #19115 from akka/wip-remove-jdk7-class-ref-2
=htc remove reference to jdk7 class in test
2015-12-08 10:56:35 +01:00
Viktor Klang
ba20115d0e =http - 19091 - Removes the buffer(1, Backpressure) from the Http blueprint 2015-12-08 10:28:51 +01:00
Konrad Malawski
df3c0e32b6 Merge pull request #19112 from akka/wip-19082-more-var-√
=str - 19082 - Moves the `allow` var into the Logic of DropWithin
2015-12-07 14:45:10 +01:00
Viktor Klang
7cbc916b4c !str - 19028 - Adds requirements for minimum ports
Broadcast == min output ports: 2
Merge == min input ports: 2
MergePreferred == min secondary ports: 1
Concat == min input ports: 2
2015-12-07 14:41:27 +01:00
Konrad Malawski
a8545c0437 =htc remove reference to jdk7 class in test 2015-12-07 14:12:13 +01:00
Viktor Klang
8b0b63625e =str - 19082 - Moves the allow var into the Logic of DropWithin 2015-12-07 12:41:38 +01:00
Konrad Malawski
51eb69c0ff Merge pull request #19105 from akka/misspelled-emit-multiple-johanandren
str One overload of emitMultiple misspelled
2015-12-07 12:08:30 +01:00
Johan Andrén
33350ab708 !str One overload of emitMultiple misspelled. 2015-12-07 10:42:35 +01:00
Konrad Malawski
02ee319568 Merge pull request #19101 from akka/wip-add-csv-contenttype
+htc add `text/csv(UTF-8)` ContentType
2015-12-06 19:34:54 +01:00
Konrad Malawski
aabb9ad237 +htc add text/csv(UTF-8) ContentType
"CSV files considered the ultimate integration pattern" 😉

Adding the ContentType here is useful when someone wants to render a raw response which we know is a csv (i.e. fed from a file)
2015-12-06 02:24:08 +01:00
Alexander Golubev
357af9c388 +str #18807 Source.range for Java DSL 2015-12-04 09:46:50 -05:00
Konrad Malawski
0be7e5e786 Merge pull request #19090 from spray/w/19064-fix-little-endian-parsing
=str #19064 fix little endian conversion for field length == 4
2015-12-04 15:19:43 +01:00
Konrad Malawski
f720847f76 Merge pull request #19060 from ktoso/wip-towards-a-reusable-http-pipeline-ktoso
[WIP] =htc #19050 reusable http blueprint: attribute injected rem-addr
2015-12-04 15:15:12 +01:00
Konrad Malawski
0fbe4d73dc Merge pull request #19066 from spray/wip-19034-mathias
http: refactor MediaType / ContentType model and content negotiation
2015-12-04 14:47:41 +01:00
Johannes Rudolph
ebc0649824 =str speed up test by 20s by removing an order of magnitude of sizes to test 2015-12-04 14:26:16 +01:00
Johannes Rudolph
382734fdf6 =str #19064 fix little endian conversion for field length == 4 2015-12-04 14:22:03 +01:00