iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BAEL-1461: Combined modules and refactored

This commit is contained in:
Thoughtscript 2018-05-02 20:42:11 +01:00
parent 594b6dda12
commit 2636f0cc7c
44 changed files with 234 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ethereum/ethereumj/.gitgnore → ethereum/.gitgnore
View File

6
ethereum/ethereumj/README.md
View File

@ -1,6 +0,0 @@
## Ethereum
### Relevant Articles:
- [Introduction to EthereumJ](http://www.baeldung.com/ethereumj)
- [Lightweight Web3](http://www.baeldung.com/lightweight-web3/)

94
ethereum/ethereumj/pom.xml
View File

@ -1,94 +0,0 @@
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung.ethereumj</groupId>
<artifactId>ethereumj</artifactId>
<packaging>war</packaging>
<version>1.0.0</version>
<name>ethereumj</name>
<parent>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<tomcat.version>8.5.4</tomcat.version>
<ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
<web3j.core.version>3.3.1</web3j.core.version>
<jackson-databind.version>2.5.0</jackson-databind.version>
</properties>
<repositories>
<repository>
<id>Ethereum</id>
<name>Ethereum</name>
<url>https://dl.bintray.com/ethereum/maven/</url>
</repository>
</repositories>
<dependencies>
<!-- Spring Boot Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</dependency>
<!-- Unit Testing -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- Ethereum -->
<dependency>
<groupId>org.ethereum</groupId>
<artifactId>ethereumj-core</artifactId>
<version>${ethereumj-core.version}</version>
</dependency>
<!-- Web3j -->
<dependency>
<groupId>org.web3j</groupId>
<artifactId>core</artifactId>
<version>${web3j.core.version}</version>
</dependency>
<!-- JSTL/JSP -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
<finalName>ethereumj</finalName>
</build>
</project>

233
ethereum/pom.xml
View File

@ -6,4 +6,237 @@
<version>0.0.1-SNAPSHOT</version>
<name>ethereum</name>
<!-- Don't Use This - Use the BOM or direct dependency rather than parent -->
<!--<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.6.RELEASE</version>
</parent>-->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<tomcat.version>8.5.4</tomcat.version>
<ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
<web3j.core.version>3.3.1</web3j.core.version>
<springframework.version>5.0.5.RELEASE</springframework.version>
<spring.boot.version>1.5.6.RELEASE</spring.boot.version>
<maven-surefire.version>2.18.1</maven-surefire.version>
<mockito.version>1.10.19</mockito.version>
<jackson-databind.version>2.5.0</jackson-databind.version>
<hamcrest.version>1.3</hamcrest.version>
<jackson.version>2.9.3</jackson.version>
<javax-jsp.version>2.3.1</javax-jsp.version>
<javax-servlet.version>3.1.0</javax-servlet.version>
<jsonpath.version>2.4.0</jsonpath.version>
<jstl.version>1.2</jstl.version>
<junit.version>4.12</junit.version>
<logback.version>1.2.3</logback.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>
<repositories>
<repository>
<id>Ethereum</id>
<name>Ethereum</name>
<url>https://dl.bintray.com/ethereum/maven/</url>
</repository>
</repositories>
<dependencies>
<!-- Spring Boot Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${springframework.version}</version>
</dependency>
<!-- Ethereum -->
<dependency>
<groupId>org.ethereum</groupId>
<artifactId>ethereumj-core</artifactId>
<version>${ethereumj-core.version}</version>
</dependency>
<dependency>
<groupId>org.web3j</groupId>
<artifactId>core</artifactId>
<version>${web3j.core.version}</version>
</dependency>
<!-- Jackson Dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- Servlet -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl-api</artifactId>
<version>${jstl.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>${javax-jsp.version}</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- Spring Testing -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${springframework.version}</version>
<scope>test</scope>
</dependency>
<!-- Testing -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${jsonpath.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<finalName>ethereum</finalName>
</build>
</project>

0
ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/ApplicationMain.java → ethereum/src/main/java/com/baeldung/ethereumj/ApplicationMain.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/Constants.java → ethereum/src/main/java/com/baeldung/ethereumj/Constants.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/beans/EthBean.java → ethereum/src/main/java/com/baeldung/ethereumj/beans/EthBean.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/config/EthConfig.java → ethereum/src/main/java/com/baeldung/ethereumj/config/EthConfig.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/controllers/EthController.java → ethereum/src/main/java/com/baeldung/ethereumj/controllers/EthController.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java → ethereum/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java → ethereum/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/web3j/Template.java → ethereum/src/main/java/com/baeldung/web3j/Template.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/config/AppConfig.java → ethereum/src/main/java/com/baeldung/web3j/config/AppConfig.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java → ethereum/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/constants/Constants.java → ethereum/src/main/java/com/baeldung/web3j/constants/Constants.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/contracts/Example.java → ethereum/src/main/java/com/baeldung/web3j/contracts/Example.java
View File

0
ethereum/ethereumj/src/main/java/com/baeldung/web3j/contracts/Greeting.java → ethereum/src/main/java/com/baeldung/web3j/contracts/Greeting.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java → ethereum/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java → ethereum/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/services/Web3Service.java → ethereum/src/main/java/com/baeldung/web3j/services/Web3Service.java
View File

0
ethereum/web3j/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java → ethereum/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java
View File

0
ethereum/ethereumj/src/main/resources/application.properties → ethereum/src/main/resources/application.properties
View File

0
ethereum/web3j/dev_ganache/README.md → ethereum/src/main/resources/dev_ganache/README.md
View File

0
ethereum/web3j/dev_truffle/README.md → ethereum/src/main/resources/dev_truffle/README.md
View File

0
ethereum/web3j/dev_truffle/build/contracts/ConvertLib.json → ethereum/src/main/resources/dev_truffle/build/contracts/ConvertLib.json
View File

0
ethereum/web3j/dev_truffle/build/contracts/Example.json → ethereum/src/main/resources/dev_truffle/build/contracts/Example.json
View File

0
ethereum/web3j/dev_truffle/build/contracts/Migrations.json → ethereum/src/main/resources/dev_truffle/build/contracts/Migrations.json
View File

0
ethereum/web3j/dev_truffle/contracts/ConvertLib.sol → ethereum/src/main/resources/dev_truffle/contracts/ConvertLib.sol
View File

0
ethereum/web3j/dev_truffle/contracts/Example.sol → ethereum/src/main/resources/dev_truffle/contracts/Example.sol
View File

0
ethereum/web3j/dev_truffle/contracts/Migrations.sol → ethereum/src/main/resources/dev_truffle/contracts/Migrations.sol
View File

0
ethereum/web3j/dev_truffle/migrations/1_initial_migration.js → ethereum/src/main/resources/dev_truffle/migrations/1_initial_migration.js
View File

0
ethereum/web3j/dev_truffle/migrations/2_deploy_contracts.js → ethereum/src/main/resources/dev_truffle/migrations/2_deploy_contracts.js
View File

0
ethereum/web3j/dev_truffle/truffle.js → ethereum/src/main/resources/dev_truffle/truffle.js
View File

0
ethereum/ethereumj/src/main/resources/solidity/Greeting.sol → ethereum/src/main/resources/solidity/Greeting.sol
View File

0
ethereum/ethereumj/src/main/resources/solidity/build/Greeting.abi → ethereum/src/main/resources/solidity/build/Greeting.abi
View File

0
ethereum/ethereumj/src/main/resources/solidity/build/Greeting.bin → ethereum/src/main/resources/solidity/build/Greeting.bin
View File

0
ethereum/web3j/src/main/webapp/WEB-INF/.gitkeep → ethereum/src/main/webapp/WEB-INF/.gitkeep
View File

0
ethereum/web3j/src/main/webapp/resources/.gitkeep → ethereum/src/main/webapp/resources/.gitkeep
View File

2
ethereum/ethereumj/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java → ethereum/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java
View File

@ -74,4 +74,4 @@ public class EthControllerLiveTest {
assertTrue("Dynamic data returned?", a.hasBody());
System.out.println("Dynamic data returned?: " + a.hasBody());
}
}
}

0
ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java → ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java
View File

0
ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java → ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java
View File

4
ethereum/web3j/src/test/com/baeldung/web3j/services/EthereumContractUnitTest.java → ethereum/src/test/java/com/baeldung/web3j/services/EthereumContractUnitTest.java
View File

@ -3,13 +3,9 @@ package com.baeldung.web3j.services;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.concurrent.CompletableFuture;
import static com.baeldung.web3j.constants.Constants.PLEASE_SUPPLY_REAL_DATA;
public class EthereumContractUnitTest {
private Web3Service web3Service;

3
ethereum/web3j/.gitignore vendored
View File

@ -1,3 +0,0 @@
.idea
target
*.iml

210
ethereum/web3j/pom.xml
View File

@ -1,210 +0,0 @@
<?xml version="1.0"?>
<project 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" xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung.web3j</groupId>
<artifactId>Web3j</artifactId>
<packaging>war</packaging>
<version>1.0.0</version>
<name>web3j</name>
<properties>
<hamcrest.version>1.3</hamcrest.version>
<jackson.version>2.9.3</jackson.version>
<javax-jsp.version>2.3.1</javax-jsp.version>
<javax-servlet.version>3.1.0</javax-servlet.version>
<jsonpath.version>2.4.0</jsonpath.version>
<jstl.version>1.2</jstl.version>
<junit.version>4.12</junit.version>
<logback.version>1.2.3</logback.version>
<maven-surefire.version>2.18.1</maven-surefire.version>
<mockito.version>1.10.19</mockito.version>
<slf4j.version>1.7.25</slf4j.version>
<springframework.version>5.0.5.RELEASE</springframework.version>
</properties>
<dependencies>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${springframework.version}</version>
</dependency>
<!-- Servlet -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl-api</artifactId>
<version>${jstl.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>${javax-jsp.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- Jackson Dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- Web3J -->
<dependency>
<groupId>org.web3j</groupId>
<artifactId>core</artifactId>
<version>3.3.1</version>
</dependency>
<!-- Testing -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${springframework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${jsonpath.version}</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat8-maven-plugin</artifactId>
<version>3.0-r1655215</version>
<configuration>
<path>/javaweb3</path>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<includes>
<include>
test/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java
</include>
<include>
test/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java
</include>
<include>
test/com/baeldung/web3j/services/EthereumContractUnitTest.java
</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<finalName>web3j</finalName>
</build>
</project>