diff --git a/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java b/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java index 95de38dc..f6a21e92 100644 --- a/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java +++ b/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java @@ -28,7 +28,7 @@ public class IdentificationStringParser { private final Logger log; private final Buffer.PlainBuffer buffer; - private byte[] EXPECTED_START_BYTES = new byte[] {'S', 'S', 'H', '-'}; + private final byte[] EXPECTED_START_BYTES = new byte[] {'S', 'S', 'H', '-'}; public IdentificationStringParser(Buffer.PlainBuffer buffer) { this(buffer, LoggerFactory.DEFAULT); diff --git a/src/main/java/com/hierynomus/sshj/transport/cipher/BlockCiphers.java b/src/main/java/com/hierynomus/sshj/transport/cipher/BlockCiphers.java index 99cf09f3..e8731d21 100644 --- a/src/main/java/com/hierynomus/sshj/transport/cipher/BlockCiphers.java +++ b/src/main/java/com/hierynomus/sshj/transport/cipher/BlockCiphers.java @@ -121,11 +121,11 @@ public class BlockCiphers { public static class Factory implements net.schmizz.sshj.common.Factory.Named { - private int keysize; - private String cipher; - private String mode; - private String name; - private int ivsize; + private final int keysize; + private final String cipher; + private final String mode; + private final String name; + private final int ivsize; /** * @param ivsize diff --git a/src/main/java/com/hierynomus/sshj/transport/cipher/GcmCiphers.java b/src/main/java/com/hierynomus/sshj/transport/cipher/GcmCiphers.java index 2a288516..414b8af8 100644 --- a/src/main/java/com/hierynomus/sshj/transport/cipher/GcmCiphers.java +++ b/src/main/java/com/hierynomus/sshj/transport/cipher/GcmCiphers.java @@ -33,12 +33,12 @@ public class GcmCiphers { public static class Factory implements net.schmizz.sshj.common.Factory.Named { - private int keysize; - private int authSize; - private String cipher; - private String mode; - private String name; - private int ivsize; + private final int keysize; + private final int authSize; + private final String cipher; + private final String mode; + private final String name; + private final int ivsize; /** * @param ivsize diff --git a/src/main/java/com/hierynomus/sshj/transport/cipher/StreamCiphers.java b/src/main/java/com/hierynomus/sshj/transport/cipher/StreamCiphers.java index 55d37f0f..1c92c732 100644 --- a/src/main/java/com/hierynomus/sshj/transport/cipher/StreamCiphers.java +++ b/src/main/java/com/hierynomus/sshj/transport/cipher/StreamCiphers.java @@ -40,10 +40,10 @@ public class StreamCiphers { public static class Factory implements net.schmizz.sshj.common.Factory.Named { - private int keysize; - private String cipher; - private String mode; - private String name; + private final int keysize; + private final String cipher; + private final String mode; + private final String name; /** * @param keysize The keysize used in bits. diff --git a/src/main/java/com/hierynomus/sshj/transport/kex/DHG.java b/src/main/java/com/hierynomus/sshj/transport/kex/DHG.java index dbb97092..4c7f3e20 100644 --- a/src/main/java/com/hierynomus/sshj/transport/kex/DHG.java +++ b/src/main/java/com/hierynomus/sshj/transport/kex/DHG.java @@ -28,8 +28,8 @@ import java.security.GeneralSecurityException; * */ public class DHG extends AbstractDHG { - private BigInteger group; - private BigInteger generator; + private final BigInteger group; + private final BigInteger generator; public DHG(BigInteger group, BigInteger generator, Digest digest) { super(new DH(), digest); diff --git a/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java b/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java index abff0149..6387f0a7 100644 --- a/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java +++ b/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java @@ -68,10 +68,10 @@ public class DHGroups { public static class Factory implements net.schmizz.sshj.common.Factory.Named { - private String name; - private BigInteger group; - private BigInteger generator; - private Factory.Named digestFactory; + private final String name; + private final BigInteger group; + private final BigInteger generator; + private final Factory.Named digestFactory; public Factory(String name, BigInteger group, BigInteger generator, Named digestFactory) { this.name = name; diff --git a/src/main/java/com/hierynomus/sshj/transport/mac/Macs.java b/src/main/java/com/hierynomus/sshj/transport/mac/Macs.java index 9383b351..37b210a0 100644 --- a/src/main/java/com/hierynomus/sshj/transport/mac/Macs.java +++ b/src/main/java/com/hierynomus/sshj/transport/mac/Macs.java @@ -71,10 +71,10 @@ public class Macs { public static class Factory implements net.schmizz.sshj.common.Factory.Named { - private String name; - private String algorithm; - private int bSize; - private int defBSize; + private final String name; + private final String algorithm; + private final int bSize; + private final int defBSize; private final boolean etm; public Factory(String name, String algorithm, int bSize, int defBSize, boolean etm) { diff --git a/src/main/java/com/hierynomus/sshj/transport/verification/KnownHostMatchers.java b/src/main/java/com/hierynomus/sshj/transport/verification/KnownHostMatchers.java index d86721cb..cf16cb51 100644 --- a/src/main/java/com/hierynomus/sshj/transport/verification/KnownHostMatchers.java +++ b/src/main/java/com/hierynomus/sshj/transport/verification/KnownHostMatchers.java @@ -57,7 +57,7 @@ public class KnownHostMatchers { } private static class EquiHostMatcher implements HostMatcher { - private String host; + private final String host; public EquiHostMatcher(String host) { this.host = host; diff --git a/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java b/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java index 29701b18..43584b84 100644 --- a/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java +++ b/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java @@ -37,7 +37,7 @@ public final class ChannelOutputStream extends OutputStream implements ErrorNoti private final DataBuffer buffer = new DataBuffer(); private final byte[] b = new byte[1]; - private AtomicBoolean closed; + private final AtomicBoolean closed; private SSHException error; private final class DataBuffer { diff --git a/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java b/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java index d1d5d5a1..190f7f1b 100644 --- a/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java +++ b/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java @@ -77,7 +77,7 @@ public class SignatureECDSA extends AbstractSignatureDSA { } - private String keyTypeName; + private final String keyTypeName; public SignatureECDSA(String algorithm, String keyTypeName) { super(algorithm, keyTypeName); diff --git a/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java b/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java index e9695ac4..ad8275dc 100644 --- a/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java +++ b/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java @@ -87,7 +87,7 @@ public class SignatureRSA } - private KeyType keyType; + private final KeyType keyType; public SignatureRSA(String algorithm, KeyType keyType, String name) { diff --git a/src/main/java/net/schmizz/sshj/transport/kex/ECDHNistP.java b/src/main/java/net/schmizz/sshj/transport/kex/ECDHNistP.java index be836680..56081dd0 100644 --- a/src/main/java/net/schmizz/sshj/transport/kex/ECDHNistP.java +++ b/src/main/java/net/schmizz/sshj/transport/kex/ECDHNistP.java @@ -25,7 +25,7 @@ import java.security.spec.ECGenParameterSpec; public class ECDHNistP extends AbstractDHG { - private String curve; + private final String curve; /** Named factory for ECDHNistP key exchange */ public static class Factory521 diff --git a/src/main/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHosts.java b/src/main/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHosts.java index 473a3be4..c887def8 100644 --- a/src/main/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHosts.java +++ b/src/main/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHosts.java @@ -475,7 +475,7 @@ public class OpenSSHKnownHosts } public static class BadHostEntry implements KnownHostEntry { - private String line; + private final String line; public BadHostEntry(String line) { this.line = line; diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java index ef5133bc..671e09fb 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java @@ -101,7 +101,7 @@ public class PuTTYKeyFile extends BaseFileKeyProvider { throw new IOException(String.format("Unsupported encryption: %s", encryption)); } - private Map payload = new HashMap(); + private final Map payload = new HashMap(); /** * For each line that looks like "Xyz: vvv", it will be stored in this map. diff --git a/src/main/java/net/schmizz/sshj/xfer/scp/ScpCommandLine.java b/src/main/java/net/schmizz/sshj/xfer/scp/ScpCommandLine.java index 4a9d3246..75b70297 100644 --- a/src/main/java/net/schmizz/sshj/xfer/scp/ScpCommandLine.java +++ b/src/main/java/net/schmizz/sshj/xfer/scp/ScpCommandLine.java @@ -71,7 +71,7 @@ public class ScpCommandLine { } } - private LinkedHashMap arguments = new LinkedHashMap(); + private final LinkedHashMap arguments = new LinkedHashMap(); private String path; ScpCommandLine() {