You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2015/02/05 12:56:31 UTC
[1/2] directory-kerberos git commit: More code refactoring
Repository: directory-kerberos
Updated Branches:
refs/heads/master cacd28379 -> 4ae948c6c
More code refactoring
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/f2ccbc32
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/f2ccbc32
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/f2ccbc32
Branch: refs/heads/master
Commit: f2ccbc325dbc4c94c4741835d2a71c4623815a67
Parents: cacd283
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 5 11:28:41 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 5 11:28:41 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/kerby/asn1/Asn1Dump.java | 6 +++--
.../org/apache/kerby/asn1/Asn1OutputBuffer.java | 2 +-
.../kerby/asn1/type/AbstractAsn1Type.java | 4 ++-
.../org/apache/kerby/asn1/type/Asn1Any.java | 6 ++---
.../apache/kerby/asn1/type/Asn1BmpString.java | 6 ++---
.../org/apache/kerby/asn1/type/Asn1Choice.java | 22 ++++++++---------
.../kerby/asn1/type/Asn1CollectionType.java | 26 +++++++++++---------
.../kerby/asn1/type/Asn1GeneralizedTime.java | 4 ++-
.../org/apache/kerby/asn1/type/Asn1Item.java | 16 +++++++-----
.../kerby/asn1/type/Asn1ObjectIdentifier.java | 4 ++-
.../org/apache/kerby/asn1/type/Asn1Tagging.java | 12 ++++-----
.../org/apache/kerby/asn1/type/Asn1UtcTime.java | 3 +--
.../apache/kerby/asn1/TestAsn1Collection.java | 4 +--
.../test/java/org/apache/kerby/asn1/Util.java | 8 +++---
14 files changed, 68 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Dump.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Dump.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Dump.java
index cfd9c5d..b9199fe 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Dump.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Dump.java
@@ -39,7 +39,9 @@ public class Asn1Dump {
Asn1Type value;
while (true) {
value = buffer.read();
- if (value == null) break;
+ if (value == null) {
+ break;
+ }
dump(value, sb);
}
@@ -54,7 +56,7 @@ public class Asn1Dump {
private static void dump(Asn1Type value, StringBuilder buffer) {
if (value instanceof Asn1Simple) {
- buffer.append(((Asn1Simple) value).getValue().toString());
+ buffer.append(((Asn1Simple<?>) value).getValue().toString());
} else if (value instanceof Asn1Item) {
dump((Asn1Item) value, buffer);
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1OutputBuffer.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1OutputBuffer.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1OutputBuffer.java
index 42f8ead..76e4d2b 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1OutputBuffer.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1OutputBuffer.java
@@ -56,7 +56,7 @@ public class Asn1OutputBuffer {
int allLen = 0;
for (Asn1Type item : objects) {
if (item != null) {
- allLen += ((AbstractAsn1Type) item).encodingLength();
+ allLen += ((AbstractAsn1Type<?>) item).encodingLength();
}
}
return allLen;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
index 9605646..a00591d 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
@@ -155,7 +155,9 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
public int tagFlags() {
if (tagFlags == -1) {
int flags = tagClass.getValue();
- if (isConstructed()) flags |= EncodingOption.CONSTRUCTED_FLAG;
+ if (isConstructed()) {
+ flags |= EncodingOption.CONSTRUCTED_FLAG;
+ }
return flags;
}
return tagFlags;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Any.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Any.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Any.java
index 1474851..e73315d 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Any.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Any.java
@@ -32,16 +32,16 @@ public class Asn1Any extends AbstractAsn1Type<Asn1Type> {
@Override
protected int encodingBodyLength() {
- return ((AbstractAsn1Type) getValue()).encodingBodyLength();
+ return ((AbstractAsn1Type<?>) getValue()).encodingBodyLength();
}
@Override
protected void encodeBody(ByteBuffer buffer) {
- ((AbstractAsn1Type) getValue()).encodeBody(buffer);
+ ((AbstractAsn1Type<?>) getValue()).encodeBody(buffer);
}
@Override
protected void decodeBody(LimitedByteBuffer content) throws IOException {
- ((AbstractAsn1Type) getValue()).decodeBody(content);
+ ((AbstractAsn1Type<?>) getValue()).decodeBody(content);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1BmpString.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1BmpString.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1BmpString.java
index 125b9a2..aa59ed4 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1BmpString.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1BmpString.java
@@ -44,9 +44,9 @@ public class Asn1BmpString extends Asn1Simple<String>
String strValue = getValue();
int len = strValue.length();
byte[] bytes = new byte[len * 2];
- char c;
+
for (int i = 0; i != len; i++) {
- c = strValue.charAt(i);
+ char c = strValue.charAt(i);
bytes[2 * i] = (byte)(c >> 8);
bytes[2 * i + 1] = (byte)c;
}
@@ -55,7 +55,7 @@ public class Asn1BmpString extends Asn1Simple<String>
protected void toValue() throws IOException {
byte[] bytes = getBytes();
- char[] chars = new char[bytes.length / 2];
+ char[] chars = new char[bytes.length / 2];
for (int i = 0; i != chars.length; i++) {
chars[i] = (char)((bytes[2 * i] << 8) | (bytes[2 * i + 1] & 0xff));
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java
index cb439b2..69b1fd6 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Choice.java
@@ -44,13 +44,11 @@ public class Asn1Choice extends AbstractAsn1Type<Asn1Type> {
@Override
protected int encodingBodyLength() {
- AbstractAsn1Type field;
- TaggingOption taggingOption;
for (int i = 0; i < fields.length; ++i) {
- field = (AbstractAsn1Type) fields[i];
+ AbstractAsn1Type<?> field = (AbstractAsn1Type<?>) fields[i];
if (field != null) {
if (fieldInfos[i].isTagged()) {
- taggingOption = fieldInfos[i].getTaggingOption();
+ TaggingOption taggingOption = fieldInfos[i].getTaggingOption();
return field.taggedEncodingLength(taggingOption);
} else {
return field.encodingLength();
@@ -62,13 +60,11 @@ public class Asn1Choice extends AbstractAsn1Type<Asn1Type> {
@Override
protected void encodeBody(ByteBuffer buffer) {
- Asn1Type field;
- TaggingOption taggingOption;
for (int i = 0; i < fields.length; ++i) {
- field = fields[i];
+ Asn1Type field = fields[i];
if (field != null) {
if (fieldInfos[i].isTagged()) {
- taggingOption = fieldInfos[i].getTaggingOption();
+ TaggingOption taggingOption = fieldInfos[i].getTaggingOption();
field.taggedEncode(buffer, taggingOption);
} else {
field.encode(buffer);
@@ -105,7 +101,7 @@ public class Asn1Choice extends AbstractAsn1Type<Asn1Type> {
}
if (! item.isFullyDecoded()) {
- AbstractAsn1Type fieldValue = (AbstractAsn1Type) fields[foundPos];
+ AbstractAsn1Type<?> fieldValue = (AbstractAsn1Type<?>) fields[foundPos];
if (item.isContextSpecific()) {
item.decodeValueWith(fieldValue, fieldInfos[foundPos].getTaggingOption());
} else {
@@ -139,7 +135,9 @@ public class Asn1Choice extends AbstractAsn1Type<Asn1Type> {
protected String getFieldAsString(int index) {
Asn1Type value = fields[index];
- if (value == null) return null;
+ if (value == null) {
+ return null;
+ }
if (value instanceof Asn1String) {
return ((Asn1String) value).getValue();
@@ -150,7 +148,9 @@ public class Asn1Choice extends AbstractAsn1Type<Asn1Type> {
protected byte[] getFieldAsOctets(int index) {
Asn1OctetString value = getFieldAs(index, Asn1OctetString.class);
- if (value != null) return value.getValue();
+ if (value != null) {
+ return value.getValue();
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
index 28d8a15..4187209 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
@@ -50,13 +50,11 @@ public abstract class Asn1CollectionType extends AbstractAsn1Type<Asn1Collection
@Override
protected int encodingBodyLength() {
int allLen = 0;
- AbstractAsn1Type field;
- TaggingOption taggingOption;
for (int i = 0; i < fields.length; ++i) {
- field = (AbstractAsn1Type) fields[i];
+ AbstractAsn1Type<?> field = (AbstractAsn1Type<?>) fields[i];
if (field != null) {
if (fieldInfos[i].isTagged()) {
- taggingOption = fieldInfos[i].getTaggingOption();
+ TaggingOption taggingOption = fieldInfos[i].getTaggingOption();
allLen += field.taggedEncodingLength(taggingOption);
} else {
allLen += field.encodingLength();
@@ -68,13 +66,11 @@ public abstract class Asn1CollectionType extends AbstractAsn1Type<Asn1Collection
@Override
protected void encodeBody(ByteBuffer buffer) {
- Asn1Type field;
- TaggingOption taggingOption;
for (int i = 0; i < fields.length; ++i) {
- field = fields[i];
+ Asn1Type field = fields[i];
if (field != null) {
if (fieldInfos[i].isTagged()) {
- taggingOption = fieldInfos[i].getTaggingOption();
+ TaggingOption taggingOption = fieldInfos[i].getTaggingOption();
field.taggedEncode(buffer, taggingOption);
} else {
field.encode(buffer);
@@ -111,7 +107,7 @@ public abstract class Asn1CollectionType extends AbstractAsn1Type<Asn1Collection
}
if (! item.isFullyDecoded()) {
- AbstractAsn1Type fieldValue = (AbstractAsn1Type) fields[foundPos];
+ AbstractAsn1Type<?> fieldValue = (AbstractAsn1Type<?>) fields[foundPos];
if (item.isContextSpecific()) {
item.decodeValueWith(fieldValue, fieldInfos[foundPos].getTaggingOption());
} else {
@@ -137,7 +133,9 @@ public abstract class Asn1CollectionType extends AbstractAsn1Type<Asn1Collection
protected <T extends Asn1Type> T getFieldAs(int index, Class<T> t) {
Asn1Type value = fields[index];
- if (value == null) return null;
+ if (value == null) {
+ return null;
+ }
return (T) value;
}
@@ -147,7 +145,9 @@ public abstract class Asn1CollectionType extends AbstractAsn1Type<Asn1Collection
protected String getFieldAsString(int index) {
Asn1Type value = fields[index];
- if (value == null) return null;
+ if (value == null) {
+ return null;
+ }
if (value instanceof Asn1String) {
return ((Asn1String) value).getValue();
@@ -158,7 +158,9 @@ public abstract class Asn1CollectionType extends AbstractAsn1Type<Asn1Collection
protected byte[] getFieldAsOctets(int index) {
Asn1OctetString value = getFieldAs(index, Asn1OctetString.class);
- if (value != null) return value.getValue();
+ if (value != null) {
+ return value.getValue();
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
index 4346f65..020a7b4 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
@@ -105,7 +105,9 @@ public class Asn1GeneralizedTime extends Asn1Simple<Date> {
chr = dateStr.charAt(i);
if ('0' <= chr && chr <= '9') {
millDigits[j++] = chr;
- } else break;
+ } else {
+ break;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Item.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Item.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Item.java
index a18d135..1249c20 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Item.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Item.java
@@ -58,7 +58,7 @@ public class Asn1Item extends AbstractAsn1Type<Asn1Type>
@Override
protected int encodingBodyLength() {
if (getValue() != null) {
- return ((AbstractAsn1Type) getValue()).encodingBodyLength();
+ return ((AbstractAsn1Type<?>) getValue()).encodingBodyLength();
}
return (int) bodyContent.hasLeft();
}
@@ -66,7 +66,7 @@ public class Asn1Item extends AbstractAsn1Type<Asn1Type>
@Override
protected void encodeBody(ByteBuffer buffer) {
if (getValue() != null) {
- ((AbstractAsn1Type) getValue()).encodeBody(buffer);
+ ((AbstractAsn1Type<?>) getValue()).encodeBody(buffer);
} else {
try {
buffer.put(bodyContent.readAllLeftBytes());
@@ -86,7 +86,9 @@ public class Asn1Item extends AbstractAsn1Type<Asn1Type>
}
public void decodeValueAsSimple() throws IOException {
- if (getValue() != null) return;
+ if (getValue() != null) {
+ return;
+ }
if (! isSimple()) {
throw new IllegalArgumentException("Attempting to decode non-simple value as simple");
}
@@ -96,7 +98,9 @@ public class Asn1Item extends AbstractAsn1Type<Asn1Type>
}
public void decodeValueAsCollection() throws IOException {
- if (getValue() != null) return;
+ if (getValue() != null) {
+ return;
+ }
if (! isCollection()) {
throw new IllegalArgumentException("Attempting to decode non-collection value as collection");
}
@@ -117,7 +121,7 @@ public class Asn1Item extends AbstractAsn1Type<Asn1Type>
public void decodeValueWith(Asn1Type value) throws IOException {
setValue(value);
- ((AbstractAsn1Type) value).decode(tagFlags(), tagNo(), bodyContent);
+ ((AbstractAsn1Type<?>) value).decode(tagFlags(), tagNo(), bodyContent);
}
public void decodeValueAsImplicitTagged(int originalTag, int originalTagNo) throws IOException {
@@ -149,7 +153,7 @@ public class Asn1Item extends AbstractAsn1Type<Asn1Type>
if (! isTagged()) {
throw new IllegalArgumentException("Attempting to decode non-tagged value using tagging way");
}
- ((AbstractAsn1Type) value).taggedDecode(tagFlags(), tagNo(), getBodyContent(), taggingOption);
+ ((AbstractAsn1Type<?>) value).taggedDecode(tagFlags(), tagNo(), getBodyContent(), taggingOption);
setValue(value);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java
index d12f6ca..0cec9c2 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1ObjectIdentifier.java
@@ -101,7 +101,9 @@ public class Asn1ObjectIdentifier extends Asn1Simple<String> {
private byte[][] group(byte[] bytes) {
int count = 0, i, j;
int[] countArr = new int[bytes.length]; // how many bytes for each group
- for (i = 0; i < countArr.length; ++i) countArr[i] = 0;
+ for (i = 0; i < countArr.length; ++i) {
+ countArr[i] = 0;
+ }
for (j = 0, i = 0; i < bytes.length; ++i) {
if ((bytes[i] & 0x80) != 0) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
index 9f56b39..b1e919c 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
@@ -46,7 +46,7 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
@Override
protected int encodingBodyLength() {
- AbstractAsn1Type value = (AbstractAsn1Type) getValue();
+ AbstractAsn1Type<?> value = (AbstractAsn1Type<?>) getValue();
if (getEncodingOption().isExplicit()) {
return value.encodingLength();
} else if (getEncodingOption().isImplicit()) {
@@ -61,7 +61,7 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
if (getEncodingOption().isExplicit()) {
return true;
} else if (getEncodingOption().isImplicit()) {
- AbstractAsn1Type value = (AbstractAsn1Type) getValue();
+ AbstractAsn1Type<?> value = (AbstractAsn1Type<?>) getValue();
return value.isConstructed();
}
return false;
@@ -69,7 +69,7 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
@Override
protected void encodeBody(ByteBuffer buffer) {
- AbstractAsn1Type value = (AbstractAsn1Type) getValue();
+ AbstractAsn1Type<?> value = (AbstractAsn1Type<?>) getValue();
if (getEncodingOption().isExplicit()) {
value.encode(buffer);
} else if (getEncodingOption().isImplicit()) {
@@ -81,7 +81,7 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
@Override
protected void decodeBody(LimitedByteBuffer content) throws IOException {
- AbstractAsn1Type value = (AbstractAsn1Type) getValue();
+ AbstractAsn1Type<?> value = (AbstractAsn1Type<?>) getValue();
if (getEncodingOption().isExplicit()) {
value.decode(content);
} else if (getEncodingOption().isImplicit()) {
@@ -93,9 +93,9 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
private void initValue() {
Class<? extends Asn1Type> valueType = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
- AbstractAsn1Type value = null;
+ AbstractAsn1Type<?> value = null;
try {
- value = (AbstractAsn1Type) valueType.newInstance();
+ value = (AbstractAsn1Type<?>) valueType.newInstance();
} catch (Exception e) {
throw new RuntimeException("Failed to create tagged value", e);
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1UtcTime.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1UtcTime.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1UtcTime.java
index c39dcdc..220e7c2 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1UtcTime.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1UtcTime.java
@@ -66,8 +66,7 @@ public class Asn1UtcTime extends Asn1Simple<Date>
throw new IllegalArgumentException("Bad utc time string " + dateStr);
}
- SimpleDateFormat sdf;
- sdf = new SimpleDateFormat("yyMMddHHmmssZ");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmssZ");
sdf.setTimeZone(new SimpleTimeZone(0, "Z"));
try {
setValue(sdf.parse(fixedDateStr));
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/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 b3e81fc..16c368f 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
@@ -50,10 +50,10 @@ public class TestAsn1Collection {
public void testSequenceDecoding() throws IOException {
Asn1Sequence seq = new Asn1Sequence();
seq.decode(EXPECTED_BYTES);
- AbstractAsn1Type field = (AbstractAsn1Type) seq.getValue().get(0).getValue();
+ AbstractAsn1Type<?> field = (AbstractAsn1Type<?>) seq.getValue().get(0).getValue();
assertThat(field.getValue()).isEqualTo(TEST_STR);
- field = (AbstractAsn1Type) seq.getValue().get(1).getValue();
+ field = (AbstractAsn1Type<?>) seq.getValue().get(1).getValue();
assertThat(field.getValue()).isEqualTo(TEST_BOOL);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f2ccbc32/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
index 446917a..d3a1570 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/Util.java
@@ -50,7 +50,7 @@ public class Util {
* 0x02 02 00 80
*/
public static byte[] hex2bytes(String hexString) {
- if (hexString==null) {
+ if (hexString == null) {
throw new IllegalArgumentException("Invalid hex string to convert : null");
}
@@ -60,7 +60,7 @@ public class Util {
throw new IllegalArgumentException("Invalid hex string to convert : length below 4");
}
- if (( hexStr[0] != '0') || ((hexStr[1]!='x') && (hexStr[1]!='X'))) {
+ if (( hexStr[0] != '0') || ((hexStr[1] != 'x') && (hexStr[1] != 'X'))) {
throw new IllegalArgumentException("Invalid hex string to convert : not starting with '0x'");
}
@@ -69,9 +69,9 @@ public class Util {
boolean high = false;
boolean prefix = true;
- for (char c:hexStr) {
+ for (char c : hexStr) {
if (prefix) {
- if ((c == 'x')|| (c=='X')) {
+ if ((c == 'x') || (c=='X')) {
prefix = false;
}
[2/2] directory-kerberos git commit: Some test refactoring
Posted by co...@apache.org.
Some test refactoring
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/4ae948c6
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/4ae948c6
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/4ae948c6
Branch: refs/heads/master
Commit: 4ae948c6c3cb0458d90c1af547d1ebab99c40849
Parents: f2ccbc3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 5 11:54:00 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 5 11:54:00 2015 +0000
----------------------------------------------------------------------
.../src/main/resources/aes128-kerberos-data | Bin 1712 -> 0 bytes
.../src/main/resources/aes128-key-data | 1 -
.../src/main/resources/aes128-spnego-data | Bin 1778 -> 0 bytes
.../src/main/resources/aes256-kerberos-data | Bin 1744 -> 0 bytes
.../src/main/resources/aes256-key-data | Bin 32 -> 0 bytes
.../src/main/resources/aes256-spnego-data | Bin 1810 -> 0 bytes
.../src/main/resources/asrep.token | Bin 1241 -> 0 bytes
.../src/main/resources/asreq.token | Bin 291 -> 0 bytes
.../src/main/resources/des-kerberos-data | Bin 1773 -> 0 bytes
.../src/main/resources/des-key-data | 1 -
.../src/main/resources/des-pac-data | Bin 1072 -> 0 bytes
.../src/main/resources/des-spnego-data | Bin 1839 -> 0 bytes
.../src/main/resources/exceptions.properties | 55 -------------------
.../src/main/resources/rc4-kerberos-data | Bin 1735 -> 0 bytes
.../src/main/resources/rc4-key-data | 1 -
.../src/main/resources/rc4-pac-data | Bin 1048 -> 0 bytes
.../src/main/resources/rc4-spnego-data | Bin 1801 -> 0 bytes
.../src/main/resources/server.keytab | Bin 387 -> 0 bytes
.../src/main/resources/tgsrep.token | Bin 1189 -> 0 bytes
.../src/main/resources/tgsreq.token | Bin 1211 -> 0 bytes
.../kerb/codec/kerberos/KerberosApRequest.java | 2 +-
.../kerb/codec/kerberos/KerberosToken.java | 6 +-
.../kerberos/kerb/codec/spnego/SpnegoToken.java | 4 +-
.../kerberos/kerb/codec/test/CodecTestUtil.java | 13 +++--
.../kerberos/kerb/codec/test/TestKerberos.java | 6 +-
.../kerberos/kerb/codec/test/TestSpnego.java | 3 +-
.../src/test/resources/aes128-kerberos-data | Bin 0 -> 1712 bytes
.../src/test/resources/aes128-key-data | 1 +
.../src/test/resources/aes128-spnego-data | Bin 0 -> 1778 bytes
.../src/test/resources/aes256-kerberos-data | Bin 0 -> 1744 bytes
.../src/test/resources/aes256-key-data | Bin 0 -> 32 bytes
.../src/test/resources/aes256-spnego-data | Bin 0 -> 1810 bytes
.../src/test/resources/asrep.token | Bin 0 -> 1241 bytes
.../src/test/resources/asreq.token | Bin 0 -> 291 bytes
.../src/test/resources/des-kerberos-data | Bin 0 -> 1773 bytes
.../src/test/resources/des-key-data | 1 +
.../src/test/resources/des-pac-data | Bin 0 -> 1072 bytes
.../src/test/resources/des-spnego-data | Bin 0 -> 1839 bytes
.../src/test/resources/exceptions.properties | 55 +++++++++++++++++++
.../src/test/resources/rc4-kerberos-data | Bin 0 -> 1735 bytes
.../src/test/resources/rc4-key-data | 1 +
.../src/test/resources/rc4-pac-data | Bin 0 -> 1048 bytes
.../src/test/resources/rc4-spnego-data | Bin 0 -> 1801 bytes
.../src/test/resources/server.keytab | Bin 0 -> 387 bytes
.../src/test/resources/tgsrep.token | Bin 0 -> 1189 bytes
.../src/test/resources/tgsreq.token | Bin 0 -> 1211 bytes
.../kerby/kerberos/kerb/KrbErrorException.java | 4 ++
.../kerby/kerberos/kerb/KrbException.java | 5 ++
.../kerby/kerberos/kerb/spec/KerberosTime.java | 10 +---
.../kerberos/kerb/spec/KrbAppSequenceType.java | 3 +-
.../kerberos/kerb/spec/KrbSequenceType.java | 3 +-
.../kerberos/kerb/spec/common/CheckSum.java | 12 +++-
.../kerb/spec/common/EncryptedData.java | 12 +++-
.../kerb/spec/common/EncryptionKey.java | 16 ++++--
.../kerb/spec/common/PrincipalName.java | 2 +-
55 files changed, 120 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data
deleted file mode 100644
index 7f3b582..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data b/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data
deleted file mode 100644
index 4ba2540..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data
+++ /dev/null
@@ -1 +0,0 @@
-����\���U�s�7"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data
deleted file mode 100644
index 13c89e6..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data
deleted file mode 100644
index b7d539f..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data b/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data
deleted file mode 100644
index 24792c1..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data
deleted file mode 100644
index 6a7e55c..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/asrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/asrep.token b/kerby-kerb/kerb-core-test/src/main/resources/asrep.token
deleted file mode 100644
index d77cff7..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/asrep.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/asreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/asreq.token b/kerby-kerb/kerb-core-test/src/main/resources/asreq.token
deleted file mode 100644
index 6d503b3..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/asreq.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data
deleted file mode 100644
index 3db6963..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-key-data b/kerby-kerb/kerb-core-test/src/main/resources/des-key-data
deleted file mode 100644
index 84a0c50..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/des-key-data
+++ /dev/null
@@ -1 +0,0 @@
-��2^�L�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data b/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data
deleted file mode 100644
index 7408111..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data
deleted file mode 100644
index 04a56e8..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties b/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties
deleted file mode 100644
index c9cc814..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-object.cast.fail=Unable to cast object from {0} to {1}.
-
-spnego.token.empty=Empty SPNego token.
-spnego.token.invalid=Not a valid SPNego token: {0}.
-spnego.token.malformed=Malformed SPNego token.
-spnego.field.invalid=Not a valid SPNego token field: {0}.
-
-
-kerberos.object.cast=Unable to cast Kerberos object from {0} to {1}.
-kerberos.token.empty=Empty Kerberos token.
-kerberos.token.invalid=Not a Kerberos token.
-kerberos.token.malformed=Malformed Kerberos token.
-kerberos.kdcReq.empty=Empty message.
-kerberos.kdcReq.invalid=Not a KRB_AP_REQ message.
-kerberos.ticket.empty=Empty Kerberos ticket.
-kerberos.ticket.invalid=Not a Kerberos v5 ticket.
-kerberos.ticket.malformed=Malformed Kerberos ticket.
-kerberos.field.invalid=Not a valid Kerberos ticket field: {0}.
-kerberos.field.malformed=Malformed Kerberos ticket field.
-kerberos.key.notfound=Unable to find appropriate key of type {0}.
-kerberos.version.invalid=Invalid version of Kerberos ticket: {0}.
-kerberos.login.fail=Unable to get server keys.
-kerberos.decrypt.fail=Unable to decrypt encrypted data using key of type {0}.
-
-pac.token.empty=Empty PAC token.
-pac.token.malformed=Malformed PAC token.
-pac.logoninfo.malformed=Malformed PAC logon info.
-pac.signature.malformed=Malformed PAC signature.
-pac.signature.invalid=Invalid PAC signature.
-pac.string.notempty=String not empty while expected null.
-pac.string.malformed.size=Inconsistent string lengths.
-pac.string.invalid.size=Inconsistent string size: {1}, expecting {0}.
-pac.groups.invalid.size=Group count ({0}) doesn't match the real number of groups ({1}) in the PAC.
-pac.extrasids.invalid.size=Extra SID count ({0}) doesn't match the real number of extra SID ({1}) in the PAC.
-pac.resourcegroups.invalid.size=Resource group count ({0}) doesn't match the real number of resource groups ({1}) in the PAC.
-pac.sid.malformed.size=Inconsistent SID length.
-pac.subauthority.malformed.size=Incorrect byte array length: {0}; must be multiple of 4.
-pac.version.invalid=Invalid version of PAC token: {0}.
-pac.check.fail=Unable to check PAC signature.
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data
deleted file mode 100644
index 6be7086..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data
deleted file mode 100644
index 64f9d9c..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data
+++ /dev/null
@@ -1 +0,0 @@
-l�܇y#�l�mv��k�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data
deleted file mode 100644
index df45f91..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data
deleted file mode 100644
index 91cbe26..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/server.keytab
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/server.keytab b/kerby-kerb/kerb-core-test/src/main/resources/server.keytab
deleted file mode 100644
index b44347c..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/server.keytab and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token b/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token
deleted file mode 100644
index 25d6270..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token b/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token
deleted file mode 100644
index 69f6b46..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
index 4266ea6..3ffb686 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
@@ -33,7 +33,7 @@ public class KerberosApRequest {
private KerberosTicket ticket;
public KerberosApRequest(byte[] token, EncryptionKey key) throws Exception {
- if(token.length <= 0) {
+ if (token.length <= 0) {
throw new IOException("kerberos request empty");
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
index f3488c3..bb24611 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
@@ -35,14 +35,16 @@ public class KerberosToken {
public KerberosToken(byte[] token, EncryptionKey key) throws Exception {
- if(token.length <= 0)
+ if (token.length <= 0) {
throw new IOException("kerberos.token.empty");
+ }
Asn1InputBuffer buffer = new Asn1InputBuffer(token);
Asn1Item value = (Asn1Item) buffer.read();
- if(! value.isAppSpecific() && ! value.isConstructed())
+ if(! value.isAppSpecific() && ! value.isConstructed()) {
throw new IOException("kerberos.token.malformed");
+ }
buffer = new Asn1InputBuffer(value.getBodyContent());
buffer.skipNext();
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
index 7c80a59..6e61dc1 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
@@ -33,8 +33,9 @@ public abstract class SpnegoToken {
public static SpnegoToken parse(byte[] token) throws IOException {
SpnegoToken spnegoToken = null;
- if(token.length <= 0)
+ if (token.length <= 0) {
throw new IOException("spnego.token.empty");
+ }
switch (token[0]) {
case (byte)0x60:
@@ -45,7 +46,6 @@ public abstract class SpnegoToken {
break;
default:
spnegoToken = null;
- Object[] args = new Object[]{token[0]};
throw new IOException("spnego.token.invalid");
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
index ed11259..2657093 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
@@ -23,10 +23,11 @@ import java.io.IOException;
import java.io.InputStream;
public class CodecTestUtil {
- /*package*/ static byte[] readBinaryFile(String path) throws IOException {
- InputStream is = CodecTestUtil.class.getResourceAsStream(path);
- byte[] bytes = new byte[is.available()];
- is.read(bytes);
- return bytes;
- }
+ /*package*/
+ static byte[] readBinaryFile(String path) throws IOException {
+ InputStream is = CodecTestUtil.class.getResourceAsStream(path);
+ byte[] bytes = new byte[is.available()];
+ is.read(bytes);
+ return bytes;
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
index 900186f..42e5feb 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
@@ -44,10 +44,8 @@ public class TestKerberos {
@Before
public void setUp() throws IOException {
- InputStream file;
- byte[] keyData;
- file = this.getClass().getClassLoader().getResourceAsStream("rc4-kerberos-data");
+ InputStream file = this.getClass().getClassLoader().getResourceAsStream("rc4-kerberos-data");
rc4Token = new byte[file.available()];
file.read(rc4Token);
file.close();
@@ -68,7 +66,7 @@ public class TestKerberos {
file.close();
file = this.getClass().getClassLoader().getResourceAsStream("rc4-key-data");
- keyData = new byte[file.available()];
+ byte[] keyData = new byte[file.available()];
file.read(keyData);
rc4Key = new EncryptionKey(23, keyData, 2);
file.close();
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
index 8c53d3a..35eed4a 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
@@ -39,9 +39,8 @@ public class TestSpnego {
//@Before
public void setUp() throws IOException {
- InputStream file;
- file = this.getClass().getClassLoader().getResourceAsStream("rc4-spnego-data");
+ InputStream file = this.getClass().getClassLoader().getResourceAsStream("rc4-spnego-data");
rc4Token = new byte[file.available()];
file.read(rc4Token);
file.close();
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data
new file mode 100644
index 0000000..7f3b582
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data b/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data
new file mode 100644
index 0000000..4ba2540
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data
@@ -0,0 +1 @@
+����\���U�s�7"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data
new file mode 100644
index 0000000..13c89e6
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data
new file mode 100644
index 0000000..b7d539f
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data b/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data
new file mode 100644
index 0000000..24792c1
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data
new file mode 100644
index 0000000..6a7e55c
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/asrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/asrep.token b/kerby-kerb/kerb-core-test/src/test/resources/asrep.token
new file mode 100644
index 0000000..d77cff7
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/asrep.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/asreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/asreq.token b/kerby-kerb/kerb-core-test/src/test/resources/asreq.token
new file mode 100644
index 0000000..6d503b3
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/asreq.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data
new file mode 100644
index 0000000..3db6963
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-key-data b/kerby-kerb/kerb-core-test/src/test/resources/des-key-data
new file mode 100644
index 0000000..84a0c50
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/des-key-data
@@ -0,0 +1 @@
+��2^�L�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data b/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data
new file mode 100644
index 0000000..7408111
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data
new file mode 100644
index 0000000..04a56e8
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties b/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties
new file mode 100644
index 0000000..c9cc814
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties
@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+object.cast.fail=Unable to cast object from {0} to {1}.
+
+spnego.token.empty=Empty SPNego token.
+spnego.token.invalid=Not a valid SPNego token: {0}.
+spnego.token.malformed=Malformed SPNego token.
+spnego.field.invalid=Not a valid SPNego token field: {0}.
+
+
+kerberos.object.cast=Unable to cast Kerberos object from {0} to {1}.
+kerberos.token.empty=Empty Kerberos token.
+kerberos.token.invalid=Not a Kerberos token.
+kerberos.token.malformed=Malformed Kerberos token.
+kerberos.kdcReq.empty=Empty message.
+kerberos.kdcReq.invalid=Not a KRB_AP_REQ message.
+kerberos.ticket.empty=Empty Kerberos ticket.
+kerberos.ticket.invalid=Not a Kerberos v5 ticket.
+kerberos.ticket.malformed=Malformed Kerberos ticket.
+kerberos.field.invalid=Not a valid Kerberos ticket field: {0}.
+kerberos.field.malformed=Malformed Kerberos ticket field.
+kerberos.key.notfound=Unable to find appropriate key of type {0}.
+kerberos.version.invalid=Invalid version of Kerberos ticket: {0}.
+kerberos.login.fail=Unable to get server keys.
+kerberos.decrypt.fail=Unable to decrypt encrypted data using key of type {0}.
+
+pac.token.empty=Empty PAC token.
+pac.token.malformed=Malformed PAC token.
+pac.logoninfo.malformed=Malformed PAC logon info.
+pac.signature.malformed=Malformed PAC signature.
+pac.signature.invalid=Invalid PAC signature.
+pac.string.notempty=String not empty while expected null.
+pac.string.malformed.size=Inconsistent string lengths.
+pac.string.invalid.size=Inconsistent string size: {1}, expecting {0}.
+pac.groups.invalid.size=Group count ({0}) doesn't match the real number of groups ({1}) in the PAC.
+pac.extrasids.invalid.size=Extra SID count ({0}) doesn't match the real number of extra SID ({1}) in the PAC.
+pac.resourcegroups.invalid.size=Resource group count ({0}) doesn't match the real number of resource groups ({1}) in the PAC.
+pac.sid.malformed.size=Inconsistent SID length.
+pac.subauthority.malformed.size=Incorrect byte array length: {0}; must be multiple of 4.
+pac.version.invalid=Invalid version of PAC token: {0}.
+pac.check.fail=Unable to check PAC signature.
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data
new file mode 100644
index 0000000..6be7086
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data
new file mode 100644
index 0000000..64f9d9c
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data
@@ -0,0 +1 @@
+l�܇y#�l�mv��k�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data
new file mode 100644
index 0000000..df45f91
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data
new file mode 100644
index 0000000..91cbe26
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/server.keytab
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/server.keytab b/kerby-kerb/kerb-core-test/src/test/resources/server.keytab
new file mode 100644
index 0000000..b44347c
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/server.keytab differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token b/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token
new file mode 100644
index 0000000..25d6270
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token b/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token
new file mode 100644
index 0000000..69f6b46
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
index e2c2658..7bcdefa 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
@@ -22,6 +22,10 @@ package org.apache.kerby.kerberos.kerb;
import org.apache.kerby.kerberos.kerb.spec.common.KrbError;
public class KrbErrorException extends KrbException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5541320518061583932L;
private KrbError krbError;
public KrbErrorException(KrbError krbError) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
index 878e264..3f75bcd 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
@@ -21,6 +21,11 @@ package org.apache.kerby.kerberos.kerb;
public class KrbException extends Exception {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3561718983481823145L;
+
public KrbException(String message) {
super(message);
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
index 3614253..632c8f2 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
@@ -19,17 +19,14 @@
*/
package org.apache.kerby.kerberos.kerb.spec;
-import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
-
import java.util.Date;
-import java.util.TimeZone;
+
+import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
/**
KerberosTime ::= GeneralizedTime -- with no fractional seconds
*/
public class KerberosTime extends Asn1GeneralizedTime {
- private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
-
public static final KerberosTime NEVER = new KerberosTime(Long.MAX_VALUE);
public static final int MINUTE = 60000;
@@ -93,8 +90,7 @@ public class KerberosTime extends Asn1GeneralizedTime {
public KerberosTime copy() {
long time = getTime();
- KerberosTime result = new KerberosTime(time);
- return result;
+ return new KerberosTime(time);
}
/**
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/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 bee83da..2e72cbb 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
@@ -43,8 +43,7 @@ public abstract class KrbAppSequenceType extends TaggingSequence {
}
protected KerberosTime getFieldAsTime(int index) {
- KerberosTime value = getFieldAs(index, KerberosTime.class);
- return value;
+ return getFieldAs(index, KerberosTime.class);
}
protected void setFieldAsTime(int index, long value) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/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 4cdb181..d0d9d52 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
@@ -41,8 +41,7 @@ public abstract class KrbSequenceType extends Asn1SequenceType {
}
protected KerberosTime getFieldAsTime(int index) {
- KerberosTime value = getFieldAs(index, KerberosTime.class);
- return value;
+ return getFieldAs(index, KerberosTime.class);
}
protected void setFieldAsTime(int index, long value) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
index 9822c02..0bbaaf1 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
@@ -75,12 +75,18 @@ public class CheckSum extends KrbSequenceType {
@Override
public boolean equals(Object other) {
- if (this == other) return true;
- if (other == null || getClass() != other.getClass()) return false;
+ if (this == other) {
+ return true;
+ }
+ if (other == null || getClass() != other.getClass()) {
+ return false;
+ }
CheckSum that = (CheckSum) other;
- if (getCksumtype() != that.getCksumtype()) return false;
+ if (getCksumtype() != that.getCksumtype()) {
+ return false;
+ }
return Arrays.equals(getChecksum(), that.getChecksum());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
index 3875000..c012a16 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
@@ -79,8 +79,12 @@ public class EncryptedData extends KrbSequenceType {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
EncryptedData that = (EncryptedData) o;
@@ -89,7 +93,9 @@ public class EncryptedData extends KrbSequenceType {
getKvno() != that.getKvno()) return false;
*/
- if (getEType() != that.getEType()) return false;
+ if (getEType() != that.getEType()) {
+ return false;
+ }
return Arrays.equals(getCipher(), that.getCipher());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
index 6f7f540..1cc72da 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
@@ -93,14 +93,22 @@ public class EncryptionKey extends KrbSequenceType {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
EncryptionKey that = (EncryptionKey) o;
- if (kvno != -1 && that.kvno != -1 && kvno != that.kvno) return false;
+ if (kvno != -1 && that.kvno != -1 && kvno != that.kvno) {
+ return false;
+ }
- if (getKeyType() != that.getKeyType()) return false;
+ if (getKeyType() != that.getKeyType()) {
+ return false;
+ }
return Arrays.equals(getKeyData(), that.getKeyData());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
index eef8ede..be05d8b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
@@ -75,7 +75,7 @@ public class PrincipalName extends KrbSequenceType {
if (krbStrings != null) {
return krbStrings.getAsStrings();
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
public void setNameStrings(List<String> nameStrings) {