Skip to content

Commit c75f68c

Browse files
johanandrenjohanandren
committed
formatting
1 parent 0111e60 commit c75f68c

File tree

108 files changed

+952
-1076
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+952
-1076
lines changed

‎amqp/src/test/java/akka/stream/alpakka/amqp/javadsl/AmqpConnectionProvidersTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66

77
import static org.hamcrest.CoreMatchers.instanceOf;
88
import static org.hamcrest.MatcherAssert.assertThat;
9-
import static org.junit.Assert.assertNotEquals;
109
import static org.junit.Assert.assertEquals;
1110
import static org.junit.Assert.assertFalse;
11+
import static org.junit.Assert.assertNotEquals;
1212
import static org.junit.Assert.assertTrue;
1313

1414
import akka.stream.alpakka.amqp.*;
1515
import akka.stream.alpakka.testkit.javadsl.LogCapturingJunit4;
1616
import com.rabbitmq.client.Connection;
1717
import com.rabbitmq.client.ConnectionFactory;
18+
import java.net.ConnectException;
1819
import org.junit.Rule;
1920
import org.junit.Test;
2021

21-
import java.net.ConnectException;
22-
2322
public class AmqpConnectionProvidersTest {
2423

2524
@Rule public final LogCapturingJunit4 logCapturing = new LogCapturingJunit4();

‎amqp/src/test/java/akka/stream/alpakka/amqp/javadsl/AmqpConnectorsTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
package akka.stream.alpakka.amqp.javadsl;
66

7+
import static org.junit.Assert.assertEquals;
8+
import static org.junit.Assert.fail;
9+
710
import akka.Done;
811
import akka.NotUsed;
912
import akka.actor.ActorSystem;
@@ -23,10 +26,6 @@
2326
import akka.testkit.javadsl.TestKit;
2427
import akka.util.ByteString;
2528
import com.rabbitmq.client.AuthenticationFailureException;
26-
import org.junit.*;
27-
import scala.concurrent.duration.Duration;
28-
import scala.jdk.javaapi.CollectionConverters;
29-
3029
import java.net.ConnectException;
3130
import java.util.Arrays;
3231
import java.util.Collections;
@@ -35,9 +34,9 @@
3534
import java.util.concurrent.ExecutionException;
3635
import java.util.concurrent.TimeUnit;
3736
import java.util.stream.Collectors;
38-
39-
import static org.junit.Assert.assertEquals;
40-
import static org.junit.Assert.fail;
37+
import org.junit.*;
38+
import scala.concurrent.duration.Duration;
39+
import scala.jdk.javaapi.CollectionConverters;
4140

4241
/** Needs a local running AMQP server on the default port with no password. */
4342
public class AmqpConnectorsTest {
@@ -161,7 +160,9 @@ public void publishAndConsumeRpcWithoutAutoAck() throws Exception {
161160
.to(amqpSink)
162161
.run(system);
163162

164-
java.util.Collection<ReadResult> probeResult = CollectionConverters.asJavaCollection(result.second().toStrict(Duration.create(3, TimeUnit.SECONDS)));
163+
java.util.Collection<ReadResult> probeResult =
164+
CollectionConverters.asJavaCollection(
165+
result.second().toStrict(Duration.create(3, TimeUnit.SECONDS)));
165166
assertEquals(
166167
probeResult.stream().map(s -> s.bytes().utf8String()).collect(Collectors.toList()), input);
167168
sourceToSink.shutdown();

‎amqp/src/test/java/akka/stream/alpakka/amqp/javadsl/AmqpFlowTest.java‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@
44

55
package akka.stream.alpakka.amqp.javadsl;
66

7-
import java.time.Duration;
8-
import java.util.Arrays;
9-
import java.util.List;
10-
import java.util.concurrent.CompletionStage;
11-
import java.util.stream.Collectors;
12-
13-
import akka.stream.alpakka.testkit.javadsl.LogCapturingJunit4;
14-
import org.junit.BeforeClass;
15-
import org.junit.Rule;
16-
import org.junit.Test;
17-
187
import akka.Done;
198
import akka.actor.ActorSystem;
209
import akka.japi.Pair;
@@ -23,14 +12,22 @@
2312
import akka.stream.alpakka.amqp.QueueDeclaration;
2413
import akka.stream.alpakka.amqp.WriteMessage;
2514
import akka.stream.alpakka.amqp.WriteResult;
15+
import akka.stream.alpakka.testkit.javadsl.LogCapturingJunit4;
2616
import akka.stream.javadsl.Flow;
2717
import akka.stream.javadsl.FlowWithContext;
2818
import akka.stream.javadsl.Keep;
2919
import akka.stream.javadsl.Source;
3020
import akka.stream.testkit.TestSubscriber;
3121
import akka.stream.testkit.javadsl.TestSink;
3222
import akka.util.ByteString;
33-
23+
import java.time.Duration;
24+
import java.util.Arrays;
25+
import java.util.List;
26+
import java.util.concurrent.CompletionStage;
27+
import java.util.stream.Collectors;
28+
import org.junit.BeforeClass;
29+
import org.junit.Rule;
30+
import org.junit.Test;
3431
import scala.jdk.javaapi.CollectionConverters;
3532

3633
/** Needs a local running AMQP server on the default port with no password. */
@@ -85,9 +82,7 @@ private void shouldEmitConfirmationForPublishedMessages(
8582
.toMat(TestSink.create(system), Keep.right())
8683
.run(system);
8784

88-
result
89-
.request(input.size())
90-
.expectNextN(CollectionConverters.asScala(expectedOutput).toList());
85+
result.request(input.size()).expectNextN(CollectionConverters.asScala(expectedOutput).toList());
9186
}
9287

9388
@Test
@@ -119,9 +114,7 @@ private void shouldPropagateContext(
119114
.toMat(TestSink.create(system), Keep.right())
120115
.run(system);
121116

122-
result
123-
.request(input.size())
124-
.expectNextN(CollectionConverters.asScala(expectedOutput).toList());
117+
result.request(input.size()).expectNextN(CollectionConverters.asScala(expectedOutput).toList());
125118
}
126119

127120
@Test
@@ -142,8 +135,6 @@ public void shouldPropagatePassThrough() {
142135
.toMat(TestSink.create(system), Keep.right())
143136
.run(system);
144137

145-
result
146-
.request(input.size())
147-
.expectNextN(CollectionConverters.asScala(expectedOutput).toList());
138+
result.request(input.size()).expectNextN(CollectionConverters.asScala(expectedOutput).toList());
148139
}
149140
}

‎amqp/src/test/java/docs/javadsl/AmqpDocsTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
package docs.javadsl;
66

7+
import static org.junit.Assert.assertEquals;
8+
79
import akka.Done;
810
import akka.NotUsed;
911
import akka.actor.ActorSystem;
@@ -27,17 +29,13 @@
2729
import akka.stream.testkit.javadsl.TestSink;
2830
import akka.testkit.javadsl.TestKit;
2931
import akka.util.ByteString;
30-
31-
import org.junit.*;
32-
3332
import java.time.Duration;
3433
import java.util.*;
3534
import java.util.concurrent.CompletableFuture;
3635
import java.util.concurrent.CompletionStage;
3736
import java.util.concurrent.TimeUnit;
3837
import java.util.stream.Collectors;
39-
40-
import static org.junit.Assert.assertEquals;
38+
import org.junit.*;
4139

4240
/** Needs a local running AMQP server on the default port with no password. */
4341
public class AmqpDocsTest {

‎awslambda/src/test/java/docs/javadsl/AwsLambdaFlowTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
package docs.javadsl;
66

7+
import static org.junit.Assert.assertEquals;
8+
import static org.mockito.ArgumentMatchers.eq;
9+
import static org.mockito.Mockito.mock;
10+
import static org.mockito.Mockito.when;
11+
712
import akka.NotUsed;
813
import akka.actor.ActorSystem;
914
import akka.stream.alpakka.awslambda.javadsl.AwsLambdaFlow;
@@ -13,20 +18,14 @@
1318
import akka.stream.javadsl.Source;
1419
import akka.stream.testkit.javadsl.StreamTestKit;
1520
import akka.testkit.javadsl.TestKit;
16-
import org.junit.*;
17-
import software.amazon.awssdk.services.lambda.LambdaAsyncClient;
18-
import software.amazon.awssdk.services.lambda.model.InvokeRequest;
19-
import software.amazon.awssdk.services.lambda.model.InvokeResponse;
20-
2121
import java.util.List;
2222
import java.util.concurrent.CompletableFuture;
2323
import java.util.concurrent.CompletionStage;
2424
import java.util.concurrent.TimeUnit;
25-
26-
import static org.junit.Assert.assertEquals;
27-
import static org.mockito.ArgumentMatchers.eq;
28-
import static org.mockito.Mockito.mock;
29-
import static org.mockito.Mockito.when;
25+
import org.junit.*;
26+
import software.amazon.awssdk.services.lambda.LambdaAsyncClient;
27+
import software.amazon.awssdk.services.lambda.model.InvokeRequest;
28+
import software.amazon.awssdk.services.lambda.model.InvokeResponse;
3029

3130
public class AwsLambdaFlowTest {
3231

‎azure-storage-queue/src/test/java/docs/javadsl/JavaDslTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
import akka.testkit.javadsl.TestKit;
1717
import com.microsoft.azure.storage.*;
1818
import com.microsoft.azure.storage.queue.*;
19-
2019
import java.time.Duration;
2120
import java.util.List;
2221
import java.util.concurrent.CompletionStage;
2322
import java.util.concurrent.ExecutionException;
2423
import java.util.concurrent.TimeUnit;
2524
import java.util.concurrent.TimeoutException;
2625
import java.util.function.Supplier;
27-
2826
import org.junit.*;
2927

3028
public class JavaDslTest {

‎azure-storage/src/test/java/docs/javadsl/RequestBuilderTest.java‎

Lines changed: 64 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -19,65 +19,68 @@
1919

2020
public class RequestBuilderTest {
2121

22-
@Rule
23-
public final LogCapturingJunit4 logCapturing = new LogCapturingJunit4();
24-
25-
@Test
26-
public void createSimpleRequest() {
27-
28-
//#simple-request-builder
29-
final GetBlob requestBuilder = GetBlob.create();
30-
//#simple-request-builder
31-
32-
Assert.assertEquals(Option.empty(), requestBuilder.versionId());
33-
Assert.assertEquals(Option.empty(), requestBuilder.range());
34-
Assert.assertEquals(Option.empty(), requestBuilder.leaseId());
35-
Assert.assertEquals(Option.empty(), requestBuilder.sse());
36-
}
37-
38-
@Test
39-
public void populateRequestBuilder() {
40-
41-
//#populate-request-builder
42-
final var requestBuilder = GetBlob.create().withLeaseId("my-lease-id").withRange(ByteRange.createSlice(0, 25));
43-
//#populate-request-builder
44-
45-
Assert.assertEquals(Option.apply("my-lease-id"), requestBuilder.leaseId());
46-
Assert.assertEquals(Option.apply(ByteRange.createSlice(0, 25)), requestBuilder.range());
47-
Assert.assertEquals(Option.empty(), requestBuilder.sse());
48-
}
49-
50-
@Test
51-
public void createRequestBuilderWithMandatoryParams() {
52-
53-
//#request-builder-with-initial-values
54-
final var requestBuilder = CreateFile.create(256L, ContentTypes.TEXT_PLAIN_UTF8);
55-
//#request-builder-with-initial-values
56-
57-
Assert.assertEquals(Option.empty(), requestBuilder.leaseId());
58-
Assert.assertEquals(256L, requestBuilder.maxFileSize());
59-
Assert.assertEquals(ContentTypes.TEXT_PLAIN_UTF8, requestBuilder.contentType());
60-
}
61-
62-
@Test
63-
public void populateServerSideEncryption() {
64-
65-
//#request-builder-with-sse
66-
final var requestBuilder = PutBlockBlob.create(256L, ContentTypes.TEXT_PLAIN_UTF8)
67-
.withServerSideEncryption(ServerSideEncryption.customerKey("SGVsbG9Xb3JsZA=="));
68-
//#request-builder-with-sse
69-
70-
Assert.assertEquals(ServerSideEncryption.customerKey("SGVsbG9Xb3JsZA=="), requestBuilder.sse().get());
71-
}
72-
73-
@Test
74-
public void populateAdditionalHeaders() {
75-
76-
//#request-builder-with-additional-headers
77-
final var requestBuilder = GetBlob.create().addHeader("If-Match", "foobar");
78-
//#request-builder-with-additional-headers
79-
80-
Assert.assertEquals(1, requestBuilder.additionalHeaders().size());
81-
Assert.assertEquals(new RawHeader("If-Match", "foobar"), requestBuilder.additionalHeaders().head());
82-
}
22+
@Rule public final LogCapturingJunit4 logCapturing = new LogCapturingJunit4();
23+
24+
@Test
25+
public void createSimpleRequest() {
26+
27+
// #simple-request-builder
28+
final GetBlob requestBuilder = GetBlob.create();
29+
// #simple-request-builder
30+
31+
Assert.assertEquals(Option.empty(), requestBuilder.versionId());
32+
Assert.assertEquals(Option.empty(), requestBuilder.range());
33+
Assert.assertEquals(Option.empty(), requestBuilder.leaseId());
34+
Assert.assertEquals(Option.empty(), requestBuilder.sse());
35+
}
36+
37+
@Test
38+
public void populateRequestBuilder() {
39+
40+
// #populate-request-builder
41+
final var requestBuilder =
42+
GetBlob.create().withLeaseId("my-lease-id").withRange(ByteRange.createSlice(0, 25));
43+
// #populate-request-builder
44+
45+
Assert.assertEquals(Option.apply("my-lease-id"), requestBuilder.leaseId());
46+
Assert.assertEquals(Option.apply(ByteRange.createSlice(0, 25)), requestBuilder.range());
47+
Assert.assertEquals(Option.empty(), requestBuilder.sse());
48+
}
49+
50+
@Test
51+
public void createRequestBuilderWithMandatoryParams() {
52+
53+
// #request-builder-with-initial-values
54+
final var requestBuilder = CreateFile.create(256L, ContentTypes.TEXT_PLAIN_UTF8);
55+
// #request-builder-with-initial-values
56+
57+
Assert.assertEquals(Option.empty(), requestBuilder.leaseId());
58+
Assert.assertEquals(256L, requestBuilder.maxFileSize());
59+
Assert.assertEquals(ContentTypes.TEXT_PLAIN_UTF8, requestBuilder.contentType());
60+
}
61+
62+
@Test
63+
public void populateServerSideEncryption() {
64+
65+
// #request-builder-with-sse
66+
final var requestBuilder =
67+
PutBlockBlob.create(256L, ContentTypes.TEXT_PLAIN_UTF8)
68+
.withServerSideEncryption(ServerSideEncryption.customerKey("SGVsbG9Xb3JsZA=="));
69+
// #request-builder-with-sse
70+
71+
Assert.assertEquals(
72+
ServerSideEncryption.customerKey("SGVsbG9Xb3JsZA=="), requestBuilder.sse().get());
73+
}
74+
75+
@Test
76+
public void populateAdditionalHeaders() {
77+
78+
// #request-builder-with-additional-headers
79+
final var requestBuilder = GetBlob.create().addHeader("If-Match", "foobar");
80+
// #request-builder-with-additional-headers
81+
82+
Assert.assertEquals(1, requestBuilder.additionalHeaders().size());
83+
Assert.assertEquals(
84+
new RawHeader("If-Match", "foobar"), requestBuilder.additionalHeaders().head());
85+
}
8386
}

0 commit comments

Comments
 (0)