From 14841289c7470d413e63191e657a228f43670446 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Fri, 23 Jun 2023 16:39:16 -0400
Subject: [PATCH] Fix the list of files for py_matter_idl package contents
 (#27440)

* Fix the list of files for py_matter_idl package contents

* Remove a lot of timeouts ... there seems to be no practical reason for this (no tests that may deadlock, only compiles)
---
 .github/workflows/examples-linux-standalone.yaml | 13 -------------
 scripts/py_matter_idl/setup.cfg                  |  9 +++++++--
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index ecbf3ef2cd7339..c42d1ad1f7a810 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -85,21 +85,18 @@ jobs:
                       .environment/pigweed-venv/*.log
 
             - name: Build Standalone cert tool
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
                         --target linux-x64-chip-cert \
                         build"
             - name: Build minmdns example with platform dns
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
                         --target linux-x64-address-resolve-tool-platform-mdns-ipv6only \
                         build"
             - name: Build example Standalone chip tool
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -110,7 +107,6 @@ jobs:
                     out/linux-x64-chip-tool/chip-tool \
                     /tmp/bloat_reports/
             - name: Build example Standalone Shell
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -121,7 +117,6 @@ jobs:
                     out/linux-x64-shell/chip-shell \
                     /tmp/bloat_reports/
             - name: Build example Standalone All Clusters Server
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -132,7 +127,6 @@ jobs:
                     out/linux-x64-all-clusters/chip-all-clusters-app \
                     /tmp/bloat_reports/
             - name: Build example Standalone All Clusters Minimal Server
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -143,7 +137,6 @@ jobs:
                     out/linux-x64-all-clusters-minimal/chip-all-clusters-minimal-app \
                     /tmp/bloat_reports/
             - name: Build example TV app
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -154,7 +147,6 @@ jobs:
                     out/linux-x64-tv-app/chip-tv-app \
                     /tmp/bloat_reports/
             - name: Build example Standalone TV Casting App
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -165,7 +157,6 @@ jobs:
                     out/linux-x64-tv-casting-app/chip-tv-casting-app \
                     /tmp/bloat_reports/
             - name: Build example lighting app with RPCs and UI
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -176,7 +167,6 @@ jobs:
                     out/linux-x64-light-rpc-with-ui/chip-lighting-app \
                     /tmp/bloat_reports/
             - name: Build example Standalone Bridge
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -187,7 +177,6 @@ jobs:
                     out/linux-x64-bridge/chip-bridge-app \
                     /tmp/bloat_reports/
             - name: Build example OTA Provider
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -198,7 +187,6 @@ jobs:
                     out/linux-x64-ota-provider/chip-ota-provider-app \
                     /tmp/bloat_reports/
             - name: Build example OTA Requestor
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -209,7 +197,6 @@ jobs:
                     out/linux-x64-ota-requestor/chip-ota-requestor-app \
                     /tmp/bloat_reports/
             - name: Build example Standalone Lock App
-              timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
diff --git a/scripts/py_matter_idl/setup.cfg b/scripts/py_matter_idl/setup.cfg
index fec72b8fc14017..ae5b29a88e2947 100644
--- a/scripts/py_matter_idl/setup.cfg
+++ b/scripts/py_matter_idl/setup.cfg
@@ -26,7 +26,12 @@ zip_safe = False
 matter_idl =
     lint/lint_rules_grammar.lark
     matter_grammar.lark
-    generators/java/ChipClustersRead.jinja
-    generators/java/ChipClustersCpp.jinja
     generators/cpp/application/CallbackStubSource.jinja
     generators/cpp/application/PluginApplicationCallbacksHeader.jinja
+    generators/java/CHIPCallbackTypes.jinja
+    generators/java/ChipClustersCpp.jinja
+    generators/java/ChipClustersRead.jinja
+    generators/java/CHIPReadCallbacks_h.jinja
+    generators/java/ClusterIDMapping.jinja
+    generators/java/ClusterReadMapping.jinja
+    generators/java/ClusterWriteMapping.jinja