You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2018/08/26 06:24:53 UTC
[4/5] mina-sshd git commit: Define all LazyXXXHolder classes 'final'
Define all LazyXXXHolder classes 'final'
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/c615b4f3
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/c615b4f3
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/c615b4f3
Branch: refs/heads/master
Commit: c615b4f342a4634d21117a23eab6ba8b6994df83
Parents: 5b364e8
Author: Goldstein Lyor <ly...@cb4.com>
Authored: Sun Aug 26 09:01:03 2018 +0300
Committer: Goldstein Lyor <ly...@cb4.com>
Committed: Sun Aug 26 09:24:44 2018 +0300
----------------------------------------------------------------------
.../java/org/apache/sshd/agent/SshAgentConstants.java | 2 +-
.../java/org/apache/sshd/common/SshConstants.java | 14 ++++++++------
.../apache/sshd/common/config/VersionProperties.java | 2 +-
.../config/keys/loader/AESPrivateKeyObfuscator.java | 2 +-
.../common/io/DefaultIoServiceFactoryFactory.java | 2 +-
.../sshd/common/subsystem/sftp/SftpConstants.java | 2 +-
.../subsystem/sftp/extensions/AclSupportedParser.java | 2 +-
7 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c615b4f3/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java b/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java
index e7692db..dd6e95a 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java
@@ -81,7 +81,7 @@ public final class SshAgentConstants {
throw new UnsupportedOperationException("N/A instance");
}
- private static class LazyMessagesMapHolder {
+ private static final class LazyMessagesMapHolder {
private static final Map<Integer, String> MESSAGES_MAP =
LoggingUtils.generateMnemonicMap(SshAgentConstants.class, f -> {
String name = f.getName();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c615b4f3/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java b/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java
index 35205c1..d274424 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/SshConstants.java
@@ -125,7 +125,7 @@ public final class SshConstants {
throw new UnsupportedOperationException("No instance allowed");
}
- private static class LazyAmbiguousOpcodesHolder {
+ private static final class LazyAmbiguousOpcodesHolder {
private static final Set<Integer> AMBIGUOUS_OPCODES =
Collections.unmodifiableSet(
new HashSet<>(
@@ -149,7 +149,7 @@ public final class SshConstants {
return LazyAmbiguousOpcodesHolder.AMBIGUOUS_OPCODES;
}
- private static class LazyMessagesMapHolder {
+ private static final class LazyMessagesMapHolder {
private static final Map<Integer, String> MESSAGES_MAP =
LoggingUtils.generateMnemonicMap(SshConstants.class, f -> {
String name = f.getName();
@@ -182,8 +182,9 @@ public final class SshConstants {
}
}
- private static class LazyReasonsMapHolder {
- private static final Map<Integer, String> REASONS_MAP = LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH2_DISCONNECT_");
+ private static final class LazyReasonsMapHolder {
+ private static final Map<Integer, String> REASONS_MAP =
+ LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH2_DISCONNECT_");
}
/**
@@ -203,8 +204,9 @@ public final class SshConstants {
}
}
- private static class LazyOpenCodesMapHolder {
- private static final Map<Integer, String> OPEN_CODES_MAP = LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH_OPEN_");
+ private static final class LazyOpenCodesMapHolder {
+ private static final Map<Integer, String> OPEN_CODES_MAP =
+ LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH_OPEN_");
}
/**
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c615b4f3/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java b/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
index c7e4271..7817c8f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
public final class VersionProperties {
- private static class LazyHolder {
+ private static final class LazyHolder {
private static final NavigableMap<String, String> PROPERTIES =
Collections.unmodifiableNavigableMap(loadVersionProperties(LazyHolder.class));
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c615b4f3/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscator.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscator.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscator.java
index b2205ed..20e51e6 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscator.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscator.java
@@ -82,7 +82,7 @@ public class AESPrivateKeyObfuscator extends AbstractPrivateKeyObfuscator {
return LazyValuesHolder.KEY_LENGTHS;
}
- private static class LazyValuesHolder {
+ private static final class LazyValuesHolder {
private static final List<Integer> KEY_LENGTHS =
Collections.unmodifiableList(detectSupportedKeySizes());
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c615b4f3/sshd-core/src/main/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactory.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactory.java b/sshd-core/src/main/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactory.java
index 1e95fd0..7feecc1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactory.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactory.java
@@ -173,7 +173,7 @@ public class DefaultIoServiceFactoryFactory extends AbstractIoServiceFactoryFact
throw new IllegalStateException("Unable to create instance of class " + factory);
}
- private static class LazyDefaultIoServiceFactoryFactoryHolder {
+ private static final class LazyDefaultIoServiceFactoryFactoryHolder {
private static final DefaultIoServiceFactoryFactory INSTANCE = new DefaultIoServiceFactoryFactory();
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c615b4f3/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java b/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java
index ad6234c..b185941 100644
--- a/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java
+++ b/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java
@@ -276,7 +276,7 @@ public final class SftpConstants {
throw new UnsupportedOperationException("No instance");
}
- private static class LazyCommandNameHolder {
+ private static final class LazyCommandNameHolder {
private static final Map<Integer, String> NAMES_MAP =
Collections.unmodifiableMap(
LoggingUtils.generateMnemonicMap(SftpConstants.class, f -> {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/c615b4f3/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java b/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java
index ea2d12d..13ece01 100644
--- a/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java
+++ b/sshd-sftp/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java
@@ -99,7 +99,7 @@ public class AclSupportedParser extends AbstractParser<AclCapabilities> {
return Objects.toString(decodeAclCapabilities(getCapabilities()));
}
- private static class LazyAclCapabilityNameHolder {
+ private static final class LazyAclCapabilityNameHolder {
private static final String ACL_CAP_NAME_PREFIX = "SSH_ACL_CAP_";
private static final Map<Integer, String> ACL_VALUES_MAP = LoggingUtils.generateMnemonicMap(SftpConstants.class, ACL_CAP_NAME_PREFIX);
private static final Map<String, Integer> ACL_NAMES_MAP =