Skip to content

Commit 1748690

Browse files
andy31415pull[bot]
authored andcommitted
Stop running prettify during regen_all for java files (#26795)
* Remove run of java prettify on jinja codegen. * zap regen all * Make linter happy
1 parent 226e241 commit 1748690

File tree

4 files changed

+32719
-38343
lines changed

4 files changed

+32719
-38343
lines changed

scripts/tools/zap_regen_all.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import sys
2525
import tempfile
2626
import time
27-
import traceback
28-
import urllib.request
2927
from dataclasses import dataclass
3028
from enum import Flag, auto
3129
from pathlib import Path
@@ -216,34 +214,10 @@ def __init__(self, generator: str, output_directory: str, idl_path: str):
216214
self.command = ["./scripts/codegen.py", "--output-dir", output_directory,
217215
"--generator", generator, idl_path]
218216

219-
def runJavaPrettifier(self):
220-
try:
221-
java_outputs = subprocess.check_output(["./scripts/codegen.py", "--name-only", "--generator",
222-
self.generator, "--log-level", "fatal", self.idl_path]).decode("utf8").split("\n")
223-
java_outputs = [os.path.join(self.output_directory, name) for name in java_outputs if name]
224-
225-
logging.info("Prettifying %d java files:", len(java_outputs))
226-
for name in java_outputs:
227-
logging.info(" %s" % name)
228-
229-
# Keep this version in sync with what restyler uses (https://github.com/project-chip/connectedhomeip/blob/master/.restyled.yaml).
230-
FORMAT_VERSION = "1.6"
231-
URL_PREFIX = 'https://github.com/google/google-java-format/releases/download/google-java-format'
232-
JAR_NAME = f"google-java-format-{FORMAT_VERSION}-all-deps.jar"
233-
jar_url = f"{URL_PREFIX}-{FORMAT_VERSION}/{JAR_NAME}"
234-
235-
path, http_message = urllib.request.urlretrieve(jar_url, Path.home().joinpath(JAR_NAME).as_posix())
236-
237-
subprocess.check_call(['java', '-jar', path, '--replace'] + java_outputs)
238-
except Exception as err:
239-
traceback.print_exception(err)
240-
print('google-java-format error:', err)
241-
242217
def generate(self) -> TargetRunStats:
243218
generate_start = time.time()
244219

245220
subprocess.check_call(self.command)
246-
self.runJavaPrettifier()
247221

248222
generate_end = time.time()
249223

0 commit comments

Comments
 (0)