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/LllvarParseInfo.java
+8 -8
View File
@@ -36,8 +36,8 @@ public class LllvarParseInfo extends FieldParseInfo {
super(IsoType.LLLVAR, 0);
}
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, UnsupportedEncodingException {
if (pos < 0) {
throw new ParseException(String.format("Invalid LLLVAR field %d pos %d",
@@ -74,14 +74,15 @@ public class LllvarParseInfo extends FieldParseInfo {
if (custom == null) {
return new IsoValue<String>(type, _v, length, null);
} else {
Object decoded = custom.decodeField(_v);
T decoded = custom.decodeField(_v);
//If decode fails, return string; otherwise use the decoded object and its codec
return new IsoValue(type, decoded == null ? _v : decoded, length, decoded == null ? null : custom);
return decoded == null ? new IsoValue<String>(type, _v, length, null) :
new IsoValue<T>(type, decoded, length, custom);
}
}
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, UnsupportedEncodingException {
if (pos < 0) {
throw new ParseException(String.format("Invalid bin LLLVAR field %d pos %d", field, pos), pos);
@@ -100,8 +101,7 @@ public class LllvarParseInfo extends FieldParseInfo {
if (custom == null) {
return new IsoValue<String>(type, new String(buf, pos + 2, length, getCharacterEncoding()), null);
} else {
@SuppressWarnings({"unchecked", "rawtypes"})
IsoValue<?> v = new IsoValue(type, custom.decodeField(new String(buf, pos + 2, length, getCharacterEncoding())), custom);
IsoValue<T> v = new IsoValue<T>(type, custom.decodeField(new String(buf, pos + 2, length, getCharacterEncoding())), custom);
if (v.getValue() == null) {
return new IsoValue<String>(type, new String(buf, pos + 2, length, getCharacterEncoding()), null);
}