ASN1. Introduced Asn1Converter to convert a parsing result into an ASN1 object
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1.java
index 8ca411d..654c781 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1.java
@@ -51,7 +51,7 @@
public static Asn1Type decode(ByteBuffer content) throws IOException {
Asn1ParsingResult parsingResult = Asn1Parser.parse(content);
- return DecodingUtil.decodeValue(parsingResult);
+ return Asn1Converter.convert(parsingResult);
}
public static Asn1ParsingResult parse(byte[] content) throws IOException {
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/DecodingUtil.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Converter.java
similarity index 82%
rename from kerby-asn1/src/main/java/org/apache/kerby/asn1/DecodingUtil.java
rename to kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Converter.java
index ef39540..89606a3 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/DecodingUtil.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Converter.java
@@ -28,13 +28,16 @@
import java.io.IOException;
-public class DecodingUtil {
+/**
+ * Converting a ASN1 parsing result into an ASN1 object.
+ */
+public class Asn1Converter {
- public static Asn1Type decodeValue(Asn1ParsingResult parsingResult) throws IOException {
+ public static Asn1Type convert(Asn1ParsingResult parsingResult) throws IOException {
if (Asn1Simple.isSimple(parsingResult.tag())) {
- return DecodingUtil.decodeValueAsSimple(parsingResult);
+ return Asn1Converter.convertAsSimple(parsingResult);
} else if (Asn1Collection.isCollection(parsingResult.tag())) {
- return DecodingUtil.decodeValueAsCollection(parsingResult);
+ return Asn1Converter.convertAsCollection(parsingResult);
} else if (!parsingResult.tag().isPrimitive()) {
Asn1Object tmpValue = new Asn1Constructed(parsingResult.tag());
tmpValue.decode(parsingResult);
@@ -44,14 +47,14 @@
}
}
- public static Asn1Type decodeValueAsSimple(Asn1ParsingResult parsingResult) throws IOException {
+ public static Asn1Type convertAsSimple(Asn1ParsingResult parsingResult) throws IOException {
Asn1Object value = (Asn1Object) Asn1Simple.createSimple(parsingResult.tagNo());
value.useDefinitiveLength(parsingResult.isDefinitiveLength());
decodeValueWith(parsingResult, value);
return value;
}
- public static Asn1Type decodeValueAsCollection(Asn1ParsingResult parsingResult) throws IOException {
+ public static Asn1Type convertAsCollection(Asn1ParsingResult parsingResult) throws IOException {
Asn1Collection value = Asn1Collection.createCollection(parsingResult.tag());
value.useDefinitiveLength(parsingResult.isDefinitiveLength());
value.setLazy(true);
@@ -59,8 +62,8 @@
return value;
}
- public static Asn1Type decodeValueAs(Asn1ParsingResult parsingResult,
- Class<? extends Asn1Type> type) throws IOException {
+ public static Asn1Type convertAs(Asn1ParsingResult parsingResult,
+ Class<? extends Asn1Type> type) throws IOException {
Asn1Type value;
try {
value = type.newInstance();
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 f63481f..4b42970 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
@@ -20,7 +20,7 @@
package org.apache.kerby.asn1.type;
import org.apache.kerby.asn1.Asn1FieldInfo;
-import org.apache.kerby.asn1.DecodingUtil;
+import org.apache.kerby.asn1.Asn1Converter;
import org.apache.kerby.asn1.UniversalTag;
import org.apache.kerby.asn1.parse.Asn1ParsingResult;
@@ -85,10 +85,10 @@
try {
if (field.isContextSpecific()) {
- DecodingUtil.decodeValueWith(field, result,
+ Asn1Converter.decodeValueWith(field, result,
fieldInfo.getTaggingOption());
} else {
- DecodingUtil.decodeValueWith(field, result);
+ Asn1Converter.decodeValueWith(field, result);
}
} catch (IOException e) {
throw new RuntimeException("Fully decoding failed", e);
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionOf.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionOf.java
index 08eb317..d7849fe 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionOf.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionOf.java
@@ -20,7 +20,7 @@
package org.apache.kerby.asn1.type;
import org.apache.kerby.asn1.Asn1Dumper;
-import org.apache.kerby.asn1.DecodingUtil;
+import org.apache.kerby.asn1.Asn1Converter;
import org.apache.kerby.asn1.UniversalTag;
import org.apache.kerby.asn1.parse.Asn1ParsingResult;
@@ -43,7 +43,7 @@
}
Asn1Type tmpValue = createElement();
- DecodingUtil.decodeValueWith(parsingItem, tmpValue);
+ Asn1Converter.decodeValueWith(parsingItem, tmpValue);
addItem(tmpValue);
}
}
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 2039b08..1b98847 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
@@ -22,7 +22,7 @@
import org.apache.kerby.asn1.Asn1Dumpable;
import org.apache.kerby.asn1.Asn1Dumper;
import org.apache.kerby.asn1.Asn1FieldInfo;
-import org.apache.kerby.asn1.DecodingUtil;
+import org.apache.kerby.asn1.Asn1Converter;
import org.apache.kerby.asn1.EnumType;
import org.apache.kerby.asn1.TaggingOption;
import org.apache.kerby.asn1.UniversalTag;
@@ -121,10 +121,10 @@
any.setFieldInfo(fieldInfos[foundPos]);
} else {
if (parsingItem.isContextSpecific()) {
- DecodingUtil.decodeValueWith(parsingItem, fieldValue,
+ Asn1Converter.decodeValueWith(parsingItem, fieldValue,
fieldInfos[foundPos].getTaggingOption());
} else {
- DecodingUtil.decodeValueWith(parsingItem, fieldValue);
+ Asn1Converter.decodeValueWith(parsingItem, fieldValue);
}
}
}
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Constructed.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Constructed.java
index 605b445..723bbca 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Constructed.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Constructed.java
@@ -21,7 +21,7 @@
import org.apache.kerby.asn1.Asn1Dumpable;
import org.apache.kerby.asn1.Asn1Dumper;
-import org.apache.kerby.asn1.DecodingUtil;
+import org.apache.kerby.asn1.Asn1Converter;
import org.apache.kerby.asn1.Tag;
import org.apache.kerby.asn1.parse.Asn1Container;
import org.apache.kerby.asn1.parse.Asn1ParsingResult;
@@ -106,7 +106,7 @@
continue;
}
- Asn1Type tmpValue = DecodingUtil.decodeValue(parsingItem);
+ Asn1Type tmpValue = Asn1Converter.convert(parsingItem);
addItem(tmpValue);
}
}
