Revize d7ea8c04

#7794

Lehká uprava struktury v projektu. Hlavním důvodem commitu je prohrabání se testovacími daty od zákazníka - vyhovující testovací data ve složce test_input.

demo_mh/Deserializer/results.json

@@ -1 @@
-{"parent":{"variables":{"str":"ABCD"},"name":"class serialize.Parent","interface":"java.io.Serializable"},"variables":{"x":10.0,"variable":{"variables":{"realNum":15.6},"name":"class serialize.Contain","interface":"java.io.Serializable"},"numberX":7},"name":"class serialize.Example","interface":"java.io.Serializable"}
+{"parent":{"variables":{"str":"ABCD","abc":true,"y":59.87},"name":"class serialize.Parent","interface":"java.io.Serializable"},"variables":{"x":10.0,"variable":{"variables":{"array":"NON_IMPLEMENTED"},"name":"class serialize.Contain","interface":"java.io.Serializable"},"numberX":7},"name":"class serialize.Example","interface":"java.io.Serializable"}

demo_mh/Deserializer/src/deserialize/ByteReader.java

@@ +1 @@
+package deserialize;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+// TODO osetreni vyjimek... a to celkove vsude. Zatim ponechavano z duvodu testovani.
+
+public class ByteReader {
+
+	private byte[] buffer;
+	private int actPos;
+	
+	public ByteReader(byte buffer[]) {
+		this.buffer = Arrays.copyOf(buffer, buffer.length);
+		actPos = 0;
+	}
+	
+	public boolean end() {
+		return actPos >= buffer.length;
+	}
+	
+	private byte readNext() {
+		return buffer[actPos++];
+	}
+	
+	private long readNumber(int bytes) {
+		long result = 0;
+		for (int i = (bytes - 1) * Byte.SIZE; i >= 0; i -= Byte.SIZE) {
+			result = result | ((readNext() & 0xFF) << i);
+		}
+		return result;
+	}
+	
+	public byte readByte() {
+		return readNext();
+	}
+	
+	public char readUnsignedByte() {
+		return (char) readNumber(Byte.BYTES);
+	}
+	
+	public short readShort() {
+		return (short) readNumber(Short.BYTES);
+	}
+	
+	public char readChar() {
+		return (char) readShort();
+	}
+	
+	public int readInt() {
+		return (int) readNumber(Integer.BYTES);
+	}
+	
+	public long readLong() {
+		return readNumber(Long.BYTES);
+	}
+	
+	public String readString(long length) {
+		String str = "";
+		for (int i = 0; i < length; i++) {
+			str += (char) readByte();
+		}
+		return str;
+	}
+	
+	public String readUtf() {
+		short length = readShort();
+		return readString(length);
+	}
+	
+	public String readLongUtf() {
+		long length = readLong();
+		return readString(length);
+	}
+	
+	public float readFloat() {
+		return Float.intBitsToFloat(readInt());
+	}
+	
+	public double readDouble() {
+		// return Double.longBitsToDouble(readLong()); DOESNT WORK...
+		byte b[] = new byte[Long.BYTES];
+		for (int i = 0; i < b.length; i++) {
+			b[i] = readByte();
+		}
+		return ByteBuffer.wrap(b).getDouble();
+	}
+	
+	public boolean readBoolean() {
+		return readByte() != 0;
+	}
+	
+}

demo_mh/Deserializer/src/deserialize/ClassDescription.java

@@ -21 +21 @@
 	private List<Variable> variables = new ArrayList<Variable>();
 	private int actVariableIndex = -1;
 	
+	
+	
+	public List<ClassDescription> getParents() {
+		return parents;
+	}
+	
+	public List<Variable> getVariables() {
+		return variables;
+	}
+	
+	
+	
 	public Variable nextVariable() {
 		if (++actVariableIndex < variables.size()) {
 			return variables.get(actVariableIndex);

demo_mh/Deserializer/src/deserialize/DataType.java

@@ -3 +3 @@
 import java.util.HashMap;
 
 public class DataType {
-
+	
 	public final static HashMap<Character, String> primTypeCodes;
 	public final static HashMap<Character, String> objTypeCodes;
 	

demo_mh/Deserializer/src/deserialize/Grammar.java

@@ -1 +1 @@
 package deserialize;
 
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -36 +37 @@
 	final static byte SC_EXTERNALIZABLE = 0x04;
 	final static byte SC_ENUM = 0x10;
 
-	private List<Byte> buffer;
-	public Grammar(byte buffer[]) {
-		this.buffer = new ArrayList<Byte>();
-		for (int i = 0; i < buffer.length; i++) {
-			this.buffer.add(buffer[i]);
-		}
-	}
-	
-	
-	private byte takeFirst() {
-		return buffer.remove(0);
-	}
-	
-	public byte readByte() {
-		return takeFirst();
-	}
-	
-	private long readNumber(int bytes) {
-		long result = 0;
-		for (int i = (bytes - 1) * Byte.SIZE; i >= 0; i -= Byte.SIZE) {
-			result = result | ((takeFirst() & 0xFF) << i);
-		}
-		return result;
-	}
-	
-	public char readUnsignedByte() {
-		return (char) readNumber(Byte.BYTES);
-	}
-	
-	public short readShort() {
-		return (short) readNumber(Short.BYTES);
-	}
-	
-	public int readInt() {
-		return (int) readNumber(Integer.BYTES);
-	}
+	private ByteReader reader;
 	
-	public long readLong() {
-		return readNumber(Long.BYTES);
-	}
-	
-	public String readString(long length) {
-		String str = "";
-		for (int i = 0; i < length; i++) {
-			str += (char) readByte();
-		}
-		return str;
-	}
-	
-	public String readUtf() {
-		short length = readShort();
-		return readString(length);
-	}
-	
-	public String readLongUtf() {
-		long length = readLong();
-		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;
+	public Grammar(byte buffer[]) {
+		reader = new ByteReader(buffer);
 	}
 	
 	
@@ -113 +48 @@
 	ClassDescription actClass = null;
 	
 	public JSONObject process() {
-		System.out.println("Kontrola hlavicky souboru: " + (readShort() == STREAM_MAGIC && readShort() == STREAM_VERSION));
+		System.out.println("Kontrola hlavicky souboru: " + (reader.readShort() == STREAM_MAGIC && reader.readShort() == STREAM_VERSION));
 		
-		while (!buffer.isEmpty()) {
+		while (!reader.end()) {
 			try {
 				object();
 			} catch (Exception e) {
+				e.printStackTrace();
 				break;
 			}
 		}
@@ -132 +68 @@
     // classDesc for the current object
 	public Object object() {
 		Object retValue;
-		byte b = readByte();
+		byte b = reader.readByte();
 		switch (b) {
 			case TC_OBJECT: {
 					System.out.println("X1");
@@ -181 +117 @@
 					System.out.println("X3");
 					ClassDescription desc = (ClassDescription) object();
 					// TODO int size = readInt();
-					retValue = desc.className;; // TODO + "[" + size + "]";
+					retValue = desc; // TODO + "[" + size + "]";
 				}
 				break;
 			case TC_STRING: {
 					System.out.println("X4");
-					String str = readUtf();
+					String str = reader.readUtf();
 					retValue = str;
 				}
 				break;
 			case TC_LONGSTRING: {
 					System.out.println("X5");
-					String str = readLongUtf();
+					String str = reader.readLongUtf();
 					retValue = str;
 				}
 				break;
@@ -209 +145 @@
 			case TC_CLASSDESC: {
 					System.out.println("X7");
 					ClassDescription desc = new ClassDescription();
-					desc.className = readUtf();
-					desc.serialVersionUID = readLong();
-					desc.flags = readByte();
+					desc.className = reader.readUtf();
+					desc.serialVersionUID = reader.readLong();
+					desc.flags = reader.readByte();
 					desc.isClass = true;
 					desc.setVariables(fields());
 					
@@ -228 +164 @@
 				break;
 			case TC_PROXYCLASSDESC: {
 					System.out.println("X8");
-					int count = readInt();
-					String name = readUtf();
+					int count = reader.readInt();
+					String name = reader.readUtf();
 					retValue = name + "[" + +count + "]";
 					// TODO object(null); classDesc();
 					
@@ -249 +185 @@
 						}
 						
 						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 'B': actVar.setValue(reader.readByte()); break;
+						case 'C': actVar.setValue((char) reader.readByte()); break;
+						case 'D': actVar.setValue(reader.readDouble()); break;
+						case 'F': actVar.setValue(reader.readFloat()); break;
+						case 'I': actVar.setValue(reader.readInt()); break;
+						case 'J': actVar.setValue(reader.readLong()); break;
+						case 'S': actVar.setValue(reader.readShort()); break;
+						case 'Z': actVar.setValue(reader.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();
+							ClassDescription desccc = (ClassDescription) object();
+							
+							object(); // END BLOK
+							object(); // NULL
+							
+							int count = reader.readInt();
 							System.out.println("------------- VELIKOST POLE = " + count);
 							for (int i = 0; i < count; i++) {
-								System.out.println("------------- HODNOTA = " + (char) readShort());
+								System.out.println("------------- HODNOTA = " + reader.readChar());
 							}
 							//actVar.setValue(readByte());
 							break;
@@ -297 +232 @@
 				break;
 			case TC_BLOCKDATA: {
 					System.out.println("X13");
-					char size = readUnsignedByte();
+					char size = reader.readUnsignedByte();
 					// (unsigned byte)<size> (byte)[size];
 					retValue = "byte [" + (int) size + "]";
 				}
 				break;
 			case TC_BLOCKDATALONG: {
 					System.out.println("X14");
-					int size = readInt();
+					int size = reader.readInt();
 					// (int)<size> (byte)[size];
 					retValue = "byte [" + size + "]";
 				}
@@ -326 +261 @@
 	public List<Variable> fields() {
 		List<Variable> variables = new ArrayList<Variable>();
 		
-		short count = readShort();
+		short count = reader.readShort();
 		for (int i = 0; i < count; i++) {
-			char type = (char) readByte();
-			String variable = readUtf();
+			char type = (char) reader.readByte();
+			String variable = reader.readUtf();
 			String typeName = null;
 			if (!DataType.isPrimaryType(type))
 				typeName = (String) object();

demo_mh/Deserializer/src/deserialize/ToJSON.java

@@ -67 +67 @@
 			System.out.println("Chyba pri otevirani (uzavirani) streamu pri pokusu o klasickou deserializaci.");
 			e.printStackTrace();
 			
+			return false;
+			
 		} catch (Exception e) {
 			
 			// Others: ClassNotFoundException, ClassCastException, ...
@@ -100 +102 @@
 	    
 	    try {
 	    	if (entry != null) {
-		    	array = new byte[(int) entry.getSize()];
-				zipInputStream.read(array);
+	    		//array = new byte[(int) entry.getSize()];
+				array = entry.getExtra();
+				System.out.println(array.length);
+	    		//zipInputStream.read(array);
 				zipInputStream.close();
 		    } else {
 		    	array = new byte[(int) input.length()];

demo_mh/Deserializer/src/serialize/Contain.java

@@ -6 +6 @@
 
 	private static final long serialVersionUID = 1L;
 	
-	// TODO jeste nefunguje char array[] = new char[] {'W', 'X', 'Y', 'Z'};
-	float realNum = 15.6f;
+	char array[] = new char[] {'W', 'X', 'Y', 'Z'};
+	// float realNum = 15.6f;
 	
 }

demo_mh/Deserializer/src/serialize/Parent.java

@@ -7 +7 @@
 	private static final long serialVersionUID = 1L;
 	
 	String str = "ABCD";
+	boolean abc = true;
+	double y = 59.87;
 	
 }