You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2019/12/16 10:55:23 UTC
[directory-kerby] branch trunk updated: Fixing some trivial issues
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/directory-kerby.git
The following commit(s) were added to refs/heads/trunk by this push:
new ced0d95 Fixing some trivial issues
ced0d95 is described below
commit ced0d955ad2500a7c5da67412cb91fdcb841613b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Dec 16 10:55:05 2019 +0000
Fixing some trivial issues
---
.../has/plugins/server/mysql/MySQLHasServerPlugin.java | 2 +-
.../java/org/apache/kerby/asn1/type/Asn1Choice.java | 2 +-
.../apache/kerby/asn1/type/Asn1ObjectIdentifier.java | 2 +-
.../src/main/java/org/apache/kerby/util/Base64.java | 4 ++--
.../kerb/admin/server/kadmin/AdminServerSetting.java | 6 ++----
.../kerberos/kerb/admin/RemoteAdminClientTool.java | 2 +-
.../kerb/admin/kadmin/local/LocalKadminImpl.java | 2 +-
.../kerb/admin/kadmin/remote/AdminSetting.java | 6 ++----
.../kerberos/kerb/admin/kadmin/remote/AdminUtil.java | 18 +++++++-----------
.../apache/kerby/kerberos/kerb/client/ClientUtil.java | 2 +-
.../apache/kerby/kerberos/kerb/client/KrbSetting.java | 6 ++----
.../kerb/client/request/AsRequestWithKeytab.java | 5 +++--
.../kerby/kerberos/kerb/client/request/KdcRequest.java | 2 +-
.../kerberos/kerb/preauth/pkinit/PkinitCrypto.java | 2 +-
.../apache/kerby/kerberos/kerb/server/KdcSetting.java | 6 ++----
.../kerb/server/preauth/pkinit/PkinitPreauth.java | 4 ++--
.../kerb/server/preauth/token/TokenPreauth.java | 2 +-
.../kerberos/tool/kinit/KinitToolWithConcurrence.java | 4 ++--
.../kerberos/tool/admin/local/AdminLocalTool.java | 4 ++--
.../tool/admin/remote/cmd/KeytabAddRemoteCmd.java | 2 +-
.../kerberos/tool/hclient/HasClientLoginTool.java | 4 ++--
.../kerby/kerberos/tool/init/cmd/ConfigBackendCmd.java | 2 +-
.../apache/kerby/kerberos/tool/kadmin/KadminTool.java | 4 ++--
.../tool/kadmin/command/ChangePasswordCommand.java | 2 +-
.../kerberos/tool/kadmin/command/KeytabAddCommand.java | 2 +-
.../tool/kadmin/command/KeytabRemoveCommand.java | 4 ++--
.../kerby/kerberos/tool/kdcinit/KdcInitTool.java | 2 +-
27 files changed, 46 insertions(+), 57 deletions(-)
diff --git a/has-project/has-server-plugin/src/main/java/org/apache/kerby/has/plugins/server/mysql/MySQLHasServerPlugin.java b/has-project/has-server-plugin/src/main/java/org/apache/kerby/has/plugins/server/mysql/MySQLHasServerPlugin.java
index 1aba04d..e262c9f 100644
--- a/has-project/has-server-plugin/src/main/java/org/apache/kerby/has/plugins/server/mysql/MySQLHasServerPlugin.java
+++ b/has-project/has-server-plugin/src/main/java/org/apache/kerby/has/plugins/server/mysql/MySQLHasServerPlugin.java
@@ -136,7 +136,7 @@ public class MySQLHasServerPlugin extends AbstractHasServerPlugin {
} catch (ClassNotFoundException e) {
throw new HasAuthenException("JDBC Driver Class not found. ", e);
} catch (SQLException e) {
- throw new HasAuthenException("Failed to connecting to MySQL."
+ throw new HasAuthenException("Failed to connect to MySQL. "
+ "Please check MySQL URL, username and password. ", e);
}
diff --git a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java
index 8835c9d..e47f93b 100644
--- a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java
+++ b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java
@@ -202,7 +202,7 @@ public class Asn1Choice
return null;
}
- if (chosenField != null && index != chosenField.getIndex()) {
+ if (index != chosenField.getIndex()) {
throw new IllegalArgumentException("Incorrect chosen value requested");
}
diff --git a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java
index 1cc1e99..e0f7733 100644
--- a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java
+++ b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java
@@ -139,7 +139,7 @@ public class Asn1ObjectIdentifier extends Asn1Simple<String> {
for (int i = 1; i < parts.length; ++i) {
coms[i - 1] = new BigInteger(parts[i]);
}
- coms[0] = coms[0].add(BigInteger.valueOf(Integer.parseInt(parts[0]) * 40));
+ coms[0] = coms[0].add(BigInteger.valueOf(Integer.parseInt(parts[0]) * 40L));
byte[][] bytesGroups = new byte[coms.length][];
for (int i = 0; i < coms.length; ++i) {
diff --git a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Base64.java b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
index 43ea190..22d594b 100644
--- a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
+++ b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
@@ -732,7 +732,7 @@ public class Base64 {
if (pArray == null || pArray.length == 0) {
return pArray;
}
- long len = (pArray.length * 3) / 4;
+ long len = (pArray.length * 3L) / 4;
byte[] buf = new byte[(int) len];
setInitialBuffer(buf, 0, buf.length);
decode(pArray, 0, pArray.length);
@@ -957,7 +957,7 @@ public class Base64 {
// base64 always encodes to multiples of 4.
chunkSize = (chunkSize / 4) * 4;
- long len = (pArray.length * 4) / 3;
+ long len = (pArray.length * 4L) / 3;
long mod = len % 4;
if (mod != 0) {
len += 4 - mod;
diff --git a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerSetting.java b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerSetting.java
index a8dba48..90e5da9 100644
--- a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerSetting.java
+++ b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerSetting.java
@@ -166,9 +166,8 @@ public class AdminServerSetting implements ServerSetting {
* @return tcp protocol is allowed or not
*/
public boolean allowTcp() {
- Boolean allowTcp = startupOptions.getBooleanOption(
+ return startupOptions.getBooleanOption(
AdminServerOption.ALLOW_TCP, adminServerConfig.allowTcp());
- return allowTcp;
}
/**
@@ -176,9 +175,8 @@ public class AdminServerSetting implements ServerSetting {
* @return udp protocol is allowed or not
*/
public boolean allowUdp() {
- Boolean allowUdp = startupOptions.getBooleanOption(
+ return startupOptions.getBooleanOption(
AdminServerOption.ALLOW_UDP, adminServerConfig.allowUdp());
- return allowUdp;
}
/**
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/RemoteAdminClientTool.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/RemoteAdminClientTool.java
index 852f32a..96d68ce 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/RemoteAdminClientTool.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/RemoteAdminClientTool.java
@@ -110,7 +110,7 @@ public class RemoteAdminClientTool {
adminClient = new AdminClient(adminConfig);
File keytabFile = new File(adminConfig.getKeyTabFile());
- if (keytabFile == null || !keytabFile.exists()) {
+ if (!keytabFile.exists()) {
System.err.println("Need the valid keytab file value in conf file.");
return;
}
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/local/LocalKadminImpl.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/local/LocalKadminImpl.java
index fdc0865..513e8cb 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/local/LocalKadminImpl.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/local/LocalKadminImpl.java
@@ -332,7 +332,7 @@ public class LocalKadminImpl implements LocalKadmin {
return getPrincipals();
}
- Boolean containsAt = pt.pattern().indexOf('@') != -1;
+ boolean containsAt = pt.pattern().indexOf('@') != -1;
List<String> result = new LinkedList<>();
List<String> principalNames = getPrincipals();
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminSetting.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminSetting.java
index 1e519ea..f500697 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminSetting.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminSetting.java
@@ -100,15 +100,13 @@ public class AdminSetting {
}
public boolean allowUdp() {
- Boolean allowUdp = commonOptions.getBooleanOption(
+ return commonOptions.getBooleanOption(
AdminOption.ALLOW_UDP, adminConfig.allowUdp());
- return allowUdp;
}
public boolean allowTcp() {
- Boolean allowTcp = commonOptions.getBooleanOption(
+ return commonOptions.getBooleanOption(
AdminOption.ALLOW_TCP, adminConfig.allowTcp());
- return allowTcp;
}
public int getKdcUdpPort() {
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminUtil.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminUtil.java
index 00cc409..4b61809 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminUtil.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/AdminUtil.java
@@ -45,18 +45,14 @@ public final class AdminUtil {
throw new KrbException(KRB5_FILE_NAME + " not found");
}
- if (confFile != null && confFile.exists()) {
- AdminConfig adminConfig = new AdminConfig();
- try {
- adminConfig.addKrb5Config(confFile);
- return adminConfig;
- } catch (IOException e) {
- throw new KrbException("Failed to load krb config "
- + confFile.getAbsolutePath());
- }
+ AdminConfig adminConfig = new AdminConfig();
+ try {
+ adminConfig.addKrb5Config(confFile);
+ return adminConfig;
+ } catch (IOException e) {
+ throw new KrbException("Failed to load krb config "
+ + confFile.getAbsolutePath());
}
-
- return null;
}
/**
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
index b2a1122..da7362b 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
@@ -45,7 +45,7 @@ public final class ClientUtil {
* @throws KrbException e
*/
public static KrbConfig getConfig(File conf) throws KrbException {
- if (!conf.exists()) {
+ if (conf == null || !conf.exists()) {
throw new KrbException(conf + " not found");
}
File confFile = conf.isDirectory() ? new File(conf, KRB5_FILE_NAME) : conf;
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
index ce0216b..d4fa3ca 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
@@ -100,15 +100,13 @@ public class KrbSetting {
}
public boolean allowUdp() {
- Boolean allowUdp = commonOptions.getBooleanOption(
+ return commonOptions.getBooleanOption(
KrbOption.ALLOW_UDP, krbConfig.allowUdp());
- return allowUdp;
}
public boolean allowTcp() {
- Boolean allowTcp = commonOptions.getBooleanOption(
+ return commonOptions.getBooleanOption(
KrbOption.ALLOW_TCP, krbConfig.allowTcp());
- return allowTcp;
}
public int getKdcUdpPort() {
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java
index 7726a26..55e1cf3 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java
@@ -61,9 +61,10 @@ public class AsRequestWithKeytab extends AsRequest {
Keytab keytab = null;
try {
- keytab = Keytab.loadKeytab(keytabFile);
+ keytab = Keytab.loadKeytab(keytabFile);
} catch (IOException e) {
- System.err.println("Can not load keytab from file" + keytabFile.getAbsolutePath());
+ String path = keytabFile != null ? keytabFile.getAbsolutePath() : "";
+ System.err.println("Can not load keytab from file" + path);
}
return keytab;
}
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
index 97aadde..272f6a3 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
@@ -311,7 +311,7 @@ public abstract class KdcRequest {
public long getTicketValidTime() {
if (getRequestOptions().contains(KrbOption.LIFE_TIME)) {
- return getRequestOptions().getIntegerOption(KrbOption.LIFE_TIME) * 1000;
+ return getRequestOptions().getIntegerOption(KrbOption.LIFE_TIME) * 1000L;
} else {
return context.getTicketValidTime();
}
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java
index 877d83f..b3346f9 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitCrypto.java
@@ -175,7 +175,7 @@ public class PkinitCrypto {
LOG.error("bad g dhparameter");
return false;
}
- LOG.info("Good dhparams", dh1.getP().bitLength());
+ LOG.info("Good dhparams %d", dh1.getP().bitLength());
return true;
}
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
index c53d5d6..a5ceafe 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
@@ -140,9 +140,8 @@ public class KdcSetting implements ServerSetting {
* @return tcp protocol is allowed or not
*/
public boolean allowTcp() {
- Boolean allowTcp = startupOptions.getBooleanOption(
+ return startupOptions.getBooleanOption(
KdcServerOption.ALLOW_TCP, kdcConfig.allowTcp());
- return allowTcp;
}
/**
@@ -150,9 +149,8 @@ public class KdcSetting implements ServerSetting {
* @return udp protocol is allowed or not
*/
public boolean allowUdp() {
- Boolean allowUdp = startupOptions.getBooleanOption(
+ return startupOptions.getBooleanOption(
KdcServerOption.ALLOW_UDP, kdcConfig.allowUdp());
- return allowUdp;
}
/**
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java
index 909a04e..e4e8163 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java
@@ -151,7 +151,7 @@ public class PkinitPreauth extends AbstractPreauthPlugin {
PkinitCrypto.verifyCmsSignedData(CmsMessageType.CMS_SIGN_CLIENT, signedData);
- Boolean isSigned = signedData.isSigned();
+ boolean isSigned = signedData.isSigned();
if (isSigned) {
//TODO
LOG.info("Signed data.");
@@ -204,7 +204,7 @@ public class PkinitPreauth extends AbstractPreauthPlugin {
expectedCheckSum = CheckSumUtil.makeCheckSum(CheckSumType.NIST_SHA,
reqBodyBytes);
} catch (KrbException e) {
- LOG.error("Unable to calculate AS REQ checksum.", e.getMessage());
+ LOG.error("Unable to calculate AS REQ checksum. %s", e.getMessage());
}
byte[] receivedCheckSumByte = pkAuthenticator.getPaChecksum();
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
index 56e9046..25e67c9 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
@@ -114,7 +114,7 @@ public class TokenPreauth extends AbstractPreauthPlugin {
kdcRequest.setServerPrincipal(serverPrincipal);
if (audiences == null || !audiences.contains(serverPrincipal.getName())) {
throw new KrbException(
- "The token audience does not match with the target server principal!"
+ "The token audience does not match with the target server principal! "
+ "Server principal is: " + serverPrincipal);
}
kdcRequest.setToken(authToken);
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitToolWithConcurrence.java b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitToolWithConcurrence.java
index a63da76..a20c8c0 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitToolWithConcurrence.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitToolWithConcurrence.java
@@ -221,7 +221,7 @@ public class KinitToolWithConcurrence {
int[] tempDelayNumbers = new int[threadNumbers];
int[] delayNumbers = new int[threadNumbers];
startTime = System.currentTimeMillis();
- Long timeStamp = System.currentTimeMillis();
+ long timeStamp = System.currentTimeMillis();
int max = 0;
int min = 0;
@@ -232,7 +232,7 @@ public class KinitToolWithConcurrence {
while (true) {
Thread.sleep(2000);
int temp = 0;
- Long now = System.currentTimeMillis();
+ long now = System.currentTimeMillis();
for (int j = 0; j < threadNumbers; j++) {
delayNumbers[j] = reList[j * INTERVAL] - tempDelayNumbers[j];
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/AdminLocalTool.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/AdminLocalTool.java
index 6c787bd..94831ac 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/AdminLocalTool.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/AdminLocalTool.java
@@ -182,7 +182,7 @@ public class AdminLocalTool {
private static File getConfDir(String[] args) {
String envDir;
confDir = new File(args[0]);
- if (confDir == null || !confDir.exists()) {
+ if (!confDir.exists()) {
try {
Map<String, String> mapEnv = System.getenv();
envDir = mapEnv.get("KRB5_KDC_DIR");
@@ -259,7 +259,7 @@ public class AdminLocalTool {
}
} else if (kOptions.contains(KadminOption.K)) {
File keyTabFile = new File(kOptions.getStringOption(KadminOption.K));
- if (keyTabFile == null || !keyTabFile.exists()) {
+ if (!keyTabFile.exists()) {
printUsage("Need the valid keytab file.");
return;
}
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/KeytabAddRemoteCmd.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/KeytabAddRemoteCmd.java
index c125316..b99e8eb 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/KeytabAddRemoteCmd.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/KeytabAddRemoteCmd.java
@@ -47,7 +47,7 @@ public class KeytabAddRemoteCmd extends AdminRemoteCmd {
String principal = null;
String keytabFileLocation = null;
- Boolean glob = false;
+ boolean glob = false;
int index = 1;
while (index < items.length) {
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java
index 697ab2c..1004a03 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java
@@ -238,7 +238,7 @@ public class HasClientLoginTool {
keytabList.add(i, file);
}
System.out.println("Start the login test.");
- Long startTime = System.currentTimeMillis();
+ long startTime = System.currentTimeMillis();
exec = Executors.newFixedThreadPool(5);
for (int i = 0; i < taskNum; ++i) {
exec.submit(new Task(i));
@@ -250,7 +250,7 @@ public class HasClientLoginTool {
System.err.println(e.getMessage());
return;
}
- Long endTime = System.currentTimeMillis();
+ long endTime = System.currentTimeMillis();
System.out.println("Finish the login test.");
System.out.println("Cost time: " + (endTime - startTime) + "ms");
} else if (cmd.equals("delete")) {
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/ConfigBackendCmd.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/ConfigBackendCmd.java
index 02c8cf2..ba535e4 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/ConfigBackendCmd.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/ConfigBackendCmd.java
@@ -51,7 +51,7 @@ public class ConfigBackendCmd extends InitCmd {
}
HasInitClient client = getClient();
- if (items.length >= 3 && items[1].equals("json")) {
+ if (items[1].equals("json")) {
System.out.println(client.configBackend(items[1], items[2],
null, null, null));
} else if (items.length >= 5 && items[1].equals("mysql")) {
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
index 82f49b9..d880dae 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
@@ -170,7 +170,7 @@ public class KadminTool {
private static File getConfDir(String[] args) {
String envDir;
confDir = new File(args[0]);
- if (confDir == null || !confDir.exists()) {
+ if (!confDir.exists()) {
try {
Map<String, String> mapEnv = System.getenv();
envDir = mapEnv.get("KRB5_KDC_DIR");
@@ -236,7 +236,7 @@ public class KadminTool {
}
} else if (kOptions.contains(KadminOption.K)) {
File keyTabFile = new File(kOptions.getStringOption(KadminOption.K));
- if (keyTabFile == null || !keyTabFile.exists()) {
+ if (!keyTabFile.exists()) {
printUsage("Need the valid keytab file.");
return;
}
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/ChangePasswordCommand.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/ChangePasswordCommand.java
index b4bc4a0..14f357f 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/ChangePasswordCommand.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/ChangePasswordCommand.java
@@ -62,7 +62,7 @@ public class ChangePasswordCommand extends KadminCommand {
} catch (KrbException e) {
System.err.println("Fail to update password. " + e.getCause());
}
- } else if (commands.length > 2) {
+ } else {
kOptions = ToolUtil.parseOptions(commands, 1, commands.length - 2);
if (kOptions == null) {
System.err.println(USAGE);
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabAddCommand.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabAddCommand.java
index 71fdee7..b7076fd 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabAddCommand.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabAddCommand.java
@@ -41,7 +41,7 @@ public class KeytabAddCommand extends KadminCommand {
String principal = null;
String keytabFileLocation = null;
- Boolean glob = false;
+ boolean glob = false;
//Since commands[0] is ktadd, the initial index is 1.
int index = 1;
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabRemoveCommand.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabRemoveCommand.java
index 82ab676..24e3ad8 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabRemoveCommand.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KeytabRemoveCommand.java
@@ -80,9 +80,9 @@ public class KeytabRemoveCommand extends KadminCommand {
File keytabFile = new File(keytabFileLocation);
try {
- if (removeOption.equals("all")) {
+ if ("all".equals(removeOption)) {
getKadmin().removeKeytabEntriesOf(keytabFile, principal);
- } else if (removeOption.equals("old")) {
+ } else if ("old".equals(removeOption)) {
getKadmin().removeOldKeytabEntriesOf(keytabFile, principal);
} else {
int kvno = Integer.parseInt(removeOption);
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
index ada10cd..8eae79a 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
@@ -89,7 +89,7 @@ public class KdcInitTool {
System.err.println("The conf-dir is invalid or does not exist.");
System.exit(2);
}
- if (keytabDir != null && !keytabDir.exists() && !keytabDir.mkdirs()) {
+ if (!keytabDir.exists() && !keytabDir.mkdirs()) {
System.err.println("Could not create keytab path." + keytabDir);
System.exit(3);
}