Skip to content

Commit a340d25

Browse files
committed
revert back to Java 8
1 parent b863e17 commit a340d25

File tree

10 files changed

+34
-19
lines changed

10 files changed

+34
-19
lines changed

hermes-aws-lambda/src/main/java/com/sigpwned/hermes/aws/lambda/sns/SnsConsumerLambdaFunctionBase.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.math.BigDecimal;
2424
import java.util.List;
2525
import java.util.Optional;
26+
import java.util.stream.Stream;
2627
import org.slf4j.Logger;
2728
import org.slf4j.LoggerFactory;
2829
import com.amazonaws.services.lambda.runtime.Context;
@@ -56,15 +57,19 @@ protected static Message toMessage(SNSRecord m) {
5657
String id = m.getSNS().getMessageId();
5758

5859
MessageHeaders headers = MessageHeaders.of(m.getSNS().getMessageAttributes().entrySet().stream()
59-
.flatMap(e -> toMessageAttributeValue(e.getValue())
60-
.map(v -> MessageHeader.of(e.getKey(), v)).stream())
60+
.flatMap(e -> stream(
61+
toMessageAttributeValue(e.getValue()).map(v -> MessageHeader.of(e.getKey(), v))))
6162
.collect(toList()));
6263

6364
String body = m.getSNS().getMessage();
6465

6566
return Message.of(id, headers, body);
6667
}
6768

69+
private static <T> Stream<T> stream(Optional<T> o) {
70+
return o.isPresent() ? Stream.of(o.get()) : Stream.empty();
71+
}
72+
6873
protected static Optional<MessageHeaderValue> toMessageAttributeValue(MessageAttribute a) {
6974
MessageHeaderValue result;
7075

hermes-aws-lambda/src/main/java/com/sigpwned/hermes/aws/lambda/sqs/SqsConsumerLambdaFunctionBase.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.math.BigDecimal;
2424
import java.util.List;
2525
import java.util.Optional;
26+
import java.util.stream.Stream;
2627
import org.slf4j.Logger;
2728
import org.slf4j.LoggerFactory;
2829
import com.amazonaws.services.lambda.runtime.Context;
@@ -56,15 +57,19 @@ protected static Message toMessage(SQSMessage m) {
5657
String id = m.getMessageId();
5758

5859
MessageHeaders headers = MessageHeaders.of(m.getMessageAttributes().entrySet().stream()
59-
.flatMap(e -> toMessageAttributeValue(e.getValue())
60-
.map(v -> MessageHeader.of(e.getKey(), v)).stream())
60+
.flatMap(e -> stream(
61+
toMessageAttributeValue(e.getValue()).map(v -> MessageHeader.of(e.getKey(), v))))
6162
.collect(toList()));
6263

6364
String body = m.getBody();
6465

6566
return Message.of(id, headers, body);
6667
}
6768

69+
private static <T> Stream<T> stream(Optional<T> o) {
70+
return o.isPresent() ? Stream.of(o.get()) : Stream.empty();
71+
}
72+
6873
protected static Optional<MessageHeaderValue> toMessageAttributeValue(MessageAttribute a) {
6974
MessageHeaderValue result;
7075

hermes-aws-sqs/src/main/java/com/sigpwned/hermes/aws/sqs/messageconsumer/SqsMessageConsumer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020
package com.sigpwned.hermes.aws.sqs.messageconsumer;
2121

22+
import static java.util.Collections.emptyList;
2223
import static java.util.stream.Collectors.toList;
2324
import java.math.BigDecimal;
24-
import java.util.List;
2525
import java.util.stream.Stream;
2626
import com.sigpwned.hermes.aws.sqs.SqsDestination;
2727
import com.sigpwned.hermes.aws.sqs.messageconsumer.batch.DefaultSqsMessageBatch;
@@ -87,7 +87,7 @@ public SqsMessageBatch receive(int maxNumberOfMessages, int waitTimeSeconds,
8787
.collect(toList())),
8888
m.body(), m.receiptHandle()))
8989
.collect(toList())
90-
: List.of());
90+
: emptyList());
9191
}
9292

9393
private static MessageHeader toMessageHeader(MessageSystemAttributeName k, String v) {

hermes-aws-sqs/src/main/java/com/sigpwned/hermes/aws/sqs/messageconsumer/batch/CombinedSqsMessageBatch.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
*/
2020
package com.sigpwned.hermes.aws.sqs.messageconsumer.batch;
2121

22+
import static java.util.Collections.unmodifiableList;
2223
import static java.util.stream.Collectors.toList;
23-
import static java.util.stream.Collectors.toUnmodifiableList;
2424
import java.util.Iterator;
2525
import java.util.List;
2626
import java.util.stream.Stream;
@@ -42,8 +42,8 @@ public CombinedSqsMessageBatch(List<SqsMessageBatch> batches) {
4242
throw new IllegalArgumentException("multiple destinations " + destinations);
4343
this.batches = batches;
4444
this.destination = destinations.get(0);
45-
this.messages =
46-
getBatches().stream().flatMap(b -> b.getMessages().stream()).collect(toUnmodifiableList());
45+
this.messages = unmodifiableList(
46+
getBatches().stream().flatMap(b -> b.getMessages().stream()).collect(toList()));
4747
}
4848

4949
@Override

hermes-aws-sqs/src/main/java/com/sigpwned/hermes/aws/sqs/messageloop/plan/BackoffSqsReceivePlanner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
*/
2020
package com.sigpwned.hermes.aws.sqs.messageloop.plan;
2121

22+
import static java.util.Arrays.asList;
2223
import static java.util.Objects.requireNonNull;
2324
import java.time.Duration;
2425
import java.util.Collections;
25-
import java.util.List;
2626
import com.sigpwned.hermes.aws.sqs.messageconsumer.SqsMessageBatch;
2727
import com.sigpwned.hermes.aws.sqs.messageloop.SqsMessageLoopBody;
2828
import com.sigpwned.hermes.aws.sqs.messageloop.SqsReceivePlan;
@@ -66,7 +66,7 @@ public SqsReceivePlan plan() throws InterruptedException {
6666

6767
if (consecutiveErrors > 0)
6868
Thread.sleep(
69-
Collections.min(List.of(backoff(consecutiveErrors), getMaximumBackoff())).toMillis());
69+
Collections.min(asList(backoff(consecutiveErrors), getMaximumBackoff())).toMillis());
7070

7171
return getDelegate().plan();
7272
}

hermes-aws-sqs/src/main/java/com/sigpwned/hermes/aws/sqs/messageloop/plan/ThrottlingSqsReceivePlanner.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.time.Duration;
2424
import java.time.LocalDate;
2525
import java.time.LocalTime;
26+
import java.time.Month;
2627
import java.time.OffsetDateTime;
2728
import java.time.ZoneOffset;
2829
import com.sigpwned.hermes.aws.sqs.messageloop.SqsReceivePlan;
@@ -43,7 +44,8 @@ public ThrottlingSqsReceivePlanner(SqsReceivePlanner delegate, Duration minimumD
4344
throw new IllegalArgumentException("minimumDuration must not be negative");
4445
this.delegate = requireNonNull(delegate);
4546
this.minimumDuration = requireNonNull(minimumDuration);
46-
this.last = OffsetDateTime.of(LocalDate.EPOCH, LocalTime.MIN, ZoneOffset.UTC);
47+
this.last =
48+
OffsetDateTime.of(LocalDate.of(1970, Month.JANUARY, 1), LocalTime.MIN, ZoneOffset.UTC);
4749
}
4850

4951
@Override

hermes-core/src/main/java/com/sigpwned/hermes/core/messageproducer/BatchingMessageProducer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package com.sigpwned.hermes.core.messageproducer;
2121

2222
import static java.lang.String.format;
23+
import static java.util.Collections.emptyList;
2324
import static java.util.stream.Collectors.toCollection;
2425
import java.util.ArrayList;
2526
import java.util.Collections;
@@ -47,7 +48,7 @@ public BatchingMessageProducer(MessageProducer delegate, int maxPayloadSize) {
4748
public void send(List<MessageContent> messages) {
4849
List<MessageContent> combined;
4950
if (messages.isEmpty()) {
50-
combined = List.of();
51+
combined = emptyList();
5152
} else {
5253
combined = combine(messages);
5354
}

hermes-core/src/main/java/com/sigpwned/hermes/core/messageproducer/GroupingMessageProducer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package com.sigpwned.hermes.core.messageproducer;
2121

2222
import static java.lang.String.format;
23+
import static java.util.Collections.emptyList;
2324
import static java.util.stream.Collectors.toCollection;
2425
import java.util.ArrayList;
2526
import java.util.Collections;
@@ -49,7 +50,7 @@ public GroupingMessageProducer(MessageProducer delegate, int maxPayloadSize, int
4950
public void send(List<MessageContent> messages) {
5051
List<List<MessageContent>> grouped;
5152
if (messages.isEmpty()) {
52-
grouped = List.of();
53+
grouped = emptyList();
5354
} else {
5455
grouped = group(messages);
5556
}

hermes-core/src/main/java/com/sigpwned/hermes/core/model/MessageHeaders.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package com.sigpwned.hermes.core.model;
2121

22+
import static java.util.Collections.emptyList;
2223
import static java.util.Collections.unmodifiableList;
2324
import java.util.Iterator;
2425
import java.util.List;
@@ -27,7 +28,7 @@
2728
import java.util.stream.Stream;
2829

2930
public class MessageHeaders implements Iterable<MessageHeader> {
30-
public static final MessageHeaders EMPTY = of(List.of());
31+
public static final MessageHeaders EMPTY = of(emptyList());
3132

3233
public static MessageHeaders of() {
3334
return EMPTY;

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<version>0.0.0-b4-SNAPSHOT</version>
77
<name>hermes</name>
88
<inceptionYear>2022</inceptionYear>
9-
<description>Divine Messaging in the Cloud for Java 11+</description>
9+
<description>Divine Messaging in the Cloud for Java 8+</description>
1010
<url>https://github.com/sigpwned/hermes</url>
1111
<packaging>pom</packaging>
1212

@@ -77,9 +77,9 @@
7777
<artifactId>maven-compiler-plugin</artifactId>
7878
<version>3.10.1</version>
7979
<configuration>
80-
<source>11</source>
81-
<target>11</target>
82-
<release>11</release>
80+
<source>8</source>
81+
<target>8</target>
82+
<release>8</release>
8383
</configuration>
8484
</plugin>
8585

0 commit comments

Comments
 (0)