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 2021/03/10 07:38:53 UTC
[directory-kerby] branch trunk updated: Some PMD fixes with the
upgrade to 3.14.0
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 7b12f7d Some PMD fixes with the upgrade to 3.14.0
7b12f7d is described below
commit 7b12f7d7e0f22ccb9ec4972a1ded2880edd4bc62
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Mar 10 07:38:31 2021 +0000
Some PMD fixes with the upgrade to 3.14.0
---
.../apache/kerby/has/client/HasLoginModule.java | 2 +-
.../apache/kerby/asn1/parse/Asn1ParseResult.java | 4 +-
.../org/apache/kerby/asn1/type/Asn1Simple.java | 2 +-
.../main/java/org/apache/kerby/util/Base64.java | 14 +++---
.../org/apache/kerby/util/IPAddressParser.java | 3 +-
.../org/apache/kerby/xdr/type/XdrStructType.java | 14 +++---
.../java/org/apache/kerby/xdr/type/XdrUnion.java | 14 +++---
.../kerb/integration/test/JWTTokenTest.java | 52 ++++++++--------------
.../admin/server/kadmin/AdminServerHandler.java | 14 +++---
.../kerb/admin/server/PasswordCallbackHandler.java | 8 ++--
.../kerb/admin/kadmin/remote/RemoteKadminImpl.java | 4 +-
.../remote/command/RemoteListPrincsCommand.java | 4 +-
.../kerb/client/impl/DefaultInternalKrbClient.java | 2 +-
.../kerby/kerberos/kerb/codec/AsReqCodecTest.java | 7 ++-
.../identity/backend/AbstractIdentityBackend.java | 8 ++--
.../kerb/server/preauth/token/TokenPreauth.java | 6 +--
.../kerby/kerberos/kerb/client/JaasKrbUtil.java | 6 +--
.../kerb/ccache/CredCacheOutputStream.java | 4 +-
.../remote/cmd/CreatePrincipalsRemoteCmd.java | 4 +-
.../admin/remote/cmd/ListPrincipalsRemoteCmd.java | 4 +-
20 files changed, 80 insertions(+), 96 deletions(-)
diff --git a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasLoginModule.java b/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasLoginModule.java
index ca7ce5c..b045eb5 100644
--- a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasLoginModule.java
+++ b/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasLoginModule.java
@@ -113,7 +113,7 @@ public class HasLoginModule implements LoginModule {
"true".equalsIgnoreCase((String) options.get("refreshKrb5Config"));
// check isInitiator value
- String isInitiatorValue = ((String) options.get("isInitiator"));
+ String isInitiatorValue = (String) options.get("isInitiator");
if (isInitiatorValue != null) {
// use default, if value not set
isInitiator = "true".equalsIgnoreCase(isInitiatorValue);
diff --git a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1ParseResult.java b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1ParseResult.java
index 0152cfc..7a9b40c 100644
--- a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1ParseResult.java
+++ b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1ParseResult.java
@@ -90,8 +90,8 @@ public abstract class Asn1ParseResult extends Asn1Object {
public int getHeaderLength() {
int bodyLen = getBodyLength();
int headerLen = Asn1Util.lengthOfTagLength(header.getTag().tagNo());
- headerLen += (header.isDefinitiveLength()
- ? Asn1Util.lengthOfBodyLength(bodyLen) : 1);
+ headerLen += header.isDefinitiveLength()
+ ? Asn1Util.lengthOfBodyLength(bodyLen) : 1;
return headerLen;
}
diff --git a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java
index cac3d60..352af66 100644
--- a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java
+++ b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java
@@ -210,7 +210,7 @@ public abstract class Asn1Simple<T> extends AbstractAsn1Type<T> {
public String toString() {
String typeStr = simpleInfo();
T theValue = getValue();
- String valueStr = (theValue != null ? String.valueOf(theValue) : "null");
+ String valueStr = theValue != null ? String.valueOf(theValue) : "null";
return typeStr + valueStr;
}
}
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 22d594b..7f8b794 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
@@ -606,8 +606,8 @@ public class Base64 {
* false, otherwise
*/
public static boolean isArrayByteBase64(byte[] arrayOctet) {
- for (int i = 0; i < arrayOctet.length; i++) {
- if (!isBase64(arrayOctet[i]) && !isWhiteSpace(arrayOctet[i])) {
+ for (byte b : arrayOctet) {
+ if (!isBase64(b) && !isWhiteSpace(b)) {
return false;
}
}
@@ -622,8 +622,8 @@ public class Base64 {
* @return <code>true</code> if any byte is a valid character in the Base64 alphabet; false herwise
*/
private static boolean containsBase64Byte(byte[] arrayOctet) {
- for (int i = 0; i < arrayOctet.length; i++) {
- if (isBase64(arrayOctet[i])) {
+ for (byte b : arrayOctet) {
+ if (isBase64(b)) {
return true;
}
}
@@ -847,15 +847,15 @@ public class Base64 {
static byte[] discardWhitespace(byte[] data) {
byte[] groomedData = new byte[data.length];
int bytesCopied = 0;
- for (int i = 0; i < data.length; i++) {
- switch (data[i]) {
+ for (byte b : data) {
+ switch (b) {
case ' ' :
case '\n' :
case '\r' :
case '\t' :
break;
default :
- groomedData[bytesCopied++] = data[i];
+ groomedData[bytesCopied++] = b;
}
}
byte[] packedData = new byte[bytesCopied];
diff --git a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/IPAddressParser.java b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/IPAddressParser.java
index d83d544..2f31412 100644
--- a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/IPAddressParser.java
+++ b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/IPAddressParser.java
@@ -132,8 +132,7 @@ public class IPAddressParser {
byte[] ip6 = new byte[16];
int i = 0;
- for (int j = 0; j < raw.length; j++) {
- String tok = raw[j];
+ for (String tok : raw) {
if (tok.length() > 4) {
return null;
}
diff --git a/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrStructType.java b/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrStructType.java
index fb1780c..8fea6b8 100644
--- a/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrStructType.java
+++ b/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrStructType.java
@@ -61,8 +61,7 @@ public abstract class XdrStructType extends AbstractXdrType<XdrStructType> {
@Override
protected int encodingBodyLength() throws IOException {
int allLen = 0;
- for (int i = 0; i < fields.length; ++i) {
- AbstractXdrType field = (AbstractXdrType) fields[i];
+ for (XdrType field : fields) {
if (field != null) {
allLen += field.encodingLength();
}
@@ -72,8 +71,7 @@ public abstract class XdrStructType extends AbstractXdrType<XdrStructType> {
@Override
protected void encodeBody(ByteBuffer buffer) throws IOException {
- for (int i = 0; i < fields.length; ++i) {
- XdrType field = fields[i];
+ for (XdrType field : fields) {
if (field != null) {
field.encode(buffer);
}
@@ -84,10 +82,10 @@ public abstract class XdrStructType extends AbstractXdrType<XdrStructType> {
public void decode(ByteBuffer content) throws IOException {
AbstractXdrType[] fields = getAllFields();
Object[] value;
- for (int i = 0; i < fields.length; i++) {
- if (fields[i] != null) {
- fields[i].decode(content);
- int length = fields[i].encodingLength();
+ for (XdrType field : fields) {
+ if (field != null) {
+ field.decode(content);
+ int length = field.encodingLength();
byte[] array = content.array();
byte[] newArray = new byte[array.length - length];
System.arraycopy(array, length, newArray, 0, array.length - length);
diff --git a/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrUnion.java b/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrUnion.java
index 9b5aaf3..5e8e905 100644
--- a/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrUnion.java
+++ b/kerby-common/kerby-xdr/src/main/java/org/apache/kerby/xdr/type/XdrUnion.java
@@ -93,8 +93,7 @@ public abstract class XdrUnion extends AbstractXdrType<XdrUnion> {
@Override
protected int encodingBodyLength() throws IOException {
int allLen = 0;
- for (int i = 0; i < fields.length; i++) {
- AbstractXdrType field = (AbstractXdrType) fields[i];
+ for (XdrType field : fields) {
if (field != null) {
allLen += field.encodingLength();
}
@@ -104,8 +103,7 @@ public abstract class XdrUnion extends AbstractXdrType<XdrUnion> {
@Override
protected void encodeBody(ByteBuffer buffer) throws IOException {
- for (int i = 0; i < fields.length; ++i) {
- XdrType field = fields[i];
+ for (XdrType field : fields) {
if (field != null) {
field.encode(buffer);
}
@@ -116,10 +114,10 @@ public abstract class XdrUnion extends AbstractXdrType<XdrUnion> {
public void decode(ByteBuffer content) throws IOException {
AbstractXdrType[] fields = getAllFields();
Object[] value;
- for (int i = 0; i < fields.length; i++) {
- if (fields[i] != null) {
- fields[i].decode(content);
- int length = fields[i].encodingLength();
+ for (XdrType field : fields) {
+ if (field != null) {
+ field.decode(content);
+ int length = field.encodingLength();
byte[] array = content.array();
byte[] newArray = new byte[array.length - length];
System.arraycopy(array, length, newArray, 0, array.length - length);
diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java
index 1f85b4f..71b66da 100644
--- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java
+++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java
@@ -123,7 +123,7 @@ public class JWTTokenTest extends TokenLoginTestBase {
cCacheFile.delete();
}
- @org.junit.Test
+ @org.junit.Test(expected = KrbException.class)
public void accessTokenInvalidAudience() throws Exception {
KrbClient client = getKrbClient();
@@ -165,15 +165,12 @@ public class JWTTokenTest extends TokenLoginTestBase {
// Now get a SGT using the JWT
try {
tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath());
- fail("Failure expected on an invalid audience");
- } catch (KrbException ex) { //NOPMD
- // expected
+ } finally {
+ cCacheFile.delete();
}
-
- cCacheFile.delete();
}
- @org.junit.Test
+ @org.junit.Test(expected = KrbException.class)
public void accessTokenInvalidSignature() throws Exception {
KrbClient client = getKrbClient();
@@ -215,15 +212,12 @@ public class JWTTokenTest extends TokenLoginTestBase {
// Now get a SGT using the JWT
try {
tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath());
- fail("Failure expected on an invalid signature");
- } catch (KrbException ex) { //NOPMD
- // expected
+ } finally {
+ cCacheFile.delete();
}
-
- cCacheFile.delete();
}
- @org.junit.Test
+ @org.junit.Test(expected = KrbException.class)
public void accessTokenUnknownIssuer() throws Exception {
KrbClient client = getKrbClient();
@@ -266,12 +260,9 @@ public class JWTTokenTest extends TokenLoginTestBase {
// Now get a SGT using the JWT
try {
tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath());
- fail("Failure expected on an unknown issuer");
- } catch (KrbException ex) { //NOPMD
- // expected
+ } finally {
+ cCacheFile.delete();
}
-
- cCacheFile.delete();
}
// Use the TGT here instead of an armor cache
@@ -387,7 +378,7 @@ public class JWTTokenTest extends TokenLoginTestBase {
cCacheFile.delete();
}
- @org.junit.Test
+ @org.junit.Test(expected = KrbException.class)
public void identityTokenInvalidAudience() throws Exception {
KrbClient client = getKrbClient();
@@ -428,14 +419,12 @@ public class JWTTokenTest extends TokenLoginTestBase {
try {
tokenClient.requestTgt(krbToken, cCacheFile.getPath());
fail("Failure expected on an invalid audience");
- } catch (KrbException ex) { //NOPMD
- // expected
+ } finally {
+ cCacheFile.delete();
}
-
- cCacheFile.delete();
}
- @org.junit.Test
+ @org.junit.Test(expected = KrbException.class)
public void identityTokenInvalidSignature() throws Exception {
KrbClient client = getKrbClient();
@@ -475,14 +464,12 @@ public class JWTTokenTest extends TokenLoginTestBase {
try {
tokenClient.requestTgt(krbToken, cCacheFile.getPath());
fail("Failure expected on an invalid signature");
- } catch (KrbException ex) { //NOPMD
- // expected
+ } finally {
+ cCacheFile.delete();
}
-
- cCacheFile.delete();
}
- @org.junit.Test
+ @org.junit.Test(expected = KrbException.class)
public void identityTokenUnknownIssuer() throws Exception {
KrbClient client = getKrbClient();
@@ -522,12 +509,9 @@ public class JWTTokenTest extends TokenLoginTestBase {
// Now get a TGT using the JWT token
try {
tokenClient.requestTgt(krbToken, cCacheFile.getPath());
- fail("Failure expected on an unknown issuer");
- } catch (KrbException ex) { //NOPMD
- // expected
+ } finally {
+ cCacheFile.delete();
}
-
- cCacheFile.delete();
}
private byte[] signToken(AuthToken authToken, PrivateKey signKey) throws Exception {
diff --git a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
index 6510cbf..0e7f3b7 100644
--- a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
+++ b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
@@ -216,8 +216,8 @@ public class AdminServerHandler {
}
private ByteBuffer handleGetprincsReq(LocalKadmin localKadmin, XdrFieldInfo[] fieldInfos) throws IOException {
- int paramNum = ((int) fieldInfos[1].getValue());
- String globString = paramNum != 0 ? ((String) fieldInfos[2].getValue()) : null;
+ int paramNum = (int) fieldInfos[1].getValue();
+ String globString = paramNum != 0 ? (String) fieldInfos[2].getValue() : null;
List<String> princsList = null;
try {
@@ -237,7 +237,7 @@ public class AdminServerHandler {
}
private ByteBuffer handleExportKeytabReq(LocalKadmin localKadmin, XdrFieldInfo[] fieldInfos) throws IOException {
- String principals = ((String) fieldInfos[2].getValue());
+ String principals = (String) fieldInfos[2].getValue();
if (principals != null) {
List<String> princList = stringToList(principals);
@@ -271,8 +271,8 @@ public class AdminServerHandler {
}
private ByteBuffer handleChangePwdReq(LocalKadmin localKadmin, XdrFieldInfo[] fieldInfos) throws IOException {
- String principal = ((String) fieldInfos[2].getValue());
- String newPassword = ((String) fieldInfos[3].getValue());
+ String principal = (String) fieldInfos[2].getValue();
+ String newPassword = (String) fieldInfos[3].getValue();
if (principal == null || principal.isEmpty() || newPassword == null || newPassword.isEmpty()) {
String error = "Value of principal or new password is null.";
@@ -390,8 +390,8 @@ public class AdminServerHandler {
}
//Both speed and safety,so use StringBuilder
StringBuilder result = new StringBuilder();
- for (int i = 0; i < list.size(); i++) {
- result.append(list.get(i)).append(" ");
+ for (String item : list) {
+ result.append(item).append(" ");
}
return result.toString();
}
diff --git a/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java b/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java
index 7b5d2b5..07132ab 100644
--- a/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java
+++ b/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java
@@ -37,13 +37,13 @@ public class PasswordCallbackHandler implements CallbackHandler {
@Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof PasswordCallback) {
- PasswordCallback pc = (PasswordCallback) callbacks[i];
+ for (Callback callback : callbacks) {
+ if (callback instanceof PasswordCallback) {
+ PasswordCallback pc = (PasswordCallback) callback;
pc.setPassword(Password.readPassword(new ByteArrayInputStream(password.getBytes()), pc.isEchoOn()));
} else {
throw new UnsupportedCallbackException(
- callbacks[i], "Only support PasswordCallback");
+ callback, "Only support PasswordCallback");
}
}
}
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/RemoteKadminImpl.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/RemoteKadminImpl.java
index 66517df..b833916 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/RemoteKadminImpl.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/RemoteKadminImpl.java
@@ -267,8 +267,8 @@ public class RemoteKadminImpl implements Kadmin {
}
//Both speed and safety,so use StringBuilder
StringBuilder result = new StringBuilder();
- for (int i = 0; i < list.size(); i++) {
- result.append(list.get(i)).append(" ");
+ for (String l : list) {
+ result.append(l).append(" ");
}
return result.toString();
}
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/command/RemoteListPrincsCommand.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/command/RemoteListPrincsCommand.java
index b808c91..7beda42 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/command/RemoteListPrincsCommand.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/kadmin/remote/command/RemoteListPrincsCommand.java
@@ -56,8 +56,8 @@ public class RemoteListPrincsCommand extends RemoteCommand {
return;
} else {
System.out.println("Principals are listed:");
- for (int i = 0; i < principalLists.size(); i++) {
- System.out.println(principalLists.get(i));
+ for (String principal : principalLists) {
+ System.out.println(principal);
}
}
}
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
index 781351f..7db8136 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
@@ -62,7 +62,7 @@ public class DefaultInternalKrbClient extends AbstractInternalKrbClient {
krbHandler.init(getContext());
}
- private void doRequest(KdcRequest request) throws KrbException {
+ private void doRequest(KdcRequest request) throws KrbException { //NOPMD
String realm = getSetting().getKdcRealm();
PrincipalName serverPrincipalName = request.getServerPrincipal();
diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java
index 2ffd960..182ab90 100644
--- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java
+++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java
@@ -20,7 +20,12 @@
package org.apache.kerby.kerberos.kerb.codec;
import org.apache.kerby.asn1.Asn1;
-import org.apache.kerby.kerberos.kerb.type.base.*;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.HostAddrType;
+import org.apache.kerby.kerberos.kerb.type.base.HostAddress;
+import org.apache.kerby.kerberos.kerb.type.base.KrbMessageType;
+import org.apache.kerby.kerberos.kerb.type.base.NameType;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import org.apache.kerby.kerberos.kerb.type.kdc.AsReq;
import org.apache.kerby.kerberos.kerb.type.kdc.KdcReqBody;
import org.apache.kerby.kerberos.kerb.type.pa.PaData;
diff --git a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
index 78a8a54..d9e5ce0 100644
--- a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
+++ b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
@@ -161,7 +161,7 @@ public abstract class AbstractIdentityBackend
KrbIdentity identity = doGetIdentity(principalName);
logger.debug("getIdentity {}, principalName = {}",
- (identity != null ? "successful" : "failed"), principalName);
+ identity != null ? "successful" : "failed", principalName);
return identity;
}
@@ -190,7 +190,7 @@ public abstract class AbstractIdentityBackend
AuthorizationData authData = doGetIdentityAuthorizationData(kdcClientRequest,
encTicketPart);
logger.debug("getIdentityAuthorizationData {}, authData = {}",
- (authData != null ? "successful" : "failed"), authData);
+ authData != null ? "successful" : "failed", authData);
return authData;
}
@@ -238,7 +238,7 @@ public abstract class AbstractIdentityBackend
KrbIdentity added = doAddIdentity(identity);
logger.debug("addIdentity {}, principalName = {}",
- (added != null ? "successful" : "failed"), identity.getPrincipalName());
+ added != null ? "successful" : "failed", identity.getPrincipalName());
return added;
}
@@ -268,7 +268,7 @@ public abstract class AbstractIdentityBackend
KrbIdentity updated = doUpdateIdentity(identity);
logger.debug("updateIdentity {}, principalName = {}",
- (updated != null ? "successful" : "failed"), identity.getPrincipalName());
+ updated != null ? "successful" : "failed", identity.getPrincipalName());
return updated;
}
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 25e67c9..679011c 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
@@ -162,9 +162,9 @@ public class TokenPreauth extends AbstractPreauthPlugin {
if (listOfFiles == null) {
throw new FileNotFoundException("The key path is incorrect");
}
- for (int i = 0; i < listOfFiles.length; i++) {
- if (listOfFiles[i].isFile() && listOfFiles[i].getName().contains(issuer)) {
- verifyKeyFile = listOfFiles[i];
+ for (File f : listOfFiles) {
+ if (f.isFile() && f.getName().contains(issuer)) {
+ verifyKeyFile = f;
break;
}
}
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
index c655200..7cdcb7c 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
@@ -206,9 +206,9 @@ public final class JaasKrbUtil {
public void handle(Callback[] callbacks)
throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof PasswordCallback) {
- PasswordCallback pc = (PasswordCallback) callbacks[i];
+ for (Callback callback : callbacks) {
+ if (callback instanceof PasswordCallback) {
+ PasswordCallback pc = (PasswordCallback) callback;
if (pc.getPrompt().contains(principal)) {
pc.setPassword(password.toCharArray());
break;
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
index 4ee1313..4ee9746 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
@@ -71,8 +71,8 @@ public class CredCacheOutputStream extends KrbOutputStream {
}
public void writeTimes(KerberosTime[] times) throws IOException {
- for (int i = 0; i < times.length; ++i) {
- writeTime(times[i]);
+ for (KerberosTime time : times) {
+ writeTime(time);
}
}
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/CreatePrincipalsRemoteCmd.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/CreatePrincipalsRemoteCmd.java
index 3504f4c..1bfb75f 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/CreatePrincipalsRemoteCmd.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/CreatePrincipalsRemoteCmd.java
@@ -80,8 +80,8 @@ public class CreatePrincipalsRemoteCmd extends AdminRemoteCmd {
}
List<String> results = client.addPrincipalsByRole(sb.toString());
if (results != null) {
- for (int i = 0; i < results.size(); i++) {
- System.out.println(results.get(i));
+ for (String result : results) {
+ System.out.println(result);
}
}
}
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/ListPrincipalsRemoteCmd.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/ListPrincipalsRemoteCmd.java
index 7ad83b7..89ff22a 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/ListPrincipalsRemoteCmd.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/remote/cmd/ListPrincipalsRemoteCmd.java
@@ -63,8 +63,8 @@ public class ListPrincipalsRemoteCmd extends AdminRemoteCmd {
return;
} else {
System.out.println("Principals are listed:");
- for (int i = 0; i < principalLists.size(); i++) {
- System.out.println(principalLists.get(i));
+ for (String principal : principalLists) {
+ System.out.println(principal);
}
}
}