Skip to content

Commit 2636f0c

Browse files
ThoughtscriptThoughtscript
committed
BAEL-1461: Combined modules and refactored
1 parent 594b6dd commit 2636f0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+234
-318
lines changed

‎ethereum/ethereumj/.gitgnore renamed to ‎ethereum/.gitgnore

File renamed without changes.

‎ethereum/ethereumj/README.md

-6
This file was deleted.

‎ethereum/ethereumj/pom.xml

-94
This file was deleted.

‎ethereum/pom.xml

+233
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,237 @@
66
<version>0.0.1-SNAPSHOT</version>
77
<name>ethereum</name>
88

9+
<!-- Don't Use This - Use the BOM or direct dependency rather than parent -->
10+
<!--<parent>
11+
<groupId>org.springframework.boot</groupId>
12+
<artifactId>spring-boot-starter-parent</artifactId>
13+
<version>1.5.6.RELEASE</version>
14+
</parent>-->
15+
16+
<properties>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
<java.version>1.8</java.version>
19+
<tomcat.version>8.5.4</tomcat.version>
20+
<ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
21+
<web3j.core.version>3.3.1</web3j.core.version>
22+
<springframework.version>5.0.5.RELEASE</springframework.version>
23+
<spring.boot.version>1.5.6.RELEASE</spring.boot.version>
24+
<maven-surefire.version>2.18.1</maven-surefire.version>
25+
<mockito.version>1.10.19</mockito.version>
26+
<jackson-databind.version>2.5.0</jackson-databind.version>
27+
<hamcrest.version>1.3</hamcrest.version>
28+
<jackson.version>2.9.3</jackson.version>
29+
<javax-jsp.version>2.3.1</javax-jsp.version>
30+
<javax-servlet.version>3.1.0</javax-servlet.version>
31+
<jsonpath.version>2.4.0</jsonpath.version>
32+
<jstl.version>1.2</jstl.version>
33+
<junit.version>4.12</junit.version>
34+
<logback.version>1.2.3</logback.version>
35+
<slf4j.version>1.7.25</slf4j.version>
36+
</properties>
37+
38+
<repositories>
39+
<repository>
40+
<id>Ethereum</id>
41+
<name>Ethereum</name>
42+
<url>https://dl.bintray.com/ethereum/maven/</url>
43+
</repository>
44+
</repositories>
45+
46+
<dependencies>
47+
48+
<!-- Spring Boot Dependencies -->
49+
<dependency>
50+
<groupId>org.springframework.boot</groupId>
51+
<artifactId>spring-boot-starter</artifactId>
52+
<version>${spring.boot.version}</version>
53+
</dependency>
54+
55+
<dependency>
56+
<groupId>org.springframework.boot</groupId>
57+
<artifactId>spring-boot-starter-web</artifactId>
58+
<version>${spring.boot.version}</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.springframework.boot</groupId>
62+
<artifactId>spring-boot-starter-tomcat</artifactId>
63+
<version>${spring.boot.version}</version>
64+
</dependency>
65+
66+
<!-- Spring Dependencies -->
67+
<dependency>
68+
<groupId>org.springframework</groupId>
69+
<artifactId>spring-core</artifactId>
70+
<version>${springframework.version}</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.springframework</groupId>
74+
<artifactId>spring-web</artifactId>
75+
<version>${springframework.version}</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.springframework</groupId>
79+
<artifactId>spring-webmvc</artifactId>
80+
<version>${springframework.version}</version>
81+
</dependency>
82+
83+
<!-- Ethereum -->
84+
<dependency>
85+
<groupId>org.ethereum</groupId>
86+
<artifactId>ethereumj-core</artifactId>
87+
<version>${ethereumj-core.version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.web3j</groupId>
91+
<artifactId>core</artifactId>
92+
<version>${web3j.core.version}</version>
93+
</dependency>
94+
95+
<!-- Jackson Dependencies -->
96+
<dependency>
97+
<groupId>com.fasterxml.jackson.core</groupId>
98+
<artifactId>jackson-core</artifactId>
99+
<version>${jackson.version}</version>
100+
</dependency>
101+
<dependency>
102+
<groupId>com.fasterxml.jackson.core</groupId>
103+
<artifactId>jackson-databind</artifactId>
104+
<version>${jackson.version}</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>com.fasterxml.jackson.core</groupId>
108+
<artifactId>jackson-annotations</artifactId>
109+
<version>${jackson.version}</version>
110+
</dependency>
111+
112+
<!-- Servlet -->
113+
<dependency>
114+
<groupId>javax.servlet</groupId>
115+
<artifactId>jstl</artifactId>
116+
<version>${jstl.version}</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>javax.servlet</groupId>
120+
<artifactId>javax.servlet-api</artifactId>
121+
<version>${javax-servlet.version}</version>
122+
</dependency>
123+
<dependency>
124+
<groupId>javax.servlet.jsp.jstl</groupId>
125+
<artifactId>jstl-api</artifactId>
126+
<version>${jstl.version}</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>javax.servlet.jsp</groupId>
130+
<artifactId>javax.servlet.jsp-api</artifactId>
131+
<version>${javax-jsp.version}</version>
132+
</dependency>
133+
134+
<!-- Logging -->
135+
<dependency>
136+
<groupId>org.slf4j</groupId>
137+
<artifactId>jcl-over-slf4j</artifactId>
138+
<version>${slf4j.version}</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>ch.qos.logback</groupId>
142+
<artifactId>logback-classic</artifactId>
143+
<version>${logback.version}</version>
144+
</dependency>
145+
146+
<!-- Spring Testing -->
147+
<dependency>
148+
<groupId>org.springframework.boot</groupId>
149+
<artifactId>spring-boot-starter-test</artifactId>
150+
<scope>test</scope>
151+
<version>${spring.boot.version}</version>
152+
</dependency>
153+
<dependency>
154+
<groupId>org.springframework</groupId>
155+
<artifactId>spring-context</artifactId>
156+
<version>${springframework.version}</version>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.springframework</groupId>
160+
<artifactId>spring-test</artifactId>
161+
<version>${springframework.version}</version>
162+
<scope>test</scope>
163+
</dependency>
164+
165+
<!-- Testing -->
166+
<dependency>
167+
<groupId>org.mockito</groupId>
168+
<artifactId>mockito-core</artifactId>
169+
<version>${mockito.version}</version>
170+
<exclusions>
171+
<exclusion>
172+
<groupId>org.hamcrest</groupId>
173+
<artifactId>hamcrest-core</artifactId>
174+
</exclusion>
175+
</exclusions>
176+
<scope>test</scope>
177+
</dependency>
178+
<dependency>
179+
<groupId>junit</groupId>
180+
<artifactId>junit</artifactId>
181+
<version>${junit.version}</version>
182+
<scope>test</scope>
183+
<exclusions>
184+
<exclusion>
185+
<groupId>org.hamcrest</groupId>
186+
<artifactId>hamcrest-core</artifactId>
187+
</exclusion>
188+
</exclusions>
189+
</dependency>
190+
<dependency>
191+
<groupId>org.hamcrest</groupId>
192+
<artifactId>hamcrest-library</artifactId>
193+
<version>${hamcrest.version}</version>
194+
<scope>test</scope>
195+
</dependency>
196+
<dependency>
197+
<groupId>com.jayway.jsonpath</groupId>
198+
<artifactId>json-path</artifactId>
199+
<version>${jsonpath.version}</version>
200+
</dependency>
201+
</dependencies>
202+
<build>
203+
<plugins>
204+
<plugin>
205+
<artifactId>maven-compiler-plugin</artifactId>
206+
<version>3.1</version>
207+
<configuration>
208+
<source>1.8</source>
209+
<target>1.8</target>
210+
</configuration>
211+
</plugin>
212+
<plugin>
213+
<groupId>org.springframework.boot</groupId>
214+
<artifactId>spring-boot-maven-plugin</artifactId>
215+
</plugin>
216+
<plugin>
217+
<groupId>org.apache.maven.plugins</groupId>
218+
<artifactId>maven-war-plugin</artifactId>
219+
<version>3.0.0</version>
220+
<configuration>
221+
<warSourceDirectory>src/main/webapp</warSourceDirectory>
222+
<failOnMissingWebXml>false</failOnMissingWebXml>
223+
</configuration>
224+
</plugin>
225+
<plugin>
226+
<groupId>org.apache.maven.plugins</groupId>
227+
<artifactId>maven-surefire-plugin</artifactId>
228+
<version>${maven-surefire.version}</version>
229+
<executions>
230+
<execution>
231+
<id>install</id>
232+
<phase>install</phase>
233+
<goals>
234+
<goal>test</goal>
235+
</goals>
236+
</execution>
237+
</executions>
238+
</plugin>
239+
</plugins>
240+
<finalName>ethereum</finalName>
241+
</build>
9242
</project>

‎ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/ApplicationMain.java renamed to ‎ethereum/src/main/java/com/baeldung/ethereumj/ApplicationMain.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/Constants.java renamed to ‎ethereum/src/main/java/com/baeldung/ethereumj/Constants.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/beans/EthBean.java renamed to ‎ethereum/src/main/java/com/baeldung/ethereumj/beans/EthBean.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/config/EthConfig.java renamed to ‎ethereum/src/main/java/com/baeldung/ethereumj/config/EthConfig.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/controllers/EthController.java renamed to ‎ethereum/src/main/java/com/baeldung/ethereumj/controllers/EthController.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java renamed to ‎ethereum/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java renamed to ‎ethereum/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/web3j/Template.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/Template.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/config/AppConfig.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/config/AppConfig.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/constants/Constants.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/constants/Constants.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/contracts/Example.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/contracts/Example.java

File renamed without changes.

‎ethereum/ethereumj/src/main/java/com/baeldung/web3j/contracts/Greeting.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/contracts/Greeting.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/services/Web3Service.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/services/Web3Service.java

File renamed without changes.

‎ethereum/web3j/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java renamed to ‎ethereum/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java

File renamed without changes.

‎ethereum/ethereumj/src/main/resources/application.properties renamed to ‎ethereum/src/main/resources/application.properties

File renamed without changes.

‎ethereum/web3j/dev_ganache/README.md renamed to ‎ethereum/src/main/resources/dev_ganache/README.md

‎ethereum/web3j/dev_truffle/README.md renamed to ‎ethereum/src/main/resources/dev_truffle/README.md

‎ethereum/web3j/dev_truffle/build/contracts/ConvertLib.json renamed to ‎ethereum/src/main/resources/dev_truffle/build/contracts/ConvertLib.json

File renamed without changes.

‎ethereum/web3j/dev_truffle/build/contracts/Example.json renamed to ‎ethereum/src/main/resources/dev_truffle/build/contracts/Example.json

File renamed without changes.

‎ethereum/web3j/dev_truffle/build/contracts/Migrations.json renamed to ‎ethereum/src/main/resources/dev_truffle/build/contracts/Migrations.json

File renamed without changes.

‎ethereum/web3j/dev_truffle/contracts/ConvertLib.sol renamed to ‎ethereum/src/main/resources/dev_truffle/contracts/ConvertLib.sol

File renamed without changes.

‎ethereum/web3j/dev_truffle/contracts/Example.sol renamed to ‎ethereum/src/main/resources/dev_truffle/contracts/Example.sol

File renamed without changes.

‎ethereum/web3j/dev_truffle/contracts/Migrations.sol renamed to ‎ethereum/src/main/resources/dev_truffle/contracts/Migrations.sol

File renamed without changes.

‎ethereum/web3j/dev_truffle/migrations/1_initial_migration.js renamed to ‎ethereum/src/main/resources/dev_truffle/migrations/1_initial_migration.js

File renamed without changes.

‎ethereum/web3j/dev_truffle/migrations/2_deploy_contracts.js renamed to ‎ethereum/src/main/resources/dev_truffle/migrations/2_deploy_contracts.js

File renamed without changes.

‎ethereum/web3j/dev_truffle/truffle.js renamed to ‎ethereum/src/main/resources/dev_truffle/truffle.js

File renamed without changes.

‎ethereum/ethereumj/src/main/resources/solidity/Greeting.sol renamed to ‎ethereum/src/main/resources/solidity/Greeting.sol

File renamed without changes.

‎ethereum/ethereumj/src/main/resources/solidity/build/Greeting.abi renamed to ‎ethereum/src/main/resources/solidity/build/Greeting.abi

File renamed without changes.

‎ethereum/ethereumj/src/main/resources/solidity/build/Greeting.bin renamed to ‎ethereum/src/main/resources/solidity/build/Greeting.bin

File renamed without changes.

‎ethereum/web3j/src/main/webapp/WEB-INF/.gitkeep renamed to ‎ethereum/src/main/webapp/WEB-INF/.gitkeep

File renamed without changes.

‎ethereum/web3j/src/main/webapp/resources/.gitkeep renamed to ‎ethereum/src/main/webapp/resources/.gitkeep

File renamed without changes.

‎ethereum/ethereumj/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java renamed to ‎ethereum/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ public void difficultyTest() throws Exception {
7474
assertTrue("Dynamic data returned?", a.hasBody());
7575
System.out.println("Dynamic data returned?: " + a.hasBody());
7676
}
77-
}
77+
}

‎ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java renamed to ‎ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java

File renamed without changes.

‎ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java renamed to ‎ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java

File renamed without changes.

‎ethereum/web3j/src/test/com/baeldung/web3j/services/EthereumContractUnitTest.java renamed to ‎ethereum/src/test/java/com/baeldung/web3j/services/EthereumContractUnitTest.java

-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
import org.junit.After;
44
import org.junit.Before;
55
import org.junit.Test;
6-
import org.mockito.Mock;
7-
import org.springframework.beans.factory.annotation.Autowired;
86

97
import java.util.concurrent.CompletableFuture;
108

11-
import static com.baeldung.web3j.constants.Constants.PLEASE_SUPPLY_REAL_DATA;
12-
139
public class EthereumContractUnitTest {
1410

1511
private Web3Service web3Service;

‎ethereum/web3j/.gitignore

-3
This file was deleted.

0 commit comments

Comments
 (0)