Alawn/Java-8583-Util
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #10 - improve use of type parameters instead of suppressing warnings

Browse Source
This commit is contained in:
Enrique Zamudio
2013-04-23 11:22:21 -05:00
parent 0221f8881a
commit cc5918dd50
15 changed files with 98 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/solab/iso8583/parse/LlbinParseInfo.java
+10 -17
View File
@@ -37,8 +37,8 @@ public class LlbinParseInfo extends FieldParseInfo {
}
@Override
public IsoValue<?> parse(final int field, final byte[] buf,
final int pos, final CustomField<?> custom)
public <T> IsoValue<?> parse(final int field, final byte[] buf,
final int pos, final CustomField<T> custom)
throws ParseException {
if (pos < 0) {
throw new ParseException(String.format("Invalid LLBIN field %d position %d",
@@ -62,13 +62,9 @@ public class LlbinParseInfo extends FieldParseInfo {
return new IsoValue<byte[]>(type, binval, binval.length, null);
} else {
try {
@SuppressWarnings({"unchecked", "rawtypes"})
IsoValue<?> v = new IsoValue(type, custom.decodeField(
new String(buf, pos + 2, length)), binval.length, custom);
if (v.getValue() == null) {
return new IsoValue<byte[]>(type, binval, binval.length, null);
}
return v;
T dec = custom.decodeField(new String(buf, pos + 2, length));
return dec == null ? new IsoValue<byte[]>(type, binval, binval.length, null) :
new IsoValue<T>(type, dec, binval.length, custom);
} catch (IndexOutOfBoundsException ex) {
throw new ParseException(String.format(
"Insufficient data for LLBIN field %d, pos %d (LEN states '%s')",
@@ -78,8 +74,8 @@ public class LlbinParseInfo extends FieldParseInfo {
}
@Override
public IsoValue<?> parseBinary(final int field, final byte[] buf,
final int pos, final CustomField<?> custom)
public <T> IsoValue<?> parseBinary(final int field, final byte[] buf,
final int pos, final CustomField<T> custom)
throws ParseException {
if (pos < 0) {
throw new ParseException(String.format("Invalid bin LLBIN field %d position %d",
@@ -101,12 +97,9 @@ public class LlbinParseInfo extends FieldParseInfo {
if (custom == null) {
return new IsoValue<byte[]>(type, _v, null);
} else {
@SuppressWarnings({"unchecked", "rawtypes"})
IsoValue<?> v = new IsoValue(type, custom.decodeField(HexCodec.hexEncode(_v, 0, _v.length)), custom);
if (v.getValue() == null) {
return new IsoValue<byte[]>(type, _v, null);
}
return v;
T dec = custom.decodeField(HexCodec.hexEncode(_v, 0, _v.length));
return dec == null ? new IsoValue<byte[]>(type, _v, null) :
new IsoValue<T>(type, dec, custom);
}
}