Switched over to gradle and added a logger to remove some warnings.

Signed-off-by: r2roC <arturo@IBM.com>
This commit is contained in:
r2roC 2020-08-03 16:54:38 -04:00
parent e94d639d46
commit cba0e182de
14 changed files with 406 additions and 176 deletions

View file

@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

View file

@ -1,7 +0,0 @@
/bin/
/target/
.settings/
.classpath
.project
wallet
!wallet/.gitkeep

View file

@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

185
asset-transfer-basic/application-java/gradlew vendored Executable file
View file

@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

View file

@ -0,0 +1,104 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

View file

@ -1,85 +0,0 @@
<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>
<groupId>asset-transfer-basic</groupId>
<artifactId>application-java</artifactId>
<version>1.0</version>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.0</version>
<executions>
<!-- Attach the shade goal into the package phase -->
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>oss-sonatype</id>
<name>OSS Sonatype</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.hyperledger.fabric</groupId>
<artifactId>fabric-gateway-java</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.4.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.4.2</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.12.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

View file

@ -0,0 +1,10 @@
/*
* This file was generated by the Gradle 'init' task.
*
* The settings file is used to specify which projects to include in your build.
*
* Detailed information about configuring a multi-project build in Gradle can be found
* in the user manual at https://docs.gradle.org/6.5/userguide/multi_project_builds.html
*/
rootProject.name = 'application-java'

View file

@ -1,26 +1,24 @@
/* /*
SPDX-License-Identifier: Apache-2.0 * This Java source file was generated by the Gradle 'init' task.
*/ */
package application.java;
package org.example;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import org.hyperledger.fabric.gateway.Contract; import org.hyperledger.fabric.gateway.Contract;
import org.hyperledger.fabric.gateway.Gateway; import org.hyperledger.fabric.gateway.Gateway;
import org.hyperledger.fabric.gateway.Network; import org.hyperledger.fabric.gateway.Network;
import org.hyperledger.fabric.gateway.Wallet; import org.hyperledger.fabric.gateway.Wallet;
import org.hyperledger.fabric.gateway.Wallets; import org.hyperledger.fabric.gateway.Wallets;
public class ClientApp { public class ClientUtilities
{
static { static {
System.setProperty("org.hyperledger.fabric.sdk.service_discovery.as_localhost", "true"); System.setProperty("org.hyperledger.fabric.sdk.service_discovery.as_localhost", "true");
} }
// helper function for getting connected to the gateway // helper function for getting connected to the gateway
public static Gateway Connect() throws Exception{ public static Gateway connect() throws Exception{
// Load a file system based wallet for managing identities. // Load a file system based wallet for managing identities.
Path walletPath = Paths.get("wallet"); Path walletPath = Paths.get("wallet");
Wallet wallet = Wallets.newFileSystemWallet(walletPath); Wallet wallet = Wallets.newFileSystemWallet(walletPath);
@ -30,14 +28,13 @@ public class ClientApp {
Gateway.Builder builder = Gateway.createBuilder(); Gateway.Builder builder = Gateway.createBuilder();
builder.identity(wallet, "appUser").networkConfig(networkConfigPath).discovery(true); builder.identity(wallet, "appUser").networkConfig(networkConfigPath).discovery(true);
return builder.connect(); return builder.connect();
} }
// Connects to the chaincode and calls InitLedger() // connects to the chaincode and calls InitLedger()
public static void main(String[] args) throws Exception { public static void InitLedger() throws Exception {
// create a gateway connection // create a gateway connection
try (Gateway gateway = Connect()) { try (Gateway gateway = connect()) {
// get the network and contract // get the network and contract
Network network = gateway.getNetwork("mychannel"); Network network = gateway.getNetwork("mychannel");
@ -54,12 +51,12 @@ public class ClientApp {
} }
} }
// Connects to the chaincode and calls CreateAsset() // connects to the chaincode and calls CreateAsset()
public static void CreateAsset(final String assetID, final String color, final String size, public static void CreateAsset(final String assetID, final String color, final String size,
final String owner, final String appraisedValue) throws Exception { final String owner, final String appraisedValue) throws Exception {
// create a gateway connection // create a gateway connection
try (Gateway gateway = Connect()) { try (Gateway gateway = connect()) {
// get the network and contract // get the network and contract
Network network = gateway.getNetwork("mychannel"); Network network = gateway.getNetwork("mychannel");
@ -75,9 +72,9 @@ public class ClientApp {
} }
} }
public static void ReadAsset(final String assetID) throws Exception { public static void ReadAsset(final String assetID) throws Exception {
// create a gateway connection // create a gateway connection
try (Gateway gateway = Connect()) { try (Gateway gateway = connect()) {
// get the network and contract // get the network and contract
Network network = gateway.getNetwork("mychannel"); Network network = gateway.getNetwork("mychannel");
@ -94,12 +91,12 @@ public class ClientApp {
} }
} }
// Connects to the chaincode and calls CreateAsset() // connects to the chaincode and calls CreateAsset()
public static void UpdateAsset(final String assetID, final String color, final String size, public static void UpdateAsset(final String assetID, final String color, final String size,
final String owner, final String appraisedValue) throws Exception { final String owner, final String appraisedValue) throws Exception {
// create a gateway connection // create a gateway connection
try (Gateway gateway = Connect()) { try (Gateway gateway = connect()) {
// get the network and contract // get the network and contract
Network network = gateway.getNetwork("mychannel"); Network network = gateway.getNetwork("mychannel");
@ -115,11 +112,11 @@ public class ClientApp {
} }
} }
// Connects to the chaincode and calls CreateAsset() // connects to the chaincode and calls CreateAsset()
public static void DeleteAsset(final String assetID) throws Exception { public static void DeleteAsset(final String assetID) throws Exception {
// create a gateway connection // create a gateway connection
try (Gateway gateway = Connect()) { try (Gateway gateway = connect()) {
// get the network and contract // get the network and contract
Network network = gateway.getNetwork("mychannel"); Network network = gateway.getNetwork("mychannel");
@ -134,11 +131,11 @@ public class ClientApp {
} }
} }
// Connects to the chaincode and calls CreateAsset() // connects to the chaincode and calls CreateAsset()
public static void TransferAsset(final String assetID, final String newOwner) throws Exception { public static void TransferAsset(final String assetID, final String newOwner) throws Exception {
// create a gateway connection // create a gateway connection
try (Gateway gateway = Connect()) { try (Gateway gateway = connect()) {
// get the network and contract // get the network and contract
Network network = gateway.getNetwork("mychannel"); Network network = gateway.getNetwork("mychannel");
@ -158,7 +155,7 @@ public class ClientApp {
public static void GetAllAssets() throws Exception { public static void GetAllAssets() throws Exception {
// create a gateway connection // create a gateway connection
try (Gateway gateway = Connect()) { try (Gateway gateway = connect()) {
// get the network and contract // get the network and contract
Network network = gateway.getNetwork("mychannel"); Network network = gateway.getNetwork("mychannel");
@ -174,4 +171,4 @@ public class ClientApp {
System.out.println("Error connecting to gateway: " + e); System.out.println("Error connecting to gateway: " + e);
} }
} }
} }

View file

@ -2,7 +2,7 @@
SPDX-License-Identifier: Apache-2.0 SPDX-License-Identifier: Apache-2.0
*/ */
package org.example; package application.java;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Properties; import java.util.Properties;

View file

@ -2,7 +2,7 @@
SPDX-License-Identifier: Apache-2.0 SPDX-License-Identifier: Apache-2.0
*/ */
package org.example; package application.java;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.PrivateKey; import java.security.PrivateKey;

View file

@ -0,0 +1,19 @@
# initialize root logger with level ERROR for stdout and fout
log4j.rootLogger=ERROR,stdout,fout
# set the log level for these components
log4j.logger.com.endeca=INFO
log4j.logger.com.endeca.itl.web.metrics=INFO
# add a ConsoleAppender to the logger stdout to write to the console
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
# use a simple message format
log4j.appender.stdout.layout.ConversionPattern=%m%n
# add a FileAppender to the logger fout
log4j.appender.fout=org.apache.log4j.FileAppender
# create a log file
log4j.appender.fout.File=crawl.log
log4j.appender.fout.layout=org.apache.log4j.PatternLayout
# use a more detailed message pattern
log4j.appender.fout.layout.ConversionPattern=%p\t%d{ISO8601}\t%r\t%c\t[%t]\t%m%n

View file

@ -0,0 +1,53 @@
/*
* This Java source file was generated by the Gradle 'init' task.
*/
package application.java;
import org.junit.Test;
import org.apache.log4j.Logger;
import static org.junit.Assert.*;
public class TestApp {
@Test
public void start() throws Exception {
EnrollAdmin.main(null);
RegisterUser.main(null);
ClientUtilities.InitLedger();
}
// Creates asset7, modify the parameters to create other assets
@Test
public void CreateAssetTest() throws Exception {
ClientUtilities.CreateAsset("asset7", "magenta", "20", "kenysha", "800");
}
// Reads asset1, modify the parameters to read other assets
@Test
public void ReadAssetTest() throws Exception {
ClientUtilities.ReadAsset("asset7");
}
// Updates asset3, modify the parameters to read other assets
@Test
public void UpdateAssetTest() throws Exception {
ClientUtilities.UpdateAsset("asset3", "blue", "20", "Jin Soo", "600");
}
// Deletes asset2, modify the parameters to delete other assets
@Test
public void DeleteAssetTest() throws Exception {
ClientUtilities.DeleteAsset("asset2");
}
// Transfers asset1 to arturo, modify the parameters to transfer other assets
@Test
public void TransferAssetTest() throws Exception {
ClientUtilities.TransferAsset("asset1", "arturo");
}
// Outputs all the assets
@Test
public void GetAllAssetsTest() throws Exception {
ClientUtilities.GetAllAssets();
}
}

View file

@ -1,57 +0,0 @@
/*
SPDX-License-Identifier: Apache-2.0
*/
package org.example;
import org.junit.Test;
public class TestApp {
/*
* Enrolls an admin
* Registers a user
* Initializes the ledger with some assets
*/
@Test
public void start() throws Exception {
EnrollAdmin.main(null);
RegisterUser.main(null);
ClientApp.main(null);
}
// Creates asset7, modify the parameters to create other assets
@Test
public void CreateAsset() throws Exception {
ClientApp.CreateAsset("asset7", "magenta", "20", "kenysha", "800");
}
// Reads asset1, modify the parameters to read other assets
@Test
public void ReadAsset() throws Exception {
ClientApp.ReadAsset("asset7");
}
// Updates asset3, modify the parameters to read other assets
@Test
public void UpdateAsset() throws Exception {
ClientApp.UpdateAsset("asset3", "blue", "20", "Jin Soo", "600");
}
// Deletes asset2, modify the parameters to delete other assets
@Test
public void DeleteAsset() throws Exception {
ClientApp.DeleteAsset("asset2");
}
// Transfers asset1 to arturo, modify the parameters to transfer other assets
@Test
public void TransferAsset() throws Exception {
ClientApp.TransferAsset("asset1", "arturo");
}
// Outputs all the assets
@Test
public void GetAllAssets() throws Exception {
ClientApp.GetAllAssets();
}
}