Repository: mina-sshd Updated Branches: refs/heads/master d5ce26836 -> dd299ae7a
[SSHD-698] Deleted AbstractSimplifiedLOg Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/008f1b62 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/008f1b62 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/008f1b62 Branch: refs/heads/master Commit: 008f1b6210eda37bcc36a3b787105f41431d306f Parents: d5ce268 Author: Lyor Goldstein <[email protected]> Authored: Sat Oct 1 16:08:14 2016 +0300 Committer: Lyor Goldstein <[email protected]> Committed: Sat Oct 1 16:08:14 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/sshd/client/SshKeyScan.java | 5 ++- .../util/logging/AbstractSimplifiedLog.java | 36 -------------------- .../sshd/common/util/logging/LoggingUtils.java | 5 ++- .../sshd/common/util/logging/SimplifiedLog.java | 7 ++-- 4 files changed, 9 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/008f1b62/sshd-core/src/main/java/org/apache/sshd/client/SshKeyScan.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshKeyScan.java b/sshd-core/src/main/java/org/apache/sshd/client/SshKeyScan.java index bb7ff42..da592f3 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/SshKeyScan.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/SshKeyScan.java @@ -75,8 +75,8 @@ import org.apache.sshd.common.util.SecurityUtils; import org.apache.sshd.common.util.ValidateUtils; import org.apache.sshd.common.util.io.IoUtils; import org.apache.sshd.common.util.io.NoCloseInputStream; -import org.apache.sshd.common.util.logging.AbstractSimplifiedLog; import org.apache.sshd.common.util.logging.LoggingUtils; +import org.apache.sshd.common.util.logging.SimplifiedLog; import org.apache.sshd.common.util.net.SshdSocketAddress; /** @@ -84,8 +84,7 @@ import org.apache.sshd.common.util.net.SshdSocketAddress; * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ -public class SshKeyScan extends AbstractSimplifiedLog - implements Channel, Callable<Void>, ServerKeyVerifier, SessionListener { +public class SshKeyScan implements Channel, Callable<Void>, ServerKeyVerifier, SessionListener, SimplifiedLog { /** * Default key types if not overridden from the command line */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/008f1b62/sshd-core/src/main/java/org/apache/sshd/common/util/logging/AbstractSimplifiedLog.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/logging/AbstractSimplifiedLog.java b/sshd-core/src/main/java/org/apache/sshd/common/util/logging/AbstractSimplifiedLog.java deleted file mode 100644 index 8a19b8d..0000000 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/logging/AbstractSimplifiedLog.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.sshd.common.util.logging; - -import java.util.logging.Level; - -/** - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -public abstract class AbstractSimplifiedLog implements SimplifiedLog { - protected AbstractSimplifiedLog() { - super(); - } - - @Override - public void log(Level level, Object message) { - log(level, message, null); - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/008f1b62/sshd-core/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java index 45bcf1b..6ba3df0 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/logging/LoggingUtils.java @@ -238,7 +238,7 @@ public final class LoggingUtils { if (logger == null) { return SimplifiedLog.EMPTY; } else { - return new AbstractSimplifiedLog() { + return new SimplifiedLog() { @Override public void log(Level level, Object message, Throwable t) { if (isEnabled(level)) { @@ -256,10 +256,9 @@ public final class LoggingUtils { } // NOTE: assume that level enabled has been checked !!! - @SuppressWarnings("StatementWithEmptyBody") public static void logMessage(Logger logger, Level level, Object message, Throwable t) { if ((logger == null) || (level == null) || Level.OFF.equals(level)) { - // ignore + return; } else if (Level.SEVERE.equals(level)) { logger.error(Objects.toString(message), t); } else if (Level.WARNING.equals(level)) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/008f1b62/sshd-core/src/main/java/org/apache/sshd/common/util/logging/SimplifiedLog.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/logging/SimplifiedLog.java b/sshd-core/src/main/java/org/apache/sshd/common/util/logging/SimplifiedLog.java index 966f71c..58d58ee 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/logging/SimplifiedLog.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/logging/SimplifiedLog.java @@ -28,7 +28,7 @@ public interface SimplifiedLog { /** * An "empty" {@link SimplifiedLog} that does nothing */ - SimplifiedLog EMPTY = new AbstractSimplifiedLog() { + SimplifiedLog EMPTY = new SimplifiedLog() { @Override public boolean isEnabled(Level level) { return false; @@ -36,6 +36,7 @@ public interface SimplifiedLog { @Override public void log(Level level, Object message, Throwable t) { + // ignored } @Override @@ -46,7 +47,9 @@ public interface SimplifiedLog { boolean isEnabled(Level level); - void log(Level level, Object message); + default void log(Level level, Object message) { + log(level, message, null); + } void log(Level level, Object message, Throwable t); }
