From f483a5a0d463283e0aa9542708e93b39959bc0f7 Mon Sep 17 00:00:00 2001
From: huanghaiquan <huanghaiquan@jd.com>
Date: Sat, 4 May 2019 00:20:46 +0800
Subject: [PATCH] Fixed compiling errors.

---
 .../transaction/ContractDefinition.java       |  5 --
 .../blockchain/transaction/ContractType.java  | 56 +++++++++++++++++++
 .../jd/blockchain/transaction/TxBuilder.java  |  2 +-
 source/sdk/sdk-samples/pom.xml                | 20 +++----
 source/test/test-integration/pom.xml          |  5 --
 .../com/jd/blockchain/utils/ValueType.java    | 10 +++-
 6 files changed, 75 insertions(+), 23 deletions(-)
 delete mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java
 create mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractType.java

diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java
deleted file mode 100644
index cee26713..00000000
--- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.jd.blockchain.transaction;
-
-class ContractDefinition {
-
-}
diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractType.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractType.java
new file mode 100644
index 00000000..27d75e25
--- /dev/null
+++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractType.java
@@ -0,0 +1,56 @@
+package com.jd.blockchain.transaction;
+
+import java.lang.reflect.Method;
+import java.util.Set;
+import java.util.SortedMap;
+
+class ContractType {
+	
+	private String name;
+	
+	private SortedMap<String, Method> events;
+	
+	private SortedMap<Method, String> handleMethods;
+
+	/**
+	 * 返回声明的所有事件；
+	 * 
+	 * @return
+	 */
+	Set<String> getEvents() {
+		return events.keySet();
+	}
+
+	/**
+	 * 返回指定方法声明的事件；<br>
+	 * 
+	 * 如果不存在，则返回 null；
+	 * 
+	 * @param method
+	 * @return
+	 */
+	String getEvent(Method method) {
+		return handleMethods.get(method);
+	}
+
+	/**
+	 * 返回事件的处理方法；<br>
+	 * 
+	 * 如果不存在，则返回 null；
+	 * 
+	 * @param event
+	 * @return
+	 */
+	Method getHandleMethod(String event) {
+		return events.get(event);
+	}
+	
+	private ContractType() {
+	}
+	
+	
+//	public static ContractType resolve(Class<?> contractIntf) {
+//		
+//	}
+
+}
diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java
index 2a2c62fd..bab7dd0f 100644
--- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java
+++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java
@@ -87,7 +87,7 @@ public class TxBuilder implements TransactionBuilder {
 	@Override
 	public <T> T contract(String address, Class<T> contractIntf) {
 		// TODO Auto-generated method stub
-		return null;
+		throw new IllegalStateException("Not implemented.");
 	}
 
 }
diff --git a/source/sdk/sdk-samples/pom.xml b/source/sdk/sdk-samples/pom.xml
index bc85d375..b6c36f6d 100644
--- a/source/sdk/sdk-samples/pom.xml
+++ b/source/sdk/sdk-samples/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -16,7 +17,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
-			<artifactId>contract-model</artifactId>
+			<artifactId>ledger-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -31,18 +32,17 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
 			</plugin>
-			<!--<plugin>-->
-				<!--<groupId>org.springframework.boot</groupId>-->
-				<!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-				<!--<configuration>-->
-					<!--<mainClass>com.jd.blockchain.sdk.samples.SDKDemo_RegisterTest</mainClass>-->
-				<!--</configuration>-->
-			<!--</plugin>-->
+			<!--<plugin> -->
+			<!--<groupId>org.springframework.boot</groupId> -->
+			<!--<artifactId>spring-boot-maven-plugin</artifactId> -->
+			<!--<configuration> -->
+			<!--<mainClass>com.jd.blockchain.sdk.samples.SDKDemo_RegisterTest</mainClass> -->
+			<!--</configuration> -->
+			<!--</plugin> -->
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/source/test/test-integration/pom.xml b/source/test/test-integration/pom.xml
index 8e2e4946..b84a54bd 100644
--- a/source/test/test-integration/pom.xml
+++ b/source/test/test-integration/pom.xml
@@ -40,11 +40,6 @@
 			<artifactId>sdk-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.jd.blockchain</groupId>
-			<artifactId>contract-model</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>io.nats</groupId>
 			<artifactId>jnats</artifactId>
diff --git a/source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ValueType.java b/source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ValueType.java
index ccabc600..906223fe 100644
--- a/source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ValueType.java
+++ b/source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ValueType.java
@@ -16,12 +16,11 @@ public enum ValueType {
 	/**
 	 * 布尔型；
 	 */
-	BOOLEAN((byte) 0x10),
+	BOOLEAN((byte)  0x10),
 
 	/**
 	 * 数值型：
 	 */
-
 	INT8((byte) 0x11),
 
 	INT16((byte) 0x12),
@@ -89,6 +88,13 @@ public enum ValueType {
 //	 * 
 //	 */
 //	REFERENCE((byte) 0x80);
+	
+
+	public static final byte NUMERIC_FLAG = (byte)0x10;
+	
+	public static final byte TEXT_FLAG = (byte)0x20;
+	
+	public static final byte BINARY_FLAG = (byte)0x40;
 
 	public final byte CODE;