You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/11/26 12:45:41 UTC
directory-kerby git commit: Renamed the method: getIntValue to
getValue
Repository: directory-kerby
Updated Branches:
refs/heads/master 1f4b21c86 -> 28bb76d8e
Renamed the method: getIntValue to getValue
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/28bb76d8
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/28bb76d8
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/28bb76d8
Branch: refs/heads/master
Commit: 28bb76d8e1a7e5e71596aed14a33db819a0efd81
Parents: 1f4b21c
Author: Kai Zheng <ka...@intel.com>
Authored: Thu Nov 26 19:45:24 2015 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Thu Nov 26 19:45:24 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kerby/asn1/type/Asn1EnumType.java | 2 +-
.../main/java/org/apache/kerby/asn1/type/Asn1Flags.java | 10 +++++-----
.../test/java/org/apache/kerby/asn1/TestAsn1Flags.java | 2 +-
.../kerberos/kdc/identitybackend/LdapIdentityBackend.java | 2 +-
.../main/java/org/apache/kerby/KrbIdentitySerializer.java | 2 +-
.../org/apache/kerby/kerberos/kerb/preauth/PaFlag.java | 4 ++--
.../apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java | 8 ++++----
.../apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java | 8 ++++----
.../java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java | 4 ++--
.../kerby/kerberos/kerb/spec/KrbAppSequenceType.java | 2 +-
.../apache/kerby/kerberos/kerb/spec/KrbSequenceType.java | 2 +-
.../kerberos/kerb/spec/ad/AuthorizationDataEntry.java | 2 +-
.../kerby/kerberos/kerb/spec/ad/AuthorizationType.java | 4 ++--
.../org/apache/kerby/kerberos/kerb/spec/ap/ApOption.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/base/CheckSum.java | 2 +-
.../kerby/kerberos/kerb/spec/base/CheckSumType.java | 4 ++--
.../kerby/kerberos/kerb/spec/base/EncryptedData.java | 2 +-
.../kerby/kerberos/kerb/spec/base/EncryptionKey.java | 2 +-
.../kerby/kerberos/kerb/spec/base/EncryptionType.java | 4 ++--
.../kerby/kerberos/kerb/spec/base/HostAddrType.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/base/HostAddress.java | 2 +-
.../apache/kerby/kerberos/kerb/spec/base/KeyUsage.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/base/KrbMessage.java | 4 ++--
.../kerby/kerberos/kerb/spec/base/KrbMessageType.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/base/KrbToken.java | 2 +-
.../kerby/kerberos/kerb/spec/base/LastReqEntry.java | 2 +-
.../apache/kerby/kerberos/kerb/spec/base/LastReqType.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/base/NameType.java | 4 ++--
.../kerby/kerberos/kerb/spec/base/PrincipalName.java | 2 +-
.../org/apache/kerby/kerberos/kerb/spec/base/SamType.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/base/TokenFormat.java | 4 ++--
.../kerberos/kerb/spec/base/TransitedEncodingType.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/fast/ArmorType.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/fast/FastOption.java | 4 ++--
.../kerby/kerberos/kerb/spec/fast/KrbFastArmor.java | 2 +-
.../kerby/kerberos/kerb/spec/fast/PaAuthnEntry.java | 2 +-
.../apache/kerby/kerberos/kerb/spec/kdc/KdcOption.java | 4 ++--
.../apache/kerby/kerberos/kerb/spec/kdc/KdcReqBody.java | 2 +-
.../kerberos/kerb/spec/pa/PaAuthenticationSetElem.java | 2 +-
.../apache/kerby/kerberos/kerb/spec/pa/PaDataEntry.java | 2 +-
.../apache/kerby/kerberos/kerb/spec/pa/PaDataType.java | 4 ++--
.../kerby/kerberos/kerb/spec/pa/token/TokenFlag.java | 4 ++--
.../kerby/kerberos/kerb/spec/pa/token/TokenFlags.java | 2 +-
.../kerby/kerberos/kerb/spec/ticket/TicketFlag.java | 4 ++--
.../kerby/kerberos/kerb/spec/ticket/TicketFlags.java | 2 +-
.../kerby/kerberos/kerb/crypto/CheckSumHandler.java | 4 ++--
.../kerby/kerberos/kerb/crypto/EncryptionHandler.java | 6 +++---
.../kerby/kerberos/kerb/identity/backend/BackendTest.java | 4 ++--
.../kerby/kerberos/kerb/ccache/CredCacheOutputStream.java | 10 +++++-----
.../org/apache/kerby/kerberos/kerb/ccache/Credential.java | 2 +-
.../kerby/kerberos/kerb/keytab/KeytabOutputStream.java | 4 ++--
51 files changed, 91 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java
index 12e5e65..7210aee 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1EnumType.java
@@ -23,5 +23,5 @@ package org.apache.kerby.asn1.type;
* A helper interface used by Asn1Enumerated.
*/
public interface Asn1EnumType {
- int getIntValue();
+ int getValue();
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
index a9b57f2..9c219df 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Flags.java
@@ -82,23 +82,23 @@ public class Asn1Flags extends Asn1BitString {
}
public boolean isFlagSet(Asn1EnumType flag) {
- return isFlagSet(flag.getIntValue());
+ return isFlagSet(flag.getValue());
}
public void setFlag(Asn1EnumType flag) {
- setFlag(flag.getIntValue());
+ setFlag(flag.getValue());
}
public void setFlag(Asn1EnumType flag, boolean isSet) {
if (isSet) {
- setFlag(flag.getIntValue());
+ setFlag(flag.getValue());
} else {
- clearFlag(flag.getIntValue());
+ clearFlag(flag.getValue());
}
}
public void clearFlag(Asn1EnumType flag) {
- clearFlag(flag.getIntValue());
+ clearFlag(flag.getValue());
}
private void flags2Value() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
index e866831..ef70a69 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestAsn1Flags.java
@@ -56,7 +56,7 @@ public class TestAsn1Flags {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
index 993f63e..3c9c39e 100644
--- a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
+++ b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
@@ -162,7 +162,7 @@ public class LdapIdentityBackend extends AbstractIdentityBackend {
this.kvnos = new String[keymap.size()];
int i = 0;
for (Map.Entry<EncryptionType, EncryptionKey> entryKey : keymap.entrySet()) {
- etypes[i] = entryKey.getKey().getIntValue() + "";
+ etypes[i] = entryKey.getKey().getValue() + "";
keys[i] = entryKey.getValue().encode();
kvnos[i] = entryKey.getValue().getKvno() + "";
i++;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
index 61fef87..22766ec 100644
--- a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
+++ b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
@@ -85,7 +85,7 @@ public class KrbIdentitySerializer implements ElementSerializer<KrbIdentity> {
out.write(IntSerializer.serialize(keys.size()));
for (EncryptionKey ek : keys.values()) {
- int type = ek.getKeyType().getIntValue();
+ int type = ek.getKeyType().getValue();
out.write(IntSerializer.serialize(type));
byte[] data = ek.getKeyData();
out.write(IntSerializer.serialize(data.length));
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
index 99fd33e..f67ab90 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/PaFlag.java
@@ -33,13 +33,13 @@ public enum PaFlag implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static PaFlag fromValue(int value) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (PaFlag) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
index 94b9c16..21317a9 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
@@ -90,12 +90,12 @@ public class TestAsReqCodec {
List<EncryptionType> types = body.getEtypes();
assertThat(types).hasSize(7);
- assertThat(types.get(0).getIntValue()).isEqualTo(0x0017);
+ assertThat(types.get(0).getValue()).isEqualTo(0x0017);
//assertThat(types.get(1).getValue()).isEqualTo(0xff7b);//FIXME
//assertThat(types.get(2).getValue()).isEqualTo(0x0080);//FIXME
- assertThat(types.get(3).getIntValue()).isEqualTo(0x0003);
- assertThat(types.get(4).getIntValue()).isEqualTo(0x0001);
- assertThat(types.get(5).getIntValue()).isEqualTo(0x0018);
+ assertThat(types.get(3).getValue()).isEqualTo(0x0003);
+ assertThat(types.get(4).getValue()).isEqualTo(0x0001);
+ assertThat(types.get(5).getValue()).isEqualTo(0x0018);
//assertThat(types.get(6).getValue()).isEqualTo(0xff79);//FIXME
List<HostAddress> hostAddress = body.getAddresses().getElements();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
index 5fabbce..de75355 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
@@ -81,12 +81,12 @@ public class TestTgsReqCodec {
List<EncryptionType> eTypes = body.getEtypes();
assertThat(eTypes).hasSize(7);
- assertThat(eTypes.get(0).getIntValue()).isEqualTo(0x0017);
+ assertThat(eTypes.get(0).getValue()).isEqualTo(0x0017);
//assertThat(eTypes.get(1).getValue()).isEqualTo(-133);//FIXME
//assertThat(eTypes.get(2).getValue()).isEqualTo(-128);//FIXME
- assertThat(eTypes.get(3).getIntValue()).isEqualTo(0x0003);
- assertThat(eTypes.get(4).getIntValue()).isEqualTo(0x0001);
- assertThat(eTypes.get(5).getIntValue()).isEqualTo(0x0018);
+ assertThat(eTypes.get(3).getValue()).isEqualTo(0x0003);
+ assertThat(eTypes.get(4).getValue()).isEqualTo(0x0001);
+ assertThat(eTypes.get(5).getValue()).isEqualTo(0x0018);
//assertThat(eTypes.get(6).getValue()).isEqualTo(-135);//FIXME
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
index ef0a3d1..33b0689 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorCode.java
@@ -109,7 +109,7 @@ public enum KrbErrorCode implements Asn1EnumType {
public static KrbErrorCode fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (KrbErrorCode) e;
}
}
@@ -118,7 +118,7 @@ public enum KrbErrorCode implements Asn1EnumType {
return KRB_ERR_GENERIC;
}
- public int getIntValue() {
+ public int getValue() {
return value;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
index 6e4e1bd..5e83189 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
@@ -52,6 +52,6 @@ public abstract class KrbAppSequenceType extends TaggingSequence {
}
protected void setField(int index, Asn1EnumType krbEnum) {
- setFieldAsInt(index, krbEnum.getIntValue());
+ setFieldAsInt(index, krbEnum.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
index 388de92..b9902bc 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
@@ -50,6 +50,6 @@ public abstract class KrbSequenceType extends Asn1SequenceType {
}
protected void setField(int index, Asn1EnumType value) {
- setFieldAsInt(index, value.getIntValue());
+ setFieldAsInt(index, value.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 113c9c4..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
@@ -49,7 +49,7 @@ public class AuthorizationDataEntry extends KrbSequenceType {
}
public void setAuthzType(AuthorizationType authzType) {
- setFieldAsInt(AD_TYPE, authzType.getIntValue());
+ setFieldAsInt(AD_TYPE, authzType.getValue());
}
public byte[] getAuthzData() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationType.java
index aecc138..f4c4988 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ad/AuthorizationType.java
@@ -125,14 +125,14 @@ public enum AuthorizationType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static AuthorizationType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (AuthorizationType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApOption.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApOption.java
index 4faf643..b62d298 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApOption.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ap/ApOption.java
@@ -42,13 +42,13 @@ public enum ApOption implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static ApOption fromValue(int value) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (ApOption) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 d40fa81..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
@@ -62,7 +62,7 @@ public class CheckSum extends KrbSequenceType {
}
public void setCksumtype(CheckSumType cksumtype) {
- setFieldAsInt(CKSUM_TYPE, cksumtype.getIntValue());
+ setFieldAsInt(CKSUM_TYPE, cksumtype.getValue());
}
public byte[] getChecksum() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSumType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSumType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSumType.java
index a4c7498..8e6347a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSumType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/CheckSumType.java
@@ -81,7 +81,7 @@ public enum CheckSumType implements Asn1EnumType {
public static CheckSumType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (CheckSumType) e;
}
}
@@ -101,7 +101,7 @@ public enum CheckSumType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 8e4dca7..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
@@ -54,7 +54,7 @@ public class EncryptedData extends KrbSequenceType {
}
public void setEType(EncryptionType eType) {
- setFieldAsInt(ETYPE, eType.getIntValue());
+ setFieldAsInt(ETYPE, eType.getValue());
}
public int getKvno() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 b15160a..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
@@ -72,7 +72,7 @@ public class EncryptionKey extends KrbSequenceType {
}
public void setKeyType(EncryptionType keyType) {
- setFieldAsInt(KEY_TYPE, keyType.getIntValue());
+ setFieldAsInt(KEY_TYPE, keyType.getValue());
}
public byte[] getKeyData() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionType.java
index f173c09..752ca27 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/EncryptionType.java
@@ -96,7 +96,7 @@ public enum EncryptionType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
@@ -119,7 +119,7 @@ public enum EncryptionType implements Asn1EnumType {
public static EncryptionType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (EncryptionType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddrType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddrType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddrType.java
index 1b8b616..33342da 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddrType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/HostAddrType.java
@@ -82,14 +82,14 @@ public enum HostAddrType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static HostAddrType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (HostAddrType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 2fd33d4..2c2a1b8 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
@@ -99,7 +99,7 @@ public class HostAddress extends KrbSequenceType {
@Override
public int hashCode() {
- int result = getAddrType().getIntValue();
+ int result = getAddrType().getValue();
if (getAddress() != null) {
result = 31 * result + Arrays.hashCode(getAddress());
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KeyUsage.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KeyUsage.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KeyUsage.java
index 2cdb10b..1715865 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KeyUsage.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KeyUsage.java
@@ -108,14 +108,14 @@ public enum KeyUsage implements Asn1EnumType {
this.value = value;
}
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static KeyUsage fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (KeyUsage) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 904a919..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
@@ -30,7 +30,7 @@ public abstract class KrbMessage extends KrbAppSequenceType {
private final int pvno = KrbConstant.KRB_V5;
public KrbMessage(KrbMessageType msgType, Asn1FieldInfo[] fieldInfos) {
- super(msgType.getIntValue(), fieldInfos);
+ super(msgType.getValue(), fieldInfos);
setPvno(pvno);
setMsgType(msgType);
}
@@ -49,6 +49,6 @@ public abstract class KrbMessage extends KrbAppSequenceType {
}
public void setMsgType(KrbMessageType msgType) {
- setFieldAsInt(MSG_TYPE, msgType.getIntValue());
+ setFieldAsInt(MSG_TYPE, msgType.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessageType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessageType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessageType.java
index 32d22cb..464c87d 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessageType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbMessageType.java
@@ -41,14 +41,14 @@ public enum KrbMessageType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static KrbMessageType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (KrbMessageType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 970692e..c40b7bb 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
@@ -149,7 +149,7 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
* @param tokenFormat The token format
*/
public void setTokenFormat(TokenFormat tokenFormat) {
- setFieldAsInt(TOKEN_FORMAT, tokenFormat.getIntValue());
+ setFieldAsInt(TOKEN_FORMAT, tokenFormat.getValue());
}
/**
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 f6e4d16..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
@@ -49,7 +49,7 @@ public class LastReqEntry extends KrbSequenceType {
}
public void setLrType(LastReqType lrType) {
- setFieldAsInt(LR_TYPE, lrType.getIntValue());
+ setFieldAsInt(LR_TYPE, lrType.getValue());
}
public KerberosTime getLrValue() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqType.java
index 5064de0..8113fe9 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/LastReqType.java
@@ -45,14 +45,14 @@ public enum LastReqType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static LastReqType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (LastReqType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/NameType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/NameType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/NameType.java
index 8f61bc3..86055f4 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/NameType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/NameType.java
@@ -36,14 +36,14 @@ public enum NameType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static NameType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (NameType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 496e36d..4bf6e0f 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
@@ -103,7 +103,7 @@ public class PrincipalName extends KrbSequenceType {
}
public void setNameType(NameType nameType) {
- setFieldAsInt(NAME_TYPE, nameType.getIntValue());
+ setFieldAsInt(NAME_TYPE, nameType.getValue());
}
public List<String> getNameStrings() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/SamType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/SamType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/SamType.java
index 7461672..bf8fad7 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/SamType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/SamType.java
@@ -48,14 +48,14 @@ public enum SamType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static SamType fromValue(Integer value) {
if (value != null) {
for (SamType st : SamType.values()) {
- if (value == st.getIntValue()) {
+ if (value == st.getValue()) {
return st;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TokenFormat.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TokenFormat.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TokenFormat.java
index de9aad8..f4e2a7d 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TokenFormat.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TokenFormat.java
@@ -32,14 +32,14 @@ public enum TokenFormat implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static TokenFormat fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (TokenFormat) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncodingType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncodingType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncodingType.java
index 83de2bc..a7616ac 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncodingType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/TransitedEncodingType.java
@@ -33,14 +33,14 @@ public enum TransitedEncodingType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static TransitedEncodingType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (TransitedEncodingType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/ArmorType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/ArmorType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/ArmorType.java
index 05d5f0e..65184a7 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/ArmorType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/ArmorType.java
@@ -32,14 +32,14 @@ public enum ArmorType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static ArmorType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (ArmorType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/FastOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/FastOption.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/FastOption.java
index 39bfbbb..adc6445 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/FastOption.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/fast/FastOption.java
@@ -35,13 +35,13 @@ public enum FastOption implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static FastOption fromValue(int value) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (FastOption) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 4b7d04d..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
@@ -51,7 +51,7 @@ public class KrbFastArmor extends KrbSequenceType {
}
public void setArmorType(ArmorType armorType) {
- setFieldAsInt(ARMOR_TYPE, armorType.getIntValue());
+ setFieldAsInt(ARMOR_TYPE, armorType.getValue());
}
public byte[] getArmorValue() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 da15051..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
@@ -59,7 +59,7 @@ public class PaAuthnEntry extends KrbSequenceType {
}
public void setPaType(PaDataType paDataType) {
- setFieldAsInt(PA_TYPE, paDataType.getIntValue());
+ setFieldAsInt(PA_TYPE, paDataType.getValue());
}
public byte[] getPaHint() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcOption.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcOption.java
index 57633b5..98c1438 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcOption.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/kdc/KdcOption.java
@@ -63,13 +63,13 @@ public enum KdcOption implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static KdcOption fromValue(int value) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (KdcOption) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 081b0a0..a9b3c48 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
@@ -141,7 +141,7 @@ public class KdcReqBody extends KrbSequenceType {
public void setEtypes(List<EncryptionType> etypes) {
List<Integer> values = new ArrayList<Integer>();
for (EncryptionType etype: etypes) {
- values.add(etype.getIntValue());
+ values.add(etype.getValue());
}
KrbIntegers value = new KrbIntegers(values);
setFieldAs(ETYPE, value);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 62f90b5..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
@@ -53,7 +53,7 @@ public class PaAuthenticationSetElem extends KrbSequenceType {
}
public void setPaType(PaDataType paDataType) {
- setFieldAsInt(PA_TYPE, paDataType.getIntValue());
+ setFieldAsInt(PA_TYPE, paDataType.getValue());
}
public byte[] getPaHint() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 f9a9170..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
@@ -56,7 +56,7 @@ public class PaDataEntry extends KrbSequenceType {
}
public void setPaDataType(PaDataType paDataType) {
- setFieldAsInt(PADATA_TYPE, paDataType.getIntValue());
+ setFieldAsInt(PADATA_TYPE, paDataType.getValue());
}
public byte[] getPaDataValue() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataType.java
index a29540b..3656b5e 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/PaDataType.java
@@ -74,14 +74,14 @@ public enum PaDataType implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static PaDataType fromValue(Integer value) {
if (value != null) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value.intValue()) {
+ if (e.getValue() == value.intValue()) {
return (PaDataType) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlag.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlag.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlag.java
index ea3fac7..512cda2 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlag.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlag.java
@@ -35,13 +35,13 @@ public enum TokenFlag implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static TokenFlag fromValue(int value) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (TokenFlag) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlags.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlags.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlags.java
index ec34811..026c054 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlags.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/pa/token/TokenFlags.java
@@ -34,6 +34,6 @@ public class TokenFlags extends Asn1Flags {
}
public boolean isInvalid() {
- return isFlagSet(INVALID.getIntValue());
+ return isFlagSet(INVALID.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlag.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlag.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlag.java
index 56ac780..ef53cee 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlag.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlag.java
@@ -46,13 +46,13 @@ public enum TicketFlag implements Asn1EnumType {
}
@Override
- public int getIntValue() {
+ public int getValue() {
return value;
}
public static TicketFlag fromValue(int value) {
for (Asn1EnumType e : values()) {
- if (e.getIntValue() == value) {
+ if (e.getValue() == value) {
return (TicketFlag) e;
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlags.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlags.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlags.java
index 240af65..88f5c01 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlags.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/ticket/TicketFlags.java
@@ -34,6 +34,6 @@ public class TicketFlags extends Asn1Flags {
}
public boolean isInvalid() {
- return isFlagSet(INVALID.getIntValue());
+ return isFlagSet(INVALID.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumHandler.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumHandler.java
index b2b30b4..5fb7d42 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumHandler.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumHandler.java
@@ -157,7 +157,7 @@ public class CheckSumHandler {
public static CheckSum checksumWithKey(CheckSumType checkSumType,
byte[] bytes, byte[] key, KeyUsage usage) throws KrbException {
CheckSumTypeHandler handler = getCheckSumHandler(checkSumType);
- byte[] checksumBytes = handler.checksumWithKey(bytes, key, usage.getIntValue());
+ byte[] checksumBytes = handler.checksumWithKey(bytes, key, usage.getValue());
CheckSum checkSum = new CheckSum();
checkSum.setCksumtype(checkSumType);
checkSum.setChecksum(checksumBytes);
@@ -169,6 +169,6 @@ public class CheckSumHandler {
CheckSumType checkSumType = checkSum.getCksumtype();
CheckSumTypeHandler handler = getCheckSumHandler(checkSumType);
return handler.verifyWithKey(bytes, key,
- usage.getIntValue(), checkSum.getChecksum());
+ usage.getValue(), checkSum.getChecksum());
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
index 4438ec6..a5e18df 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
@@ -199,7 +199,7 @@ public class EncryptionHandler {
public static EncryptedData encrypt(byte[] plainText, EncryptionKey key,
KeyUsage usage) throws KrbException {
EncTypeHandler handler = getEncHandler(key.getKeyType());
- byte[] cipher = handler.encrypt(plainText, key.getKeyData(), usage.getIntValue());
+ byte[] cipher = handler.encrypt(plainText, key.getKeyData(), usage.getValue());
EncryptedData ed = new EncryptedData();
ed.setCipher(cipher);
@@ -224,7 +224,7 @@ public class EncryptionHandler {
KeyUsage usage) throws KrbException {
EncTypeHandler handler = getEncHandler(key.getKeyType());
- byte[] plainData = handler.decrypt(data, key.getKeyData(), usage.getIntValue());
+ byte[] plainData = handler.decrypt(data, key.getKeyData(), usage.getValue());
return plainData;
}
@@ -242,7 +242,7 @@ public class EncryptionHandler {
EncTypeHandler handler = getEncHandler(key.getKeyType());
byte[] plainData = handler.decrypt(data.getCipher(),
- key.getKeyData(), usage.getIntValue());
+ key.getKeyData(), usage.getValue());
return plainData;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java b/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
index 6384860..ccb738c 100644
--- a/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
+++ b/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTest.java
@@ -48,9 +48,9 @@ public abstract class BackendTest {
assertThat(identity.isDisabled()).isEqualTo(kid.isDisabled());
assertThat(identity.getKeyVersion()).isEqualTo(kid.getKeyVersion());
for (EncryptionKey expectedKey : kid.getKeys().values()) {
- EncryptionType actualType = EncryptionType.fromValue(expectedKey.getKeyType().getIntValue());
+ EncryptionType actualType = EncryptionType.fromValue(expectedKey.getKeyType().getValue());
EncryptionKey actualKey = identity.getKey(actualType);
- assertThat(actualKey.getKeyType().getIntValue()).isEqualTo(expectedKey.getKeyType().getIntValue());
+ assertThat(actualKey.getKeyType().getValue()).isEqualTo(expectedKey.getKeyType().getValue());
assertThat(actualKey.getKeyData()).isEqualTo(expectedKey.getKeyData());
assertThat(actualKey.getKvno()).isEqualTo(expectedKey.getKvno());
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
index 1b30fe9..75e720d 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
@@ -44,7 +44,7 @@ public class CredCacheOutputStream extends KrbOutputStream {
List<String> nameComponents = principal.getNameStrings();
if (version != CredentialCache.FCC_FVNO_1) {
- writeInt(principal.getNameType().getIntValue());
+ writeInt(principal.getNameType().getValue());
}
int numComponents = nameComponents.size();
@@ -62,9 +62,9 @@ public class CredCacheOutputStream extends KrbOutputStream {
@Override
public void writeKey(EncryptionKey key, int version) throws IOException {
- writeShort(key.getKeyType().getIntValue());
+ writeShort(key.getKeyType().getValue());
if (version == CredentialCache.FCC_FVNO_3) {
- writeShort(key.getKeyType().getIntValue());
+ writeShort(key.getKeyType().getValue());
}
writeCountedOctets(key.getKeyData());
@@ -89,7 +89,7 @@ public class CredCacheOutputStream extends KrbOutputStream {
}
public void writeAddress(HostAddress address) throws IOException {
- write(address.getAddrType().getIntValue());
+ write(address.getAddrType().getValue());
write(address.getAddress().length);
write(address.getAddress(), 0,
address.getAddress().length);
@@ -100,7 +100,7 @@ public class CredCacheOutputStream extends KrbOutputStream {
writeInt(0);
} else {
for (AuthorizationDataEntry entry : authData.getElements()) {
- write(entry.getAuthzType().getIntValue());
+ write(entry.getAuthzType().getValue());
write(entry.getAuthzData().length);
write(entry.getAuthzData());
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/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 9f27a77..a391089 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
@@ -108,7 +108,7 @@ public class Credential {
}
public int getEType() {
- return key.getKeyType().getIntValue();
+ return key.getKeyType().getValue();
}
public PrincipalName getClientName() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28bb76d8/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
index 4438417..3fe2280 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
@@ -45,12 +45,12 @@ public class KeytabOutputStream extends KrbOutputStream {
writeCountedString(nameCom);
}
- writeInt(principal.getNameType().getIntValue()); // todo: consider the version
+ writeInt(principal.getNameType().getValue()); // todo: consider the version
}
@Override
public void writeKey(EncryptionKey key, int version) throws IOException {
- writeShort(key.getKeyType().getIntValue());
+ writeShort(key.getKeyType().getValue());
writeCountedOctets(key.getKeyData());
}