Regenerated zap files.

Author: hicklin

src/controller/data_model/controller-clusters.matter

@@ -6197,7 +6197,7 @@ cluster ServiceArea = 336 {
     kInvalidSet = 4;
   }
 
-  enum SkipCurrentStatus : enum8 {
+  enum SkipCurrentLocationStatus : enum8 {
     kSuccess = 0;
     kInvalidLocationList = 1;
     kInvalidInMode = 2;
@@ -6215,25 +6215,25 @@ cluster ServiceArea = 336 {
   }
 
   struct LocationInfoStruct {
-    nullable HomeLocationStruct homeLocationInfo = 0;
+    nullable HomeLocationStruct locationInfo = 0;
     nullable LandmarkTag landmarkTag = 1;
     nullable PositionTag positionTag = 2;
     nullable FloorSurfaceTag surfaceTag = 3;
   }
 
   struct LocationStruct {
-    int32u locationId = 0;
-    nullable int8u mapId = 1;
+    int32u locationID = 0;
+    nullable int8u mapID = 1;
     LocationInfoStruct locationInfo = 2;
   }
 
   struct MapStruct {
-    int8u mapId = 0;
+    int8u mapID = 0;
     char_string<64> name = 1;
   }
 
   struct ProgressStruct {
-    int32u locationId = 0;
+    int32u locationID = 0;
     OperationalStatusEnum status = 1;
     optional nullable elapsed_s totalOperationalTime = 2;
     optional nullable elapsed_s estimatedTime = 3;
@@ -6258,18 +6258,18 @@ cluster ServiceArea = 336 {
 
   response struct SelectLocationsResponse = 1 {
     SelectLocationsStatus status = 0;
-    char_string<256> statusText = 1;
+    optional char_string<256> statusText = 1;
   }
 
-  response struct SkipCurrentResponse = 3 {
-    SkipCurrentStatus status = 0;
-    char_string<256> statusText = 1;
+  response struct SkipCurrentLocationResponse = 3 {
+    SkipCurrentLocationStatus status = 0;
+    optional char_string<256> statusText = 1;
   }
 
   /** Command used to select a set of device locations, where the device is to operate */
   command SelectLocations(SelectLocationsRequest): SelectLocationsResponse = 0;
   /** This command is used to skip the current location where the device operates. */
-  command SkipCurrent(): SkipCurrentResponse = 2;
+  command SkipCurrentLocation(): SkipCurrentLocationResponse = 2;
 }
 
 /** An interface for configuring and controlling pumps. */

src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

@@ -37998,7 +37998,7 @@ public void onResponse(StructType invokeStructValue) {
           final long statusFieldID = 0L;
           Integer status = null;
           final long statusTextFieldID = 1L;
-          String statusText = null;
+          Optional<String> statusText = Optional.empty();
           for (StructElement element: invokeStructValue.value()) {
             if (element.contextTagNum() == statusFieldID) {
               if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -38008,19 +38008,19 @@ public void onResponse(StructType invokeStructValue) {
             } else if (element.contextTagNum() == statusTextFieldID) {
               if (element.value(BaseTLVType.class).type() == TLVType.String) {
                 StringType castingValue = element.value(StringType.class);
-                statusText = castingValue.value(String.class);
+                statusText = Optional.of(castingValue.value(String.class));
               }
             }
           }
           callback.onSuccess(status, statusText);
         }}, commandId, commandArgs, timedInvokeTimeoutMs);
     }
 
-    public void skipCurrent(SkipCurrentResponseCallback callback) {
-      skipCurrent(callback, 0);
+    public void skipCurrentLocation(SkipCurrentLocationResponseCallback callback) {
+      skipCurrentLocation(callback, 0);
     }
 
-    public void skipCurrent(SkipCurrentResponseCallback callback, int timedInvokeTimeoutMs) {
+    public void skipCurrentLocation(SkipCurrentLocationResponseCallback callback, int timedInvokeTimeoutMs) {
       final long commandId = 2L;
 
       ArrayList<StructElement> elements = new ArrayList<>();
@@ -38031,7 +38031,7 @@ public void onResponse(StructType invokeStructValue) {
           final long statusFieldID = 0L;
           Integer status = null;
           final long statusTextFieldID = 1L;
-          String statusText = null;
+          Optional<String> statusText = Optional.empty();
           for (StructElement element: invokeStructValue.value()) {
             if (element.contextTagNum() == statusFieldID) {
               if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -38041,7 +38041,7 @@ public void onResponse(StructType invokeStructValue) {
             } else if (element.contextTagNum() == statusTextFieldID) {
               if (element.value(BaseTLVType.class).type() == TLVType.String) {
                 StringType castingValue = element.value(StringType.class);
-                statusText = castingValue.value(String.class);
+                statusText = Optional.of(castingValue.value(String.class));
               }
             }
           }
@@ -38050,11 +38050,11 @@ public void onResponse(StructType invokeStructValue) {
     }
 
     public interface SelectLocationsResponseCallback extends BaseClusterCallback {
-      void onSuccess(Integer status, String statusText);
+      void onSuccess(Integer status, Optional<String> statusText);
     }
 
-    public interface SkipCurrentResponseCallback extends BaseClusterCallback {
-      void onSuccess(Integer status, String statusText);
+    public interface SkipCurrentLocationResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, Optional<String> statusText);
     }
 
     public interface SupportedLocationsAttributeCallback extends BaseAttributeCallback {