Update Java and SocketTransportJava to 1.5.8 (eclipse-uprotocol#87)

* Update Java SocketUtransport to 1.5.8 * Update Java testagent to 1.5.8 * Add CI for Java Test Agent * Resolve Comments * Change INVALID_ARGUMENT to FAILED_PRECONDITION * Remove invokemethod constant
agosh01 · Jul 31, 2024 · 31dc933 · 31dc933
1 parent 0395b91
commit 31dc933
Show file tree

Hide file tree

Showing 9 changed files with 429 additions and 426 deletions.
diff --git a/.github/workflows/tck-test.yml b/.github/workflows/tck-test.yml
@@ -23,24 +23,20 @@ jobs:
     #   with:
     #     command: build
     #     args: --manifest-path test_agent/rust/Cargo.toml
-    # - name: Set up JDK 17
-    #   uses: actions/setup-java@v3
-    #   with:
-    #     java-version: '17'
-    #     distribution: 'temurin'
-    #     cache: maven
-    #- name: Install dependencies
-    #  run: |
-    #    cd scripts
-    #    python build_up_java_latest.py
-    # - name: Build up_client_socket_java with Maven
-    #   working-directory: up_client_socket/java
-    #   run: |
-    #         mvn clean install --file pom.xml
-    # - name: Build java_test_agent with Maven
-    #   working-directory: test_agent/java
-    #   run: |
-    #         mvn clean install --file pom.xml
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build up_client_socket_java with Maven
+      working-directory: up_client_socket/java
+      run: |
+            mvn clean install --file pom.xml
+    - name: Build java_test_agent with Maven
+      working-directory: test_agent/java
+      run: |
+            mvn clean install --file pom.xml
     - name: Set up Python 3.8.7
       uses: actions/setup-python@v3
       with:

diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,5 @@ MANIFEST
 **/jar_files/**
 *.jar
 **/.DS_Store
-**/target
+**/target
+test_manager/reports/summary/summary.json
diff --git a/test_agent/java/pom.xml b/test_agent/java/pom.xml
@@ -34,6 +34,11 @@
             <artifactId>json</artifactId>
             <version>20231013</version>
         </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.8.0</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>tck-test-agent-java</finalName>

diff --git a/test_agent/java/src/main/java/org/eclipse/uprotocol/Constants/ActionCommands.java b/test_agent/java/src/main/java/org/eclipse/uprotocol/Constants/ActionCommands.java
@@ -19,23 +19,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.eclipse.uprotocol.Constants;
+ package org.eclipse.uprotocol.Constants;
 
-public class ActionCommands {
-    public static final String SEND_COMMAND = "send";
-    public static final String REGISTER_LISTENER_COMMAND = "registerlistener";
-    public static final String UNREGISTER_LISTENER_COMMAND = "unregisterlistener";
-    public static final String INVOKE_METHOD_COMMAND = "invokemethod";
-    public static final String RESPONSE_ON_RECEIVE = "onreceive";
-    public static final String RESPONSE_RPC = "rpcresponse";
-    public static final String SERIALIZE_URI = "uri_serialize";
-    public static final String DESERIALIZE_URI = "uri_deserialize";
-    public static final String VALIDATE_URI = "uri_validate";
-    public static final String VALIDATE_UUID = "uuid_validate";
-    public static final String SERIALIZE_UUID = "uuid_serialize";
-    public static final String DESERIALIZE_UUID = "uuid_deserialize";
-    public static final String VALIDATE_UATTRIBUTES = "uattributes_validate";
-    public static final String MICRO_SERIALIZE_URI = "micro_serialize_uri";
-    public static final String MICRO_DESERIALIZE_URI = "micro_deserialize_uri";
-
-}
+ public class ActionCommands {
+     public static final String SEND_COMMAND = "send";
+     public static final String REGISTER_LISTENER_COMMAND = "registerlistener";
+     public static final String UNREGISTER_LISTENER_COMMAND = "unregisterlistener";
+     public static final String RESPONSE_ON_RECEIVE = "onreceive";
+     public static final String RESPONSE_RPC = "rpcresponse";
+     public static final String SERIALIZE_URI = "uri_serialize";
+     public static final String DESERIALIZE_URI = "uri_deserialize";
+     public static final String VALIDATE_URI = "uri_validate";
+     public static final String VALIDATE_UUID = "uuid_validate";
+     public static final String SERIALIZE_UUID = "uuid_serialize";
+     public static final String DESERIALIZE_UUID = "uuid_deserialize";
+     public static final String VALIDATE_UATTRIBUTES = "uattributes_validate";
+     public static final String INITIALIZE_TRANSPORT = "initialize_transport";
+
+ }
diff --git a/test_agent/java/src/main/java/org/eclipse/uprotocol/Constants/Constant.java b/test_agent/java/src/main/java/org/eclipse/uprotocol/Constants/Constant.java
@@ -26,7 +26,7 @@
 
 public class Constant {
     public static final String TEST_MANAGER_IP = "127.0.0.5";
-    public static final int TEST_MANAGER_PORT = 12345;
+    public static final int TEST_MANAGER_PORT = 33333;
     public static final int BYTES_MSG_LENGTH = 32767;
 
 }