Basic support for writing int with BinaryStruct
This commit is contained in:
parent
1d96125ed9
commit
a33714fbc4
7 changed files with 349 additions and 168 deletions
83
src/zutil/parser/binary/BinaryFieldData.java
Executable file
83
src/zutil/parser/binary/BinaryFieldData.java
Executable file
|
|
@ -0,0 +1,83 @@
|
|||
package zutil.parser.binary;
|
||||
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import zutil.converter.Converter;
|
||||
import zutil.parser.binary.BinaryStruct.BinaryField;
|
||||
|
||||
/**
|
||||
* A class representing each field in a BinaryStruct.
|
||||
*/
|
||||
public class BinaryFieldData implements Comparable<BinaryFieldData> {
|
||||
private static final HashMap<Class, List<BinaryFieldData>> cache = new HashMap<>();
|
||||
|
||||
private int index;
|
||||
private int length;
|
||||
private Field field;
|
||||
|
||||
|
||||
protected static List<BinaryFieldData> getStructFieldList(Class<? extends BinaryStruct> clazz){
|
||||
if (!cache.containsKey(clazz)) {
|
||||
ArrayList<BinaryFieldData> list = new ArrayList<>();
|
||||
for (Field field : clazz.getFields()) {
|
||||
if (field.isAnnotationPresent(BinaryField.class))
|
||||
list.add(new BinaryFieldData(field));
|
||||
}
|
||||
Collections.sort(list);
|
||||
cache.put(clazz, list);
|
||||
}
|
||||
return cache.get(clazz);
|
||||
}
|
||||
|
||||
|
||||
private BinaryFieldData(Field f){
|
||||
field = f;
|
||||
BinaryField fieldData = field.getAnnotation(BinaryField.class);
|
||||
index = fieldData.index();
|
||||
length = fieldData.length();
|
||||
}
|
||||
|
||||
protected void setValue(Object obj, byte[] data){
|
||||
try {
|
||||
field.setAccessible(true);
|
||||
if (field.getType() == Boolean.class || field.getType() == boolean.class)
|
||||
field.set(obj, data[0] != 0);
|
||||
else if (field.getType() == Integer.class || field.getType() == int.class)
|
||||
field.set(obj, Converter.toInt(data));
|
||||
else if (field.getType() == String.class)
|
||||
field.set(obj, new String(data));
|
||||
} catch (IllegalAccessException e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: variable length support
|
||||
protected byte[] getValue(Object obj){
|
||||
try {
|
||||
if (field.getType() == Boolean.class || field.getType() == boolean.class)
|
||||
return new byte[]{ (byte)(field.getBoolean(obj) ? 0x01 : 0x00) };
|
||||
else if (field.getType() == Integer.class || field.getType() == int.class)
|
||||
return Converter.toBytes(field.getInt(obj));
|
||||
else if (field.getType() == String.class)
|
||||
return ((String)(field.get(obj))).getBytes();
|
||||
} catch (IllegalAccessException e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public int getBitLength(){
|
||||
return length;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(BinaryFieldData o) {
|
||||
return this.index - o.index;
|
||||
}
|
||||
}
|
||||
72
src/zutil/parser/binary/BinaryStructInputStream.java
Executable file
72
src/zutil/parser/binary/BinaryStructInputStream.java
Executable file
|
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2015 Ziver Koc
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package zutil.parser.binary;
|
||||
|
||||
import zutil.ByteUtil;
|
||||
import zutil.converter.Converter;
|
||||
import zutil.parser.binary.BinaryStruct.BinaryField;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* A stream class that parses a byte stream into
|
||||
* binary struct objects.
|
||||
*
|
||||
* @author Ziver
|
||||
*/
|
||||
public class BinaryStructInputStream {
|
||||
|
||||
public static int parse(BinaryStruct struct, byte[] data) {
|
||||
List<BinaryFieldData> structDataList = BinaryFieldData.getStructFieldList(struct.getClass());
|
||||
int bitOffset = 0;
|
||||
for (BinaryFieldData field : structDataList){
|
||||
|
||||
int byteIndex = bitOffset / 8;
|
||||
int bitIndex = 7 - bitOffset % 8;
|
||||
int bitLength = Math.min(bitIndex+1, field.getBitLength());
|
||||
|
||||
int readLength = 0;
|
||||
byte[] valueData = new byte[(int) Math.ceil(field.getBitLength() / 8.0)];
|
||||
for (int index = 0; index < valueData.length; ++index) {
|
||||
valueData[index] = ByteUtil.getShiftedBits(data[byteIndex], bitIndex, bitLength);
|
||||
readLength += bitLength;
|
||||
byteIndex++;
|
||||
bitIndex = 7;
|
||||
bitLength = Math.min(bitIndex+1, field.getBitLength() - readLength);
|
||||
}
|
||||
field.setValue(struct, valueData);
|
||||
bitOffset += field.getBitLength();
|
||||
}
|
||||
return bitOffset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
97
src/zutil/parser/binary/BinaryStructOutputStream.java
Executable file
97
src/zutil/parser/binary/BinaryStructOutputStream.java
Executable file
|
|
@ -0,0 +1,97 @@
|
|||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2015 Ziver Koc
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package zutil.parser.binary;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* A stream class that generates a byte stream from
|
||||
* binary struct objects.
|
||||
*
|
||||
* @author Ziver
|
||||
*/
|
||||
public class BinaryStructOutputStream {
|
||||
|
||||
private OutputStream out;
|
||||
private byte rest;
|
||||
private int restLength;
|
||||
|
||||
|
||||
public BinaryStructOutputStream(OutputStream out){
|
||||
this.out = out;
|
||||
|
||||
rest = 0;
|
||||
restLength = 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Generate a binary byte array from the provided struct.
|
||||
* The byte array will be left
|
||||
*/
|
||||
/* public byte[] serialize(BinaryStruct struct) {
|
||||
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Generate a binary stream from the provided struct and
|
||||
* write the data to the underlying stream.
|
||||
*/
|
||||
public void write(BinaryStruct struct) throws IOException {
|
||||
List<BinaryFieldData> structDataList = BinaryFieldData.getStructFieldList(struct.getClass());
|
||||
|
||||
for (BinaryFieldData field : structDataList){
|
||||
byte[] data = field.getValue(struct);
|
||||
|
||||
for (int i=data.length-1; i>=0; --i) {
|
||||
out.write(data[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Writes any outstanding data to the stream
|
||||
*/
|
||||
public void flush() throws IOException {
|
||||
if(restLength > 0){
|
||||
out.write(0xFF & rest);
|
||||
rest = 0;
|
||||
restLength = 0;
|
||||
}
|
||||
out.flush();
|
||||
}
|
||||
|
||||
/**
|
||||
* Flushes and closes the underlying stream
|
||||
*/
|
||||
public void close() throws IOException {
|
||||
flush();
|
||||
out.close();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2015 Ziver Koc
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package zutil.parser.binary;
|
||||
|
||||
import zutil.ByteUtil;
|
||||
import zutil.converter.Converter;
|
||||
import zutil.parser.binary.BinaryStruct.BinaryField;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by Ziver on 2016-01-28.
|
||||
*/
|
||||
public class BinaryStructParser {
|
||||
|
||||
public static int parse(BinaryStruct struct, byte[] data) {
|
||||
List<BinaryFieldData> structDataList = getStructDataList(struct.getClass());
|
||||
int bitOffset = 0;
|
||||
for (BinaryFieldData field : structDataList){
|
||||
bitOffset += field.setValue(struct, data, bitOffset);
|
||||
}
|
||||
return bitOffset;
|
||||
}
|
||||
|
||||
|
||||
private static List<BinaryFieldData> getStructDataList(Class<? extends BinaryStruct> clazz){
|
||||
ArrayList<BinaryFieldData> list = new ArrayList<>();
|
||||
for (Field field : clazz.getFields()){
|
||||
if (field.isAnnotationPresent(BinaryField.class))
|
||||
list.add(new BinaryFieldData(field));
|
||||
}
|
||||
Collections.sort(list);
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static class BinaryFieldData implements Comparable<BinaryFieldData> {
|
||||
private int index;
|
||||
private int length;
|
||||
private Field field;
|
||||
|
||||
protected BinaryFieldData(Field f){
|
||||
field = f;
|
||||
BinaryField fieldData = field.getAnnotation(BinaryField.class);
|
||||
index = fieldData.index();
|
||||
length = fieldData.length();
|
||||
}
|
||||
|
||||
protected int setValue(Object obj, byte[] data, int bitOffset){
|
||||
try {
|
||||
int byteIndex = bitOffset / 8;
|
||||
int bitIndex = 7 - bitOffset % 8;
|
||||
int bitLength = Math.min(bitIndex+1, length);
|
||||
|
||||
int readLength = 0;
|
||||
byte[] valueData = new byte[(int) Math.ceil(length / 8.0)];
|
||||
for (int index = 0; index < valueData.length; ++index) {
|
||||
valueData[index] = ByteUtil.getShiftedBits(data[byteIndex], bitIndex, bitLength);
|
||||
readLength += bitLength;
|
||||
byteIndex++;
|
||||
bitIndex = 7;
|
||||
bitLength = Math.min(bitIndex+1, length - readLength);
|
||||
}
|
||||
|
||||
field.setAccessible(true);
|
||||
if (field.getType() == Boolean.class || field.getType() == boolean.class)
|
||||
field.set(obj, valueData[0] != 0);
|
||||
else if (field.getType() == Integer.class || field.getType() == int.class)
|
||||
field.set(obj, Converter.toInt(valueData));
|
||||
else if (field.getType() == String.class)
|
||||
field.set(obj, new String(valueData));
|
||||
return readLength;
|
||||
} catch (IllegalAccessException e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
return length; // we return the configured length to not shift the data
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(BinaryFieldData o) {
|
||||
return this.index - o.index;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2015 Ziver Koc
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package zutil.parser.binary;
|
||||
|
||||
|
||||
/**
|
||||
* Created by Ziver
|
||||
*/
|
||||
/*TODO:*/ public class BinaryStructWriter {
|
||||
|
||||
private byte[] data;
|
||||
private int length;
|
||||
|
||||
|
||||
|
||||
public void write(BinaryStruct struct) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
public byte[] getByteArray() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public int getLength() {
|
||||
return length;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue