MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 15:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gradle][IJ-CR-132834] renamed DefaultRepositoriesModel to DefaultRepositoryModels

Browse Source 
GitOrigin-RevId: bd72860ae6ab738a5f6d45a060903fecfd221e7f
This commit is contained in:
Alexander.Glukhov
2024-08-27 13:16:41 +02:00
committed by intellij-monorepo-bot
parent eb41fec33d
commit 9c755066db
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/gradle/java/testSources/service/project/MavenRepositoriesProjectResolverTest.kt
View File

@@ -33,7 +33,7 @@ class MavenRepositoriesProjectResolverTest {
myResolver.nextResolver = mock(GradleProjectResolverExtension::class.java)
myRepoList.clear()
val fakeModel = TestRepositoriesModel(myRepoList)
val fakeModel = TestRepositoryModels(myRepoList)
myProject = mock(IdeaProject::class.java)
myModule = mock(IdeaModule::class.java)
@@ -107,7 +107,7 @@ class MavenRepositoriesProjectResolverTest {
override fun getUrl(): String = myUrl
}
private class TestRepositoriesModel(private val myRepositories: List<MavenRepositoryModel>) : RepositoryModels {
private class TestRepositoryModels(private val myRepositories: List<MavenRepositoryModel>) : RepositoryModels {
override fun getRepositories(): List<MavenRepositoryModel> = myRepositories
}
}

4
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/MavenRepositoriesModelBuilder.java
View File

@@ -10,7 +10,7 @@ import org.jetbrains.plugins.gradle.model.RepositoryModels;
import org.jetbrains.plugins.gradle.tooling.Message;
import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext;
import org.jetbrains.plugins.gradle.tooling.ModelBuilderService;
import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoriesModel;
import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoryModels;
import org.jetbrains.plugins.gradle.tooling.internal.MavenRepositoryModelImpl;
import java.util.ArrayList;
@@ -29,7 +29,7 @@ public class MavenRepositoriesModelBuilder implements ModelBuilderService {
final MavenRepositoryModel model = new MavenRepositoryModelImpl(artifactRepository.getName(), artifactRepository.getUrl().toString());
repositories.add(model);
}
return new DefaultRepositoriesModel(repositories);
return new DefaultRepositoryModels(repositories);
}
@Override

6
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoriesModel.java → plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoryModels.java
View File

@@ -8,11 +8,11 @@ import org.jetbrains.plugins.gradle.model.RepositoryModels;
import java.util.Collections;
import java.util.List;
public class DefaultRepositoriesModel implements RepositoryModels {
public class DefaultRepositoryModels implements RepositoryModels {
private final @NotNull List<MavenRepositoryModel> myRepositories;
public DefaultRepositoriesModel(@NotNull List<MavenRepositoryModel> repositories) {
public DefaultRepositoryModels(@NotNull List<MavenRepositoryModel> repositories) {
myRepositories = Collections.unmodifiableList(repositories);
}
@@ -26,7 +26,7 @@ public class DefaultRepositoriesModel implements RepositoryModels {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DefaultRepositoriesModel model = (DefaultRepositoriesModel)o;
DefaultRepositoryModels model = (DefaultRepositoryModels)o;
if (!myRepositories.equals(model.myRepositories)) return false;

10
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/RepositoriesModelSerializationService.java
View File

@@ -8,7 +8,7 @@ import com.amazon.ion.system.IonReaderBuilder;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.model.MavenRepositoryModel;
import org.jetbrains.plugins.gradle.model.RepositoryModels;
import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoriesModel;
import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoryModels;
import org.jetbrains.plugins.gradle.tooling.internal.MavenRepositoryModelImpl;
import org.jetbrains.plugins.gradle.tooling.util.IntObjectMap;
import org.jetbrains.plugins.gradle.tooling.util.IntObjectMap.SimpleObjectFactory;
@@ -101,12 +101,12 @@ public class RepositoriesModelSerializationService implements SerializationServi
reader.stepIn();
RepositoryModels model =
context.objectMap.computeIfAbsent(readInt(reader, OBJECT_ID_FIELD), new SimpleObjectFactory<DefaultRepositoriesModel>() {
context.objectMap.computeIfAbsent(readInt(reader, OBJECT_ID_FIELD), new SimpleObjectFactory<DefaultRepositoryModels>() {
@Override
public DefaultRepositoriesModel create() {
public DefaultRepositoryModels create() {
List<MavenRepositoryModel> repositories = readRepositories(reader, context);
return new DefaultRepositoriesModel(repositories);
return new DefaultRepositoryModels(repositories);
}
});
reader.stepOut();
@@ -141,7 +141,7 @@ public class RepositoriesModelSerializationService implements SerializationServi
}
private static class ReadContext {
private final IntObjectMap<DefaultRepositoriesModel> objectMap = new IntObjectMap<>();
private final IntObjectMap<DefaultRepositoryModels> objectMap = new IntObjectMap<>();
private final IntObjectMap<MavenRepositoryModel> repositoryMap = new IntObjectMap<>();
}

6
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/serialization/ToolingSerializerTest.kt
View File

@@ -24,7 +24,7 @@ import org.jetbrains.plugins.gradle.model.tests.DefaultExternalTestsModel
import org.jetbrains.plugins.gradle.tooling.internal.AnnotationProcessingModelImpl
import com.intellij.gradle.toolingExtension.impl.model.buildScriptClasspathModel.DefaultGradleBuildScriptClasspathModel
import com.intellij.gradle.toolingExtension.impl.modelSerialization.ToolingSerializer
import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoriesModel
import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoryModels
import org.jetbrains.plugins.gradle.tooling.serialization.internal.adapter.*
import org.jetbrains.plugins.gradle.tooling.util.GradleVersionComparator
import org.junit.Before
@@ -97,8 +97,8 @@ class ToolingSerializerTest {
@Test
@Throws(Exception::class)
fun `repositories model serialization test`() {
doTest(DefaultRepositoriesModel::class.java)
fun `repository models serialization test`() {
doTest(DefaultRepositoryModels::class.java)
}
@Test