Skip to content

Commit 6c5f4ca

Browse files
committed
fix compiler error for release
1 parent a464764 commit 6c5f4ca

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
</modules>
7575

7676
<properties>
77-
<java_source_version>1.7</java_source_version>
78-
<java_target_version>1.7</java_target_version>
77+
<java_source_version>1.8</java_source_version>
78+
<java_target_version>1.8</java_target_version>
7979

8080
<prometheus.client.version>0.5.0</prometheus.client.version>
8181
<spring.version>4.2.3.RELEASE</spring.version>

qmq-delay-server/src/main/java/qunar/tc/qmq/delay/receiver/Receiver.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package qunar.tc.qmq.delay.receiver;
1818

1919
import com.google.common.base.CharMatcher;
20+
import com.google.common.base.Function;
2021
import com.google.common.eventbus.Subscribe;
2122
import com.google.common.util.concurrent.Futures;
2223
import com.google.common.util.concurrent.ListenableFuture;
@@ -84,7 +85,7 @@ ListenableFuture<Datagram> receive(List<RawMessageExtend> messages, RemotingComm
8485

8586
final short version = cmd.getHeader().getVersion();
8687
return Futures.transform(Futures.allAsList(futures)
87-
, results -> RemotingBuilder.buildResponseDatagram(CommandCode.SUCCESS
88+
, (Function<? super List<ReceivedResult>, ? extends Datagram>) results -> RemotingBuilder.buildResponseDatagram(CommandCode.SUCCESS
8889
, cmd.getHeader(), new SendResultPayloadHolder(results, version)));
8990
}
9091

qmq-server-common/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
<groupId>${project.groupId}</groupId>
2424
<artifactId>qmq-remoting</artifactId>
2525
</dependency>
26+
<dependency>
27+
<groupId>com.fasterxml.jackson.core</groupId>
28+
<artifactId>jackson-annotations</artifactId>
29+
<version>2.9.1</version>
30+
</dependency>
2631
<dependency>
2732
<groupId>org.slf4j</groupId>
2833
<artifactId>slf4j-api</artifactId>

qmq-server/src/main/java/qunar/tc/qmq/processor/SendMessageWorker.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package qunar.tc.qmq.processor;
1818

1919
import com.google.common.base.CharMatcher;
20+
import com.google.common.base.Function;
2021
import com.google.common.eventbus.Subscribe;
2122
import com.google.common.util.concurrent.Futures;
2223
import com.google.common.util.concurrent.ListenableFuture;
@@ -76,7 +77,7 @@ ListenableFuture<Datagram> receive(final List<RawMessage> messages, final Remoti
7677

7778
final short version = cmd.getHeader().getVersion();
7879
return Futures.transform(Futures.allAsList(futures),
79-
input -> RemotingBuilder.buildResponseDatagram(CommandCode.SUCCESS, cmd.getHeader(), new SendResultPayloadHolder(input, version)));
80+
(Function<? super List<ReceiveResult>, ? extends Datagram>) input -> RemotingBuilder.buildResponseDatagram(CommandCode.SUCCESS, cmd.getHeader(), new SendResultPayloadHolder(input, version)));
8081
}
8182

8283
private void monitorMessageReceived(long receiveTime, String subject) {

0 commit comments

Comments
 (0)