Revize 9744d223

#7767

Zprovoznění exportu do JSON. Přidáno zpracovávání binárních zazipovaných dat. Úprava struktury.

demo_mh/Deserializer/src/deserialize/Grammar.java

@@ -1 +1 @@
 package deserialize;
 
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import org.json.simple.JSONObject;
+
 /**
  * https://docs.oracle.com/javase/7/docs/platform/serialization/spec/protocol.html
  */
@@ -14 +13 @@
 	
 	private final static short STREAM_MAGIC = (short) 0xACED;
 	private final static short STREAM_VERSION = 5;
-	private final static byte TC_NULL = (byte) 0x70;
-	private final static byte TC_REFERENCE = (byte) 0x71;
-	private final static byte TC_CLASSDESC = (byte) 0x72;
-	private final static byte TC_OBJECT = (byte) 0x73;
-	private final static byte TC_STRING = (byte) 0x74;
-	private final static byte TC_ARRAY = (byte) 0x75;
-	private final static byte TC_CLASS = (byte) 0x76;
-	private final static byte TC_BLOCKDATA = (byte) 0x77;
-	private final static byte TC_ENDBLOCKDATA = (byte) 0x78;
-	private final static byte TC_RESET = (byte) 0x79;
-	private final static byte TC_BLOCKDATALONG = (byte) 0x7A;
-	private final static byte TC_EXCEPTION = (byte) 0x7B;
-	private final static byte TC_LONGSTRING = (byte) 0x7C;
-	private final static byte TC_PROXYCLASSDESC = (byte) 0x7D;
-	private final static byte TC_ENUM = (byte) 0x7E;
+	private final static byte TC_NULL = 0x70;
+	private final static byte TC_REFERENCE = 0x71;
+	private final static byte TC_CLASSDESC = 0x72;
+	private final static byte TC_OBJECT = 0x73;
+	private final static byte TC_STRING = 0x74;
+	private final static byte TC_ARRAY = 0x75;
+	private final static byte TC_CLASS = 0x76;
+	private final static byte TC_BLOCKDATA = 0x77;
+	private final static byte TC_ENDBLOCKDATA = 0x78;
+	private final static byte TC_RESET = 0x79;
+	private final static byte TC_BLOCKDATALONG = 0x7A;
+	private final static byte TC_EXCEPTION = 0x7B;
+	private final static byte TC_LONGSTRING = 0x7C;
+	private final static byte TC_PROXYCLASSDESC = 0x7D;
+	private final static byte TC_ENUM = 0x7E;
 	private final static int baseWireHandle = (int) 0x7E0000;
 	
-	final static byte SC_WRITE_METHOD = (byte) 0x01; // if SC_SERIALIZABLE
-	final static byte SC_BLOCK_DATA = (byte) 0x08; // if SC_EXTERNALIZABLE
-	final static byte SC_SERIALIZABLE = (byte) 0x02;
-	final static byte SC_EXTERNALIZABLE = (byte) 0x04;
-	final static byte SC_ENUM = (byte) 0x10;
+	final static byte SC_WRITE_METHOD = 0x01; // if SC_SERIALIZABLE
+	final static byte SC_BLOCK_DATA = 0x08; // if SC_EXTERNALIZABLE
+	final static byte SC_SERIALIZABLE = 0x02;
+	final static byte SC_EXTERNALIZABLE = 0x04;
+	final static byte SC_ENUM = 0x10;
 
-	HashMap<Character, String> primTypeCodes;
-	HashMap<Character, String> objTypeCodes;
-	
-	
-	// Note. (XXX) This token has the XXX type specified
-	
-	
 	private List<Byte> buffer;
-	public Grammar(List<Byte> buffer) {
-		this.buffer = buffer;
-		
-		primTypeCodes = new HashMap<Character, String>();
-		primTypeCodes.put('B', "byte");
-		primTypeCodes.put('C', "char");
-		primTypeCodes.put('D', "double");
-		primTypeCodes.put('F', "float");
-		primTypeCodes.put('I', "integer");
-		primTypeCodes.put('J', "long");
-		primTypeCodes.put('S', "short");
-		primTypeCodes.put('Z', "boolean");
-		
-		objTypeCodes = new HashMap<Character, String>();
-		objTypeCodes.put('[', "array");
-		objTypeCodes.put('L', "object");
+	public Grammar(byte buffer[]) {
+		this.buffer = new ArrayList<Byte>();
+		for (int i = 0; i < buffer.length; i++) {
+			this.buffer.add(buffer[i]);
+		}
 	}
 	
 	
@@ -104 +85 @@
 		return str;
 	}
 	
-	
-	
-	
-	
 	public String readUtf() {
 		short length = readShort();
 		return readString(length);
@@ -118 +95 @@
 		return readString(length);
 	}
 	
+	public float readFloat() {
+		return Float.intBitsToFloat(readInt());
+	}
 	
+	public double readDouble() {
+		return Double.longBitsToDouble(readLong());
+	}
 	
+	public boolean readBoolean() {
+		// TODO zkontrolovat
+		return readByte() != 0;
+	}
 	
 	
+	List<ClassDescription> classes = new ArrayList<ClassDescription>();
+	ClassDescription actClass = null;
 	
-	
-	
-	public void start() {
+	public JSONObject process() {
 		System.out.println("Kontrola hlavicky souboru: " + (readShort() == STREAM_MAGIC && readShort() == STREAM_VERSION));
+		
 		while (!buffer.isEmpty()) {
-			object();
+			try {
+				object();
+			} catch (Exception e) {
+				break;
+			}
 		}
+		
+		return classes.get(0).getJSONObject();
+		// System.out.println(classes.get(0).toString());
 	}
 	
 	// FOR VALUES : 
@@ -185 +180 @@
 			case TC_ARRAY: {
 					System.out.println("X3");
 					ClassDescription desc = (ClassDescription) object();
-					int size = readInt();
-					retValue = desc.className + "[" + size + "]";
+					// TODO int size = readInt();
+					retValue = desc.className;; // TODO + "[" + size + "]";
 				}
 				break;
 			case TC_STRING: {
+					System.out.println("X4");
 					String str = readUtf();
-					System.out.println("X4 " + str);
 					retValue = str;
 				}
 				break;
@@ -218 +213 @@
 					desc.serialVersionUID = readLong();
 					desc.flags = readByte();
 					desc.isClass = true;
-					desc.variables = fields();
+					desc.setVariables(fields());
+					
+					if (actClass == null) {
+						actClass = desc;
+					}
+					// TODO
+					actClass.addParent(desc);
+					
 					// TODO object(null); classDesc();
-					System.out.println(desc.toString());
+					// TODO System.out.println(desc.toString());
 					retValue = desc;
 				}
 				break;
@@ -237 +239 @@
 					// TODO
 					System.out.println("---NULL---");
 					retValue = null;
+					
+					classes.add(actClass);
+					actClass = null;
+					while (true) {
+						Variable actVar = classes.get(classes.size() - 1).getActVariable();
+						if (actVar == null) {
+							break;
+						}
+						
+						switch (actVar.getType()) {
+						case 'B': actVar.setValue(readByte()); break;
+						case 'C': actVar.setValue((char) readByte()); break;
+						case 'D': actVar.setValue(readDouble()); break;
+						case 'F': actVar.setValue(readFloat()); break;
+						case 'I': actVar.setValue(readInt()); break;
+						case 'J': actVar.setValue(readLong()); break;
+						case 'S': actVar.setValue(readShort()); break;
+						case 'Z': actVar.setValue(readBoolean()); break;
+						case '[':
+							// int count = readShort();
+							// TODO
+							for (int i = 0; i < 3; i++) {
+								object();
+								// System.out.println("DEF: " + " " + (char) xxx + " " + xxx);
+							}
+							int count = readInt();
+							System.out.println("------------- VELIKOST POLE = " + count);
+							for (int i = 0; i < count; i++) {
+								System.out.println("------------- HODNOTA = " + (char) readShort());
+							}
+							//actVar.setValue(readByte());
+							break;
+						case 'L': actVar.setValue(object()); break;
+						}
+					}
 				}
 				break;
 			case TC_REFERENCE: {
@@ -286 +323 @@
 		return retValue;
 	}
 	
-	public List<String> fields() {
-		List<String> rows = new ArrayList<String>();
+	public List<Variable> fields() {
+		List<Variable> variables = new ArrayList<Variable>();
 		
 		short count = readShort();
 		for (int i = 0; i < count; i++) {
 			char type = (char) readByte();
-			
-			String row;
-			if (primTypeCodes.containsKey(type)) {
-				row = primTypeCodes.get(type) + " " + readUtf();
-			} else {
-				String variable = readUtf();
-				String dataType = (String) object();
-				dataType = dataType.substring(1);
-				
-				if (primTypeCodes.containsKey(dataType.charAt(0)))
-					dataType = primTypeCodes.get(dataType.charAt(0)); // remove type
-				
-				row = dataType + " " + variable;
-				if (objTypeCodes.get(type) == "array")
-					row += "[]";
-			}
-			
-			rows.add(row);
+			String variable = readUtf();
+			String typeName = null;
+			if (!DataType.isPrimaryType(type))
+				typeName = (String) object();
+			variables.add(new Variable(type, variable, typeName));
 		}
 		
-		return rows;
+		return variables;
 	}
 	
 }