Java, Ruby, Python prod package testing and samples

.github/workflows/test-java.yml

@@ -0,0 +1,31 @@
+name: Java (prod test)
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  schedule:
+    # Do it daily at 8AM
+    - cron: "0 8 * * *"
+  pull_request:
+    paths:
+      - ".github/workflows/test-java.yml"
+
+jobs:
+  prod-test-java:
+    name: Java - samples - prod test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: '15'
+          distribution: 'adopt'
+      - name: Run Demos
+        run: |
+          gradle build
+        shell: pwsh
+        working-directory: samples/java

.github/workflows/test-python.yml

@@ -32,4 +32,4 @@ jobs:
             python $Item.FullName
           }
         shell: pwsh
-        working-directory: python/samples
+        working-directory: samples/python

.github/workflows/test-ruby.yml

@@ -32,4 +32,4 @@ jobs:
             ruby $Item.FullName
           }
         shell: pwsh
-        working-directory: ruby/test
+        working-directory: samples/ruby

.gitignore

@@ -391,3 +391,6 @@ devops/protoc-plugins/
 ruby/.ruby-version
 python/tests/allison.txt
 java/allison.txt
+samples/java/build/
+samples/java/.gradle/
+samples/java/gradle/wrapper/gradle-wrapper.jar

java/src/test/java/trinsic/services/AccountServiceTest.java → java/src/test/java/trinsic/AccountServiceTest.java

@@ -1,10 +1,10 @@
-package trinsic.services;
+package trinsic;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import trinsic.TrinsicUtilities;
 import trinsic.okapi.DidException;
+import trinsic.services.AccountService;
 
 import java.util.concurrent.ExecutionException;
 
@@ -16,8 +16,8 @@ public void testProtectUnprotectAccount() throws ExecutionException, Interrupted
         var myProfile = accountService.signIn().get();
 
         var code = "1234";
-        var myProtectedProfile = accountService.protect(myProfile, code);
-        var myUnprotectedProfile = accountService.unprotect(myProtectedProfile, code);
+        var myProtectedProfile = AccountService.protect(myProfile, code);
+        var myUnprotectedProfile = AccountService.unprotect(myProtectedProfile, code);
 
         Assertions.assertThrows(Exception.class, () -> {
            accountService.setProfile(myProtectedProfile);

java/src/test/java/trinsic/VaccineDemo.java

@@ -1,7 +1,6 @@
 package trinsic;
 
 
-import org.junit.jupiter.api.Assertions;
 import trinsic.okapi.DidException;
 import trinsic.services.AccountService;
 import trinsic.services.CredentialsService;
@@ -83,7 +82,7 @@ public static void run() throws IOException, DidException, ExecutionException, I
         var verifyProofResponse = credentialsService.verifyProof(VerifiableCredentials.VerifyProofRequest.newBuilder().setProofDocumentJson(credentialProof).build()).get();
         var isValid = verifyProofResponse.getIsValid();
         System.out.println("Verification result: " + isValid);
-        Assertions.assertTrue(isValid);
+        assert isValid;
         // }
 
         accountService.shutdown();

samples/CopyTestSamples.ps1

@@ -0,0 +1,20 @@
+# Copy python samples
+$PythonInputDir = Resolve-Path "$PSScriptRoot/../python/samples"
+$PythonOutputDir = Resolve-Path "$PSScriptRoot/python"
+foreach ($Item in Get-ChildItem -Path $PythonInputDir -Include *_demo.py -Recurse) {
+    Copy-Item -Path $Item.FullName -Destination $PythonOutputDir
+}
+
+# Copy java samples
+$JavaInputDir = Resolve-Path "$PSScriptRoot/../java/src/test/java/trinsic"
+$JavaOutputDir = Resolve-Path "$PSScriptRoot/java/src/main"
+foreach ($Item in Get-ChildItem -Path $JavaInputDir -Include *Demo.java -Recurse) {
+    Copy-Item -Path $Item.FullName -Destination $JavaOutputDir
+}
+
+# Copy ruby samples
+$RubyInputDir = Resolve-Path "$PSScriptRoot/../ruby/test"
+$RubyOutputDir = Resolve-Path "$PSScriptRoot/ruby"
+foreach ($Item in Get-ChildItem -Path $RubyInputDir -Include *_demo.rb -Recurse) {
+    Copy-Item -Path $Item.FullName -Destination $RubyOutputDir
+}

samples/java/build.gradle

@@ -0,0 +1,48 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+}
+plugins {
+    id 'java'
+}
+
+
+def urlFile = { url, name ->
+    File file = new File("$buildDir/download/${name}.jar")
+    file.parentFile.mkdirs()
+    if (!file.exists()) {
+        new URL(url).withInputStream { downloadStream ->
+            file.withOutputStream { fileOut ->
+                fileOut << downloadStream
+            }
+        }
+    }
+    files(file.absolutePath)
+}
+
+dependencies {
+    compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
+    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.guava:guava:31.1-jre'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.1'
+    implementation 'com.google.protobuf:protobuf-java-util:3.19.4'
+    implementation 'io.grpc:grpc-protobuf:1.44.1'
+    implementation 'io.grpc:grpc-netty-shaded:1.44.1'
+    implementation 'io.grpc:grpc-stub:1.44.1'
+    implementation 'io.grpc:grpc-protobuf:1.44.1'
+    implementation 'org.jetbrains:annotations:23.0.0'
+    implementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    implementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    implementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
+    implementation urlFile('https://github.com/trinsic-id/okapi/releases/download/v1.4.0/trinsic-okapi-1.4.0.jar', 'trinsic-okapi-1.4.0')
+    implementation urlFile('https://github.com/trinsic-id/sdk/releases/download/v1.4.0/trinsic-services-1.4.1.jar', 'trinsic-services-1.4.1')
+}
+
+test {
+    useJUnitPlatform()
+}
+
+repositories {
+    mavenCentral()
+}

samples/java/gradle/wrapper/gradle-wrapper.properties

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

samples/java/gradlew

@@ -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
+    ;;
+  MSYS* | 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" "$@"