Goodbye Singleton!

java/java-impl/src/fileTemplates/Singleton.java.ft

@@ -1,12 +0,0 @@
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
-#parse("File Header.java")
-public class ${NAME}{
-    private static ${NAME} ourInstance = new ${NAME}();
-
-    public static ${NAME} getInstance() {
-        return ourInstance;
-    }
-
-    private ${NAME}() {
-    }
-}

java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/JavaFileTemplatesTest.java

@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.java.ide.fileTemplates;
 
 import com.intellij.ide.IdeBundle;
@@ -34,7 +20,6 @@ public class JavaFileTemplatesTest extends LightCodeInsightFixtureTestCase {
     myFixture.configureByText("foo.java", "");
     AnAction[] children = new CreateFromTemplateGroup().getChildren(new TestActionEvent(new TestDataProvider(getProject())));
     assertTrue(Stream.of(children).noneMatch(action -> isTemplateAction(action, "Class")));
-    assertTrue(Stream.of(children).anyMatch(action -> isTemplateAction(action, "Singleton")));
   }
 
   private static boolean isTemplateAction(AnAction action, String name) {