From 87442acbd1d235f31327693f9e402115cc8ae4c9 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Wed, 10 Sep 2025 18:11:09 +0200 Subject: [PATCH] [groovy] Cleanup: rename java6 package to java8, as it's Java 8 now GitOrigin-RevId: dd1b5d887f295a2060938b40a9612bd3a753b49b --- .../rt/classLoader/util/java8}/fastutil/LICENSE.txt | 0 .../rt/classLoader/util/java8}/BloomFilterBase.java | 4 ++-- .../rt/classLoader/util/java8}/ClassLoadingLocks.java | 4 ++-- .../rt/classLoader/util/java8}/ClassPath.java | 4 ++-- .../rt/classLoader/util/java8}/ClasspathCache.java | 8 ++++---- .../rt/classLoader/util/java8}/FileLoader.java | 4 ++-- .../rt/classLoader/util/java8}/JarLoader.java | 6 +++--- .../rt/classLoader/util/java8}/Loader.java | 4 ++-- .../rt/classLoader/util/java8}/Resource.java | 4 ++-- .../rt/classLoader/util/java8}/SecureJarLoader.java | 4 ++-- .../rt/classLoader/util/java8}/UrlClassLoader.java | 4 ++-- .../rt/classLoader/util/java8}/fastutil/Hash.java | 2 +- .../util/java8}/fastutil/StrippedIntOpenHashSet.java | 2 +- .../util/java8}/fastutil/StrippedLongOpenHashSet.java | 2 +- .../org/jetbrains/groovy/compiler/rt/GroovycRunner.java | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) rename plugins/groovy/rt/classLoader/resources/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/fastutil/LICENSE.txt (100%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/BloomFilterBase.java (95%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/ClassLoadingLocks.java (91%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/ClassPath.java (99%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/ClasspathCache.java (96%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/FileLoader.java (98%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/JarLoader.java (97%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/Loader.java (85%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/Resource.java (81%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/SecureJarLoader.java (95%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/UrlClassLoader.java (99%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/fastutil/Hash.java (97%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/fastutil/StrippedIntOpenHashSet.java (99%) rename plugins/groovy/rt/classLoader/src/com/intellij/{util/lang/java6 => groovy/rt/classLoader/util/java8}/fastutil/StrippedLongOpenHashSet.java (99%) diff --git a/plugins/groovy/rt/classLoader/resources/com/intellij/util/lang/java6/fastutil/LICENSE.txt b/plugins/groovy/rt/classLoader/resources/com/intellij/groovy/rt/classLoader/util/java8/fastutil/LICENSE.txt similarity index 100% rename from plugins/groovy/rt/classLoader/resources/com/intellij/util/lang/java6/fastutil/LICENSE.txt rename to plugins/groovy/rt/classLoader/resources/com/intellij/groovy/rt/classLoader/util/java8/fastutil/LICENSE.txt diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/BloomFilterBase.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/BloomFilterBase.java similarity index 95% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/BloomFilterBase.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/BloomFilterBase.java index cae85d576db7..55f012bfda3f 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/BloomFilterBase.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/BloomFilterBase.java @@ -1,5 +1,5 @@ -// 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.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import com.intellij.openapi.util.io.DataInputOutputUtilRt; import org.jetbrains.annotations.NotNull; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClassLoadingLocks.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClassLoadingLocks.java similarity index 91% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClassLoadingLocks.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClassLoadingLocks.java index 69f3f948bf2d..3011a3e96d78 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClassLoadingLocks.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClassLoadingLocks.java @@ -1,5 +1,5 @@ -// Copyright 2000-2020 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.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import org.jetbrains.annotations.NotNull; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClassPath.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClassPath.java similarity index 99% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClassPath.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClassPath.java index 65347aa6f7c0..390bc168a971 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClassPath.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClassPath.java @@ -1,5 +1,5 @@ -// 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.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import com.intellij.ReviseWhenPortedToJDK; import com.intellij.openapi.diagnostic.LoggerRt; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClasspathCache.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClasspathCache.java similarity index 96% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClasspathCache.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClasspathCache.java index 6a3515fcf4a2..c2213589e8d6 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/ClasspathCache.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/ClasspathCache.java @@ -1,12 +1,12 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; +import com.intellij.groovy.rt.classLoader.util.java8.fastutil.StrippedIntOpenHashSet; +import com.intellij.groovy.rt.classLoader.util.java8.fastutil.StrippedLongOpenHashSet; import com.intellij.openapi.util.io.DataInputOutputUtilRt; import com.intellij.openapi.util.text.StringHash; import com.intellij.util.ArrayUtilRt; import com.intellij.util.containers.IntObjectHashMap; -import com.intellij.util.lang.java6.fastutil.StrippedIntOpenHashSet; -import com.intellij.util.lang.java6.fastutil.StrippedLongOpenHashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/FileLoader.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/FileLoader.java similarity index 98% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/FileLoader.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/FileLoader.java index 21bc2ca8152a..8923e001bd31 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/FileLoader.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/FileLoader.java @@ -1,5 +1,5 @@ -// Copyright 2000-2020 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.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import com.intellij.openapi.util.io.DataInputOutputUtilRt; import com.intellij.openapi.util.io.FileUtilRt; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/JarLoader.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/JarLoader.java similarity index 97% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/JarLoader.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/JarLoader.java index 166bb6e020c4..6ab243f19662 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/JarLoader.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/JarLoader.java @@ -1,9 +1,9 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; +import com.intellij.groovy.rt.classLoader.util.java8.fastutil.StrippedIntOpenHashSet; import com.intellij.openapi.diagnostic.LoggerRt; import com.intellij.openapi.util.io.FileUtilRt; -import com.intellij.util.lang.java6.fastutil.StrippedIntOpenHashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/Loader.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/Loader.java similarity index 85% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/Loader.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/Loader.java index f0d27866946b..f6c92b12747a 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/Loader.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/Loader.java @@ -1,5 +1,5 @@ -// Copyright 2000-2020 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.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/Resource.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/Resource.java similarity index 81% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/Resource.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/Resource.java index 617a06a03c19..83381c379885 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/Resource.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/Resource.java @@ -1,5 +1,5 @@ -// Copyright 2000-2020 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.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/SecureJarLoader.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/SecureJarLoader.java similarity index 95% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/SecureJarLoader.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/SecureJarLoader.java index 096121a210c1..d1b827058b78 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/SecureJarLoader.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/SecureJarLoader.java @@ -1,5 +1,5 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import com.intellij.openapi.util.io.FileUtilRt; import org.jetbrains.annotations.NotNull; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/UrlClassLoader.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/UrlClassLoader.java similarity index 99% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/UrlClassLoader.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/UrlClassLoader.java index 6804d5436809..fc606f949194 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/UrlClassLoader.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/UrlClassLoader.java @@ -1,5 +1,5 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.util.lang.java6; +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.groovy.rt.classLoader.util.java8; import com.intellij.ReviseWhenPortedToJDK; import com.intellij.openapi.diagnostic.LoggerRt; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/Hash.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/Hash.java similarity index 97% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/Hash.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/Hash.java index 2c7b7c7b2b4b..1d430aa49bc2 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/Hash.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/Hash.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.lang.java6.fastutil; +package com.intellij.groovy.rt.classLoader.util.java8.fastutil; final class Hash { static final float DEFAULT_LOAD_FACTOR = .75f; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/StrippedIntOpenHashSet.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/StrippedIntOpenHashSet.java similarity index 99% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/StrippedIntOpenHashSet.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/StrippedIntOpenHashSet.java index 2496e5444dd4..8e9ac285aa53 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/StrippedIntOpenHashSet.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/StrippedIntOpenHashSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.lang.java6.fastutil; +package com.intellij.groovy.rt.classLoader.util.java8.fastutil; import java.util.NoSuchElementException; diff --git a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/StrippedLongOpenHashSet.java b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/StrippedLongOpenHashSet.java similarity index 99% rename from plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/StrippedLongOpenHashSet.java rename to plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/StrippedLongOpenHashSet.java index ef3b60c66523..f9cc2c5a45e7 100644 --- a/plugins/groovy/rt/classLoader/src/com/intellij/util/lang/java6/fastutil/StrippedLongOpenHashSet.java +++ b/plugins/groovy/rt/classLoader/src/com/intellij/groovy/rt/classLoader/util/java8/fastutil/StrippedLongOpenHashSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.lang.java6.fastutil; +package com.intellij.groovy.rt.classLoader.util.java8.fastutil; import java.util.NoSuchElementException; diff --git a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java index 9fffdcf26cb5..479f9c7f8238 100644 --- a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java +++ b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java @@ -108,7 +108,7 @@ public final class GroovycRunner { } try { - Class classLoaderClass = Class.forName("com.intellij.util.lang.java6.UrlClassLoader"); + Class classLoaderClass = Class.forName("com.intellij.groovy.rt.classLoader.util.java8.UrlClassLoader"); return (ClassLoader)classLoaderClass.getMethod("create", List.class).invoke(null, urls); } catch (Throwable t) {