Browse Source

Fixed compiling errors.

tags/1.0.0
huanghaiquan 5 years ago
parent
commit
f483a5a0d4
6 changed files with 75 additions and 23 deletions
  1. +0
    -5
      source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java
  2. +56
    -0
      source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractType.java
  3. +1
    -1
      source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java
  4. +10
    -10
      source/sdk/sdk-samples/pom.xml
  5. +0
    -5
      source/test/test-integration/pom.xml
  6. +8
    -2
      source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ValueType.java

+ 0
- 5
source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java View File

@@ -1,5 +0,0 @@
package com.jd.blockchain.transaction;

class ContractDefinition {

}

+ 56
- 0
source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractType.java View File

@@ -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) {
//
// }

}

+ 1
- 1
source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java View File

@@ -87,7 +87,7 @@ public class TxBuilder implements TransactionBuilder {
@Override @Override
public <T> T contract(String address, Class<T> contractIntf) { public <T> T contract(String address, Class<T> contractIntf) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null;
throw new IllegalStateException("Not implemented.");
} }
} }

+ 10
- 10
source/sdk/sdk-samples/pom.xml View File

@@ -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"> 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@@ -16,7 +17,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>contract-model</artifactId>
<artifactId>ledger-model</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -31,18 +32,17 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</project> </project>

+ 0
- 5
source/test/test-integration/pom.xml View File

@@ -40,11 +40,6 @@
<artifactId>sdk-client</artifactId> <artifactId>sdk-client</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>contract-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.nats</groupId> <groupId>io.nats</groupId>
<artifactId>jnats</artifactId> <artifactId>jnats</artifactId>


+ 8
- 2
source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ValueType.java View File

@@ -16,12 +16,11 @@ public enum ValueType {
/** /**
* 布尔型; * 布尔型;
*/ */
BOOLEAN((byte) 0x10),
BOOLEAN((byte) 0x10),
/** /**
* 数值型: * 数值型:
*/ */
INT8((byte) 0x11), INT8((byte) 0x11),
INT16((byte) 0x12), INT16((byte) 0x12),
@@ -89,6 +88,13 @@ public enum ValueType {
// * // *
// */ // */
// REFERENCE((byte) 0x80); // 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; public final byte CODE;


Loading…
Cancel
Save