diff --git a/ethereum/ethereumj/.gitgnore b/ethereum/.gitgnore similarity index 100% rename from ethereum/ethereumj/.gitgnore rename to ethereum/.gitgnore diff --git a/ethereum/ethereumj/README.md b/ethereum/ethereumj/README.md deleted file mode 100644 index eb695e4bc3..0000000000 --- a/ethereum/ethereumj/README.md +++ /dev/null @@ -1,6 +0,0 @@ -## Ethereum - -### Relevant Articles: -- [Introduction to EthereumJ](http://www.baeldung.com/ethereumj) -- [Lightweight Web3](http://www.baeldung.com/lightweight-web3/) - diff --git a/ethereum/ethereumj/pom.xml b/ethereum/ethereumj/pom.xml deleted file mode 100644 index 903e23bfda..0000000000 --- a/ethereum/ethereumj/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - com.baeldung.ethereumj - ethereumj - war - 1.0.0 - ethereumj - - - parent-boot-5 - com.baeldung - 0.0.1-SNAPSHOT - ../../parent-boot-5 - - - - UTF-8 - 1.8 - 8.5.4 - 1.5.0-RELEASE - 3.3.1 - 2.5.0 - - - - - Ethereum - Ethereum - https://dl.bintray.com/ethereum/maven/ - - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.ethereum - ethereumj-core - ${ethereumj-core.version} - - - - org.web3j - core - ${web3j.core.version} - - - - javax.servlet - jstl - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - - - - - - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.springframework.boot - spring-boot-maven-plugin - - - ethereumj - - - \ No newline at end of file diff --git a/ethereum/pom.xml b/ethereum/pom.xml index 7737348771..02b9e5afe1 100644 --- a/ethereum/pom.xml +++ b/ethereum/pom.xml @@ -6,4 +6,237 @@ 0.0.1-SNAPSHOT ethereum + + + + + UTF-8 + 1.8 + 8.5.4 + 1.5.0-RELEASE + 3.3.1 + 5.0.5.RELEASE + 1.5.6.RELEASE + 2.18.1 + 1.10.19 + 2.5.0 + 1.3 + 2.9.3 + 2.3.1 + 3.1.0 + 2.4.0 + 1.2 + 4.12 + 1.2.3 + 1.7.25 + + + + + Ethereum + Ethereum + https://dl.bintray.com/ethereum/maven/ + + + + + + + + org.springframework.boot + spring-boot-starter + ${spring.boot.version} + + + + org.springframework.boot + spring-boot-starter-web + ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-tomcat + ${spring.boot.version} + + + + + org.springframework + spring-core + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + + + org.ethereum + ethereumj-core + ${ethereumj-core.version} + + + org.web3j + core + ${web3j.core.version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + + javax.servlet + jstl + ${jstl.version} + + + javax.servlet + javax.servlet-api + ${javax-servlet.version} + + + javax.servlet.jsp.jstl + jstl-api + ${jstl.version} + + + javax.servlet.jsp + javax.servlet.jsp-api + ${javax-jsp.version} + + + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + + org.springframework.boot + spring-boot-starter-test + test + ${spring.boot.version} + + + org.springframework + spring-context + ${springframework.version} + + + org.springframework + spring-test + ${springframework.version} + test + + + + + org.mockito + mockito-core + ${mockito.version} + + + org.hamcrest + hamcrest-core + + + test + + + junit + junit + ${junit.version} + test + + + org.hamcrest + hamcrest-core + + + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + com.jayway.jsonpath + json-path + ${jsonpath.version} + + + + + + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-war-plugin + 3.0.0 + + src/main/webapp + false + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire.version} + + + install + install + + test + + + + + + ethereum + diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/ApplicationMain.java b/ethereum/src/main/java/com/baeldung/ethereumj/ApplicationMain.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/ApplicationMain.java rename to ethereum/src/main/java/com/baeldung/ethereumj/ApplicationMain.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/Constants.java b/ethereum/src/main/java/com/baeldung/ethereumj/Constants.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/Constants.java rename to ethereum/src/main/java/com/baeldung/ethereumj/Constants.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/beans/EthBean.java b/ethereum/src/main/java/com/baeldung/ethereumj/beans/EthBean.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/beans/EthBean.java rename to ethereum/src/main/java/com/baeldung/ethereumj/beans/EthBean.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/config/EthConfig.java b/ethereum/src/main/java/com/baeldung/ethereumj/config/EthConfig.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/config/EthConfig.java rename to ethereum/src/main/java/com/baeldung/ethereumj/config/EthConfig.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/controllers/EthController.java b/ethereum/src/main/java/com/baeldung/ethereumj/controllers/EthController.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/controllers/EthController.java rename to ethereum/src/main/java/com/baeldung/ethereumj/controllers/EthController.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java b/ethereum/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java rename to ethereum/src/main/java/com/baeldung/ethereumj/listeners/EthListener.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java b/ethereum/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java rename to ethereum/src/main/java/com/baeldung/ethereumj/transfer/EthResponse.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/web3j/Template.java b/ethereum/src/main/java/com/baeldung/web3j/Template.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/web3j/Template.java rename to ethereum/src/main/java/com/baeldung/web3j/Template.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/config/AppConfig.java b/ethereum/src/main/java/com/baeldung/web3j/config/AppConfig.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/config/AppConfig.java rename to ethereum/src/main/java/com/baeldung/web3j/config/AppConfig.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java b/ethereum/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java rename to ethereum/src/main/java/com/baeldung/web3j/config/WebAppInitializer.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/constants/Constants.java b/ethereum/src/main/java/com/baeldung/web3j/constants/Constants.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/constants/Constants.java rename to ethereum/src/main/java/com/baeldung/web3j/constants/Constants.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/contracts/Example.java b/ethereum/src/main/java/com/baeldung/web3j/contracts/Example.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/contracts/Example.java rename to ethereum/src/main/java/com/baeldung/web3j/contracts/Example.java diff --git a/ethereum/ethereumj/src/main/java/com/baeldung/web3j/contracts/Greeting.java b/ethereum/src/main/java/com/baeldung/web3j/contracts/Greeting.java similarity index 100% rename from ethereum/ethereumj/src/main/java/com/baeldung/web3j/contracts/Greeting.java rename to ethereum/src/main/java/com/baeldung/web3j/contracts/Greeting.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java b/ethereum/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java rename to ethereum/src/main/java/com/baeldung/web3j/controllers/EthereumRestController.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java b/ethereum/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java rename to ethereum/src/main/java/com/baeldung/web3j/helpers/TimeHelper.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/services/Web3Service.java b/ethereum/src/main/java/com/baeldung/web3j/services/Web3Service.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/services/Web3Service.java rename to ethereum/src/main/java/com/baeldung/web3j/services/Web3Service.java diff --git a/ethereum/web3j/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java b/ethereum/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java similarity index 100% rename from ethereum/web3j/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java rename to ethereum/src/main/java/com/baeldung/web3j/transfers/ResponseTransfer.java diff --git a/ethereum/ethereumj/src/main/resources/application.properties b/ethereum/src/main/resources/application.properties similarity index 100% rename from ethereum/ethereumj/src/main/resources/application.properties rename to ethereum/src/main/resources/application.properties diff --git a/ethereum/web3j/dev_ganache/README.md b/ethereum/src/main/resources/dev_ganache/README.md similarity index 100% rename from ethereum/web3j/dev_ganache/README.md rename to ethereum/src/main/resources/dev_ganache/README.md diff --git a/ethereum/web3j/dev_truffle/README.md b/ethereum/src/main/resources/dev_truffle/README.md similarity index 100% rename from ethereum/web3j/dev_truffle/README.md rename to ethereum/src/main/resources/dev_truffle/README.md diff --git a/ethereum/web3j/dev_truffle/build/contracts/ConvertLib.json b/ethereum/src/main/resources/dev_truffle/build/contracts/ConvertLib.json similarity index 100% rename from ethereum/web3j/dev_truffle/build/contracts/ConvertLib.json rename to ethereum/src/main/resources/dev_truffle/build/contracts/ConvertLib.json diff --git a/ethereum/web3j/dev_truffle/build/contracts/Example.json b/ethereum/src/main/resources/dev_truffle/build/contracts/Example.json similarity index 100% rename from ethereum/web3j/dev_truffle/build/contracts/Example.json rename to ethereum/src/main/resources/dev_truffle/build/contracts/Example.json diff --git a/ethereum/web3j/dev_truffle/build/contracts/Migrations.json b/ethereum/src/main/resources/dev_truffle/build/contracts/Migrations.json similarity index 100% rename from ethereum/web3j/dev_truffle/build/contracts/Migrations.json rename to ethereum/src/main/resources/dev_truffle/build/contracts/Migrations.json diff --git a/ethereum/web3j/dev_truffle/contracts/ConvertLib.sol b/ethereum/src/main/resources/dev_truffle/contracts/ConvertLib.sol similarity index 100% rename from ethereum/web3j/dev_truffle/contracts/ConvertLib.sol rename to ethereum/src/main/resources/dev_truffle/contracts/ConvertLib.sol diff --git a/ethereum/web3j/dev_truffle/contracts/Example.sol b/ethereum/src/main/resources/dev_truffle/contracts/Example.sol similarity index 100% rename from ethereum/web3j/dev_truffle/contracts/Example.sol rename to ethereum/src/main/resources/dev_truffle/contracts/Example.sol diff --git a/ethereum/web3j/dev_truffle/contracts/Migrations.sol b/ethereum/src/main/resources/dev_truffle/contracts/Migrations.sol similarity index 100% rename from ethereum/web3j/dev_truffle/contracts/Migrations.sol rename to ethereum/src/main/resources/dev_truffle/contracts/Migrations.sol diff --git a/ethereum/web3j/dev_truffle/migrations/1_initial_migration.js b/ethereum/src/main/resources/dev_truffle/migrations/1_initial_migration.js similarity index 100% rename from ethereum/web3j/dev_truffle/migrations/1_initial_migration.js rename to ethereum/src/main/resources/dev_truffle/migrations/1_initial_migration.js diff --git a/ethereum/web3j/dev_truffle/migrations/2_deploy_contracts.js b/ethereum/src/main/resources/dev_truffle/migrations/2_deploy_contracts.js similarity index 100% rename from ethereum/web3j/dev_truffle/migrations/2_deploy_contracts.js rename to ethereum/src/main/resources/dev_truffle/migrations/2_deploy_contracts.js diff --git a/ethereum/web3j/dev_truffle/truffle.js b/ethereum/src/main/resources/dev_truffle/truffle.js similarity index 100% rename from ethereum/web3j/dev_truffle/truffle.js rename to ethereum/src/main/resources/dev_truffle/truffle.js diff --git a/ethereum/ethereumj/src/main/resources/solidity/Greeting.sol b/ethereum/src/main/resources/solidity/Greeting.sol similarity index 100% rename from ethereum/ethereumj/src/main/resources/solidity/Greeting.sol rename to ethereum/src/main/resources/solidity/Greeting.sol diff --git a/ethereum/ethereumj/src/main/resources/solidity/build/Greeting.abi b/ethereum/src/main/resources/solidity/build/Greeting.abi similarity index 100% rename from ethereum/ethereumj/src/main/resources/solidity/build/Greeting.abi rename to ethereum/src/main/resources/solidity/build/Greeting.abi diff --git a/ethereum/ethereumj/src/main/resources/solidity/build/Greeting.bin b/ethereum/src/main/resources/solidity/build/Greeting.bin similarity index 100% rename from ethereum/ethereumj/src/main/resources/solidity/build/Greeting.bin rename to ethereum/src/main/resources/solidity/build/Greeting.bin diff --git a/ethereum/web3j/src/main/webapp/WEB-INF/.gitkeep b/ethereum/src/main/webapp/WEB-INF/.gitkeep similarity index 100% rename from ethereum/web3j/src/main/webapp/WEB-INF/.gitkeep rename to ethereum/src/main/webapp/WEB-INF/.gitkeep diff --git a/ethereum/web3j/src/main/webapp/resources/.gitkeep b/ethereum/src/main/webapp/resources/.gitkeep similarity index 100% rename from ethereum/web3j/src/main/webapp/resources/.gitkeep rename to ethereum/src/main/webapp/resources/.gitkeep diff --git a/ethereum/ethereumj/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java b/ethereum/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java similarity index 99% rename from ethereum/ethereumj/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java rename to ethereum/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java index f62d229261..7676b99224 100644 --- a/ethereum/ethereumj/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java +++ b/ethereum/src/test/java/com/baeldung/ethereumj/controllers/EthControllerLiveTest.java @@ -74,4 +74,4 @@ public class EthControllerLiveTest { assertTrue("Dynamic data returned?", a.hasBody()); System.out.println("Dynamic data returned?: " + a.hasBody()); } -} +} \ No newline at end of file diff --git a/ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java b/ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java similarity index 100% rename from ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java rename to ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java diff --git a/ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java b/ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java similarity index 100% rename from ethereum/web3j/src/test/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java rename to ethereum/src/test/java/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java diff --git a/ethereum/web3j/src/test/com/baeldung/web3j/services/EthereumContractUnitTest.java b/ethereum/src/test/java/com/baeldung/web3j/services/EthereumContractUnitTest.java similarity index 81% rename from ethereum/web3j/src/test/com/baeldung/web3j/services/EthereumContractUnitTest.java rename to ethereum/src/test/java/com/baeldung/web3j/services/EthereumContractUnitTest.java index 5c74e1c7ce..382c96e985 100644 --- a/ethereum/web3j/src/test/com/baeldung/web3j/services/EthereumContractUnitTest.java +++ b/ethereum/src/test/java/com/baeldung/web3j/services/EthereumContractUnitTest.java @@ -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; diff --git a/ethereum/web3j/.gitignore b/ethereum/web3j/.gitignore deleted file mode 100644 index f83e8cf07c..0000000000 --- a/ethereum/web3j/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.idea -target -*.iml diff --git a/ethereum/web3j/pom.xml b/ethereum/web3j/pom.xml deleted file mode 100644 index b65f120218..0000000000 --- a/ethereum/web3j/pom.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - 4.0.0 - com.baeldung.web3j - Web3j - war - 1.0.0 - web3j - - - 1.3 - 2.9.3 - 2.3.1 - 3.1.0 - 2.4.0 - 1.2 - 4.12 - 1.2.3 - 2.18.1 - 1.10.19 - 1.7.25 - 5.0.5.RELEASE - - - - - - org.springframework - spring-core - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - - - javax.servlet - javax.servlet-api - ${javax-servlet.version} - - - javax.servlet.jsp.jstl - jstl-api - ${jstl.version} - - - javax.servlet.jsp - javax.servlet.jsp-api - ${javax-jsp.version} - - - javax.servlet - jstl - ${jstl.version} - - - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - - org.web3j - core - 3.3.1 - - - - - org.mockito - mockito-core - ${mockito.version} - - - org.hamcrest - hamcrest-core - - - test - - - junit - junit - ${junit.version} - test - - - org.hamcrest - hamcrest-core - - - - - org.hamcrest - hamcrest-library - ${hamcrest.version} - test - - - org.springframework - spring-context - ${springframework.version} - - - org.springframework - spring-test - ${springframework.version} - test - - - com.jayway.jsonpath - json-path - ${jsonpath.version} - - - - - - - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.apache.tomcat.maven - tomcat8-maven-plugin - 3.0-r1655215 - - /javaweb3 - - - - org.apache.maven.plugins - maven-war-plugin - 3.0.0 - - src/main/webapp - false - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire.version} - - - install - install - - test - - - - - test/com/baeldung/web3j/controllers/EthereumRestControllerIntegrationTest.java - - - test/com/baeldung/web3j/controllers/EthereumRestControllerUnitTest.java - - - test/com/baeldung/web3j/services/EthereumContractUnitTest.java - - - - - - - - - web3j - - \ No newline at end of file