Fix compile failures on java7
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5069325 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5069325 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5069325 Branch: refs/heads/3.1.x-fixes Commit: c5069325bd0492aba57a7a3fdbc663fa867964c7 Parents: fcb6141 Author: Daniel Kulp <[email protected]> Authored: Tue Feb 14 11:00:04 2017 -0500 Committer: Daniel Kulp <[email protected]> Committed: Tue Feb 14 16:25:48 2017 -0500 ---------------------------------------------------------------------- .../java/org/apache/cxf/ext/logging/LoggingInInterceptor.java | 6 ++++-- .../apache/cxf/ext/logging/event/PrintWriterEventSender.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c5069325/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java index 6c19109..0643bc2 100644 --- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java +++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java @@ -23,7 +23,6 @@ import java.io.PrintWriter; import java.io.Reader; import java.io.SequenceInputStream; import java.util.Collection; -import java.util.Collections; import org.apache.cxf.common.injection.NoJSR250Annotations; import org.apache.cxf.common.util.StringUtils; @@ -75,7 +74,10 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor { super(Phase.RECEIVE, sender); } public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() { - return Collections.singleton(new SendLogEventInterceptor()); + PhaseInterceptor<Message> intc = new SendLogEventInterceptor(); + java.util.Set<PhaseInterceptor<? extends Message>> ret = new java.util.HashSet<>(); + ret.add(intc); + return ret; } http://git-wip-us.apache.org/repos/asf/cxf/blob/c5069325/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java ---------------------------------------------------------------------- diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java index b34133d..24fae7c 100644 --- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java +++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java @@ -20,7 +20,7 @@ package org.apache.cxf.ext.logging.event; import java.io.PrintWriter; -import java.time.Instant; +import java.util.Date; import javax.xml.namespace.QName; @@ -44,7 +44,7 @@ public class PrintWriterEventSender implements LogEventSender { public void send(LogEvent event) { StringBuilder b = new StringBuilder(); - b.append(Instant.now().toString()).append(" - PrintWriterEventSender\n"); + b.append(new Date().toString()).append(" - PrintWriterEventSender\n"); put(b, "type", event.getType().toString()); put(b, "address", event.getAddress()); put(b, "content-type", event.getContentType());
