Merge branch 'master' into vplyashkun/inplace_rename_lags

GitOrigin-RevId: aaecc2a32e4e42de827efb45b8df733874a722e4

java/java-tests/testData/codeStyle/jsonExport.json

@@ -45,8 +45,8 @@
       "blank_lines_before_imports": 1,
       "blank_lines_before_method_body": 0,
       "blank_lines_before_package": 0,
+      "block_brace_style": "end_of_line",
       "block_comment_at_first_column": true,
-      "brace_style": "end_of_line",
       "call_parameters_new_line_after_left_paren": false,
       "call_parameters_right_paren_on_new_line": false,
       "call_parameters_wrap": "on_every_item",
@@ -94,11 +94,11 @@
       "if_brace_force": "never",
       "imports_layout": [
         "*",
-        "blank_line",
+        "|",
         "javax.**",
         "java.**",
-        "blank_line",
-        "static *"
+        "|",
+        "$*"
       ],
       "indent_case_from_switch": true,
       "indent_size": 4,