Merge branch 'SDK-870-version-constants' of https://github.com/trinsi…

…c-id/sdk into SDK-870-version-constants
trinsic-id · Jul 14, 2022 · 6623886 · 6623886
2 parents 167e7c4 + 98a4705
commit 6623886
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/dart/lib/src/trinsic_util.dart b/dart/lib/src/trinsic_util.dart
@@ -18,4 +18,4 @@ ServiceOptions trinsicConfig({String authToken = ""}) {
 String getSdkVersion() {
   const sdkVersion = "1.0.0";
   return sdkVersion;
-}
+}
diff --git a/java/src/main/java/trinsic/TrinsicUtilities.java b/java/src/main/java/trinsic/TrinsicUtilities.java
@@ -3,9 +3,8 @@
 import com.google.gson.Gson;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import trinsic.sdk.options.v1.Options;
-
 import java.util.HashMap;
+import trinsic.sdk.options.v1.Options;
 
 public class TrinsicUtilities {
 

diff --git a/java/src/main/java/trinsic/services/ServiceBase.java b/java/src/main/java/trinsic/services/ServiceBase.java
@@ -1,11 +1,15 @@
 package trinsic.services;
 
+import static trinsic.TrinsicUtilities.getSdkVersion;
+import static trinsic.TrinsicUtilities.getTrinsicServiceOptions;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
 import io.grpc.Channel;
 import io.grpc.ManagedChannel;
 import io.grpc.Metadata;
 import io.grpc.stub.MetadataUtils;
+import java.util.Base64;
 import trinsic.TrinsicUtilities;
 import trinsic.okapi.DidException;
 import trinsic.okapi.OkapiMetadata;
@@ -14,11 +18,6 @@
 import trinsic.security.OberonSecurityProvider;
 import trinsic.services.account.v1.AccountProfile;
 
-import java.util.Base64;
-
-import static trinsic.TrinsicUtilities.getSdkVersion;
-import static trinsic.TrinsicUtilities.getTrinsicServiceOptions;
-
 public abstract class ServiceBase {
   private final ISecurityProvider securityProvider = new OberonSecurityProvider();
   private final Channel channel;
@@ -42,10 +41,7 @@ public Metadata buildMetadata(Message request)
       throws InvalidProtocolBufferException, DidException {
     var metadata = new Metadata();
     putMetadata(metadata, "TrinsicSDKLanguage", "java");
-    putMetadata(
-        metadata,
-        "TrinsicSDKVersion",
-        getSdkVersion());
+    putMetadata(metadata, "TrinsicSDKVersion", getSdkVersion());
     putMetadata(metadata, "TrinsicOkapiVersion", OkapiMetadata.getMetadata().getVersion());
     if (request != null) {
       if (this.options == null || this.options.getAuthToken().isEmpty())

diff --git a/java/src/test/java/trinsic/WalletsDemo.java b/java/src/test/java/trinsic/WalletsDemo.java
@@ -1,5 +1,7 @@
 package trinsic;
 
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
 import org.junit.jupiter.api.Assertions;
 import trinsic.okapi.DidException;
 import trinsic.services.TrinsicService;
@@ -8,9 +10,6 @@
 import trinsic.services.universalwallet.v1.InsertItemRequest;
 import trinsic.services.universalwallet.v1.SearchRequest;
 
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
 public class WalletsDemo {
   public static void main(String[] args)
       throws IOException, DidException, ExecutionException, InterruptedException {
@@ -53,7 +52,7 @@ public static void run()
       var walletItems = trinsic.wallet().searchWallet().get();
       // }
 
-        Assertions.assertEquals(1, walletItems.getItemsCount());
+      Assertions.assertEquals(1, walletItems.getItemsCount());
     }
 
     // Delete item in-between searches