You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/07/04 16:58:59 UTC
[1/2] directory-kerby git commit: Checkstyle: fix ModifierOrder check
Repository: directory-kerby
Updated Branches:
refs/heads/master 143b72e93 -> 7efca9755
Checkstyle: fix ModifierOrder check
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/7efca975
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/7efca975
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/7efca975
Branch: refs/heads/master
Commit: 7efca9755dc7ea86b6894114cbdf0ab33a9c1c9b
Parents: 333ebe8
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 16:04:16 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 16:55:52 2015 +0200
----------------------------------------------------------------------
.../test/java/org/apache/kerby/asn1/Util.java | 4 ++--
.../identitybackend/IdentityZNodeHelper.java | 24 ++++++++++----------
.../kerby/kerberos/kerb/client/ClientUtil.java | 4 ++--
.../kerberos/kerb/transport/KdcNetwork.java | 6 ++---
.../apache/kerby/kerberos/kerb/KrbRuntime.java | 8 +++----
.../kerby/kerberos/kerb/crypto/util/Md4.java | 8 +++----
.../kerberos/kerb/server/TestKdcServer.java | 4 ++--
.../java/org/apache/kerby/util/HexUtil.java | 4 ++--
8 files changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
index d3a1570..ad237fa 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
@@ -21,8 +21,8 @@ package org.apache.kerby.asn1;
public class Util {
- final static String HEX_CHARS_STR = "0123456789ABCDEF";
- final static char[] HEX_CHARS = HEX_CHARS_STR.toCharArray();
+ static final String HEX_CHARS_STR = "0123456789ABCDEF";
+ static final char[] HEX_CHARS = HEX_CHARS_STR.toCharArray();
/**
* Convert bytes into format as:
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
index 12fed20..368d75a 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
@@ -26,18 +26,18 @@ import java.util.List;
public class IdentityZNodeHelper {
- private final static String IDENTITIES_ZNODE_NAME = "identities";
- private final static String PRINCIPAL_NAME_ZNODE_NAME = "principalName";
- private final static String KEY_VERSION_ZNODE_NAME = "keyVersion";
- private final static String KDC_FLAGS_ZNODE_NAME = "kdcFlags";
- private final static String DISABLED_ZNODE_NAME = "disabled";
- private final static String LOCKED_ZNODE_NAME = "locked";
- private final static String EXPIRE_TIME_ZNODE_NAME = "expireTime";
- private final static String CREATED_TIME_ZNODE_NAME = "createdTime";
- private final static String KEYS_ZNODE_NAME = "keys";
- private final static String KEY_TYPE_ZNODE_NAME = "keyType";
- private final static String KEY_ZNODE_NAME = "keyData";
- private final static String ENCRYPTION_KEY_NO_ZNODE_NAME = "keyNo";
+ private static final String IDENTITIES_ZNODE_NAME = "identities";
+ private static final String PRINCIPAL_NAME_ZNODE_NAME = "principalName";
+ private static final String KEY_VERSION_ZNODE_NAME = "keyVersion";
+ private static final String KDC_FLAGS_ZNODE_NAME = "kdcFlags";
+ private static final String DISABLED_ZNODE_NAME = "disabled";
+ private static final String LOCKED_ZNODE_NAME = "locked";
+ private static final String EXPIRE_TIME_ZNODE_NAME = "expireTime";
+ private static final String CREATED_TIME_ZNODE_NAME = "createdTime";
+ private static final String KEYS_ZNODE_NAME = "keys";
+ private static final String KEY_TYPE_ZNODE_NAME = "keyType";
+ private static final String KEY_ZNODE_NAME = "keyData";
+ private static final String ENCRYPTION_KEY_NO_ZNODE_NAME = "keyNo";
private static String baseZNode = "/kerby";
public static String getBaseZNode() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
----------------------------------------------------------------------
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 97d51fe..be221a6 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
@@ -30,8 +30,8 @@ import java.util.Map;
public final class ClientUtil {
private ClientUtil() {}
- private final static String KRB5_FILE_NAME = "krb5.conf";
- private final static String KRB5_ENV_NAME = "KRB5_CONFIG";
+ private static final String KRB5_FILE_NAME = "krb5.conf";
+ private static final String KRB5_ENV_NAME = "KRB5_CONFIG";
/**
* Load krb5.conf from specified conf dir.
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
index 661e1e5..780e61b 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
@@ -34,9 +34,9 @@ import java.util.Map;
*/
@SuppressWarnings("PMD")
public abstract class KdcNetwork {
- protected final static int MAX_MESSAGE_SIZE = 65507;
- private final static int KDC_TCP_TRANSPORT_TIMEOUT = 3 * 1000;
- private final static int KDC_TCP_SERVER_TIMEOUT = 100;
+ protected static final int MAX_MESSAGE_SIZE = 65507;
+ private static final int KDC_TCP_TRANSPORT_TIMEOUT = 3 * 1000;
+ private static final int KDC_TCP_SERVER_TIMEOUT = 100;
private TransportPair tpair;
private boolean isStopped;
private ServerSocket tcpServer;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
index 14df34c..7b35332 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
@@ -37,7 +37,7 @@ public class KrbRuntime {
* Set up token provider, should be done at very initial time
* @return token provider
*/
- public synchronized static TokenProvider getTokenProvider() {
+ public static synchronized TokenProvider getTokenProvider() {
if (tokenProvider == null) {
throw new RuntimeException("No token provider is hooked into yet");
}
@@ -47,7 +47,7 @@ public class KrbRuntime {
/**
* Set token provider.
*/
- public synchronized static void setTokenProvider(TokenProvider tokenProvider) {
+ public static synchronized void setTokenProvider(TokenProvider tokenProvider) {
KrbRuntime.tokenProvider = tokenProvider;
}
@@ -55,7 +55,7 @@ public class KrbRuntime {
* Get pki provider
* @return pki provider
*/
- public synchronized static PkiProvider getPkiProvider() {
+ public static synchronized PkiProvider getPkiProvider() {
if (pkiProvider == null) {
throw new RuntimeException("No token provider is hooked into yet");
}
@@ -65,7 +65,7 @@ public class KrbRuntime {
/**
* Setup pkiProvider.
*/
- public synchronized static void setPkiProvider(PkiProvider pkiProvider) {
+ public static synchronized void setPkiProvider(PkiProvider pkiProvider) {
KrbRuntime.pkiProvider = pkiProvider;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Md4.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Md4.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Md4.java
index 5394697..dca0117 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Md4.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Md4.java
@@ -55,13 +55,13 @@ public class Md4 extends MessageDigest {
* The initial values of the four registers. RFC gives the values
* in LE so we converted it as JAVA uses BE endianness.
*/
- private final static int A = 0x67452301;
+ private static final int A = 0x67452301;
- private final static int B = 0xefcdab89;
+ private static final int B = 0xefcdab89;
- private final static int C = 0x98badcfe;
+ private static final int C = 0x98badcfe;
- private final static int D = 0x10325476;
+ private static final int D = 0x10325476;
/**
* The four registers initialized with the above IVs.
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
index 54fbcae..76f9bc1 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcServer.java
@@ -26,8 +26,8 @@ import org.apache.kerby.kerberos.kerb.client.KrbConfigKey;
import org.apache.kerby.util.NetworkUtil;
public class TestKdcServer extends SimpleKdcServer {
- public final static String KDC_REALM = "TEST.COM";
- public final static String HOSTNAME = "localhost";
+ public static final String KDC_REALM = "TEST.COM";
+ public static final String HOSTNAME = "localhost";
public TestKdcServer(boolean allowTcp, boolean allowUdp) throws KrbException {
super();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7efca975/lib/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
----------------------------------------------------------------------
diff --git a/lib/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java b/lib/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
index d4ed113..c57204e 100644
--- a/lib/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
+++ b/lib/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
@@ -22,8 +22,8 @@ package org.apache.kerby.util;
public final class HexUtil {
private HexUtil() {}
- private final static String HEX_CHARS_STR = "0123456789ABCDEF";
- private final static char[] HEX_CHARS = HEX_CHARS_STR.toCharArray();
+ private static final String HEX_CHARS_STR = "0123456789ABCDEF";
+ private static final char[] HEX_CHARS = HEX_CHARS_STR.toCharArray();
/**
* Convert bytes into format as:
[2/2] directory-kerby git commit: Checkstyle: fix TypeName check
Posted by se...@apache.org.
Checkstyle: fix TypeName check
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/333ebe89
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/333ebe89
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/333ebe89
Branch: refs/heads/master
Commit: 333ebe899be5114449644513bc124e1f98a3bb10
Parents: 143b72e
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 15:11:39 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 16:55:52 2015 +0200
----------------------------------------------------------------------
.../org/apache/kerby/config/ConfigObject.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/333ebe89/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
index 3d0cc17..2be3972 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
@@ -23,14 +23,14 @@ import java.util.ArrayList;
import java.util.List;
public class ConfigObject {
- protected static enum VALUE_TYPE { PROPERTY, LIST, CONFIG };
+ protected static enum ValueType { PROPERTY, LIST, CONFIG };
- private VALUE_TYPE valueType;
+ private ValueType valueType;
private Object value;
public ConfigObject(String value) {
this.value = value;
- this.valueType = VALUE_TYPE.PROPERTY;
+ this.valueType = ValueType.PROPERTY;
}
public ConfigObject(String[] values) {
@@ -40,7 +40,7 @@ public class ConfigObject {
}
this.value = valuesList;
- this.valueType = VALUE_TYPE.LIST;
+ this.valueType = ValueType.LIST;
}
public ConfigObject(List<String> values) {
@@ -49,17 +49,17 @@ public class ConfigObject {
} else {
this.value = new ArrayList<String>();
}
- this.valueType = VALUE_TYPE.LIST;
+ this.valueType = ValueType.LIST;
}
public ConfigObject(Config value) {
this.value = value;
- this.valueType = VALUE_TYPE.CONFIG;
+ this.valueType = ValueType.CONFIG;
}
public String getPropertyValue() {
String result = null;
- if (valueType == VALUE_TYPE.PROPERTY) {
+ if (valueType == ValueType.PROPERTY) {
result = (String) value;
}
return result;
@@ -68,7 +68,7 @@ public class ConfigObject {
@SuppressWarnings("unchecked")
public List<String> getListValues() {
List<String> results = null;
- if (valueType == VALUE_TYPE.LIST && value instanceof List<?>) {
+ if (valueType == ValueType.LIST && value instanceof List<?>) {
results = (List<String>) value;
}
@@ -77,7 +77,7 @@ public class ConfigObject {
public Config getConfigValue() {
Config result = null;
- if (valueType == VALUE_TYPE.CONFIG) {
+ if (valueType == ValueType.CONFIG) {
result = (Config) value;
}
return result;