From bbb7f3f87fa3b4d6055bd6034db2db73c65509b6 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 12 Jul 2023 17:11:58 +0200
Subject: [PATCH] reduce visibility of FTManager

GitOrigin-RevId: 702fdebbeb280115b283b9633fb898c04728091e
---
 .../ide/fileTemplates/impl/FileTemplatesTest.kt   | 15 ++++++---------
 .../ide/fileTemplates/impl/FTManager.java         |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename java/java-tests/testSrc/com/intellij/{java => }/ide/fileTemplates/impl/FileTemplatesTest.kt (95%)

diff --git a/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/impl/FileTemplatesTest.kt b/java/java-tests/testSrc/com/intellij/ide/fileTemplates/impl/FileTemplatesTest.kt
similarity index 95%
rename from java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/impl/FileTemplatesTest.kt
rename to java/java-tests/testSrc/com/intellij/ide/fileTemplates/impl/FileTemplatesTest.kt
index 982fc44ac99f..616b6b8da906 100644
--- a/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/impl/FileTemplatesTest.kt
+++ b/java/java-tests/testSrc/com/intellij/ide/fileTemplates/impl/FileTemplatesTest.kt
@@ -1,10 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.java.ide.fileTemplates.impl
+package com.intellij.ide.fileTemplates.impl
 
 import com.intellij.ide.fileTemplates.*
-import com.intellij.ide.fileTemplates.impl.CustomFileTemplate
-import com.intellij.ide.fileTemplates.impl.FTManager
-import com.intellij.ide.fileTemplates.impl.FileTemplateBase
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ex.PathManagerEx
@@ -19,7 +16,7 @@ import com.intellij.testFramework.PsiTestUtil
 import com.intellij.testFramework.UsefulTestCase
 import com.intellij.testFramework.registerExtension
 import com.intellij.util.io.delete
-import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions
 import java.io.File
 import java.io.FileReader
 import java.io.IOException
@@ -60,7 +57,7 @@ internal class FileTemplatesTest : JavaProjectTestCase() {
       templateManager.setTemplates(FileTemplateManager.INCLUDES_TEMPLATES_CATEGORY, allIncludes)
       val txt = ".txt"
       val children = testsDir.listFiles { dir: File?, name: String -> name.endsWith(".out$txt") }
-      assertThat(children).isNotEmpty()
+      Assertions.assertThat(children).isNotEmpty()
       for (resultFile in children) {
         val name = resultFile.name
         val base = name.substring(0, name.length - txt.length - ".out".length)
@@ -88,7 +85,7 @@ internal class FileTemplatesTest : JavaProjectTestCase() {
     val result = FileTemplateUtil.mergeTemplate(properties, inputString, false)
     assertEquals(expected, result)
     val attrs = FileTemplateUtil.calculateAttributes(inputString, Properties(), false, project).asList()
-    assertThat(properties.size - 1 <= attrs.size).isTrue()
+    Assertions.assertThat(properties.size - 1 <= attrs.size).isTrue()
     val e = properties.propertyNames()
     while (e.hasMoreElements()) {
       val s = e.nextElement() as String
@@ -105,7 +102,7 @@ internal class FileTemplatesTest : JavaProjectTestCase() {
     val template = addTestTemplate("my_class", "\${ABC} \${DEF} \${NAME}")
     val properties = Properties()
     properties["NAME"] = "zzz"
-    assertThat(template.getUnsetAttributes(properties, project)).containsOnly("ABC", "DEF")
+    Assertions.assertThat(template.getUnsetAttributes(properties, project)).containsOnly("ABC", "DEF")
   }
 
   fun test_collect_undefined_attribute_names_from_included_templates() {
@@ -114,7 +111,7 @@ internal class FileTemplatesTest : JavaProjectTestCase() {
     val template = addTestTemplate("my_class", "#parse(\"included.java\") \${DEF} \${NAME}")
     val properties = Properties()
     properties["NAME"] = "zzz"
-    assertThat(template.getUnsetAttributes(properties, project)).contains("ABC", "DEF")
+    Assertions.assertThat(template.getUnsetAttributes(properties, project)).contains("ABC", "DEF")
   }
 
   fun testDefaultPackage() {
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java
index 5f64ee5d98c0..1d9f73c22e55 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java
@@ -27,7 +27,7 @@ import java.util.*;
 /**
  * @author Eugene Zhuravlev
  */
-public final class FTManager {
+final class FTManager {
   private static final Logger LOG = Logger.getInstance(FTManager.class);
   private static final String DEFAULT_TEMPLATE_EXTENSION = "ft";
   static final String TEMPLATE_EXTENSION_SUFFIX = "." + DEFAULT_TEMPLATE_EXTENSION;