Remove java class name in JNI

joonhaengHeo · Jan 3, 2024 · 3b76d86 · 3b76d86
1 parent c789217
commit 3b76d86
Show file tree

Hide file tree

Showing 6 changed files with 170 additions and 189 deletions.
diff --git a/src/controller/java/MatterInteractionClient-JNI.cpp b/src/controller/java/MatterInteractionClient-JNI.cpp
diff --git a/src/controller/java/src/chip/devicecontroller/model/AttributeWriteRequest.java b/src/controller/java/src/chip/devicecontroller/model/AttributeWriteRequest.java
@@ -77,6 +77,19 @@ public ChipPathId getAttributeId() {
     return attributeId;
   }
 
+  // For use in JNI.
+  long getEndpointId(long wildcardValue) {
+    return endpointId.getId(wildcardValue);
+  }
+
+  long getClusterId(long wildcardValue) {
+    return clusterId.getId(wildcardValue);
+  }
+
+  long getAttributeId(long wildcardValue) {
+    return attributeId.getId(wildcardValue);
+  }
+
   public int getDataVersion() {
     return dataVersion.orElse(0);
   }

diff --git a/src/controller/java/src/chip/devicecontroller/model/ChipAttributePath.java b/src/controller/java/src/chip/devicecontroller/model/ChipAttributePath.java
@@ -42,6 +42,19 @@ public ChipPathId getAttributeId() {
     return attributeId;
   }
 
+  // For use in JNI.
+  long getEndpointId(long wildcardValue) {
+    return endpointId.getId(wildcardValue);
+  }
+
+  long getClusterId(long wildcardValue) {
+    return clusterId.getId(wildcardValue);
+  }
+
+  long getAttributeId(long wildcardValue) {
+    return attributeId.getId(wildcardValue);
+  }
+
   @Override
   public boolean equals(Object object) {
     if (object instanceof ChipAttributePath) {

diff --git a/src/controller/java/src/chip/devicecontroller/model/ChipEventPath.java b/src/controller/java/src/chip/devicecontroller/model/ChipEventPath.java
@@ -45,6 +45,19 @@ public ChipPathId getEventId() {
     return eventId;
   }
 
+  // For use in JNI.
+  long getEndpointId(long wildcardValue) {
+    return endpointId.getId(wildcardValue);
+  }
+
+  long getClusterId(long wildcardValue) {
+    return clusterId.getId(wildcardValue);
+  }
+
+  long getEventId(long wildcardValue) {
+    return eventId.getId(wildcardValue);
+  }
+
   public boolean isUrgent() {
     return isUrgent;
   }

diff --git a/src/controller/java/src/chip/devicecontroller/model/ChipPathId.java b/src/controller/java/src/chip/devicecontroller/model/ChipPathId.java
@@ -43,6 +43,11 @@ public IdType getType() {
     return type;
   }
 
+  // For use in JNI.
+  long getId(long wildCardValue) {
+    return type == IdType.WILDCARD ? wildCardValue : id;
+  }
+
   @Override
   public boolean equals(Object object) {
     if (object instanceof ChipPathId) {

diff --git a/src/controller/java/src/chip/devicecontroller/model/InvokeElement.java b/src/controller/java/src/chip/devicecontroller/model/InvokeElement.java
@@ -77,6 +77,19 @@ public ChipPathId getCommandId() {
     return commandId;
   }
 
+  // For use in JNI.
+  long getEndpointId(long wildcardValue) {
+    return endpointId.getId(wildcardValue);
+  }
+
+  long getClusterId(long wildcardValue) {
+    return clusterId.getId(wildcardValue);
+  }
+
+  long getCommandId(long wildcardValue) {
+    return commandId.getId(wildcardValue);
+  }
+
   public Optional<Integer> getGroupId() {
     return groupId;
   }