Refactor java okapi library package (#272)

fundthmcalculus · web-flow · commit 1c29093cc355 · 2021-11-23T15:41:42.000-05:00
diff --git a/java/build.gradle b/java/build.gradle
@@ -12,7 +12,7 @@ plugins {
 def jarDomainId = "id"
 def jarGroupId = "trinsic"
 def jarArtifactId = "okapi"
-def jarVersion = "1.0.1-preview.8"
+def jarVersion = "1.1.1"
 
 publishing {
     repositories {
diff --git a/java/src/main/java/trinsic/okapi/DidComm.java b/java/src/main/java/trinsic/okapi/DidComm.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import trinsic.okapi.transport.v1.Transport;
 
diff --git a/java/src/main/java/trinsic/okapi/DidException.java b/java/src/main/java/trinsic/okapi/DidException.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 public class DidException extends Exception {
     public int ErrorCode = 0;
     public DidException(int errorCode, String message) {
diff --git a/java/src/main/java/trinsic/okapi/DidKey.java b/java/src/main/java/trinsic/okapi/DidKey.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import trinsic.okapi.keys.v1.Keys;
 
diff --git a/java/src/main/java/trinsic/okapi/Examples.java b/java/src/main/java/trinsic/okapi/Examples.java
diff --git a/java/src/main/java/trinsic/okapi/ExternError.java b/java/src/main/java/trinsic/okapi/ExternError.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
 import com.sun.jna.Structure.FieldOrder;
diff --git a/java/src/main/java/trinsic/okapi/LdProofs.java b/java/src/main/java/trinsic/okapi/LdProofs.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import trinsic.okapi.proofs.v1.Proofs;
 
diff --git a/java/src/main/java/trinsic/okapi/Oberon.java b/java/src/main/java/trinsic/okapi/Oberon.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import trinsic.okapi.security.v1.Security;
 
diff --git a/java/src/main/java/trinsic/okapi/OkapiByteBuffer.java b/java/src/main/java/trinsic/okapi/OkapiByteBuffer.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
diff --git a/java/src/main/java/trinsic/okapi/OkapiNative.java b/java/src/main/java/trinsic/okapi/OkapiNative.java
@@ -1,3 +1,5 @@
+package trinsic.okapi;
+
 import com.google.protobuf.GeneratedMessageV3;
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
diff --git a/java/src/main/java/trinsic/okapi/v1/Keys.java b/java/src/main/java/trinsic/okapi/v1/Keys.java
diff --git a/java/src/main/java/trinsic/okapi/v1/Pbmse.java b/java/src/main/java/trinsic/okapi/v1/Pbmse.java
diff --git a/java/src/main/java/trinsic/okapi/v1/Proofs.java b/java/src/main/java/trinsic/okapi/v1/Proofs.java
diff --git a/java/src/main/java/trinsic/okapi/v1/Security.java b/java/src/main/java/trinsic/okapi/v1/Security.java
diff --git a/java/src/main/java/trinsic/okapi/v1/Transport.java b/java/src/main/java/trinsic/okapi/v1/Transport.java
diff --git a/java/src/test/java/LdProofTest.java b/java/src/test/java/LdProofTest.java
@@ -3,6 +3,9 @@
 import com.google.protobuf.Value;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import trinsic.okapi.DidException;
+import trinsic.okapi.DidKey;
+import trinsic.okapi.LdProofs;
 import trinsic.okapi.keys.v1.Keys;
 import trinsic.okapi.proofs.v1.Proofs;
 
diff --git a/java/src/test/java/OberonTest.java b/java/src/test/java/OberonTest.java
@@ -2,6 +2,8 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import trinsic.okapi.DidException;
+import trinsic.okapi.Oberon;
 import trinsic.okapi.security.v1.Security;
 
 class OberonTest {
diff --git a/java/src/test/java/OkapiNativeTest.java b/java/src/test/java/OkapiNativeTest.java
@@ -1,10 +1,11 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import trinsic.okapi.DidException;
+import trinsic.okapi.DidKey;
 import trinsic.okapi.keys.v1.Keys;
 
 import java.util.Base64;
diff --git a/python/setup.cfg b/python/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = trinsic-okapi
-version = 1.0.5
+version = 1.1.1
 author = Scott Phillips
 author_email = scott.phillips@trinsic.id
 description = Trinsic okapi SDK bindings
diff --git a/ruby/lib/version.rb b/ruby/lib/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Okapi
-  VERSION = '1.0.1-preview.8'
+  VERSION = '1.1.1'
 end

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package trinsic.okapi;`
	`2`	`+`
`1`	`3`	`import com.google.protobuf.InvalidProtocolBufferException;`
`2`	`4`	`import trinsic.okapi.transport.v1.Transport;`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package trinsic.okapi;`
	`2`	`+`
`1`	`3`	`public class DidException extends Exception {`
`2`	`4`	`public int ErrorCode = 0;`
`3`	`5`	`public DidException(int errorCode, String message) {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package trinsic.okapi;`
	`2`	`+`
`1`	`3`	`import com.sun.jna.Pointer;`
`2`	`4`	`import com.sun.jna.Structure;`
`3`	`5`	`import com.sun.jna.Structure.FieldOrder;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package trinsic.okapi;`
	`2`	`+`
`1`	`3`	`import com.sun.jna.Memory;`
`2`	`4`	`import com.sun.jna.Pointer;`
`3`	`5`	`import com.sun.jna.Structure;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package trinsic.okapi;`
	`2`	`+`
`1`	`3`	`import com.google.protobuf.GeneratedMessageV3;`
`2`	`4`	`import com.sun.jna.Native;`
`3`	`5`	`import com.sun.jna.Platform;`