Update to the latest version of up-java (v0.1.9) (#8)

Co-authored-by: Mikhail Petrov <mikhail.petrov@gm.com>
eclipse-uprotocol · Apr 9, 2024 · beefbcb · beefbcb
1 parent c45f630
commit beefbcb
Show file tree

Hide file tree

Showing 12 changed files with 398 additions and 428 deletions.
diff --git a/gradle/config.gradle b/gradle/config.gradle
@@ -17,6 +17,6 @@ ext {
         namespace       : 'org.eclipse.uprotocol.client',
         group           : 'org.eclipse.uprotocol',
         artifact        : 'up-client-android-java',
-        version         : '1.5.0',
+        version         : '0.1.2',
     ]
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ androidx-junit = "1.1.5"
 junit = "4.13.2"
 mockito = "4.6.1"
 robolectric = "4.7.3"
-up-java = "1.5.8"
+up-java = "0.1.9"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }

diff --git a/library/src/androidTest/java/org/eclipse/uprotocol/UPClientTest.java b/library/src/androidTest/java/org/eclipse/uprotocol/UPClientTest.java
diff --git a/library/src/main/java/org/eclipse/uprotocol/UPClient.java b/library/src/main/java/org/eclipse/uprotocol/UPClient.java
diff --git a/library/src/main/java/org/eclipse/uprotocol/core/udiscovery/v3/UDiscovery.java b/library/src/main/java/org/eclipse/uprotocol/core/udiscovery/v3/UDiscovery.java
@@ -26,11 +26,12 @@
 import static org.eclipse.uprotocol.rpc.RpcMapper.mapResponse;
 import static org.eclipse.uprotocol.transport.builder.UPayloadBuilder.packToAny;
 
-import org.eclipse.uprotocol.rpc.CallOptions;
 import org.eclipse.uprotocol.rpc.RpcClient;
 import org.eclipse.uprotocol.uri.factory.UResourceBuilder;
+import org.eclipse.uprotocol.v1.CallOptions;
 import org.eclipse.uprotocol.v1.UAuthority;
 import org.eclipse.uprotocol.v1.UEntity;
+import org.eclipse.uprotocol.v1.UPriority;
 import org.eclipse.uprotocol.v1.UStatus;
 import org.eclipse.uprotocol.v1.UUri;
 
@@ -53,10 +54,15 @@ public class UDiscovery {
     public static final String METHOD_UNREGISTER_FOR_NOTIFICATIONS = "UnregisterForNotifications";
     public static final String METHOD_RESOLVE_URI = "ResolveUri";
 
+    private static final CallOptions DEFAULT_OPTIONS = CallOptions.newBuilder()
+            .setPriority(UPriority.UPRIORITY_CS4)
+            .setTtl(10_000)
+            .build();
+
     private UDiscovery() {}
 
     public static UDiscovery.Stub newStub(RpcClient proxy) {
-        return newStub(proxy, null, CallOptions.DEFAULT);
+        return newStub(proxy, null, DEFAULT_OPTIONS);
     }
 
     public static UDiscovery.Stub newStub(RpcClient proxy, CallOptions options) {

diff --git a/library/src/main/java/org/eclipse/uprotocol/core/usubscription/v3/USubscription.java b/library/src/main/java/org/eclipse/uprotocol/core/usubscription/v3/USubscription.java
@@ -26,11 +26,12 @@
 import static org.eclipse.uprotocol.rpc.RpcMapper.mapResponse;
 import static org.eclipse.uprotocol.transport.builder.UPayloadBuilder.packToAny;
 
-import org.eclipse.uprotocol.rpc.CallOptions;
 import org.eclipse.uprotocol.rpc.RpcClient;
 import org.eclipse.uprotocol.uri.factory.UResourceBuilder;
+import org.eclipse.uprotocol.v1.CallOptions;
 import org.eclipse.uprotocol.v1.UAuthority;
 import org.eclipse.uprotocol.v1.UEntity;
+import org.eclipse.uprotocol.v1.UPriority;
 import org.eclipse.uprotocol.v1.UStatus;
 import org.eclipse.uprotocol.v1.UUri;
 
@@ -52,10 +53,15 @@ public class USubscription {
     public static final String METHOD_FETCH_SUBSCRIBERS = "FetchSubscribers";
     public static final String METHOD_RESET = "Reset";
 
+    private static final CallOptions DEFAULT_OPTIONS = CallOptions.newBuilder()
+            .setPriority(UPriority.UPRIORITY_CS4)
+            .setTtl(10_000)
+            .build();
+
     private USubscription() {}
 
     public static Stub newStub(RpcClient proxy) {
-        return newStub(proxy, null, CallOptions.DEFAULT);
+        return newStub(proxy, null, DEFAULT_OPTIONS);
     }
 
     public static Stub newStub(RpcClient proxy, CallOptions options) {

diff --git a/...clipse/uprotocol/core/utwin/v1/UTwin.java → ...clipse/uprotocol/core/utwin/v2/UTwin.java b/...clipse/uprotocol/core/utwin/v1/UTwin.java → ...clipse/uprotocol/core/utwin/v2/UTwin.java
@@ -21,17 +21,18 @@
  * SPDX-FileCopyrightText: 2023 General Motors GTO LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.eclipse.uprotocol.core.utwin.v1;
+package org.eclipse.uprotocol.core.utwin.v2;
 
 import static org.eclipse.uprotocol.rpc.RpcMapper.mapResponse;
 import static org.eclipse.uprotocol.transport.builder.UPayloadBuilder.packToAny;
 
-import org.eclipse.uprotocol.rpc.CallOptions;
 import org.eclipse.uprotocol.rpc.RpcClient;
 import org.eclipse.uprotocol.uri.factory.UResourceBuilder;
+import org.eclipse.uprotocol.v1.CallOptions;
 import org.eclipse.uprotocol.v1.UAuthority;
 import org.eclipse.uprotocol.v1.UEntity;
 import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UPriority;
 import org.eclipse.uprotocol.v1.UStatus;
 import org.eclipse.uprotocol.v1.UUri;
 import org.eclipse.uprotocol.v1.UUriBatch;
@@ -42,15 +43,20 @@
 public class UTwin {
     public static final UEntity SERVICE = UEntity.newBuilder()
             .setName("core.utwin")
-            .setVersionMajor(1)
+            .setVersionMajor(2)
             .build();
     public static final String METHOD_GET_LAST_MESSAGES = "GetLastMessages";
     public static final String METHOD_SET_LAST_MESSAGE = "SetLastMessage";
 
+    private static final CallOptions DEFAULT_OPTIONS = CallOptions.newBuilder()
+            .setPriority(UPriority.UPRIORITY_CS4)
+            .setTtl(10_000)
+            .build();
+
     private UTwin() {}
 
     public static UTwin.Stub newStub(RpcClient proxy) {
-        return newStub(proxy, null, CallOptions.DEFAULT);
+        return newStub(proxy, null, DEFAULT_OPTIONS);
     }
 
     public static UTwin.Stub newStub(RpcClient proxy, CallOptions options) {

diff --git a/library/src/test/java/org/eclipse/uprotocol/TestBase.java b/library/src/test/java/org/eclipse/uprotocol/TestBase.java
@@ -48,10 +48,10 @@
 import com.google.protobuf.Empty;
 
 import org.eclipse.uprotocol.common.UStatusException;
-import org.eclipse.uprotocol.rpc.CallOptions;
 import org.eclipse.uprotocol.transport.builder.UAttributesBuilder;
 import org.eclipse.uprotocol.uri.factory.UResourceBuilder;
 import org.eclipse.uprotocol.uuid.factory.UuidFactory;
+import org.eclipse.uprotocol.v1.CallOptions;
 import org.eclipse.uprotocol.v1.UAttributes;
 import org.eclipse.uprotocol.v1.UAuthority;
 import org.eclipse.uprotocol.v1.UCode;
@@ -131,8 +131,13 @@ public class TestBase {
             "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG" +
             "4gU21pdGgiLCJpYXQiOjE1MTYyMzkwMjJ9.Q_w2AVguPRU2KskCXwR7ZHl09TQXEntfEA8Jj2_Jyew";
     protected static final CallOptions OPTIONS = CallOptions.newBuilder()
-            .withTimeout(TTL)
-            .withToken(TOKEN)
+            .setPriority(UPriority.UPRIORITY_CS4)
+            .setTtl(TTL)
+            .setToken(TOKEN)
+            .build();
+    protected static final CallOptions DEFAULT_OPTIONS = CallOptions.newBuilder()
+            .setPriority(UPriority.UPRIORITY_CS4)
+            .setTtl(10_000)
             .build();
     protected static final UAttributes ATTRIBUTES = UAttributes.newBuilder()
             .setId(ID)
@@ -142,7 +147,7 @@ public class TestBase {
             .setPriority(UPriority.UPRIORITY_CS4)
             .setTtl(TTL)
             .setPermissionLevel(5)
-            .setCommstatus(UCode.DEADLINE_EXCEEDED_VALUE)
+            .setCommstatus(UCode.DEADLINE_EXCEEDED)
             .setReqid(ID2)
             .setToken(TOKEN)
             .build();