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 14:08:34 UTC

[1/5] directory-kerby git commit: Checkstyle: fix StaticVariableName check, make constants final

Repository: directory-kerby
Updated Branches:
  refs/heads/master 7cbd366ef -> 33df0463d


Checkstyle: fix StaticVariableName check, make constants final


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/abe520cc
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/abe520cc
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/abe520cc

Branch: refs/heads/master
Commit: abe520cc0ab1badfe3934c1341640c18445ece95
Parents: 60d4f51
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 14:04:56 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 14:06:04 2015 +0200

----------------------------------------------------------------------
 .../org/apache/kerby/asn1/EncodingOption.java   |  2 +-
 .../org/apache/kerby/asn1/PersonnelRecord.java  | 22 +++++++++---------
 .../apache/kerby/asn1/TestAsn1Collection.java   |  6 ++---
 .../apache/kerby/asn1/TestTaggingEncoding.java  | 10 ++++----
 .../org/apache/kerby/KrbIdentityComparator.java |  2 +-
 .../kerb/preauth/builtin/EncTsPreauthMeta.java  |  6 ++---
 .../kerb/preauth/builtin/TgtPreauthMeta.java    |  6 ++---
 .../kerb/preauth/pkinit/PkinitPreauthMeta.java  |  6 ++---
 .../kerb/preauth/token/TokenPreauthMeta.java    |  6 ++---
 .../kerby/kerberos/kerb/spec/ad/AdToken.java    |  2 +-
 .../kerb/spec/ad/AuthorizationDataEntry.java    |  4 ++--
 .../kerby/kerberos/kerb/spec/ap/ApRep.java      |  2 +-
 .../kerby/kerberos/kerb/spec/ap/ApReq.java      |  6 ++---
 .../kerberos/kerb/spec/ap/Authenticator.java    | 20 ++++++++--------
 .../kerberos/kerb/spec/ap/EncAPRepPart.java     | 10 ++++----
 .../kerby/kerberos/kerb/spec/base/CheckSum.java |  4 ++--
 .../kerberos/kerb/spec/base/EncryptedData.java  |  6 ++---
 .../kerberos/kerb/spec/base/EncryptionKey.java  |  4 ++--
 .../kerb/spec/base/EtypeInfo2Entry.java         |  6 ++---
 .../kerberos/kerb/spec/base/EtypeInfoEntry.java |  4 ++--
 .../kerberos/kerb/spec/base/HostAddress.java    |  4 ++--
 .../kerby/kerberos/kerb/spec/base/KrbError.java | 22 +++++++++---------
 .../kerberos/kerb/spec/base/KrbMessage.java     |  4 ++--
 .../kerby/kerberos/kerb/spec/base/KrbToken.java |  4 ++--
 .../kerberos/kerb/spec/base/LastReqEntry.java   |  4 ++--
 .../kerberos/kerb/spec/base/PrincipalName.java  |  4 ++--
 .../kerb/spec/base/TransitedEncoding.java       |  4 ++--
 .../kerberos/kerb/spec/fast/KrbFastArmor.java   |  4 ++--
 .../kerb/spec/fast/KrbFastArmoredRep.java       |  2 +-
 .../kerb/spec/fast/KrbFastArmoredReq.java       |  6 ++---
 .../kerb/spec/fast/KrbFastFinished.java         |  6 ++---
 .../kerberos/kerb/spec/fast/KrbFastReq.java     |  6 ++---
 .../kerb/spec/fast/KrbFastResponse.java         |  8 +++----
 .../kerberos/kerb/spec/fast/PaAuthnEntry.java   |  6 ++---
 .../kerberos/kerb/spec/fast/PaFxFastReply.java  |  2 +-
 .../kerb/spec/fast/PaFxFastRequest.java         |  2 +-
 .../kerberos/kerb/spec/kdc/EncKdcRepPart.java   | 24 ++++++++++----------
 .../kerby/kerberos/kerb/spec/kdc/KdcRep.java    | 10 ++++----
 .../kerby/kerberos/kerb/spec/kdc/KdcReq.java    |  4 ++--
 .../kerberos/kerb/spec/kdc/KdcReqBody.java      | 24 ++++++++++----------
 .../kerb/spec/pa/PaAuthenticationSetElem.java   |  6 ++---
 .../kerberos/kerb/spec/pa/PaDataEntry.java      |  4 ++--
 .../kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java |  4 ++--
 .../kerberos/kerb/spec/pa/otp/OtpTokenInfo.java | 18 +++++++--------
 .../kerb/spec/pa/otp/PaOtpChallenge.java        | 10 ++++----
 .../kerberos/kerb/spec/pa/pkinit/AuthPack.java  |  8 +++----
 .../kerberos/kerb/spec/pa/pkinit/DHRepInfo.java |  4 ++--
 .../pa/pkinit/ExternalPrincipalIdentifier.java  |  6 ++---
 .../kerb/spec/pa/pkinit/KdcDHKeyInfo.java       |  6 ++---
 .../kerb/spec/pa/pkinit/Krb5PrincipalName.java  |  4 ++--
 .../kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java |  4 ++--
 .../kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java |  6 ++---
 .../kerb/spec/pa/pkinit/PkAuthenticator.java    |  8 +++----
 .../kerb/spec/pa/pkinit/ReplyKeyPack.java       |  4 ++--
 .../kerb/spec/pa/token/PaTokenChallenge.java    |  2 +-
 .../kerb/spec/pa/token/PaTokenRequest.java      |  4 ++--
 .../kerberos/kerb/spec/pa/token/TokenInfo.java  |  4 ++--
 .../kerb/spec/ticket/EncTicketPart.java         | 22 +++++++++---------
 .../kerby/kerberos/kerb/spec/ticket/Ticket.java |  8 +++----
 .../kerb/spec/x509/AlgorithmIdentifier.java     |  4 ++--
 .../kerb/spec/x509/SubjectPublicKeyInfo.java    |  4 ++--
 .../kerby/kerberos/kerb/crypto/util/Des.java    |  2 +-
 .../kerby/kerberos/kerb/crypto/util/Rc4.java    |  2 +-
 .../kerberos/kerb/crypto/CheckSumTest.java      |  2 +-
 .../kerby/kerberos/kerb/ccache/Credential.java  |  2 +-
 .../kerby/kerberos/kerb/util/KeysTest.java      |  2 +-
 66 files changed, 217 insertions(+), 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
index ac9fa48..d40dcc7 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
@@ -52,7 +52,7 @@ public class EncodingOption {
      * A mask to determinate if a Tag is CONSTRUCTED. The fifth bit should be set to 1 if
      * the type is constructed (0010-0000).
      */
-    public static int CONSTRUCTED_FLAG = 0x20;
+    public static final int CONSTRUCTED_FLAG = 0x20;
 
     public static boolean isConstructed(int tag) {
         return (tag & CONSTRUCTED_FLAG) != 0;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
index 6c6fc04..b05a22b 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
@@ -26,12 +26,12 @@ import org.apache.kerby.asn1.type.*;
  * Annex A, A.1 ASN.1 description of the record structure
  */
 public class PersonnelRecord extends TaggingSet {
-    private static int NAME = 0;
-    private static int TITLE = 1;
-    private static int NUMBER = 2;
-    private static int DATEOFHIRE= 3;
-    private static int NAMEOFSPOUSE = 4;
-    private static int CHILDREN = 5;
+    private static final int NAME = 0;
+    private static final int TITLE = 1;
+    private static final int NUMBER = 2;
+    private static final int DATEOFHIRE= 3;
+    private static final int NAMEOFSPOUSE = 4;
+    private static final int CHILDREN = 5;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(NAME, -1, Name.class),
@@ -109,8 +109,8 @@ public class PersonnelRecord extends TaggingSet {
     }
 
     public static class ChildInformation extends Asn1SetType {
-        private static int NAME = 0;
-        private static int DATEOFBIRTH = 1;
+        private static final int NAME = 0;
+        private static final int DATEOFBIRTH = 1;
 
         static Asn1FieldInfo[] tags = new Asn1FieldInfo[] {
                 new Asn1FieldInfo(NAME, -1, Name.class),
@@ -139,9 +139,9 @@ public class PersonnelRecord extends TaggingSet {
     }
 
     public static class Name extends TaggingSequence {
-        private static int GIVENNAME = 0;
-        private static int INITIAL = 1;
-        private static int FAMILYNAME = 2;
+        private static final int GIVENNAME = 0;
+        private static final int INITIAL = 1;
+        private static final int FAMILYNAME = 2;
 
         static Asn1FieldInfo[] tags = new Asn1FieldInfo[] {
                 new Asn1FieldInfo(GIVENNAME, -1, Asn1VisibleString.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
index 16c368f..cfb5e29 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
@@ -30,9 +30,9 @@ import java.io.IOException;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAsn1Collection {
-    static String TEST_STR = "Jones";
-    static Boolean TEST_BOOL = true;
-    static byte[] EXPECTED_BYTES = new byte[] {(byte) 0x30, (byte) 0x0A,
+    static final String TEST_STR = "Jones";
+    static final Boolean TEST_BOOL = true;
+    static final byte[] EXPECTED_BYTES = new byte[] {(byte) 0x30, (byte) 0x0A,
             (byte) 0x16, (byte) 0x05, (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73,
             (byte) 0x01, (byte) 0x01, (byte) 0xFF
     };

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
index c836217..8c5d1bb 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
@@ -62,17 +62,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTaggingEncoding {
     static final String TEST_STRING = "Jones";
-    static byte[] TYPE1_EXPECTED_BYTES = new byte[] {(byte) 0x1A, (byte) 0x05,
+    static final byte[] TYPE1_EXPECTED_BYTES = new byte[] {(byte) 0x1A, (byte) 0x05,
             (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE2_EXPECTED_BYTES = new byte[] {(byte) 0x43, (byte) 0x05,
+    static final byte[] TYPE2_EXPECTED_BYTES = new byte[] {(byte) 0x43, (byte) 0x05,
             (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE3_EXPECTED_BYTES = new byte[] {(byte) 0xA2, (byte) 0x07,
+    static final byte[] TYPE3_EXPECTED_BYTES = new byte[] {(byte) 0xA2, (byte) 0x07,
             (byte) 0x43, (byte) 0x05, (byte) 0x4A, (byte) 0x6F, (byte) 0x6E,
             (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE4_EXPECTED_BYTES = new byte[] {(byte) 0x67, (byte) 0x07,
+    static final byte[] TYPE4_EXPECTED_BYTES = new byte[] {(byte) 0x67, (byte) 0x07,
             (byte) 0x43, (byte) 0x05, (byte) 0x4A, (byte) 0x6F, (byte) 0x6E,
             (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE5_EXPECTED_BYTES = new byte[] {(byte) 0x82, (byte) 0x05,
+    static final byte[] TYPE5_EXPECTED_BYTES = new byte[] {(byte) 0x82, (byte) 0x05,
             (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73};
 
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java b/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
index e842bfc..bce3033 100644
--- a/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
+++ b/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
@@ -30,7 +30,7 @@ import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
  */
 public final class KrbIdentityComparator implements Comparator<KrbIdentity> {
 
-    public static KrbIdentityComparator INSTANCE = new KrbIdentityComparator();
+    public static final KrbIdentityComparator INSTANCE = new KrbIdentityComparator();
 
     private KrbIdentityComparator() {
     }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
index a669e18..3f19553 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
@@ -24,9 +24,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
 
 public class EncTsPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "encrypted_timestamp";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "encrypted_timestamp";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.ENC_TIMESTAMP
     };
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
index 04bb47b..fb26842 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
@@ -27,9 +27,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
  */
 public class TgtPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "TGT_preauth";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "TGT_preauth";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.TGS_REQ
     };
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
index 9d196d9..221ba4e 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
@@ -24,9 +24,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
 
 public class PkinitPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "PKINIT";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "PKINIT";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.PK_AS_REQ,
             PaDataType.PK_AS_REP,
     };

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
index f393d15..8b648f6 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
@@ -24,9 +24,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
 
 public class TokenPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "TokenPreauth";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "TokenPreauth";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.TOKEN_CHALLENGE,
             PaDataType.TOKEN_REQUEST
     };

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
index 15f999e..652170b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
@@ -29,7 +29,7 @@ import org.apache.kerby.kerberos.kerb.spec.base.KrbToken;
  }
 */
 public class AdToken extends KrbSequenceType {
-    private static int TOKEN = 0;
+    private static final int TOKEN = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TOKEN, KrbToken.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
index 73eeb80..07b04d7 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class AuthorizationDataEntry extends KrbSequenceType {
-    private static int AD_TYPE = 0;
-    private static int AD_DATA = 1;
+    private static final int AD_TYPE = 0;
+    private static final int AD_DATA = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(AD_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
index fc54939..7433311 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
@@ -33,7 +33,7 @@ import org.apache.kerby.kerberos.kerb.spec.base.KrbMessageType;
  }
  */
 public class ApRep extends KrbMessage {
-    private static int ENC_PART = 2;
+    private static final int ENC_PART = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
index fe97cae..9a0b994 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
@@ -36,9 +36,9 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
  }
  */
 public class ApReq extends KrbMessage {
-    private static int AP_OPTIONS = 2;
-    private static int TICKET = 3;
-    private static int AUTHENTICATOR = 4;
+    private static final int AP_OPTIONS = 2;
+    private static final int TICKET = 3;
+    private static final int AUTHENTICATOR = 4;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
index 49a9fc0..9705ecb 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
@@ -43,16 +43,16 @@ import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
  }
  */
 public class Authenticator extends KrbAppSequenceType {
-    public static int TAG = 2;
-    private static int AUTHENTICATOR_VNO = 0;
-    private static int CREALM = 1;
-    private static int CNAME = 2;
-    private static int CKSUM = 3;
-    private static int CUSEC = 4;
-    private static int CTIME = 5;
-    private static int SUBKEY = 6;
-    private static int SEQ_NUMBER = 7;
-    private static int AUTHORIZATION_DATA = 8;
+    public static final int TAG = 2;
+    private static final int AUTHENTICATOR_VNO = 0;
+    private static final int CREALM = 1;
+    private static final int CNAME = 2;
+    private static final int CKSUM = 3;
+    private static final int CUSEC = 4;
+    private static final int CTIME = 5;
+    private static final int SUBKEY = 6;
+    private static final int SEQ_NUMBER = 7;
+    private static final int AUTHORIZATION_DATA = 8;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(AUTHENTICATOR_VNO, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
index 2ebe2eb..dd3b5ef 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
@@ -34,11 +34,11 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
  }
  */
 public class EncAPRepPart extends KrbAppSequenceType {
-    public static int TAG = 27;
-    private static int CTIME = 0;
-    private static int CUSEC = 1;
-    private static int SUBKEY = 2;
-    private static int SEQ_NUMBER = 3;
+    public static final int TAG = 27;
+    private static final int CTIME = 0;
+    private static final int CUSEC = 1;
+    private static final int SUBKEY = 2;
+    private static final int SEQ_NUMBER = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(CTIME, 0, KerberosTime.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
index 86ab842..b0ec6b8 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
@@ -33,8 +33,8 @@ import java.util.Arrays;
  }
  */
 public class CheckSum extends KrbSequenceType {
-    private static int CKSUM_TYPE = 0;
-    private static int CHECK_SUM = 1;
+    private static final int CKSUM_TYPE = 0;
+    private static final int CHECK_SUM = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
         new Asn1FieldInfo(CKSUM_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
index 80f4e04..2092560 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
@@ -34,9 +34,9 @@ import java.util.Arrays;
  }
  */
 public class EncryptedData extends KrbSequenceType {
-    private static int ETYPE = 0;
-    private static int KVNO = 1;
-    private static int CIPHER = 2;
+    private static final int ETYPE = 0;
+    private static final int KVNO = 1;
+    private static final int CIPHER = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ETYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
index 3f9465a..4f00a46 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
@@ -33,8 +33,8 @@ import java.util.Arrays;
  }
  */
 public class EncryptionKey extends KrbSequenceType {
-    private static int KEY_TYPE = 0;
-    private static int KEY_VALUE = 1;
+    private static final int KEY_TYPE = 0;
+    private static final int KEY_VALUE = 1;
 
     private int kvno = -1;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
index 25cffc4..a2071c7 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class EtypeInfo2Entry extends KrbSequenceType {
-    private static int ETYPE = 0;
-    private static int SALT = 1;
-    private static int S2KPARAMS = 2;
+    private static final int ETYPE = 0;
+    private static final int SALT = 1;
+    private static final int S2KPARAMS = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ETYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
index 716f4b9..0adb7b3 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class EtypeInfoEntry extends KrbSequenceType {
-    private static int ETYPE = 0;
-    private static int SALT = 1;
+    private static final int ETYPE = 0;
+    private static final int SALT = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ETYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
index e02901d..3a6d5b6 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
@@ -34,8 +34,8 @@ HostAddress     ::= SEQUENCE  {
 }
  */
 public class HostAddress extends KrbSequenceType {
-    private static int ADDR_TYPE = 0;
-    private static int ADDRESS = 1;
+    private static final int ADDR_TYPE = 0;
+    private static final int ADDRESS = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ADDR_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
index 3c76fd1..5ff4e62 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
@@ -44,17 +44,17 @@ import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
  }
  */
 public class KrbError extends KrbMessage {
-    private static int CTIME = 2;
-    private static int CUSEC = 3;
-    private static int STIME = 4;
-    private static int SUSEC = 5;
-    private static int ERROR_CODE = 6;
-    private static int CREALM = 7;
-    private static int CNAME = 8;
-    private static int REALM = 9;
-    private static int SNAME = 10;
-    private static int ETEXT = 11;
-    private static int EDATA = 12;
+    private static final int CTIME = 2;
+    private static final int CUSEC = 3;
+    private static final int STIME = 4;
+    private static final int SUSEC = 5;
+    private static final int ERROR_CODE = 6;
+    private static final int CREALM = 7;
+    private static final int CNAME = 8;
+    private static final int REALM = 9;
+    private static final int SNAME = 10;
+    private static final int ETEXT = 11;
+    private static final int EDATA = 12;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
index 7cc6023..0b1297c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
@@ -24,8 +24,8 @@ import org.apache.kerby.kerberos.kerb.KrbConstant;
 import org.apache.kerby.kerberos.kerb.spec.KrbAppSequenceType;
 
 public abstract class KrbMessage extends KrbAppSequenceType {
-    protected static int PVNO = 0;
-    protected static int MSG_TYPE = 1;
+    protected static final int PVNO = 0;
+    protected static final int MSG_TYPE = 1;
 
     private final int pvno = KrbConstant.KRB_V5;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
index d0fb6d4..e6c27c5 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
@@ -45,8 +45,8 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
     private static TokenEncoder tokenEncoder;
     private static TokenDecoder tokenDecoder;
 
-    private static int TOKEN_FORMAT = 0;
-    private static int TOKEN_VALUE = 1;
+    private static final int TOKEN_FORMAT = 0;
+    private static final int TOKEN_VALUE = 1;
 
     private AuthToken innerToken = null;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
index 8e9da3d..c2553d8 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class LastReqEntry extends KrbSequenceType {
-    private static int LR_TYPE = 0;
-    private static int LR_VALUE = 1;
+    private static final int LR_TYPE = 0;
+    private static final int LR_VALUE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(LR_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
index af7db73..b7e5c7c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
@@ -37,8 +37,8 @@ import java.util.List;
 public class PrincipalName extends KrbSequenceType {
     private String realm;
 
-    private static int NAME_TYPE = 0;
-    private static int NAME_STRING = 1;
+    private static final int NAME_TYPE = 0;
+    private static final int NAME_STRING = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(NAME_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
index f23fa60..1d69bd0 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class TransitedEncoding extends KrbSequenceType {
-    private static int TR_TYPE = 0;
-    private static int CONTENTS = 1;
+    private static final int TR_TYPE = 0;
+    private static final int CONTENTS = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TR_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
index 6fd36af..71227ba 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
@@ -33,8 +33,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class KrbFastArmor extends KrbSequenceType {
-    private static int ARMOR_TYPE = 0;
-    private static int ARMOR_VALUE = 1;
+    private static final int ARMOR_TYPE = 0;
+    private static final int ARMOR_VALUE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ARMOR_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
index 4cd714c..380f76f 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
@@ -31,7 +31,7 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptedData;
  }
  */
 public class KrbFastArmoredRep extends KrbSequenceType {
-    private static int ENC_FAST_REP = 0;
+    private static final int ENC_FAST_REP = 0;
 
     //private
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
index e3e8427..dfef6d6 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
@@ -45,9 +45,9 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptedData;
  }
  */
 public class KrbFastArmoredReq extends KrbSequenceType {
-    private static int ARMOR = 0;
-    private static int REQ_CHECKSUM = 1;
-    private static int ENC_FAST_REQ = 2;
+    private static final int ARMOR = 0;
+    private static final int REQ_CHECKSUM = 1;
+    private static final int ENC_FAST_REQ = 2;
 
     private KrbFastReq fastReq;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
index a338367..12f120e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
@@ -42,9 +42,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
  }
  */
 public class KrbFastFinished extends KrbSequenceType {
-    private static int FAST_OPTIONS = 0;
-    private static int PADATA = 1;
-    private static int REQ_BODY = 2;
+    private static final int FAST_OPTIONS = 0;
+    private static final int PADATA = 1;
+    private static final int REQ_BODY = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FAST_OPTIONS, KrbFastArmor.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
index 5aee39e..9cbd15c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
@@ -38,9 +38,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
  }
  */
 public class KrbFastReq extends KrbSequenceType {
-    private static int FAST_OPTIONS = 0;
-    private static int PADATA = 1;
-    private static int REQ_BODY = 2;
+    private static final int FAST_OPTIONS = 0;
+    private static final int PADATA = 1;
+    private static final int REQ_BODY = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FAST_OPTIONS, FastOptions.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
index 241d864..98ee83c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
@@ -40,10 +40,10 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
  }
  */
 public class KrbFastResponse extends KrbSequenceType {
-    private static int PADATA = 0;
-    private static int STRENGTHEN_KEY = 1;
-    private static int FINISHED = 2;
-    private static int NONCE = 3;
+    private static final int PADATA = 0;
+    private static final int STRENGTHEN_KEY = 1;
+    private static final int FINISHED = 2;
+    private static final int NONCE = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PADATA, PaData.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
index b327402..34f60fa 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
  }
  */
 public class PaAuthnEntry extends KrbSequenceType {
-    private static int PA_TYPE = 0;
-    private static int PA_HINT = 1;
-    private static int PA_VALUE = 2;
+    private static final int PA_TYPE = 0;
+    private static final int PA_HINT = 1;
+    private static final int PA_VALUE = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PA_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
index 6023886..d8768a5 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
@@ -28,7 +28,7 @@ import org.apache.kerby.asn1.type.Asn1FieldInfo;
  }
  */
 public class PaFxFastReply extends Asn1Choice {
-    private static int ARMORED_DATA = 0;
+    private static final int ARMORED_DATA = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ARMORED_DATA, KrbFastArmoredRep.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
index 148d222..4036ad2 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
@@ -28,7 +28,7 @@ import org.apache.kerby.asn1.type.Asn1FieldInfo;
  }
  */
 public class PaFxFastRequest extends Asn1Choice {
-    private static int ARMORED_DATA = 0;
+    private static final int ARMORED_DATA = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ARMORED_DATA, KrbFastArmoredReq.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
index bbe21cc..32ab96b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
@@ -47,18 +47,18 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.TicketFlags;
  }
  */
 public abstract class EncKdcRepPart extends KrbAppSequenceType {
-    private static int KEY = 0;
-    private static int LAST_REQ = 1;
-    private static int NONCE = 2;
-    private static int KEY_EXPIRATION = 3;
-    private static int FLAGS = 4;
-    private static int AUTHTIME = 5;
-    private static int STARTTIME = 6;
-    private static int ENDTIME = 7;
-    private static int RENEW_TILL = 8;
-    private static int SREALM = 9;
-    private static int SNAME = 10;
-    private static int CADDR = 11;
+    private static final int KEY = 0;
+    private static final int LAST_REQ = 1;
+    private static final int NONCE = 2;
+    private static final int KEY_EXPIRATION = 3;
+    private static final int FLAGS = 4;
+    private static final int AUTHTIME = 5;
+    private static final int STARTTIME = 6;
+    private static final int ENDTIME = 7;
+    private static final int RENEW_TILL = 8;
+    private static final int SREALM = 9;
+    private static final int SNAME = 10;
+    private static final int CADDR = 11;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(KEY, EncryptionKey.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
index fed6d12..87a160a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
@@ -44,11 +44,11 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
  }
  */
 public class KdcRep extends KrbMessage {
-    private static int PADATA = 2;
-    private static int CREALM = 3;
-    private static int CNAME = 4;
-    private static int TICKET = 5;
-    private static int ENC_PART = 6;
+    private static final int PADATA = 2;
+    private static final int CREALM = 3;
+    private static final int CNAME = 4;
+    private static final int TICKET = 5;
+    private static final int ENC_PART = 6;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
index a313e25..96a9f10 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
@@ -37,8 +37,8 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
  }
  */
 public class KdcReq extends KrbMessage {
-    private static int PADATA = 2;
-    private static int REQ_BODY = 3;
+    private static final int PADATA = 2;
+    private static final int REQ_BODY = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, 1, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
index d028ddd..82168cf 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
@@ -56,18 +56,18 @@ import java.util.List;
  }
  */
 public class KdcReqBody extends KrbSequenceType {
-    private static int KDC_OPTIONS = 0;
-    private static int CNAME = 1;
-    private static int REALM = 2;
-    private static int SNAME = 3;
-    private static int FROM = 4;
-    private static int TILL = 5;
-    private static int RTIME = 6;
-    private static int NONCE = 7;
-    private static int ETYPE = 8;
-    private static int ADDRESSES = 9;
-    private static int ENC_AUTHORIZATION_DATA = 10;
-    private static int ADDITIONAL_TICKETS = 11;
+    private static final int KDC_OPTIONS = 0;
+    private static final int CNAME = 1;
+    private static final int REALM = 2;
+    private static final int SNAME = 3;
+    private static final int FROM = 4;
+    private static final int TILL = 5;
+    private static final int RTIME = 6;
+    private static final int NONCE = 7;
+    private static final int ETYPE = 8;
+    private static final int ADDRESSES = 9;
+    private static final int ENC_AUTHORIZATION_DATA = 10;
+    private static final int ADDITIONAL_TICKETS = 11;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(KDC_OPTIONS, KdcOptions.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
index 5a484cf..48fbef9 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaAuthenticationSetElem extends KrbSequenceType {
-    private static int PA_TYPE = 0;
-    private static int PA_HINT = 1;
-    private static int PA_VALUE = 2;
+    private static final int PA_TYPE = 0;
+    private static final int PA_HINT = 1;
+    private static final int PA_VALUE = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PA_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
index 8f0714b..901eb06 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
@@ -32,8 +32,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaDataEntry extends KrbSequenceType {
-    private static int PADATA_TYPE = 0;
-    private static int PADATA_VALUE = 1;
+    private static final int PADATA_TYPE = 0;
+    private static final int PADATA_VALUE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PADATA_TYPE, 1, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
index 410f9ac..7eb0b56 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaEncTsEnc extends KrbSequenceType {
-    private static int PATIMESTAMP = 0;
-    private static int PAUSEC = 1;
+    private static final int PATIMESTAMP = 0;
+    private static final int PAUSEC = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PATIMESTAMP, 0, KerberosTime.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
index b2f3340..fa29244 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
@@ -41,15 +41,15 @@ import org.apache.kerby.kerberos.kerb.spec.pa.pkinit.AlgorithmIdentifiers;
  }
  */
 public class OtpTokenInfo extends KrbSequenceType {
-    private static int FLAGS = 0;
-    private static int OTP_VENDOR = 1;
-    private static int OTP_CHALLENGE = 2;
-    private static int OTP_LENGTH = 3;
-    private static int OTP_FORMAT = 4;
-    private static int OTP_TOKEN_ID = 5;
-    private static int OTP_ALG_ID = 6;
-    private static int SUPPORTED_HASH_ALG = 7;
-    private static int ITERATION_COUNT = 8;
+    private static final int FLAGS = 0;
+    private static final int OTP_VENDOR = 1;
+    private static final int OTP_CHALLENGE = 2;
+    private static final int OTP_LENGTH = 3;
+    private static final int OTP_FORMAT = 4;
+    private static final int OTP_TOKEN_ID = 5;
+    private static final int OTP_ALG_ID = 6;
+    private static final int SUPPORTED_HASH_ALG = 7;
+    private static final int ITERATION_COUNT = 8;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FLAGS, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
index 0266a99..58140a9 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
@@ -35,11 +35,11 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaOtpChallenge extends KrbSequenceType {
-    private static int NONCE = 0;
-    private static int OTP_SERVICE = 1;
-    private static int OTP_TOKEN_INFO = 2;
-    private static int SALT = 3;
-    private static int S2KPARAMS = 4;
+    private static final int NONCE = 0;
+    private static final int OTP_SERVICE = 1;
+    private static final int OTP_TOKEN_INFO = 2;
+    private static final int SALT = 3;
+    private static final int S2KPARAMS = 4;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(NONCE, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
index 98757e8..8ca1f9c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
@@ -32,10 +32,10 @@ import org.apache.kerby.kerberos.kerb.spec.x509.SubjectPublicKeyInfo;
  }
  */
 public class AuthPack extends KrbSequenceType {
-    private static int PK_AUTHENTICATOR = 0;
-    private static int CLIENT_PUBLIC_VALUE = 1;
-    private static int SUPPORTED_CMS_TYPES = 2;
-    private static int CLIENT_DH_NONCE = 3;
+    private static final int PK_AUTHENTICATOR = 0;
+    private static final int CLIENT_PUBLIC_VALUE = 1;
+    private static final int SUPPORTED_CMS_TYPES = 2;
+    private static final int CLIENT_DH_NONCE = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PK_AUTHENTICATOR, PkAuthenticator.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
index 9844615..721e87a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
@@ -30,8 +30,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class DHRepInfo extends KrbSequenceType {
-    private static int DH_SIGNED_DATA = 0;
-    private static int SERVER_DH_NONCE = 1;
+    private static final int DH_SIGNED_DATA = 0;
+    private static final int SERVER_DH_NONCE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(DH_SIGNED_DATA, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
index 4a67feb..08be503 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
@@ -31,9 +31,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class ExternalPrincipalIdentifier extends KrbSequenceType {
-    private static int SUBJECT_NAME = 0;
-    private static int ISSUER_AND_SERIAL_NUMBER = 1;
-    private static int SUBJECT_KEY_IDENTIFIER = 2;
+    private static final int SUBJECT_NAME = 0;
+    private static final int ISSUER_AND_SERIAL_NUMBER = 1;
+    private static final int SUBJECT_KEY_IDENTIFIER = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(SUBJECT_NAME, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
index 97c6003..0e9504e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class KdcDHKeyInfo extends KrbSequenceType {
-    private static int SUBJECT_PUBLICK_KEY = 0;
-    private static int NONCE = 1;
-    private static int DH_KEY_EXPIRATION = 2;
+    private static final int SUBJECT_PUBLICK_KEY = 0;
+    private static final int NONCE = 1;
+    private static final int DH_KEY_EXPIRATION = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(SUBJECT_PUBLICK_KEY, Asn1BitString.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
index b800794..347af0b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.base.Realm;
  }
  */
 public class Krb5PrincipalName extends KrbSequenceType {
-    private static int REALM = 0;
-    private static int PRINCIPAL_NAME = 1;
+    private static final int REALM = 0;
+    private static final int PRINCIPAL_NAME = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(REALM, Realm.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
index 952bea6..5c6000e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
@@ -30,8 +30,8 @@ import org.apache.kerby.asn1.type.Asn1OctetString;
  }
  */
 public class PaPkAsRep extends Asn1Choice {
-    private static int DH_INFO = 0;
-    private static int ENCKEY_PACK = 1;
+    private static final int DH_INFO = 0;
+    private static final int ENCKEY_PACK = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(DH_INFO, DHRepInfo.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
index 79e6e55..53c1b0d 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
@@ -31,9 +31,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaPkAsReq extends KrbSequenceType {
-    private static int SIGNED_AUTH_PACK = 0;
-    private static int TRUSTED_CERTIFIERS = 1;
-    private static int KDC_PKID = 2;
+    private static final int SIGNED_AUTH_PACK = 0;
+    private static final int TRUSTED_CERTIFIERS = 1;
+    private static final int KDC_PKID = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(SIGNED_AUTH_PACK, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
index d1fafd7..4d3909e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
@@ -41,10 +41,10 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PkAuthenticator extends KrbSequenceType {
-    private static int CUSEC = 0;
-    private static int CTIME = 1;
-    private static int NONCE = 2;
-    private static int PA_CHECKSUM = 3;
+    private static final int CUSEC = 0;
+    private static final int CTIME = 1;
+    private static final int NONCE = 2;
+    private static final int PA_CHECKSUM = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(CUSEC, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
index 87233ea..77f133b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
  }
  */
 public class ReplyKeyPack extends KrbSequenceType {
-    private static int REPLY_KEY = 0;
-    private static int AS_CHECKSUM = 1;
+    private static final int REPLY_KEY = 0;
+    private static final int AS_CHECKSUM = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(REPLY_KEY, EncryptionKey.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
index 5956fc7..77810bc 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
@@ -28,7 +28,7 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
 */
 public class PaTokenChallenge extends KrbSequenceType {
-    private static int TOKENINFOS = 0;
+    private static final int TOKENINFOS = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TOKENINFOS, TokenInfos.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
index 94c34a8..d90aa89 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
@@ -30,8 +30,8 @@ import org.apache.kerby.kerberos.kerb.spec.base.KrbToken;
  }
 */
 public class PaTokenRequest extends KrbSequenceType {
-    private static int TOKEN_INFO = 0;
-    private static int TOKEN = 1;
+    private static final int TOKEN_INFO = 0;
+    private static final int TOKEN = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TOKEN_INFO, TokenInfo.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
index 43533ca..12abfef 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class TokenInfo extends KrbSequenceType {
-    private static int FLAGS = 0;
-    private static int TOKEN_VENDOR = 1;
+    private static final int FLAGS = 0;
+    private static final int TOKEN_VENDOR = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FLAGS, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
index 34064f8..954b7cf 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
@@ -45,17 +45,17 @@ import org.apache.kerby.kerberos.kerb.spec.base.*;
 public class EncTicketPart extends KrbAppSequenceType {
     public static final int TAG = 3;
 
-    private static int FLAGS = 0;
-    private static int KEY = 1;
-    private static int CREALM = 2;
-    private static int CNAME = 3;
-    private static int TRANSITED = 4;
-    private static int AUTHTIME = 5;
-    private static int STARTTIME = 6;
-    private static int ENDTIME = 7;
-    private static int RENEW_TILL = 8;
-    private static int CADDR = 9;
-    private static int AUTHORIZATION_DATA = 10;
+    private static final int FLAGS = 0;
+    private static final int KEY = 1;
+    private static final int CREALM = 2;
+    private static final int CNAME = 3;
+    private static final int TRANSITED = 4;
+    private static final int AUTHTIME = 5;
+    private static final int STARTTIME = 6;
+    private static final int ENDTIME = 7;
+    private static final int RENEW_TILL = 8;
+    private static final int CADDR = 9;
+    private static final int AUTHORIZATION_DATA = 10;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FLAGS, 0, TicketFlags.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
index c65ee55..75213f1 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
@@ -39,10 +39,10 @@ public class Ticket extends KrbAppSequenceType {
     public static final int TKT_KVNO = KrbConstant.KRB_V5;
     public static final int TAG = 1;
 
-    private static int TKT_VNO = 0;
-    private static int REALM = 1;
-    private static int SNAME = 2;
-    private static int ENC_PART = 3;
+    private static final int TKT_VNO = 0;
+    private static final int REALM = 1;
+    private static final int SNAME = 2;
+    private static final int ENC_PART = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TKT_VNO, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
index 369b99a..544362a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
@@ -28,8 +28,8 @@ import org.apache.kerby.asn1.type.*;
  }
  */
 public class AlgorithmIdentifier extends Asn1SequenceType {
-    private static int ALGORITHM = 0;
-    private static int PARAMETERS = 1;
+    private static final int ALGORITHM = 0;
+    private static final int PARAMETERS = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ALGORITHM, -1, Asn1ObjectIdentifier.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
index f69345f..499104e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
@@ -30,8 +30,8 @@ import org.apache.kerby.asn1.type.Asn1SequenceType;
  }
  */
 public class SubjectPublicKeyInfo extends Asn1SequenceType {
-    private static int ALGORITHM = 0;
-    private static int SUBJECT_PUBLIC_KEY = 1;
+    private static final int ALGORITHM = 0;
+    private static final int SUBJECT_PUBLIC_KEY = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ALGORITHM, -1, AlgorithmIdentifier.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
index f7997fa..1d9394a 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
@@ -27,7 +27,7 @@ public class Des {
     /*
      * The following are the weak DES keys:
      */
-    static byte[][] WEAK_KEYS = {
+    static final byte[][] WEAK_KEYS = {
     /* weak keys */
             {(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01},
             {(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe},

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
index 8d62ab3..072fd43 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
@@ -24,7 +24,7 @@ package org.apache.kerby.kerberos.kerb.crypto.util;
  */
 public class Rc4 {
 
-    private static byte[] L40 = "fortybits".getBytes();
+    private static final byte[] L40 = "fortybits".getBytes();
 
     public static byte[] getSalt(int usage, boolean exportable) {
         int newUsage = convertUsage(usage);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
index 7cc127e..e7b0b10 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
@@ -55,7 +55,7 @@ public class CheckSumTest {
             )
     };
 
-    static byte[] TESTKEY = { (byte)0x45, (byte)0x01, (byte)0x49, (byte)0x61, (byte)0x58,
+    static final byte[] TESTKEY = { (byte)0x45, (byte)0x01, (byte)0x49, (byte)0x61, (byte)0x58,
             (byte)0x19, (byte)0x1a, (byte)0x3d };
 
     @Test

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
index bcc46f6..6c6f938 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
@@ -33,7 +33,7 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.TicketFlags;
 import java.io.IOException;
 
 public class Credential {
-    private static String CONF_REALM = "X-CACHECONF:";
+    private static final String CONF_REALM = "X-CACHECONF:";
 
     private PrincipalName clientName;
     private String clientRealm;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
index 54e6e0b..695a41b 100644
--- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
+++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
@@ -49,7 +49,7 @@ KVNO Principal
    1 test@SH.INTEL.COM (camellia128-cts-cmac)
  */
 public class KeysTest {
-    private static String TEST_PASSWORD = "123456";
+    private static final String TEST_PASSWORD = "123456";
 
     private Keytab keytab;
 


[4/5] directory-kerby git commit: Checkstyle: fix LocalFinalVariableName check

Posted by se...@apache.org.
Checkstyle: fix LocalFinalVariableName 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/e36fa268
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/e36fa268
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/e36fa268

Branch: refs/heads/master
Commit: e36fa268406f66da712c7258e764deaf7e88dcda
Parents: 10bc3af
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 01:05:01 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 14:06:04 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/kerby/kerberos/tool/token/TokenInit.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e36fa268/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/token/TokenInit.java
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/token/TokenInit.java b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/token/TokenInit.java
index 5caa468..eb8fef5 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/token/TokenInit.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/token/TokenInit.java
@@ -58,14 +58,14 @@ public class TokenInit {
         authToken.setAudiences(aud);
 
         // Set expiration in 60 minutes
-        final Date NOW =  new Date(new Date().getTime() / 1000 * 1000);
-        Date exp = new Date(NOW.getTime() + 1000 * 60 * 60);
+        final Date now =  new Date(new Date().getTime() / 1000 * 1000);
+        Date exp = new Date(now.getTime() + 1000 * 60 * 60);
         authToken.setExpirationTime(exp);
 
-        Date nbf = NOW;
+        Date nbf = now;
         authToken.setNotBeforeTime(nbf);
 
-        Date iat = NOW;
+        Date iat = now;
         authToken.setIssueTime(iat);
 
         return authToken;


Re: FW: [1/5] directory-kerby git commit: Checkstyle: fix StaticVariableName check, make constants final

Posted by Stefan Seelmann <ma...@stefan-seelmann.de>.
On 07/04/2015 02:47 PM, Zheng, Kai wrote:
> Thanks Stefan for the so much work! I wonder if there would be too much work to do yet to make it pass when enforcing checking styles. 
> Do you need our help? If so, maybe we could have a branch for this, having the check enforced, and just leaving it failed. Then other Kerby developers can help.

Hi Kai,

I just fix the easiest and obvious violations. Then I'll write a mail
about the remaining issues, because some require consensus.

Kind Regards,
Stefan



FW: [1/5] directory-kerby git commit: Checkstyle: fix StaticVariableName check, make constants final

Posted by "Zheng, Kai" <ka...@intel.com>.
Thanks Stefan for the so much work! I wonder if there would be too much work to do yet to make it pass when enforcing checking styles. 
Do you need our help? If so, maybe we could have a branch for this, having the check enforced, and just leaving it failed. Then other Kerby developers can help.

Thanks again!

Regards,
Kai

-----Original Message-----
From: seelmann@apache.org [mailto:seelmann@apache.org] 
Sent: Saturday, July 04, 2015 8:09 PM
To: commits@directory.apache.org
Subject: [1/5] directory-kerby git commit: Checkstyle: fix StaticVariableName check, make constants final

Repository: directory-kerby
Updated Branches:
  refs/heads/master 7cbd366ef -> 33df0463d


Checkstyle: fix StaticVariableName check, make constants final


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/abe520cc
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/abe520cc
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/abe520cc

Branch: refs/heads/master
Commit: abe520cc0ab1badfe3934c1341640c18445ece95
Parents: 60d4f51
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 14:04:56 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 14:06:04 2015 +0200

----------------------------------------------------------------------
 .../org/apache/kerby/asn1/EncodingOption.java   |  2 +-
 .../org/apache/kerby/asn1/PersonnelRecord.java  | 22 +++++++++---------
 .../apache/kerby/asn1/TestAsn1Collection.java   |  6 ++---
 .../apache/kerby/asn1/TestTaggingEncoding.java  | 10 ++++----
 .../org/apache/kerby/KrbIdentityComparator.java |  2 +-
 .../kerb/preauth/builtin/EncTsPreauthMeta.java  |  6 ++---
 .../kerb/preauth/builtin/TgtPreauthMeta.java    |  6 ++---
 .../kerb/preauth/pkinit/PkinitPreauthMeta.java  |  6 ++---
 .../kerb/preauth/token/TokenPreauthMeta.java    |  6 ++---
 .../kerby/kerberos/kerb/spec/ad/AdToken.java    |  2 +-
 .../kerb/spec/ad/AuthorizationDataEntry.java    |  4 ++--
 .../kerby/kerberos/kerb/spec/ap/ApRep.java      |  2 +-
 .../kerby/kerberos/kerb/spec/ap/ApReq.java      |  6 ++---
 .../kerberos/kerb/spec/ap/Authenticator.java    | 20 ++++++++--------
 .../kerberos/kerb/spec/ap/EncAPRepPart.java     | 10 ++++----
 .../kerby/kerberos/kerb/spec/base/CheckSum.java |  4 ++--
 .../kerberos/kerb/spec/base/EncryptedData.java  |  6 ++---
 .../kerberos/kerb/spec/base/EncryptionKey.java  |  4 ++--
 .../kerb/spec/base/EtypeInfo2Entry.java         |  6 ++---
 .../kerberos/kerb/spec/base/EtypeInfoEntry.java |  4 ++--
 .../kerberos/kerb/spec/base/HostAddress.java    |  4 ++--
 .../kerby/kerberos/kerb/spec/base/KrbError.java | 22 +++++++++---------
 .../kerberos/kerb/spec/base/KrbMessage.java     |  4 ++--
 .../kerby/kerberos/kerb/spec/base/KrbToken.java |  4 ++--
 .../kerberos/kerb/spec/base/LastReqEntry.java   |  4 ++--
 .../kerberos/kerb/spec/base/PrincipalName.java  |  4 ++--
 .../kerb/spec/base/TransitedEncoding.java       |  4 ++--
 .../kerberos/kerb/spec/fast/KrbFastArmor.java   |  4 ++--
 .../kerb/spec/fast/KrbFastArmoredRep.java       |  2 +-
 .../kerb/spec/fast/KrbFastArmoredReq.java       |  6 ++---
 .../kerb/spec/fast/KrbFastFinished.java         |  6 ++---
 .../kerberos/kerb/spec/fast/KrbFastReq.java     |  6 ++---
 .../kerb/spec/fast/KrbFastResponse.java         |  8 +++----
 .../kerberos/kerb/spec/fast/PaAuthnEntry.java   |  6 ++---
 .../kerberos/kerb/spec/fast/PaFxFastReply.java  |  2 +-
 .../kerb/spec/fast/PaFxFastRequest.java         |  2 +-
 .../kerberos/kerb/spec/kdc/EncKdcRepPart.java   | 24 ++++++++++----------
 .../kerby/kerberos/kerb/spec/kdc/KdcRep.java    | 10 ++++----
 .../kerby/kerberos/kerb/spec/kdc/KdcReq.java    |  4 ++--
 .../kerberos/kerb/spec/kdc/KdcReqBody.java      | 24 ++++++++++----------
 .../kerb/spec/pa/PaAuthenticationSetElem.java   |  6 ++---
 .../kerberos/kerb/spec/pa/PaDataEntry.java      |  4 ++--
 .../kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java |  4 ++--
 .../kerberos/kerb/spec/pa/otp/OtpTokenInfo.java | 18 +++++++--------
 .../kerb/spec/pa/otp/PaOtpChallenge.java        | 10 ++++----
 .../kerberos/kerb/spec/pa/pkinit/AuthPack.java  |  8 +++----
 .../kerberos/kerb/spec/pa/pkinit/DHRepInfo.java |  4 ++--
 .../pa/pkinit/ExternalPrincipalIdentifier.java  |  6 ++---
 .../kerb/spec/pa/pkinit/KdcDHKeyInfo.java       |  6 ++---
 .../kerb/spec/pa/pkinit/Krb5PrincipalName.java  |  4 ++--
 .../kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java |  4 ++--
 .../kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java |  6 ++---
 .../kerb/spec/pa/pkinit/PkAuthenticator.java    |  8 +++----
 .../kerb/spec/pa/pkinit/ReplyKeyPack.java       |  4 ++--
 .../kerb/spec/pa/token/PaTokenChallenge.java    |  2 +-
 .../kerb/spec/pa/token/PaTokenRequest.java      |  4 ++--
 .../kerberos/kerb/spec/pa/token/TokenInfo.java  |  4 ++--
 .../kerb/spec/ticket/EncTicketPart.java         | 22 +++++++++---------
 .../kerby/kerberos/kerb/spec/ticket/Ticket.java |  8 +++----
 .../kerb/spec/x509/AlgorithmIdentifier.java     |  4 ++--
 .../kerb/spec/x509/SubjectPublicKeyInfo.java    |  4 ++--
 .../kerby/kerberos/kerb/crypto/util/Des.java    |  2 +-
 .../kerby/kerberos/kerb/crypto/util/Rc4.java    |  2 +-
 .../kerberos/kerb/crypto/CheckSumTest.java      |  2 +-
 .../kerby/kerberos/kerb/ccache/Credential.java  |  2 +-
 .../kerby/kerberos/kerb/util/KeysTest.java      |  2 +-
 66 files changed, 217 insertions(+), 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
index ac9fa48..d40dcc7 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
@@ -52,7 +52,7 @@ public class EncodingOption {
      * A mask to determinate if a Tag is CONSTRUCTED. The fifth bit should be set to 1 if
      * the type is constructed (0010-0000).
      */
-    public static int CONSTRUCTED_FLAG = 0x20;
+    public static final int CONSTRUCTED_FLAG = 0x20;
 
     public static boolean isConstructed(int tag) {
         return (tag & CONSTRUCTED_FLAG) != 0;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
index 6c6fc04..b05a22b 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecord.java
@@ -26,12 +26,12 @@ import org.apache.kerby.asn1.type.*;
  * Annex A, A.1 ASN.1 description of the record structure
  */
 public class PersonnelRecord extends TaggingSet {
-    private static int NAME = 0;
-    private static int TITLE = 1;
-    private static int NUMBER = 2;
-    private static int DATEOFHIRE= 3;
-    private static int NAMEOFSPOUSE = 4;
-    private static int CHILDREN = 5;
+    private static final int NAME = 0;
+    private static final int TITLE = 1;
+    private static final int NUMBER = 2;
+    private static final int DATEOFHIRE= 3;
+    private static final int NAMEOFSPOUSE = 4;
+    private static final int CHILDREN = 5;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(NAME, -1, Name.class),
@@ -109,8 +109,8 @@ public class PersonnelRecord extends TaggingSet {
     }
 
     public static class ChildInformation extends Asn1SetType {
-        private static int NAME = 0;
-        private static int DATEOFBIRTH = 1;
+        private static final int NAME = 0;
+        private static final int DATEOFBIRTH = 1;
 
         static Asn1FieldInfo[] tags = new Asn1FieldInfo[] {
                 new Asn1FieldInfo(NAME, -1, Name.class),
@@ -139,9 +139,9 @@ public class PersonnelRecord extends TaggingSet {
     }
 
     public static class Name extends TaggingSequence {
-        private static int GIVENNAME = 0;
-        private static int INITIAL = 1;
-        private static int FAMILYNAME = 2;
+        private static final int GIVENNAME = 0;
+        private static final int INITIAL = 1;
+        private static final int FAMILYNAME = 2;
 
         static Asn1FieldInfo[] tags = new Asn1FieldInfo[] {
                 new Asn1FieldInfo(GIVENNAME, -1, Asn1VisibleString.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
index 16c368f..cfb5e29 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Collection.java
@@ -30,9 +30,9 @@ import java.io.IOException;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAsn1Collection {
-    static String TEST_STR = "Jones";
-    static Boolean TEST_BOOL = true;
-    static byte[] EXPECTED_BYTES = new byte[] {(byte) 0x30, (byte) 0x0A,
+    static final String TEST_STR = "Jones";
+    static final Boolean TEST_BOOL = true;
+    static final byte[] EXPECTED_BYTES = new byte[] {(byte) 0x30, (byte) 0x0A,
             (byte) 0x16, (byte) 0x05, (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73,
             (byte) 0x01, (byte) 0x01, (byte) 0xFF
     };

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
index c836217..8c5d1bb 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
@@ -62,17 +62,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTaggingEncoding {
     static final String TEST_STRING = "Jones";
-    static byte[] TYPE1_EXPECTED_BYTES = new byte[] {(byte) 0x1A, (byte) 0x05,
+    static final byte[] TYPE1_EXPECTED_BYTES = new byte[] {(byte) 0x1A, (byte) 0x05,
             (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE2_EXPECTED_BYTES = new byte[] {(byte) 0x43, (byte) 0x05,
+    static final byte[] TYPE2_EXPECTED_BYTES = new byte[] {(byte) 0x43, (byte) 0x05,
             (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE3_EXPECTED_BYTES = new byte[] {(byte) 0xA2, (byte) 0x07,
+    static final byte[] TYPE3_EXPECTED_BYTES = new byte[] {(byte) 0xA2, (byte) 0x07,
             (byte) 0x43, (byte) 0x05, (byte) 0x4A, (byte) 0x6F, (byte) 0x6E,
             (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE4_EXPECTED_BYTES = new byte[] {(byte) 0x67, (byte) 0x07,
+    static final byte[] TYPE4_EXPECTED_BYTES = new byte[] {(byte) 0x67, (byte) 0x07,
             (byte) 0x43, (byte) 0x05, (byte) 0x4A, (byte) 0x6F, (byte) 0x6E,
             (byte) 0x65, (byte) 0x73};
-    static byte[] TYPE5_EXPECTED_BYTES = new byte[] {(byte) 0x82, (byte) 0x05,
+    static final byte[] TYPE5_EXPECTED_BYTES = new byte[] {(byte) 0x82, (byte) 0x05,
             (byte) 0x4A, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x73};
 
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java b/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
index e842bfc..bce3033 100644
--- a/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
+++ b/kerby-backend/mavibot/src/main/java/org/apache/kerby/KrbIdentityComparator.java
@@ -30,7 +30,7 @@ import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
  */
 public final class KrbIdentityComparator implements Comparator<KrbIdentity> {
 
-    public static KrbIdentityComparator INSTANCE = new KrbIdentityComparator();
+    public static final KrbIdentityComparator INSTANCE = new KrbIdentityComparator();
 
     private KrbIdentityComparator() {
     }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
index a669e18..3f19553 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/EncTsPreauthMeta.java
@@ -24,9 +24,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
 
 public class EncTsPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "encrypted_timestamp";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "encrypted_timestamp";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.ENC_TIMESTAMP
     };
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
index 04bb47b..fb26842 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/builtin/TgtPreauthMeta.java
@@ -27,9 +27,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
  */
 public class TgtPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "TGT_preauth";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "TGT_preauth";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.TGS_REQ
     };
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
index 9d196d9..221ba4e 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPreauthMeta.java
@@ -24,9 +24,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
 
 public class PkinitPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "PKINIT";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "PKINIT";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.PK_AS_REQ,
             PaDataType.PK_AS_REP,
     };

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
index f393d15..8b648f6 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/token/TokenPreauthMeta.java
@@ -24,9 +24,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
 
 public class TokenPreauthMeta implements PreauthPluginMeta {
 
-    private static String NAME = "TokenPreauth";
-    private static int VERSION = 1;
-    private static PaDataType[] PA_TYPES = new PaDataType[] {
+    private static final String NAME = "TokenPreauth";
+    private static final int VERSION = 1;
+    private static final PaDataType[] PA_TYPES = new PaDataType[] {
             PaDataType.TOKEN_CHALLENGE,
             PaDataType.TOKEN_REQUEST
     };

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
index 15f999e..652170b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AdToken.java
@@ -29,7 +29,7 @@ import org.apache.kerby.kerberos.kerb.spec.base.KrbToken;
  }
 */
 public class AdToken extends KrbSequenceType {
-    private static int TOKEN = 0;
+    private static final int TOKEN = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TOKEN, KrbToken.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
index 73eeb80..07b04d7 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationDataEntry.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class AuthorizationDataEntry extends KrbSequenceType {
-    private static int AD_TYPE = 0;
-    private static int AD_DATA = 1;
+    private static final int AD_TYPE = 0;
+    private static final int AD_DATA = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(AD_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
index fc54939..7433311 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApRep.java
@@ -33,7 +33,7 @@ import org.apache.kerby.kerberos.kerb.spec.base.KrbMessageType;
  }
  */
 public class ApRep extends KrbMessage {
-    private static int ENC_PART = 2;
+    private static final int ENC_PART = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
index fe97cae..9a0b994 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApReq.java
@@ -36,9 +36,9 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
  }
  */
 public class ApReq extends KrbMessage {
-    private static int AP_OPTIONS = 2;
-    private static int TICKET = 3;
-    private static int AUTHENTICATOR = 4;
+    private static final int AP_OPTIONS = 2;
+    private static final int TICKET = 3;
+    private static final int AUTHENTICATOR = 4;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
index 49a9fc0..9705ecb 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/Authenticator.java
@@ -43,16 +43,16 @@ import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
  }
  */
 public class Authenticator extends KrbAppSequenceType {
-    public static int TAG = 2;
-    private static int AUTHENTICATOR_VNO = 0;
-    private static int CREALM = 1;
-    private static int CNAME = 2;
-    private static int CKSUM = 3;
-    private static int CUSEC = 4;
-    private static int CTIME = 5;
-    private static int SUBKEY = 6;
-    private static int SEQ_NUMBER = 7;
-    private static int AUTHORIZATION_DATA = 8;
+    public static final int TAG = 2;
+    private static final int AUTHENTICATOR_VNO = 0;
+    private static final int CREALM = 1;
+    private static final int CNAME = 2;
+    private static final int CKSUM = 3;
+    private static final int CUSEC = 4;
+    private static final int CTIME = 5;
+    private static final int SUBKEY = 6;
+    private static final int SEQ_NUMBER = 7;
+    private static final int AUTHORIZATION_DATA = 8;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(AUTHENTICATOR_VNO, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
index 2ebe2eb..dd3b5ef 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/EncAPRepPart.java
@@ -34,11 +34,11 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
  }
  */
 public class EncAPRepPart extends KrbAppSequenceType {
-    public static int TAG = 27;
-    private static int CTIME = 0;
-    private static int CUSEC = 1;
-    private static int SUBKEY = 2;
-    private static int SEQ_NUMBER = 3;
+    public static final int TAG = 27;
+    private static final int CTIME = 0;
+    private static final int CUSEC = 1;
+    private static final int SUBKEY = 2;
+    private static final int SEQ_NUMBER = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(CTIME, 0, KerberosTime.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
index 86ab842..b0ec6b8 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSum.java
@@ -33,8 +33,8 @@ import java.util.Arrays;
  }
  */
 public class CheckSum extends KrbSequenceType {
-    private static int CKSUM_TYPE = 0;
-    private static int CHECK_SUM = 1;
+    private static final int CKSUM_TYPE = 0;
+    private static final int CHECK_SUM = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
         new Asn1FieldInfo(CKSUM_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
index 80f4e04..2092560 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptedData.java
@@ -34,9 +34,9 @@ import java.util.Arrays;
  }
  */
 public class EncryptedData extends KrbSequenceType {
-    private static int ETYPE = 0;
-    private static int KVNO = 1;
-    private static int CIPHER = 2;
+    private static final int ETYPE = 0;
+    private static final int KVNO = 1;
+    private static final int CIPHER = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ETYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
index 3f9465a..4f00a46 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionKey.java
@@ -33,8 +33,8 @@ import java.util.Arrays;
  }
  */
 public class EncryptionKey extends KrbSequenceType {
-    private static int KEY_TYPE = 0;
-    private static int KEY_VALUE = 1;
+    private static final int KEY_TYPE = 0;
+    private static final int KEY_VALUE = 1;
 
     private int kvno = -1;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
index 25cffc4..a2071c7 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfo2Entry.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class EtypeInfo2Entry extends KrbSequenceType {
-    private static int ETYPE = 0;
-    private static int SALT = 1;
-    private static int S2KPARAMS = 2;
+    private static final int ETYPE = 0;
+    private static final int SALT = 1;
+    private static final int S2KPARAMS = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ETYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
index 716f4b9..0adb7b3 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EtypeInfoEntry.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class EtypeInfoEntry extends KrbSequenceType {
-    private static int ETYPE = 0;
-    private static int SALT = 1;
+    private static final int ETYPE = 0;
+    private static final int SALT = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ETYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
index e02901d..3a6d5b6 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddress.java
@@ -34,8 +34,8 @@ HostAddress     ::= SEQUENCE  {
 }
  */
 public class HostAddress extends KrbSequenceType {
-    private static int ADDR_TYPE = 0;
-    private static int ADDRESS = 1;
+    private static final int ADDR_TYPE = 0;
+    private static final int ADDRESS = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ADDR_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
index 3c76fd1..5ff4e62 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbError.java
@@ -44,17 +44,17 @@ import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
  }
  */
 public class KrbError extends KrbMessage {
-    private static int CTIME = 2;
-    private static int CUSEC = 3;
-    private static int STIME = 4;
-    private static int SUSEC = 5;
-    private static int ERROR_CODE = 6;
-    private static int CREALM = 7;
-    private static int CNAME = 8;
-    private static int REALM = 9;
-    private static int SNAME = 10;
-    private static int ETEXT = 11;
-    private static int EDATA = 12;
+    private static final int CTIME = 2;
+    private static final int CUSEC = 3;
+    private static final int STIME = 4;
+    private static final int SUSEC = 5;
+    private static final int ERROR_CODE = 6;
+    private static final int CREALM = 7;
+    private static final int CNAME = 8;
+    private static final int REALM = 9;
+    private static final int SNAME = 10;
+    private static final int ETEXT = 11;
+    private static final int EDATA = 12;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
index 7cc6023..0b1297c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessage.java
@@ -24,8 +24,8 @@ import org.apache.kerby.kerberos.kerb.KrbConstant;
 import org.apache.kerby.kerberos.kerb.spec.KrbAppSequenceType;
 
 public abstract class KrbMessage extends KrbAppSequenceType {
-    protected static int PVNO = 0;
-    protected static int MSG_TYPE = 1;
+    protected static final int PVNO = 0;
+    protected static final int MSG_TYPE = 1;
 
     private final int pvno = KrbConstant.KRB_V5;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
index d0fb6d4..e6c27c5 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
@@ -45,8 +45,8 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
     private static TokenEncoder tokenEncoder;
     private static TokenDecoder tokenDecoder;
 
-    private static int TOKEN_FORMAT = 0;
-    private static int TOKEN_VALUE = 1;
+    private static final int TOKEN_FORMAT = 0;
+    private static final int TOKEN_VALUE = 1;
 
     private AuthToken innerToken = null;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
index 8e9da3d..c2553d8 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqEntry.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class LastReqEntry extends KrbSequenceType {
-    private static int LR_TYPE = 0;
-    private static int LR_VALUE = 1;
+    private static final int LR_TYPE = 0;
+    private static final int LR_VALUE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(LR_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
index af7db73..b7e5c7c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java
@@ -37,8 +37,8 @@ import java.util.List;
 public class PrincipalName extends KrbSequenceType {
     private String realm;
 
-    private static int NAME_TYPE = 0;
-    private static int NAME_STRING = 1;
+    private static final int NAME_TYPE = 0;
+    private static final int NAME_STRING = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(NAME_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
index f23fa60..1d69bd0 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncoding.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class TransitedEncoding extends KrbSequenceType {
-    private static int TR_TYPE = 0;
-    private static int CONTENTS = 1;
+    private static final int TR_TYPE = 0;
+    private static final int CONTENTS = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TR_TYPE, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
index 6fd36af..71227ba 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmor.java
@@ -33,8 +33,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class KrbFastArmor extends KrbSequenceType {
-    private static int ARMOR_TYPE = 0;
-    private static int ARMOR_VALUE = 1;
+    private static final int ARMOR_TYPE = 0;
+    private static final int ARMOR_VALUE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ARMOR_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
index 4cd714c..380f76f 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredRep.java
@@ -31,7 +31,7 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptedData;
  }
  */
 public class KrbFastArmoredRep extends KrbSequenceType {
-    private static int ENC_FAST_REP = 0;
+    private static final int ENC_FAST_REP = 0;
 
     //private
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
index e3e8427..dfef6d6 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastArmoredReq.java
@@ -45,9 +45,9 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptedData;
  }
  */
 public class KrbFastArmoredReq extends KrbSequenceType {
-    private static int ARMOR = 0;
-    private static int REQ_CHECKSUM = 1;
-    private static int ENC_FAST_REQ = 2;
+    private static final int ARMOR = 0;
+    private static final int REQ_CHECKSUM = 1;
+    private static final int ENC_FAST_REQ = 2;
 
     private KrbFastReq fastReq;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
index a338367..12f120e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastFinished.java
@@ -42,9 +42,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
  }
  */
 public class KrbFastFinished extends KrbSequenceType {
-    private static int FAST_OPTIONS = 0;
-    private static int PADATA = 1;
-    private static int REQ_BODY = 2;
+    private static final int FAST_OPTIONS = 0;
+    private static final int PADATA = 1;
+    private static final int REQ_BODY = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FAST_OPTIONS, KrbFastArmor.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
index 5aee39e..9cbd15c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastReq.java
@@ -38,9 +38,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
  }
  */
 public class KrbFastReq extends KrbSequenceType {
-    private static int FAST_OPTIONS = 0;
-    private static int PADATA = 1;
-    private static int REQ_BODY = 2;
+    private static final int FAST_OPTIONS = 0;
+    private static final int PADATA = 1;
+    private static final int REQ_BODY = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FAST_OPTIONS, FastOptions.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
index 241d864..98ee83c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/KrbFastResponse.java
@@ -40,10 +40,10 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
  }
  */
 public class KrbFastResponse extends KrbSequenceType {
-    private static int PADATA = 0;
-    private static int STRENGTHEN_KEY = 1;
-    private static int FINISHED = 2;
-    private static int NONCE = 3;
+    private static final int PADATA = 0;
+    private static final int STRENGTHEN_KEY = 1;
+    private static final int FINISHED = 2;
+    private static final int NONCE = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PADATA, PaData.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
index b327402..34f60fa 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
  }
  */
 public class PaAuthnEntry extends KrbSequenceType {
-    private static int PA_TYPE = 0;
-    private static int PA_HINT = 1;
-    private static int PA_VALUE = 2;
+    private static final int PA_TYPE = 0;
+    private static final int PA_HINT = 1;
+    private static final int PA_VALUE = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PA_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
index 6023886..d8768a5 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastReply.java
@@ -28,7 +28,7 @@ import org.apache.kerby.asn1.type.Asn1FieldInfo;
  }
  */
 public class PaFxFastReply extends Asn1Choice {
-    private static int ARMORED_DATA = 0;
+    private static final int ARMORED_DATA = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ARMORED_DATA, KrbFastArmoredRep.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
index 148d222..4036ad2 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/PaFxFastRequest.java
@@ -28,7 +28,7 @@ import org.apache.kerby.asn1.type.Asn1FieldInfo;
  }
  */
 public class PaFxFastRequest extends Asn1Choice {
-    private static int ARMORED_DATA = 0;
+    private static final int ARMORED_DATA = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ARMORED_DATA, KrbFastArmoredReq.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
index bbe21cc..32ab96b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/EncKdcRepPart.java
@@ -47,18 +47,18 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.TicketFlags;
  }
  */
 public abstract class EncKdcRepPart extends KrbAppSequenceType {
-    private static int KEY = 0;
-    private static int LAST_REQ = 1;
-    private static int NONCE = 2;
-    private static int KEY_EXPIRATION = 3;
-    private static int FLAGS = 4;
-    private static int AUTHTIME = 5;
-    private static int STARTTIME = 6;
-    private static int ENDTIME = 7;
-    private static int RENEW_TILL = 8;
-    private static int SREALM = 9;
-    private static int SNAME = 10;
-    private static int CADDR = 11;
+    private static final int KEY = 0;
+    private static final int LAST_REQ = 1;
+    private static final int NONCE = 2;
+    private static final int KEY_EXPIRATION = 3;
+    private static final int FLAGS = 4;
+    private static final int AUTHTIME = 5;
+    private static final int STARTTIME = 6;
+    private static final int ENDTIME = 7;
+    private static final int RENEW_TILL = 8;
+    private static final int SREALM = 9;
+    private static final int SNAME = 10;
+    private static final int CADDR = 11;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(KEY, EncryptionKey.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
index fed6d12..87a160a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcRep.java
@@ -44,11 +44,11 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
  }
  */
 public class KdcRep extends KrbMessage {
-    private static int PADATA = 2;
-    private static int CREALM = 3;
-    private static int CNAME = 4;
-    private static int TICKET = 5;
-    private static int ENC_PART = 6;
+    private static final int PADATA = 2;
+    private static final int CREALM = 3;
+    private static final int CNAME = 4;
+    private static final int TICKET = 5;
+    private static final int ENC_PART = 6;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
index a313e25..96a9f10 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReq.java
@@ -37,8 +37,8 @@ import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
  }
  */
 public class KdcReq extends KrbMessage {
-    private static int PADATA = 2;
-    private static int REQ_BODY = 3;
+    private static final int PADATA = 2;
+    private static final int REQ_BODY = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PVNO, 1, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
index d028ddd..82168cf 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java
@@ -56,18 +56,18 @@ import java.util.List;
  }
  */
 public class KdcReqBody extends KrbSequenceType {
-    private static int KDC_OPTIONS = 0;
-    private static int CNAME = 1;
-    private static int REALM = 2;
-    private static int SNAME = 3;
-    private static int FROM = 4;
-    private static int TILL = 5;
-    private static int RTIME = 6;
-    private static int NONCE = 7;
-    private static int ETYPE = 8;
-    private static int ADDRESSES = 9;
-    private static int ENC_AUTHORIZATION_DATA = 10;
-    private static int ADDITIONAL_TICKETS = 11;
+    private static final int KDC_OPTIONS = 0;
+    private static final int CNAME = 1;
+    private static final int REALM = 2;
+    private static final int SNAME = 3;
+    private static final int FROM = 4;
+    private static final int TILL = 5;
+    private static final int RTIME = 6;
+    private static final int NONCE = 7;
+    private static final int ETYPE = 8;
+    private static final int ADDRESSES = 9;
+    private static final int ENC_AUTHORIZATION_DATA = 10;
+    private static final int ADDITIONAL_TICKETS = 11;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(KDC_OPTIONS, KdcOptions.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
index 5a484cf..48fbef9 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaAuthenticationSetElem.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaAuthenticationSetElem extends KrbSequenceType {
-    private static int PA_TYPE = 0;
-    private static int PA_HINT = 1;
-    private static int PA_VALUE = 2;
+    private static final int PA_TYPE = 0;
+    private static final int PA_HINT = 1;
+    private static final int PA_VALUE = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PA_TYPE, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
index 8f0714b..901eb06 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java
@@ -32,8 +32,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaDataEntry extends KrbSequenceType {
-    private static int PADATA_TYPE = 0;
-    private static int PADATA_VALUE = 1;
+    private static final int PADATA_TYPE = 0;
+    private static final int PADATA_VALUE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PADATA_TYPE, 1, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
index 410f9ac..7eb0b56 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaEncTsEnc extends KrbSequenceType {
-    private static int PATIMESTAMP = 0;
-    private static int PAUSEC = 1;
+    private static final int PATIMESTAMP = 0;
+    private static final int PAUSEC = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PATIMESTAMP, 0, KerberosTime.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
index b2f3340..fa29244 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/OtpTokenInfo.java
@@ -41,15 +41,15 @@ import org.apache.kerby.kerberos.kerb.spec.pa.pkinit.AlgorithmIdentifiers;
  }
  */
 public class OtpTokenInfo extends KrbSequenceType {
-    private static int FLAGS = 0;
-    private static int OTP_VENDOR = 1;
-    private static int OTP_CHALLENGE = 2;
-    private static int OTP_LENGTH = 3;
-    private static int OTP_FORMAT = 4;
-    private static int OTP_TOKEN_ID = 5;
-    private static int OTP_ALG_ID = 6;
-    private static int SUPPORTED_HASH_ALG = 7;
-    private static int ITERATION_COUNT = 8;
+    private static final int FLAGS = 0;
+    private static final int OTP_VENDOR = 1;
+    private static final int OTP_CHALLENGE = 2;
+    private static final int OTP_LENGTH = 3;
+    private static final int OTP_FORMAT = 4;
+    private static final int OTP_TOKEN_ID = 5;
+    private static final int OTP_ALG_ID = 6;
+    private static final int SUPPORTED_HASH_ALG = 7;
+    private static final int ITERATION_COUNT = 8;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FLAGS, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
index 0266a99..58140a9 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/otp/PaOtpChallenge.java
@@ -35,11 +35,11 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaOtpChallenge extends KrbSequenceType {
-    private static int NONCE = 0;
-    private static int OTP_SERVICE = 1;
-    private static int OTP_TOKEN_INFO = 2;
-    private static int SALT = 3;
-    private static int S2KPARAMS = 4;
+    private static final int NONCE = 0;
+    private static final int OTP_SERVICE = 1;
+    private static final int OTP_TOKEN_INFO = 2;
+    private static final int SALT = 3;
+    private static final int S2KPARAMS = 4;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(NONCE, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
index 98757e8..8ca1f9c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/AuthPack.java
@@ -32,10 +32,10 @@ import org.apache.kerby.kerberos.kerb.spec.x509.SubjectPublicKeyInfo;
  }
  */
 public class AuthPack extends KrbSequenceType {
-    private static int PK_AUTHENTICATOR = 0;
-    private static int CLIENT_PUBLIC_VALUE = 1;
-    private static int SUPPORTED_CMS_TYPES = 2;
-    private static int CLIENT_DH_NONCE = 3;
+    private static final int PK_AUTHENTICATOR = 0;
+    private static final int CLIENT_PUBLIC_VALUE = 1;
+    private static final int SUPPORTED_CMS_TYPES = 2;
+    private static final int CLIENT_DH_NONCE = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(PK_AUTHENTICATOR, PkAuthenticator.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
index 9844615..721e87a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/DHRepInfo.java
@@ -30,8 +30,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class DHRepInfo extends KrbSequenceType {
-    private static int DH_SIGNED_DATA = 0;
-    private static int SERVER_DH_NONCE = 1;
+    private static final int DH_SIGNED_DATA = 0;
+    private static final int SERVER_DH_NONCE = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(DH_SIGNED_DATA, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
index 4a67feb..08be503 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ExternalPrincipalIdentifier.java
@@ -31,9 +31,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class ExternalPrincipalIdentifier extends KrbSequenceType {
-    private static int SUBJECT_NAME = 0;
-    private static int ISSUER_AND_SERIAL_NUMBER = 1;
-    private static int SUBJECT_KEY_IDENTIFIER = 2;
+    private static final int SUBJECT_NAME = 0;
+    private static final int ISSUER_AND_SERIAL_NUMBER = 1;
+    private static final int SUBJECT_KEY_IDENTIFIER = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(SUBJECT_NAME, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
index 97c6003..0e9504e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/KdcDHKeyInfo.java
@@ -33,9 +33,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class KdcDHKeyInfo extends KrbSequenceType {
-    private static int SUBJECT_PUBLICK_KEY = 0;
-    private static int NONCE = 1;
-    private static int DH_KEY_EXPIRATION = 2;
+    private static final int SUBJECT_PUBLICK_KEY = 0;
+    private static final int NONCE = 1;
+    private static final int DH_KEY_EXPIRATION = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(SUBJECT_PUBLICK_KEY, Asn1BitString.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
index b800794..347af0b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/Krb5PrincipalName.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.base.Realm;
  }
  */
 public class Krb5PrincipalName extends KrbSequenceType {
-    private static int REALM = 0;
-    private static int PRINCIPAL_NAME = 1;
+    private static final int REALM = 0;
+    private static final int PRINCIPAL_NAME = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(REALM, Realm.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
index 952bea6..5c6000e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java
@@ -30,8 +30,8 @@ import org.apache.kerby.asn1.type.Asn1OctetString;
  }
  */
 public class PaPkAsRep extends Asn1Choice {
-    private static int DH_INFO = 0;
-    private static int ENCKEY_PACK = 1;
+    private static final int DH_INFO = 0;
+    private static final int ENCKEY_PACK = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(DH_INFO, DHRepInfo.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
index 79e6e55..53c1b0d 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java
@@ -31,9 +31,9 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PaPkAsReq extends KrbSequenceType {
-    private static int SIGNED_AUTH_PACK = 0;
-    private static int TRUSTED_CERTIFIERS = 1;
-    private static int KDC_PKID = 2;
+    private static final int SIGNED_AUTH_PACK = 0;
+    private static final int TRUSTED_CERTIFIERS = 1;
+    private static final int KDC_PKID = 2;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(SIGNED_AUTH_PACK, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
index d1fafd7..4d3909e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/PkAuthenticator.java
@@ -41,10 +41,10 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class PkAuthenticator extends KrbSequenceType {
-    private static int CUSEC = 0;
-    private static int CTIME = 1;
-    private static int NONCE = 2;
-    private static int PA_CHECKSUM = 3;
+    private static final int CUSEC = 0;
+    private static final int CTIME = 1;
+    private static final int NONCE = 2;
+    private static final int PA_CHECKSUM = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(CUSEC, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
index 87233ea..77f133b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/pkinit/ReplyKeyPack.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
  }
  */
 public class ReplyKeyPack extends KrbSequenceType {
-    private static int REPLY_KEY = 0;
-    private static int AS_CHECKSUM = 1;
+    private static final int REPLY_KEY = 0;
+    private static final int AS_CHECKSUM = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(REPLY_KEY, EncryptionKey.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
index 5956fc7..77810bc 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenChallenge.java
@@ -28,7 +28,7 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
 */
 public class PaTokenChallenge extends KrbSequenceType {
-    private static int TOKENINFOS = 0;
+    private static final int TOKENINFOS = 0;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TOKENINFOS, TokenInfos.class)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
index 94c34a8..d90aa89 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/PaTokenRequest.java
@@ -30,8 +30,8 @@ import org.apache.kerby.kerberos.kerb.spec.base.KrbToken;
  }
 */
 public class PaTokenRequest extends KrbSequenceType {
-    private static int TOKEN_INFO = 0;
-    private static int TOKEN = 1;
+    private static final int TOKEN_INFO = 0;
+    private static final int TOKEN = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TOKEN_INFO, TokenInfo.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
index 43533ca..12abfef 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenInfo.java
@@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.spec.KrbSequenceType;
  }
  */
 public class TokenInfo extends KrbSequenceType {
-    private static int FLAGS = 0;
-    private static int TOKEN_VENDOR = 1;
+    private static final int FLAGS = 0;
+    private static final int TOKEN_VENDOR = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FLAGS, Asn1OctetString.class, true),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
index 34064f8..954b7cf 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/EncTicketPart.java
@@ -45,17 +45,17 @@ import org.apache.kerby.kerberos.kerb.spec.base.*;
 public class EncTicketPart extends KrbAppSequenceType {
     public static final int TAG = 3;
 
-    private static int FLAGS = 0;
-    private static int KEY = 1;
-    private static int CREALM = 2;
-    private static int CNAME = 3;
-    private static int TRANSITED = 4;
-    private static int AUTHTIME = 5;
-    private static int STARTTIME = 6;
-    private static int ENDTIME = 7;
-    private static int RENEW_TILL = 8;
-    private static int CADDR = 9;
-    private static int AUTHORIZATION_DATA = 10;
+    private static final int FLAGS = 0;
+    private static final int KEY = 1;
+    private static final int CREALM = 2;
+    private static final int CNAME = 3;
+    private static final int TRANSITED = 4;
+    private static final int AUTHTIME = 5;
+    private static final int STARTTIME = 6;
+    private static final int ENDTIME = 7;
+    private static final int RENEW_TILL = 8;
+    private static final int CADDR = 9;
+    private static final int AUTHORIZATION_DATA = 10;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(FLAGS, 0, TicketFlags.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
index c65ee55..75213f1 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/Ticket.java
@@ -39,10 +39,10 @@ public class Ticket extends KrbAppSequenceType {
     public static final int TKT_KVNO = KrbConstant.KRB_V5;
     public static final int TAG = 1;
 
-    private static int TKT_VNO = 0;
-    private static int REALM = 1;
-    private static int SNAME = 2;
-    private static int ENC_PART = 3;
+    private static final int TKT_VNO = 0;
+    private static final int REALM = 1;
+    private static final int SNAME = 2;
+    private static final int ENC_PART = 3;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(TKT_VNO, 0, Asn1Integer.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
index 369b99a..544362a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/AlgorithmIdentifier.java
@@ -28,8 +28,8 @@ import org.apache.kerby.asn1.type.*;
  }
  */
 public class AlgorithmIdentifier extends Asn1SequenceType {
-    private static int ALGORITHM = 0;
-    private static int PARAMETERS = 1;
+    private static final int ALGORITHM = 0;
+    private static final int PARAMETERS = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ALGORITHM, -1, Asn1ObjectIdentifier.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
index f69345f..499104e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/x509/SubjectPublicKeyInfo.java
@@ -30,8 +30,8 @@ import org.apache.kerby.asn1.type.Asn1SequenceType;
  }
  */
 public class SubjectPublicKeyInfo extends Asn1SequenceType {
-    private static int ALGORITHM = 0;
-    private static int SUBJECT_PUBLIC_KEY = 1;
+    private static final int ALGORITHM = 0;
+    private static final int SUBJECT_PUBLIC_KEY = 1;
 
     static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
             new Asn1FieldInfo(ALGORITHM, -1, AlgorithmIdentifier.class),

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
index f7997fa..1d9394a 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
@@ -27,7 +27,7 @@ public class Des {
     /*
      * The following are the weak DES keys:
      */
-    static byte[][] WEAK_KEYS = {
+    static final byte[][] WEAK_KEYS = {
     /* weak keys */
             {(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01,(byte) 0x01},
             {(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe,(byte) 0xfe},

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
index 8d62ab3..072fd43 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Rc4.java
@@ -24,7 +24,7 @@ package org.apache.kerby.kerberos.kerb.crypto.util;
  */
 public class Rc4 {
 
-    private static byte[] L40 = "fortybits".getBytes();
+    private static final byte[] L40 = "fortybits".getBytes();
 
     public static byte[] getSalt(int usage, boolean exportable) {
         int newUsage = convertUsage(usage);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
index 7cc127e..e7b0b10 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
@@ -55,7 +55,7 @@ public class CheckSumTest {
             )
     };
 
-    static byte[] TESTKEY = { (byte)0x45, (byte)0x01, (byte)0x49, (byte)0x61, (byte)0x58,
+    static final byte[] TESTKEY = { (byte)0x45, (byte)0x01, (byte)0x49, (byte)0x61, (byte)0x58,
             (byte)0x19, (byte)0x1a, (byte)0x3d };
 
     @Test

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
index bcc46f6..6c6f938 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/Credential.java
@@ -33,7 +33,7 @@ import org.apache.kerby.kerberos.kerb.spec.ticket.TicketFlags;
 import java.io.IOException;
 
 public class Credential {
-    private static String CONF_REALM = "X-CACHECONF:";
+    private static final String CONF_REALM = "X-CACHECONF:";
 
     private PrincipalName clientName;
     private String clientRealm;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abe520cc/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
index 54e6e0b..695a41b 100644
--- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
+++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java
@@ -49,7 +49,7 @@ KVNO Principal
    1 test@SH.INTEL.COM (camellia128-cts-cmac)
  */
 public class KeysTest {
-    private static String TEST_PASSWORD = "123456";
+    private static final String TEST_PASSWORD = "123456";
 
     private Keytab keytab;
 



[2/5] directory-kerby git commit: Checkstyle: fix LocalFinalVariableName, FinalClass, MemberName check

Posted by se...@apache.org.
Checkstyle: fix LocalFinalVariableName, FinalClass, MemberName 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/60d4f51a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/60d4f51a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/60d4f51a

Branch: refs/heads/master
Commit: 60d4f51a5cbc8d4ef707a595192095bd1876a52c
Parents: e36fa26
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 13:44:29 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 14:06:04 2015 +0200

----------------------------------------------------------------------
 .../org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java  | 8 ++++----
 .../kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java     | 2 +-
 .../apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java   | 2 +-
 .../org/apache/kerby/kerberos/provider/token/TokenTest.java  | 8 ++++----
 .../src/test/java/org/apache/kerby/config/IniConfigTest.java | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60d4f51a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
index a326637..31bf0f1 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
@@ -91,14 +91,14 @@ public class WithTokenKdcTestBase extends KdcTestBase {
         authToken.setAudiences(aud);
 
         // Set expiration in 60 minutes
-        final Date NOW =  new Date(new Date().getTime() / 1000 * 1000);
-        Date exp = new Date(NOW.getTime() + 1000 * 60 * 60);
+        final Date now =  new Date(new Date().getTime() / 1000 * 1000);
+        Date exp = new Date(now.getTime() + 1000 * 60 * 60);
         authToken.setExpirationTime(exp);
 
-        Date nbf = NOW;
+        Date nbf = now;
         authToken.setNotBeforeTime(nbf);
 
-        Date iat = NOW;
+        Date iat = now;
         authToken.setIssueTime(iat);
         krbToken = new KrbToken(authToken, TokenFormat.JWT);
         return krbToken;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60d4f51a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
index a909170..bba6ebe 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/IdentityOpts.java
@@ -26,7 +26,7 @@ public class IdentityOpts {
 
     // From MIT Krb5 _pkinit_identity_opts
     public String identity;
-    public List<String> AltIdentities = new ArrayList<String>(1);
+    public List<String> altIdentities = new ArrayList<String>(1);
     public List<String> anchors = new ArrayList<String>(4);
     public List<String> intermediates = new ArrayList<String>(2);
     public List<String> crls = new ArrayList<String>(2);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60d4f51a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
index f117fcd..af250b2 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
@@ -13,7 +13,7 @@ public class DesKeyMakerTest {
     /**
      * The class used to store the test values
      */
-    private static class TestCase {
+    private static final class TestCase {
         String salt;
         String passwd;
         String passwdSaltBytes;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60d4f51a/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java b/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java
index f2b6000..d3fa8b2 100644
--- a/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java
+++ b/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java
@@ -65,14 +65,14 @@ public class TokenTest {
         authToken.setAudiences(auds);
 
         // Set expiration in 60 minutes
-        final Date NOW =  new Date(new Date().getTime() / 1000 * 1000);
-        Date exp = new Date(NOW.getTime() + 1000 * 60 * 60);
+        final Date now =  new Date(new Date().getTime() / 1000 * 1000);
+        Date exp = new Date(now.getTime() + 1000 * 60 * 60);
         authToken.setExpirationTime(exp);
 
-        Date nbf = NOW;
+        Date nbf = now;
         authToken.setNotBeforeTime(nbf);
 
-        Date iat = NOW;
+        Date iat = now;
         authToken.setIssueTime(iat);
     }
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60d4f51a/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java b/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
index 75d7fb6..7b670df 100644
--- a/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
+++ b/lib/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java
@@ -32,8 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class IniConfigTest {
 
-    private final File TEST_DIR = new File(System.getProperty("test.dir","target"));
-    private final File TEST_FILE = new File(TEST_DIR, "test-ini-config");
+    private static final File TEST_DIR = new File(System.getProperty("test.dir","target"));
+    private static final File TEST_FILE = new File(TEST_DIR, "test-ini-config");
 
     @Before
     public void setUp() throws IOException {


[5/5] directory-kerby git commit: Checkstyle: fix UnusedImports check

Posted by se...@apache.org.
Checkstyle: fix UnusedImports 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/33df0463
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/33df0463
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/33df0463

Branch: refs/heads/master
Commit: 33df0463d2bbb6076cf3001fdcd9d937afcae128
Parents: abe520c
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 14:07:49 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 14:07:49 2015 +0200

----------------------------------------------------------------------
 .../test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java  | 1 -
 .../test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java  | 1 -
 2 files changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/33df0463/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
index 2af6cc7..13ca7f9 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssTcpInteropTest.java
@@ -21,7 +21,6 @@ package org.apache.kerby.kerberos.kdc;
 
 import org.apache.kerby.kerberos.kdc.impl.NettyKdcServerImpl;
 import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.server.GssInteropTest;
 
 /**
  * This is an interop test using the Java GSS APIs against the Kerby KDC (using TCP)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/33df0463/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
index 5b30b7a..a3ea8e1 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/GssUdpInteropTest.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.kerberos.kdc;
 
-import org.apache.kerby.kerberos.kerb.server.GssInteropTest;
 
 /**
  * This is an interop test using the Java GSS APIs against the Kerby KDC (using UDP)


[3/5] directory-kerby git commit: Checkstyle: fix ConstantName check

Posted by se...@apache.org.
Checkstyle: fix ConstantName 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/10bc3af2
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/10bc3af2
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/10bc3af2

Branch: refs/heads/master
Commit: 10bc3af2bb374eaf1bb40f58dc0d1da4dcd0b2be
Parents: 7cbd366
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sat Jul 4 00:59:31 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sat Jul 4 14:06:04 2015 +0200

----------------------------------------------------------------------
 .../kerby/kerberos/kerb/client/ClientUtil.java    | 12 ++++++------
 .../kerberos/kerb/common/EncryptionUtil.java      | 18 +++++++++---------
 .../kerb/identity/backend/BackendTest.java        |  4 ++--
 .../kerby/kerberos/kerb/server/KdcTestBase.java   |  4 ++--
 .../kerby/kerberos/kerb/server/TestKdcServer.java |  8 ++++----
 .../main/java/org/apache/kerby/config/Conf.java   |  4 ++--
 .../org/apache/kerby/config/XmlConfigLoader.java  |  6 +++---
 7 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/10bc3af2/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 cface81..97d51fe 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,16 +30,16 @@ import java.util.Map;
 public final class ClientUtil {
     private ClientUtil() {}
 
-    private final static String krb5FileName = "krb5.conf";
-    private final static String krb5EnvName = "KRB5_CONFIG";
+    private final static String KRB5_FILE_NAME = "krb5.conf";
+    private final static String KRB5_ENV_NAME = "KRB5_CONFIG";
 
     /**
      * Load krb5.conf from specified conf dir.
      */
     public static KrbConfig getConfig(File confDir) throws KrbException {
-        File confFile = new File(confDir, krb5FileName);
+        File confFile = new File(confDir, KRB5_FILE_NAME);
         if (!confFile.exists()) {
-            throw new KrbException(krb5FileName + " not found");
+            throw new KrbException(KRB5_FILE_NAME + " not found");
         }
 
         if (confFile != null && confFile.exists()) {
@@ -66,7 +66,7 @@ public final class ClientUtil {
 
         try {
             Map<String, String> mapEnv = System.getenv();
-            tmpEnv = mapEnv.get(krb5EnvName);
+            tmpEnv = mapEnv.get(KRB5_ENV_NAME);
         } catch (SecurityException e) {
             tmpEnv = null;
         }
@@ -74,7 +74,7 @@ public final class ClientUtil {
             confFile = new File(tmpEnv);
             if (!confFile.exists()) {
                 throw new KrbException("krb5 conf not found. Invalid env "
-                        + krb5EnvName);
+                        + KRB5_ENV_NAME);
             }
         } else {
             confDir = new File("/etc/"); // for Linux. TODO: fix for Win etc.

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/10bc3af2/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
index 9fa41ff..bb81227 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
@@ -41,22 +41,22 @@ public class EncryptionUtil {
      * an order preserved map containing cipher names to the corresponding algorithm
      * names in the descending order of strength
      */
-    private static final Map<String, String> cipherAlgoMap = new LinkedHashMap<String, String>();
+    private static final Map<String, String> CIPHER_ALGO_MAP = new LinkedHashMap<String, String>();
 
     static {
-        cipherAlgoMap.put("rc4", "ArcFourHmac");
-        cipherAlgoMap.put("aes256", "AES256");
-        cipherAlgoMap.put("aes128", "AES128");
-        cipherAlgoMap.put("des3", "DESede");
-        cipherAlgoMap.put("des", "DES");
+        CIPHER_ALGO_MAP.put("rc4", "ArcFourHmac");
+        CIPHER_ALGO_MAP.put("aes256", "AES256");
+        CIPHER_ALGO_MAP.put("aes128", "AES128");
+        CIPHER_ALGO_MAP.put("des3", "DESede");
+        CIPHER_ALGO_MAP.put("des", "DES");
     }
 
     public static String getAlgoNameFromEncType(EncryptionType encType) {
         String cipherName = encType.getName().toLowerCase();
 
-        for (String c : cipherAlgoMap.keySet()) {
+        for (String c : CIPHER_ALGO_MAP.keySet()) {
             if (cipherName.startsWith(c)) {
-                return cipherAlgoMap.get(c);
+                return CIPHER_ALGO_MAP.get(c);
             }
         }
 
@@ -72,7 +72,7 @@ public class EncryptionUtil {
     public static List<EncryptionType> orderEtypesByStrength(List<EncryptionType> etypes) {
         List<EncryptionType> ordered = new ArrayList<>(etypes.size());
 
-        for (String algo : cipherAlgoMap.values()) {
+        for (String algo : CIPHER_ALGO_MAP.values()) {
             for (EncryptionType encType : etypes) {
                 String foundAlgo = getAlgoNameFromEncType(encType);
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/10bc3af2/kerby-kerb/kerb-identity-test/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity-test/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java b/kerby-kerb/kerb-identity-test/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
index 8361eac..0dc6035 100644
--- a/kerby-kerb/kerb-identity-test/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
+++ b/kerby-kerb/kerb-identity-test/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
@@ -39,7 +39,7 @@ public abstract class BackendTest {
 
     static final String TEST_PRINCIPAL = "test@EXAMPLE.COM";
 
-    static final EncryptionType[] encTypes = new EncryptionType[]{
+    static final EncryptionType[] ENC_TYPES = new EncryptionType[]{
             EncryptionType.AES128_CTS,
             EncryptionType.DES3_CBC_SHA1_KD
     };
@@ -173,7 +173,7 @@ public abstract class BackendTest {
     }
 
     protected List<EncryptionType> getEncryptionTypes() {
-        return Arrays.asList(encTypes);
+        return Arrays.asList(ENC_TYPES);
     }
 
     protected void cleanIdentities(IdentityBackend backend) {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/10bc3af2/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
index 06fd502..65d9d07 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java
@@ -36,10 +36,10 @@ public abstract class KdcTestBase {
     private final String hostname = "localhost";
     private final String clientPrincipalName = "drankye";
     private final String clientPrincipal =
-            clientPrincipalName + "@" + TestKdcServer.kdcRealm;
+            clientPrincipalName + "@" + TestKdcServer.KDC_REALM;
     private final String serverPrincipalName = "test-service";
     private final String serverPrincipal =
-            serverPrincipalName + "/" + hostname + "@" + TestKdcServer.kdcRealm;
+            serverPrincipalName + "/" + hostname + "@" + TestKdcServer.KDC_REALM;
 
     private SimpleKdcServer kdcServer;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/10bc3af2/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 4395f4b..54fbcae 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,14 +26,14 @@ import org.apache.kerby.kerberos.kerb.client.KrbConfigKey;
 import org.apache.kerby.util.NetworkUtil;
 
 public class TestKdcServer extends SimpleKdcServer {
-    public final static String kdcRealm = "TEST.COM";
-    public final static String hostname = "localhost";
+    public final static String KDC_REALM = "TEST.COM";
+    public final static String HOSTNAME = "localhost";
 
     public TestKdcServer(boolean allowTcp, boolean allowUdp) throws KrbException {
         super();
 
-        setKdcRealm(kdcRealm);
-        setKdcHost(hostname);
+        setKdcRealm(KDC_REALM);
+        setKdcHost(HOSTNAME);
         setAllowTcp(allowTcp);
         setAllowUdp(allowUdp);
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/10bc3af2/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
index 6e2a004..7edfdef 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
@@ -27,7 +27,7 @@ import java.io.IOException;
 import java.util.*;
 
 public class Conf implements Config {
-    private static final Logger logger = LoggerFactory.getLogger(Conf.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Conf.class);
 
     private List<ConfigLoader> resourceConfigs;
     private final ConfigImpl config;
@@ -80,7 +80,7 @@ public class Conf implements Config {
         try {
             loader = loaderClass.newInstance();
         } catch (Exception e) {
-            logger.error("Failed to create " + Conf.class.getPackage().getName() + " for " + loaderClass.getName(), e);
+            LOGGER.error("Failed to create " + Conf.class.getPackage().getName() + " for " + loaderClass.getName(), e);
             throw new RuntimeException("Failed to create " + Conf.class.getPackage().getName() + " for " + loaderClass.getName(), e);
         }
         loader.setResource(resource);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/10bc3af2/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
index 786ac1d..feab854 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class XmlConfigLoader extends ConfigLoader {
-    private static final Logger logger = LoggerFactory.getLogger(Config.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Config.class);
 
     @Override
     protected void loadConfig(ConfigImpl config, Resource resource) throws Exception {
@@ -46,7 +46,7 @@ public class XmlConfigLoader extends ConfigLoader {
         try {
             docBuilderFactory.setXIncludeAware(true);
         } catch (UnsupportedOperationException e) {
-            logger.error("Failed to set setXIncludeAware(true) for parser", e);
+            LOGGER.error("Failed to set setXIncludeAware(true) for parser", e);
         }
         DocumentBuilder builder = docBuilderFactory.newDocumentBuilder();
         InputStream is = (InputStream) resource.getResource();
@@ -69,7 +69,7 @@ public class XmlConfigLoader extends ConfigLoader {
         if ("config".equals(root.getTagName())) {
             valid = true;
         } else {
-            logger.error("bad conf element: top-level element not <configuration>");
+            LOGGER.error("bad conf element: top-level element not <configuration>");
         }
 
         return valid;