Merge pull request #113 from corda/jzadroga/ent-11871/jdk17-upgrade-tokentofriend

ENT-11871: Upgrade TokenToFriend CorDapp to JDK17

Author: adelel1

Tokens/tokentofriend/clients/build.gradle

@@ -5,11 +5,11 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.moowork.gradle:gradle-node-plugin:1.3.1")
+        classpath("com.github.node-gradle:gradle-node-plugin:4.0.0")
     }
 }
 
-apply plugin: "com.moowork.node"
+apply plugin: "com.github.node-gradle.node"
 apply plugin: 'org.springframework.boot'
 sourceSets {
     main {
@@ -23,6 +23,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
 
     // Corda dependencies.
+    implementation "$corda_release_group:corda-core:$corda_release_version"
     implementation "$corda_release_group:corda-rpc:$corda_release_version"
 
     // CorDapp dependencies.
@@ -34,6 +35,7 @@ dependencies {
     implementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j_version}"
     implementation "org.apache.logging.log4j:log4j-web:${log4j_version}"
     implementation "org.slf4j:jul-to-slf4j:$slf4j_version"
+    implementation "org.bouncycastle:bcprov-lts8on:2.73.6"
 }
 
 springBoot {

Tokens/tokentofriend/clients/src/main/java/net/corda/samples/tokentofriend/webserver/NodeRPCConnection.java

@@ -7,8 +7,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 /**
  * Wraps an RPC connection to a Corda node.

Tokens/tokentofriend/contracts/build.gradle

@@ -28,10 +28,13 @@ sourceSets {
 }
 
 dependencies {
+    testImplementation "junit:junit:$junit_version"
     // Corda dependencies.
     cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
     cordaProvided "$corda_release_group:corda:$corda_release_version"
     testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
+    testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
+    testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
     // Token SDK dependencies.
     cordaProvided "$tokens_release_group:tokens-contracts:$tokens_release_version"
 }

Tokens/tokentofriend/contracts/src/main/java/net/corda/samples/tokentofriend/states/CustomTokenState.java

@@ -89,10 +89,4 @@ public List<Party> getMaintainers() {
         maintainers.add(this.maintainer);
         return maintainers;
     }
-
-    /* This method returns a TokenPointer by using the linear Id of the evolvable state */
-    public TokenPointer<CustomTokenState> toPointer(){
-        LinearPointer<CustomTokenState> linearPointer = new LinearPointer<>(linearId, CustomTokenState.class);
-        return new TokenPointer<>(linearPointer, fractionDigits);
-    }
 }

Tokens/tokentofriend/workflows/src/main/java/net/corda/samples/tokentofriend/flows/IssueToken.java

@@ -49,7 +49,7 @@ public String call() throws FlowException {
          * */
         IssuedTokenType issuedToken = new NonFungibleTokenBuilder()
                 .issuedBy(getOurIdentity())
-                .ofTokenType(customTokenState.toPointer())
+                .ofTokenType(customTokenState.toPointer(customTokenState.getClass()))
                 .buildIssuedTokenType();
 
         /* Create an instance of the non-fungible house token with the owner as the token holder. The last paramter is a hash of the jar containing the TokenType, use the helper function to fetch it. */