Restoring authorship annotation for <trenin17@yandex-team.ru>. Commit 1 of 2.

27 files changed, 472 insertions, 472 deletions

diff --git a/build/conf/java.ymake.conf b/build/conf/java.ymake.conf
index ed85153c785..aa104bb5c66 100644
--- a/build/conf/java.ymake.conf
+++ b/build/conf/java.ymake.conf
@@ -10,7 +10,7 @@ macro _INPUT_WITH_FLAG_IMPL(IN{input}[], Args...) {
 }
 
 macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], DEBUG?"stdout2stderr":"stderr2stdout") {
-    .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
+    .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR 
     .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input;pre=build/scripts/:DEBUG.py} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:"tools/acceleo"}${RUN_JAR_PROG_CP_SUF} ru.yandex.se.logsng.tool.Cli $_INPUT_WITH_FLAG(--xsd IN $XSD) $_INPUT_WITH_FLAG(--mtl IN $MTL) $_INPUT_WITH_FLAG(--lang IN $LANG) --output-dir $BINDIR --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT}  --mtl-root $MTL_ROOT ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
 }
 
@@ -173,7 +173,7 @@ multimodule DLL_JAVA {
         .PEERDIRSELF=JNI_DLL
         SET(SWIG_LANG jni_java)
         PEERDIR+=build/platform/java/jdk
-        PEERDIR+=$JDK_RESOURCE_PEERDIR
+        PEERDIR+=$JDK_RESOURCE_PEERDIR 
         .FINAL_TARGET=yes
     }
 }
diff --git a/build/conf/jbuild.ymake.conf b/build/conf/jbuild.ymake.conf
index 945a7cc9797..80ec4fe498c 100644
--- a/build/conf/jbuild.ymake.conf
+++ b/build/conf/jbuild.ymake.conf
@@ -115,7 +115,7 @@ module DLL_JAVA: DLL {
     .EXTS=.o .obj .jsrc .java .mf
     .CMD=SWIG_DLL_JAR_CMD
     PEERDIR(build/platform/java/jdk)
-    PEERDIR+=$JDK_RESOURCE_PEERDIR
+    PEERDIR+=$JDK_RESOURCE_PEERDIR 
 
     PROPAGATES_MANAGEABLE_PEERS=yes
     SET(SWIG_LANG java)
diff --git a/build/conf/project_specific/maps/aar.conf b/build/conf/project_specific/maps/aar.conf
index 780ff38984b..51c939c4243 100644
--- a/build/conf/project_specific/maps/aar.conf
+++ b/build/conf/project_specific/maps/aar.conf
@@ -28,7 +28,7 @@ module MOBILE_DLL: DLL {
     PEERDIR(build/external_resources/android_sdk)
     PEERDIR(build/external_resources/gradle)
     PEERDIR(build/platform/java/jdk)
-    PEERDIR($JDK_RESOURCE_PEERDIR)
+    PEERDIR($JDK_RESOURCE_PEERDIR) 
 
     SET(BIN_AAR_DIR $BINDIR/aar)
     SET(BIN_TMP_DIR $BINDIR/tmp)
@@ -88,7 +88,7 @@ ${input;hide:EXTRA_INPUTS} \
 --output-dir $BIN_AAR_DIR \
 --bundle-name unittest \
 --maven-repos ${MAPSMOBI_MAVEN_REPO_RESOURCE_GLOBAL} \
-&& ${cwd:BIN_AAR_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assemble${_BUNDLE_BUILD_TYPE} ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
+&& ${cwd:BIN_AAR_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assemble${_BUNDLE_BUILD_TYPE} ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \ 
 && $FS_TOOLS md $BIN_APK_DIR \
 && $FS_TOOLS md $BIN_APK_DIR/res \
 && $COPY_CMD $_MOBILE_TEST_APK_TEMPLATE_DIR/Manifest.xml $BIN_APK_DIR/Manifest.xml \
@@ -106,7 +106,7 @@ ${input;hide:EXTRA_INPUTS} \
 --bundles $BIN_AAR_DIR/build/outputs/aar/unittest-${tolower:_BUNDLE_BUILD_TYPE}.aar $_MOBILE_TEST_APK_AAR_BUNDLES_VALUE \
 --library-name $_MOBILE_TEST_APK_LIBRARY_NAME \
 --maven-repos ${MAPSMOBI_MAVEN_REPO_RESOURCE_GLOBAL} \
-&& ${cwd:BIN_APK_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assembleDebug ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
+&& ${cwd:BIN_APK_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assembleDebug ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \ 
 && $COPY_CMD $BIN_APK_DIR/build/outputs/apk/${tolower:_BUNDLE_BUILD_TYPE}/$REALPRJNAME.apk ${OUTPUT}
 
 _MOBILE_TEST_APK_EXTRA_INPUTS_VALUE=
@@ -127,7 +127,7 @@ module MOBILE_TEST_APK: DLL {
     PEERDIR(build/external_resources/android_sdk)
     PEERDIR(build/external_resources/gradle)
     PEERDIR(build/platform/java/jdk)
-    PEERDIR($JDK_RESOURCE_PEERDIR)
+    PEERDIR($JDK_RESOURCE_PEERDIR) 
 
     SET(MODULE_PREFIX)
     SET(MODULE_SUFFIX .apk)
@@ -296,7 +296,7 @@ ${input;hide:EXTRA_INPUTS} \
 --maven-repos $_AAR_LOCAL_MAVEN_REPO_VALUE \
 $_AAR_GENERATE_DOC_VALUE \
 $_AAR_NO_STRIP_VALUE \
-&& ${cwd:BINDIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR bundle${_BUNDLE_BUILD_TYPE}Aar ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} $VCS_INFO_DISABLE_CACHE__NO_UID__ \
+&& ${cwd:BINDIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR bundle${_BUNDLE_BUILD_TYPE}Aar ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} $VCS_INFO_DISABLE_CACHE__NO_UID__ \ 
 && ${cwd:BINDIR} $COPY_CMD build/outputs/aar/${REALPRJNAME}-${tolower:_BUNDLE_BUILD_TYPE}.aar $TARGET \
 $_AAR_COPY_DOC_VALUE \
 && ${cwd:BINDIR} $COPY_CMD build/${suf=-pom.xml:REALPRJNAME} ${output;suf=-pom.xml:REALPRJNAME} \
@@ -324,7 +324,7 @@ module AAR: _BASE_UNIT {
     PEERDIR(build/external_resources/android_sdk)
     PEERDIR(build/external_resources/gradle)
     PEERDIR(build/platform/java/jdk)
-    PEERDIR($JDK_RESOURCE_PEERDIR)
+    PEERDIR($JDK_RESOURCE_PEERDIR) 
 
     SET(BIN_TMP_DIR $BINDIR/tmp)
     SET(BIN_GRADLE_USER_HOME_DIR $BINDIR/gradle)
diff --git a/build/platform/java/jdk/jdk10/ya.make b/build/platform/java/jdk/jdk10/ya.make
index 83a420a81f9..cb35bb1dad7 100644
--- a/build/platform/java/jdk/jdk10/ya.make
+++ b/build/platform/java/jdk/jdk10/ya.make
@@ -1,20 +1,20 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK10
-    ${JDK10_DARWIN} FOR DARWIN
-    ${JDK10_LINUX} FOR LINUX
-    ${JDK10_WINDOWS} FOR WIN32
-)
-
-IF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_WINDOWS})
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK10 
+    ${JDK10_DARWIN} FOR DARWIN 
+    ${JDK10_LINUX} FOR LINUX 
+    ${JDK10_WINDOWS} FOR WIN32 
+) 
+ 
+IF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK10 ${JDK10_WINDOWS}) 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/jdk11/ya.make b/build/platform/java/jdk/jdk11/ya.make
index ae450c9c975..541a23d9cfb 100644
--- a/build/platform/java/jdk/jdk11/ya.make
+++ b/build/platform/java/jdk/jdk11/ya.make
@@ -1,31 +1,31 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK11
-    ${JDK11_DARWIN} FOR DARWIN
-    ${JDK11_DARWIN_ARM64} FOR DARWIN-ARM64
-    ${JDK11_LINUX} FOR LINUX
-    ${JDK11_WINDOWS} FOR WIN32
-)
-
-IF(OS_DARWIN AND ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN_ARM64})
-ELSEIF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_WINDOWS})
-ENDIF()
-
-IF(SANITIZER_TYPE == "address")
-    IF(HOST_OS_LINUX)
-        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS11 ${JDK11_LINUX_ASAN})
-    ELSE()
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan)
-    ENDIF()
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK11 
+    ${JDK11_DARWIN} FOR DARWIN 
+    ${JDK11_DARWIN_ARM64} FOR DARWIN-ARM64 
+    ${JDK11_LINUX} FOR LINUX 
+    ${JDK11_WINDOWS} FOR WIN32 
+) 
+ 
+IF(OS_DARWIN AND ARCH_ARM64) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN_ARM64}) 
+ELSEIF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${JDK11_WINDOWS}) 
+ENDIF() 
+ 
+IF(SANITIZER_TYPE == "address") 
+    IF(HOST_OS_LINUX) 
+        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS11 ${JDK11_LINUX_ASAN}) 
+    ELSE() 
+        MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan) 
+    ENDIF() 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/jdk12/ya.make b/build/platform/java/jdk/jdk12/ya.make
index 3ab35533384..5171199f4ee 100644
--- a/build/platform/java/jdk/jdk12/ya.make
+++ b/build/platform/java/jdk/jdk12/ya.make
@@ -1,20 +1,20 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK12
-    ${JDK12_DARWIN} FOR DARWIN
-    ${JDK12_LINUX} FOR LINUX
-    ${JDK12_WINDOWS} FOR WIN32
-)
-
-IF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_WINDOWS})
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK12 
+    ${JDK12_DARWIN} FOR DARWIN 
+    ${JDK12_LINUX} FOR LINUX 
+    ${JDK12_WINDOWS} FOR WIN32 
+) 
+ 
+IF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK12 ${JDK12_WINDOWS}) 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/jdk13/ya.make b/build/platform/java/jdk/jdk13/ya.make
index 527af68fb28..53aba1bd78d 100644
--- a/build/platform/java/jdk/jdk13/ya.make
+++ b/build/platform/java/jdk/jdk13/ya.make
@@ -1,28 +1,28 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK13
-    ${JDK13_DARWIN} FOR DARWIN
-    ${JDK13_LINUX} FOR LINUX
-    ${JDK13_WINDOWS} FOR WIN32
-)
-
-IF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_WINDOWS})
-ENDIF()
-
-IF(SANITIZER_TYPE == "address")
-    IF(HOST_OS_LINUX)
-        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN})
-    ELSE()
-        MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan)
-    ENDIF()
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK13 
+    ${JDK13_DARWIN} FOR DARWIN 
+    ${JDK13_LINUX} FOR LINUX 
+    ${JDK13_WINDOWS} FOR WIN32 
+) 
+ 
+IF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK13 ${JDK13_WINDOWS}) 
+ENDIF() 
+ 
+IF(SANITIZER_TYPE == "address") 
+    IF(HOST_OS_LINUX) 
+        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN}) 
+    ELSE() 
+        MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan) 
+    ENDIF() 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/jdk14/ya.make b/build/platform/java/jdk/jdk14/ya.make
index ed08c1a7fba..4af59f24a78 100644
--- a/build/platform/java/jdk/jdk14/ya.make
+++ b/build/platform/java/jdk/jdk14/ya.make
@@ -1,20 +1,20 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK14
-    ${JDK14_DARWIN} FOR DARWIN
-    ${JDK14_LINUX} FOR LINUX
-    ${JDK14_WINDOWS} FOR WIN32
-)
-
-IF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_WINDOWS})
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK14 
+    ${JDK14_DARWIN} FOR DARWIN 
+    ${JDK14_LINUX} FOR LINUX 
+    ${JDK14_WINDOWS} FOR WIN32 
+) 
+ 
+IF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK14 ${JDK14_WINDOWS}) 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/jdk15/ya.make b/build/platform/java/jdk/jdk15/ya.make
index 0746e27405f..13153e36b26 100644
--- a/build/platform/java/jdk/jdk15/ya.make
+++ b/build/platform/java/jdk/jdk15/ya.make
@@ -1,22 +1,22 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK15
-    ${JDK15_DARWIN} FOR DARWIN
-    ${JDK15_DARWIN_ARM64} FOR DARWIN-ARM64
-    ${JDK15_LINUX} FOR LINUX
-    ${JDK15_WINDOWS} FOR WIN32
-)
-IF(OS_DARWIN AND ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN_ARM64})
-ELSEIF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_WINDOWS})
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK15 
+    ${JDK15_DARWIN} FOR DARWIN 
+    ${JDK15_DARWIN_ARM64} FOR DARWIN-ARM64 
+    ${JDK15_LINUX} FOR LINUX 
+    ${JDK15_WINDOWS} FOR WIN32 
+) 
+IF(OS_DARWIN AND ARCH_ARM64) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN_ARM64}) 
+ELSEIF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${JDK15_WINDOWS}) 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/jdk16/ya.make b/build/platform/java/jdk/jdk16/ya.make
index 2fc2f16418d..05131e56ada 100644
--- a/build/platform/java/jdk/jdk16/ya.make
+++ b/build/platform/java/jdk/jdk16/ya.make
@@ -1,23 +1,23 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK16
-    ${JDK16_DARWIN} FOR DARWIN
-    ${JDK16_DARWIN_ARM64} FOR DARWIN-ARM64
-    ${JDK16_LINUX} FOR LINUX
-    ${JDK16_WINDOWS} FOR WIN32
-)
-
-IF(OS_DARWIN AND ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN_ARM64})
-ELSEIF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_WINDOWS})
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK16 
+    ${JDK16_DARWIN} FOR DARWIN 
+    ${JDK16_DARWIN_ARM64} FOR DARWIN-ARM64 
+    ${JDK16_LINUX} FOR LINUX 
+    ${JDK16_WINDOWS} FOR WIN32 
+) 
+ 
+IF(OS_DARWIN AND ARCH_ARM64) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN_ARM64}) 
+ELSEIF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK16 ${JDK16_WINDOWS}) 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/jdk8/ya.make b/build/platform/java/jdk/jdk8/ya.make
index 7386b4731c0..10be961779d 100644
--- a/build/platform/java/jdk/jdk8/ya.make
+++ b/build/platform/java/jdk/jdk8/ya.make
@@ -1,23 +1,23 @@
-OWNER(trenin17)
-RESOURCES_LIBRARY()
-INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    JDK8
-    ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64
-    ${JDK8_DARWIN} FOR DARWIN
-    ${JDK8_LINUX} FOR LINUX
-    ${JDK8_WINDOWS} FOR WIN32
-)
-
-IF(OS_DARWIN AND ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN_ARM64})
-ELSEIF(OS_DARWIN)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_WINDOWS})
-ENDIF()
-
-END()
+OWNER(trenin17) 
+RESOURCES_LIBRARY() 
+INCLUDE(${ARCADIA_ROOT}/build/platform/java/jdk/resources.inc) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    JDK8 
+    ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64 
+    ${JDK8_DARWIN} FOR DARWIN 
+    ${JDK8_LINUX} FOR LINUX 
+    ${JDK8_WINDOWS} FOR WIN32 
+) 
+ 
+IF(OS_DARWIN AND ARCH_ARM64) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN_ARM64}) 
+ELSEIF(OS_DARWIN) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${JDK8_WINDOWS}) 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index 909ae36e18a..155d991f935 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -98,7 +98,7 @@ ELSEIF(JDK_VERSION == "8")
 ELSE()
     MESSAGE(FATAL_ERROR Unsupported JDK version)
 ENDIF()
-
+ 
 IF(USE_SYSTEM_JDK)
     MESSAGE(WARNING System JDK $USE_SYSTEM_JDK will be used)
 ELSEIF(JDK_VERSION == "17")
@@ -297,15 +297,15 @@ ELSE()
 ENDIF()
 
 END()
-
-RECURSE(
-    jdk8
-    jdk10
-    jdk11
-    jdk12
-    jdk13
-    jdk14
-    jdk15
-    jdk16
+ 
+RECURSE( 
+    jdk8 
+    jdk10 
+    jdk11 
+    jdk12 
+    jdk13 
+    jdk14 
+    jdk15 
+    jdk16 
     jdk17
-)
+) 
diff --git a/build/platform/java/jni/ya.make b/build/platform/java/jni/ya.make
index 9d8dab98b1b..80d6e59282a 100644
--- a/build/platform/java/jni/ya.make
+++ b/build/platform/java/jni/ya.make
@@ -1,10 +1,10 @@
 LIBRARY()
 OWNER(heretic)
 
-PEERDIR(
-    build/platform/java/jdk
-    ${JDK_RESOURCE_PEERDIR}
-)
+PEERDIR( 
+    build/platform/java/jdk 
+    ${JDK_RESOURCE_PEERDIR} 
+) 
 
 IF(OS_DARWIN)
     SET(PLATFORM_NAME darwin)
@@ -17,7 +17,7 @@ ENDIF()
 IF (USE_SYSTEM_JDK)
     SET(JDK_ROOT ${USE_SYSTEM_JDK})
 ELSE()
-    SET(JDK_ROOT ${JDK_DEFAULT_RESOURCE_GLOBAL})
+    SET(JDK_ROOT ${JDK_DEFAULT_RESOURCE_GLOBAL}) 
 ENDIF()
 IF (PLATFORM_NAME)
     CFLAGS(GLOBAL -I${JDK_ROOT}/include)
diff --git a/build/platform/java/uberjar/uberjar10/ya.make b/build/platform/java/uberjar/uberjar10/ya.make
index 29829b4cd02..247f9e1c810 100644
--- a/build/platform/java/uberjar/uberjar10/ya.make
+++ b/build/platform/java/uberjar/uberjar10/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR10 sbr:720309903)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR10 sbr:720309903) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/uberjar11/ya.make b/build/platform/java/uberjar/uberjar11/ya.make
index 69ae705253a..65caed79ae0 100644
--- a/build/platform/java/uberjar/uberjar11/ya.make
+++ b/build/platform/java/uberjar/uberjar11/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR11 sbr:962498940)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR11 sbr:962498940) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/uberjar12/ya.make b/build/platform/java/uberjar/uberjar12/ya.make
index 88ff579eca7..0cbf5049d39 100644
--- a/build/platform/java/uberjar/uberjar12/ya.make
+++ b/build/platform/java/uberjar/uberjar12/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR12 sbr:962498940)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR12 sbr:962498940) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/uberjar13/ya.make b/build/platform/java/uberjar/uberjar13/ya.make
index 62c70ca3a18..bc236789f31 100644
--- a/build/platform/java/uberjar/uberjar13/ya.make
+++ b/build/platform/java/uberjar/uberjar13/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR13 sbr:1165818979)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR13 sbr:1165818979) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/uberjar14/ya.make b/build/platform/java/uberjar/uberjar14/ya.make
index 45e7deab2f4..cbc4c9bb7f8 100644
--- a/build/platform/java/uberjar/uberjar14/ya.make
+++ b/build/platform/java/uberjar/uberjar14/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR14 sbr:1407329657)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR14 sbr:1407329657) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/uberjar15/ya.make b/build/platform/java/uberjar/uberjar15/ya.make
index 49fdd64317b..2787ae66096 100644
--- a/build/platform/java/uberjar/uberjar15/ya.make
+++ b/build/platform/java/uberjar/uberjar15/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR15 sbr:2074702997)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR15 sbr:2074702997) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/uberjar16/ya.make b/build/platform/java/uberjar/uberjar16/ya.make
index ca4cefc1b10..11bfd9d14d9 100644
--- a/build/platform/java/uberjar/uberjar16/ya.make
+++ b/build/platform/java/uberjar/uberjar16/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR16 sbr:2199772343)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR16 sbr:2199772343) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/uberjar8/ya.make b/build/platform/java/uberjar/uberjar8/ya.make
index 45aec41508d..8071d052840 100644
--- a/build/platform/java/uberjar/uberjar8/ya.make
+++ b/build/platform/java/uberjar/uberjar8/ya.make
@@ -1,6 +1,6 @@
-RESOURCES_LIBRARY()
-OWNER(trenin17)
-
-DECLARE_EXTERNAL_RESOURCE(UBERJAR8 sbr:962511340)
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(trenin17) 
+ 
+DECLARE_EXTERNAL_RESOURCE(UBERJAR8 sbr:962511340) 
+ 
+END() 
diff --git a/build/platform/java/uberjar/ya.make b/build/platform/java/uberjar/ya.make
index 29c934d5b10..033b667f3eb 100644
--- a/build/platform/java/uberjar/ya.make
+++ b/build/platform/java/uberjar/ya.make
@@ -1,6 +1,6 @@
 RESOURCES_LIBRARY()
 OWNER(heretic)
-
+ 
 IF(USE_SYSTEM_UBERJAR)
     MESSAGE(WARNING System uberjar $USE_SYSTEM_UBERJAR will be used)
 ELSEIF(JDK_VERSION == "17")
@@ -24,16 +24,16 @@ ELSEIF(JDK_VERSION == "8")
 ELSE()
     MESSAGE(FATAL_ERROR Uberjar is not supported for selected JDK version)
 ENDIF()
-
+ 
 END()
-
-RECURSE(
-    uberjar8
-    uberjar10
-    uberjar11
-    uberjar12
-    uberjar13
-    uberjar14
-    uberjar15
-    uberjar16
-)
+ 
+RECURSE( 
+    uberjar8 
+    uberjar10 
+    uberjar11 
+    uberjar12 
+    uberjar13 
+    uberjar14 
+    uberjar15 
+    uberjar16 
+) 
diff --git a/build/rules/contrib_deps.policy b/build/rules/contrib_deps.policy
index 9af4b85cc2c..bbbf335c865 100644
--- a/build/rules/contrib_deps.policy
+++ b/build/rules/contrib_deps.policy
@@ -34,7 +34,7 @@ ALLOW contrib/python/transfer_manager_client -> transfer_manager/client
 ALLOW contrib/(deprecated/)?python/django -> library/python/django
 ALLOW contrib/(deprecated/)?python/django -> library/python/gunicorn
 ALLOW contrib/python/python-magic -> library/python/symbols/libmagic
-ALLOW contrib/python/typecode -> library/python/symbols/libmagic
+ALLOW contrib/python/typecode -> library/python/symbols/libmagic 
 ALLOW contrib/tools/jdk/test -> devtools/ya/yalibrary/tools
 ALLOW contrib/libs/clang12/tools/extra/clang-tidy/tool -> library/cpp/clang_tidy
 ALLOW contrib/libs/inja -> library/cpp/scheme
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 081833998b8..566e598ec45 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -3418,7 +3418,7 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
     .RESTRICTED=EXTERNAL_JAR
 
     PEERDIR(build/platform/java/jdk)
-    PEERDIR+=$JDK_RESOURCE_PEERDIR
+    PEERDIR+=$JDK_RESOURCE_PEERDIR 
 
     PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL
     PROPAGATES_MANAGEABLE_PEERS=yes
@@ -3484,7 +3484,7 @@ when($JDK_VERSION == "8") {
 macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[], IN_DIR[], OUT_NOAUTO{output}[], OUT{output}[], TOOL{tool}[], OUT_DIR[], CLASSPATH[], REQUIREMENTS[], ADD_SRCS_TO_CLASSPATH?"yes":"no", CWD="${ARCADIA_BUILD_ROOT}", Args...) {
     _LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR})
     _CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
-    .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
+    .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR 
     .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} $YMAKE_PYTHON ${input:"build/scripts/fix_java_command_file_cp.py"} --build-root ${ARCADIA_BUILD_ROOT} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} ${Args} ${requirements;hide:REQUIREMENTS} ${requirements;hide:"network:restricted"} && $_GENTAR_HELPER($CLASSPATH $IN_DIR $IN $TOOL $Args OUT_DIR $OUT_DIR) ${input;hide:IN} ${output;noauto;hide:OUT_NOAUTO} ${output;hide:OUT} ${tool;hide:TOOL} ${IN_DIRS_INPUTS}
 }
 
@@ -3596,7 +3596,7 @@ module JAVA_CONTRIB: _JAR_BASE {
         otherwise {
             FETCH_TARGET_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && ${cwd:BINDIR} $JDK_RESOURCE/bin/jar cfvm $TARGET $VCS_JAVA .
             PEERDIR+=build/platform/java/jdk
-            PEERDIR+=$JDK_RESOURCE_PEERDIR
+            PEERDIR+=$JDK_RESOURCE_PEERDIR 
         }
     }
     when ($SRC_RESOURCE_ID) {
@@ -3609,7 +3609,7 @@ module JAVA_CONTRIB: _JAR_BASE {
         otherwise {
             FETCH_SRCS_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && $FS_TOOLS md ${BINDIR}/fake-src && ${cwd;suf=/fake-src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/;suf=-sources.jar:REALPRJNAME} $VCS_JAVA .
             PEERDIR+=build/platform/java/jdk
-            PEERDIR+=$JDK_RESOURCE_PEERDIR
+            PEERDIR+=$JDK_RESOURCE_PEERDIR 
         }
     }
 
@@ -3763,7 +3763,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
     MODULE_SUFFIX=.jar
 
     PEERDIR(build/platform/java/jdk)
-    PEERDIR+=$JDK_RESOURCE_PEERDIR
+    PEERDIR+=$JDK_RESOURCE_PEERDIR 
 
     when ($_EXT_SRC_JAR) {
         _COPY_EXT_SRC_JAR=_DO_COPY_EXT_SRC_JAR
@@ -3813,7 +3813,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
             _UBERJAR_SELF=--jar ${BINDIR}/${REALPRJNAME}.lib.jar
         }
         PEERDIR+=build/platform/java/uberjar
-        PEERDIR+=$UBERJAR_RESOURCE_PEERDIR
+        PEERDIR+=$UBERJAR_RESOURCE_PEERDIR 
     }
 
     when($JAVA_YNDEXING == "yes") {
@@ -3930,7 +3930,7 @@ module _JAR_RUNABLE: _COMPILABLE_JAR_BASE {
     }
 
     when ($WITH_JDK_VALUE) {
-        _PACK_JDK= && ${YMAKE_PYTHON} ${input:"build/scripts/tar_directory.py"} ${output;tared:"jdk.tar"} $WITH_JDK_RESOURCE $WITH_JDK_RESOURCE
+        _PACK_JDK= && ${YMAKE_PYTHON} ${input:"build/scripts/tar_directory.py"} ${output;tared:"jdk.tar"} $WITH_JDK_RESOURCE $WITH_JDK_RESOURCE 
     }
 
     when ($MAKE_UBERJAR_VALUE == "yes") {
@@ -4236,60 +4236,60 @@ when ($MAPSMOBI_BUILD_TARGET && $OS_ANDROID) {
 when ($JDK_VERSION == "17") {
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
 }
-when ($JDK_VERSION == "16") {
+when ($JDK_VERSION == "16") { 
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk16 build/platform/java/jdk/jdk11
-}
-when ($JDK_VERSION == "15") {
+} 
+when ($JDK_VERSION == "15") { 
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk11
-}
-when ($JDK_VERSION == "14") {
+} 
+when ($JDK_VERSION == "14") { 
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk14 build/platform/java/jdk/jdk11
-}
-when ($JDK_VERSION == "13") {
+} 
+when ($JDK_VERSION == "13") { 
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk13 build/platform/java/jdk/jdk11
-}
-when ($JDK_VERSION == "12") {
+} 
+when ($JDK_VERSION == "12") { 
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk12 build/platform/java/jdk/jdk11
-}
-when ($JDK_VERSION == "11") {
-    JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11
-}
-when ($JDK_VERSION == "10") {
+} 
+when ($JDK_VERSION == "11") { 
+    JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 
+} 
+when ($JDK_VERSION == "10") { 
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk10 build/platform/java/jdk/jdk11
-}
-when ($JDK_VERSION == "8") {
+} 
+when ($JDK_VERSION == "8") { 
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk8 build/platform/java/jdk/jdk11
-}
+} 
 
 # tag:java-specific
 when ($JDK_VERSION == "17") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
 }
-when ($JDK_VERSION == "16") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar16
-}
-when ($JDK_VERSION == "15") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
-}
-when ($JDK_VERSION == "14") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar14
-}
-when ($JDK_VERSION == "13") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar13
-}
-when ($JDK_VERSION == "12") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar12
-}
-when ($JDK_VERSION == "11") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
-}
-when ($JDK_VERSION == "10") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar10
-}
-when ($JDK_VERSION == "8") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar8
-}
-
+when ($JDK_VERSION == "16") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar16 
+} 
+when ($JDK_VERSION == "15") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15 
+} 
+when ($JDK_VERSION == "14") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar14 
+} 
+when ($JDK_VERSION == "13") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar13 
+} 
+when ($JDK_VERSION == "12") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar12 
+} 
+when ($JDK_VERSION == "11") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11 
+} 
+when ($JDK_VERSION == "10") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar10 
+} 
+when ($JDK_VERSION == "8") { 
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar8 
+} 
+ 
 # tag:java-specific
 JAVAC_OPTS=
 when ($USE_SYSTEM_JDK) {
@@ -4299,30 +4299,30 @@ otherwise {
     when ($JDK_VERSION == "17") {
         JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
     }
-    when ($JDK_VERSION == "16") {
-        JDK_RESOURCE=$JDK16_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "15") {
-        JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "14") {
-        JDK_RESOURCE=$JDK14_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "13") {
-        JDK_RESOURCE=$JDK13_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "12") {
-        JDK_RESOURCE=$JDK12_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "11") {
-        JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "10") {
-        JDK_RESOURCE=$JDK10_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "8") {
-        JDK_RESOURCE=$JDK8_RESOURCE_GLOBAL
-    }
+    when ($JDK_VERSION == "16") { 
+        JDK_RESOURCE=$JDK16_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "15") { 
+        JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "14") { 
+        JDK_RESOURCE=$JDK14_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "13") { 
+        JDK_RESOURCE=$JDK13_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "12") { 
+        JDK_RESOURCE=$JDK12_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "11") { 
+        JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "10") { 
+        JDK_RESOURCE=$JDK10_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "8") { 
+        JDK_RESOURCE=$JDK8_RESOURCE_GLOBAL 
+    } 
 }
 
 # tag:java-specific
@@ -4362,37 +4362,37 @@ otherwise {
     when ($JDK_VERSION == "17") {
         UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
     }
-    when ($JDK_VERSION == "16") {
-        UBERJAR_RESOURCE=$UBERJAR16_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "15") {
-        UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "14") {
-        UBERJAR_RESOURCE=$UBERJAR14_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "13") {
-        UBERJAR_RESOURCE=$UBERJAR13_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "12") {
-        UBERJAR_RESOURCE=$UBERJAR12_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "11") {
-        UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "10") {
-        UBERJAR_RESOURCE=$UBERJAR10_RESOURCE_GLOBAL
-    }
-    when ($JDK_VERSION == "8") {
-        UBERJAR_RESOURCE=$UBERJAR8_RESOURCE_GLOBAL
-    }
+    when ($JDK_VERSION == "16") { 
+        UBERJAR_RESOURCE=$UBERJAR16_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "15") { 
+        UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "14") { 
+        UBERJAR_RESOURCE=$UBERJAR14_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "13") { 
+        UBERJAR_RESOURCE=$UBERJAR13_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "12") { 
+        UBERJAR_RESOURCE=$UBERJAR12_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "11") { 
+        UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "10") { 
+        UBERJAR_RESOURCE=$UBERJAR10_RESOURCE_GLOBAL 
+    } 
+    when ($JDK_VERSION == "8") { 
+        UBERJAR_RESOURCE=$UBERJAR8_RESOURCE_GLOBAL 
+    } 
 }
 
 # tag:java-specific
 when ($JDK_VERSION == "17") {
     WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
 }
-when ($JDK_VERSION == "16") {
+when ($JDK_VERSION == "16") { 
     WITH_JDK_RESOURCE=$WITH_JDK16_RESOURCE_GLOBAL
 }
 when ($JDK_VERSION == "15") {
@@ -4416,7 +4416,7 @@ when ($JDK_VERSION == "10") {
 when ($JDK_VERSION == "8") {
     WITH_JDK_RESOURCE=$WITH_JDK8_RESOURCE_GLOBAL
 }
-
+ 
 # tag:java-specific
 COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input:"build/scripts/compile_java.py"} --javac-bin $JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET --srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME} $AUTO_INPUT DELIM $JAVAC_OPTS DELIM $PEERS ${requirements;hide:JAVA_REQUIREMENTS} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} ${kv;hide:"PEERS $PEERS"}
 REAL_SWIG_DLL_JAR_CMD=$GENERATE_VCS_JAVA_INFO_NODEP && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input:"build/scripts/build_dll_and_java.py"} $JAVA_SWIG_DELIM $REAL_LINK_DYN_LIB $JAVA_SWIG_DELIM $COMPILE_JAVA $JAVA_SWIG_DELIM $AUTO_INPUT $JAVA_SWIG_DELIM $TARGET $JAVA_SWIG_DELIM ${output;suf=.jar:REALPRJNAME} $JAVA_SWIG_DELIM ${output;suf=-sources.jar:REALPRJNAME} $JAVA_SWIG_DELIM $ARCADIA_BUILD_ROOT $ARCADIA_ROOT
@@ -4651,16 +4651,16 @@ macro JAVAC_FLAGS(Args...) {
 
 # tag:java-specific
 ENABLE_PREVIEW_VALUE=
-### @usage: ENABLE_PREVIEW()
-###
-### Enable java preview features.
-macro ENABLE_PREVIEW() {
-    SET_APPEND(JVM_ARGS_VALUE --enable-preview)
+### @usage: ENABLE_PREVIEW() 
+### 
+### Enable java preview features. 
+macro ENABLE_PREVIEW() { 
+    SET_APPEND(JVM_ARGS_VALUE --enable-preview) 
     SET_APPEND(JAVAC_OPTS --enable-preview --release $JDK_VERSION)
     SET_APPEND(JAVAC_FLAGS_VALUE --enable-preview --release $JDK_VERSION)
     SET(ENABLE_PREVIEW_VALUE yes)
-}
-
+} 
+ 
 # tag:java-specific
 SAVE_JAVAC_GENERATED_SRCS=
 SAVE_JAVAC_GENERATED_SRCS_DIR=
@@ -4866,10 +4866,10 @@ module _JAVA_PLACEHOLDER: _BASE_UNIT  {
     DYNAMIC_LINK=yes
     PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL JAR_COMPILATION
     PEERDIR(build/platform/java/jdk)
-    PEERDIR+=$JDK_RESOURCE_PEERDIR
+    PEERDIR+=$JDK_RESOURCE_PEERDIR 
     when($MAKE_UBERJAR_VALUE) {
         PEERDIR+=build/platform/java/uberjar
-        PEERDIR+=$UBERJAR_RESOURCE_PEERDIR
+        PEERDIR+=$UBERJAR_RESOURCE_PEERDIR 
     }
     when($ERROR_PRONE_VALUE) {
         # Jbuild assumes hardcoded resource name https://a.yandex-team.ru/arc_vcs/devtools/ya/jbuild/gen/consts/__init__.py?rev=1739368ed5aaa585b8300b84e5dea708a2bedd3a#L130
@@ -7043,7 +7043,7 @@ macro PYTHON(ScriptPath, IN{input}[], OUT{output}[], OUT_NOAUTO{output}[], TOOL{
 
 # tag:java-specific
 macro _RUN_JAVA(IN{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], TOOL[], STDOUT="", STDOUT_NOAUTO="", CWD="", ENV[], HIDE_OUTPUT?"stderr2stdout":"stdout2stderr", REQUIREMENTS[], Args...) {
-    PEERDIR(build/platform/java/jdk $JDK_RESOURCE_PEERDIR)
+    PEERDIR(build/platform/java/jdk $JDK_RESOURCE_PEERDIR) 
     .CMD=${cwd:CWD} ${env:ENV} $YMAKE_PYTHON ${input;pre=build/scripts/:HIDE_OUTPUT.py} $JDK_RESOURCE/bin/java $Args ${tool;hide:TOOL} ${input;hide:IN} ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${output;stdout:STDOUT} ${output;stdout;noauto:STDOUT_NOAUTO} ${requirements;hide:REQUIREMENTS} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
 }
 
diff --git a/util/generic/yexception.cpp b/util/generic/yexception.cpp
index 2ce6c4369da..8cc8ed250b9 100644
--- a/util/generic/yexception.cpp
+++ b/util/generic/yexception.cpp
@@ -4,8 +4,8 @@
 #include <util/system/backtrace.h>
 #include <util/system/type_name.h>
 
-#include <cxxabi.h>
-
+#include <cxxabi.h> 
+ 
 #include <stdexcept>
 
 #include <cstdio>
@@ -47,26 +47,26 @@ bool UncaughtException() noexcept {
 #endif
 }
 
-std::string CurrentExceptionTypeName() {
-#if defined(_linux_) || defined(_darwin_)
-    std::type_info* currentExceptionTypePtr = abi::__cxa_current_exception_type();
-    if (currentExceptionTypePtr) {
-        return TypeName(*currentExceptionTypePtr);
-    }
-#endif
-    //There is no abi::__cxa_current_exception_type() on Windows.
-    //Emulated it with rethrow - catch construction.
-    std::exception_ptr currentException = std::current_exception();
-    Y_ASSERT(currentException != nullptr);
-    try {
-        std::rethrow_exception(currentException);
-    } catch (const std::exception& e) {
-        return TypeName(typeid(e));
-    } catch (...) {
-        return "unknown type";
-    }
-}
-
+std::string CurrentExceptionTypeName() { 
+#if defined(_linux_) || defined(_darwin_) 
+    std::type_info* currentExceptionTypePtr = abi::__cxa_current_exception_type(); 
+    if (currentExceptionTypePtr) { 
+        return TypeName(*currentExceptionTypePtr); 
+    } 
+#endif 
+    //There is no abi::__cxa_current_exception_type() on Windows. 
+    //Emulated it with rethrow - catch construction. 
+    std::exception_ptr currentException = std::current_exception(); 
+    Y_ASSERT(currentException != nullptr); 
+    try { 
+        std::rethrow_exception(currentException); 
+    } catch (const std::exception& e) { 
+        return TypeName(typeid(e)); 
+    } catch (...) { 
+        return "unknown type"; 
+    } 
+} 
+ 
 void TSystemError::Init() {
     yexception& exc = *this;
 
diff --git a/util/generic/yexception.h b/util/generic/yexception.h
index b0c604e8c45..d0a9428ace5 100644
--- a/util/generic/yexception.h
+++ b/util/generic/yexception.h
@@ -13,7 +13,7 @@
 #include <util/system/defaults.h>
 #include <util/system/error.h>
 #include <util/system/src_location.h>
-#include <util/system/platform.h>
+#include <util/system/platform.h> 
 
 #include <exception>
 
@@ -171,7 +171,7 @@ TString CurrentExceptionMessage();
  */
 bool UncaughtException() noexcept;
 
-std::string CurrentExceptionTypeName();
+std::string CurrentExceptionTypeName(); 
 
 TString FormatExc(const std::exception& exception);
 
diff --git a/util/generic/yexception_ut.cpp b/util/generic/yexception_ut.cpp
index cb3e29fed84..77b26b9c25e 100644
--- a/util/generic/yexception_ut.cpp
+++ b/util/generic/yexception_ut.cpp
@@ -52,7 +52,7 @@ class TExceptionTest: public TTestBase {
     UNIT_TEST(TestMacroOverload)
     UNIT_TEST(TestMessageCrop)
     UNIT_TEST(TestTIoSystemErrorSpecialMethods)
-    UNIT_TEST(TestCurrentExceptionTypeNameMethod)
+    UNIT_TEST(TestCurrentExceptionTypeNameMethod) 
     UNIT_TEST_SUITE_END();
 
 private:
@@ -319,74 +319,74 @@ private:
         errMoveAssign = std::move(errMove);
         UNIT_ASSERT(errMoveAssign.AsStrBuf().Contains(testStr));
     }
-    inline void TestCurrentExceptionTypeNameMethod() {
-        //Basic test of getting the correct exception type name.
-        try {
-            throw std::runtime_error("Test Runtime Error Exception");
-        } catch (...) {
-            UNIT_ASSERT_STRING_CONTAINS(CurrentExceptionTypeName(), "std::runtime_error");
-        }
-        //Test when exception has an unusual type. Under Linux it should return "int" and under other OSs "unknown type".
-        try {
-            throw int(1);
-        } catch (...) {
+    inline void TestCurrentExceptionTypeNameMethod() { 
+        //Basic test of getting the correct exception type name. 
+        try { 
+            throw std::runtime_error("Test Runtime Error Exception"); 
+        } catch (...) { 
+            UNIT_ASSERT_STRING_CONTAINS(CurrentExceptionTypeName(), "std::runtime_error"); 
+        } 
+        //Test when exception has an unusual type. Under Linux it should return "int" and under other OSs "unknown type". 
+        try { 
+            throw int(1); 
+        } catch (...) { 
 #if defined(LIBCXX_BUILDING_LIBCXXRT) || defined(LIBCXX_BUILDING_LIBGCC)
-            UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "int");
-#else
-            UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "unknown type");
-#endif
-        }
-        //Test when the caught exception is rethrown with std::rethrow_exception.
-        try {
-            throw std::logic_error("Test Logic Error Exception");
-        } catch (...) {
-            try {
-                std::rethrow_exception(std::current_exception());
-            } catch (...) {
-                UNIT_ASSERT_STRING_CONTAINS(CurrentExceptionTypeName(), "std::logic_error");
-            }
-        }
-        //Test when the caught exception is rethrown with throw; .
+            UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "int"); 
+#else 
+            UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "unknown type"); 
+#endif 
+        } 
+        //Test when the caught exception is rethrown with std::rethrow_exception. 
+        try { 
+            throw std::logic_error("Test Logic Error Exception"); 
+        } catch (...) { 
+            try { 
+                std::rethrow_exception(std::current_exception()); 
+            } catch (...) { 
+                UNIT_ASSERT_STRING_CONTAINS(CurrentExceptionTypeName(), "std::logic_error"); 
+            } 
+        } 
+        //Test when the caught exception is rethrown with throw; . 
         //This test is different from the previous one because of the interaction with cxxabi specifics.
-        try {
-            throw std::bad_alloc();
-        } catch (...) {
-            try {
-                throw;
-            } catch (...) {
-                UNIT_ASSERT_STRING_CONTAINS(CurrentExceptionTypeName(), "std::bad_alloc");
-            }
-        }
+        try { 
+            throw std::bad_alloc(); 
+        } catch (...) { 
+            try { 
+                throw; 
+            } catch (...) { 
+                UNIT_ASSERT_STRING_CONTAINS(CurrentExceptionTypeName(), "std::bad_alloc"); 
+            } 
+        } 
         // For exceptions thrown by std::rethrow_exception() a nullptr will be returned by libcxxrt's __cxa_current_exception_type().
-        // Adding an explicit test for the case.
-        try {
-            throw int(1);
-        } catch (...) {
-            try {
-                std::rethrow_exception(std::current_exception());
-            } catch (...) {
+        // Adding an explicit test for the case. 
+        try { 
+            throw int(1); 
+        } catch (...) { 
+            try { 
+                std::rethrow_exception(std::current_exception()); 
+            } catch (...) { 
 #if defined(LIBCXX_BUILDING_LIBGCC)
-                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "int");
-#else
-                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "unknown type");
-#endif
-            }
-        }
-        //Test when int is rethrown with throw; .
-        try {
-            throw int(1);
-        } catch (...) {
-            try {
-                throw;
-            } catch (...) {
+                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "int"); 
+#else 
+                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "unknown type"); 
+#endif 
+            } 
+        } 
+        //Test when int is rethrown with throw; . 
+        try { 
+            throw int(1); 
+        } catch (...) { 
+            try { 
+                throw; 
+            } catch (...) { 
 #if defined(LIBCXX_BUILDING_LIBCXXRT) || defined(LIBCXX_BUILDING_LIBGCC)
-                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "int");
-#else
-                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "unknown type");
-#endif
-            }
-        }
-    }
+                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "int"); 
+#else 
+                UNIT_ASSERT_VALUES_EQUAL(CurrentExceptionTypeName(), "unknown type"); 
+#endif 
+            } 
+        } 
+    } 
 };
 
 UNIT_TEST_SUITE_REGISTRATION(TExceptionTest);