From bc791329dfc4763f52c53b37f3bb0cd528f9b5eb Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 23 Jul 2019 15:46:47 +0300 Subject: [PATCH] [Gradle] cleanup unused data of tooling project model GitOrigin-RevId: a63b8a0268a436cb92e585ce9f2bf169923a8568 --- .../data/ExternalProjectSerializer.java | 7 ---- .../plugins/gradle/model/ExternalPlugin.java | 29 --------------- .../plugins/gradle/model/ExternalProject.java | 18 --------- .../gradle/model/DefaultExternalPlugin.java | 28 -------------- .../gradle/model/DefaultExternalProject.java | 37 ------------------- .../builder/ExternalProjectBuilderImpl.groovy | 14 ------- 6 files changed, 133 deletions(-) delete mode 100644 plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java delete mode 100644 plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java index 312249339a87..61415b63e814 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java @@ -125,13 +125,6 @@ public class ExternalProjectSerializer { } }); - myKryo.register(DefaultExternalPlugin.class, new FieldSerializer(myKryo, DefaultExternalPlugin.class) { - @Override - protected DefaultExternalPlugin create(Kryo kryo, Input input, Class type) { - return new DefaultExternalPlugin(); - } - }); - myKryo.register(DefaultExternalSourceSet.class, new FieldSerializer(myKryo, DefaultExternalSourceSet.class) { @Override protected DefaultExternalSourceSet create(Kryo kryo, Input input, Class type) { diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java deleted file mode 100644 index 7a9c1566ad39..000000000000 --- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalPlugin.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 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. - */ -package org.jetbrains.plugins.gradle.model; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.Serializable; - -/** - * @author Vladislav.Soroka - */ -public interface ExternalPlugin extends Serializable { - @NotNull - String getId(); -} diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java index c93de2e80a5f..cbfdbbf9a873 100644 --- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProject.java @@ -52,24 +52,6 @@ public interface ExternalProject extends Model, Serializable { @NotNull Map getTasks(); - //@NotNull - //Map getConfigurations(); - - //@NotNull - //List getRepositories(); - - @NotNull - Map getPlugins(); - - //@NotNull - //ExternalProjectBuild getBuild(); - - @NotNull - Map getProperties(); - - @Nullable - Object getProperty(String name); - @NotNull Map getSourceSets(); diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java deleted file mode 100644 index 6d5634b190a3..000000000000 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalPlugin.java +++ /dev/null @@ -1,28 +0,0 @@ -// 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 org.jetbrains.plugins.gradle.model; - -import org.jetbrains.annotations.NotNull; - -public final class DefaultExternalPlugin implements ExternalPlugin { - private static final long serialVersionUID = 1L; - - @NotNull - private String id; - - public DefaultExternalPlugin() { - } - - public DefaultExternalPlugin(ExternalPlugin plugin) { - id = plugin.getId(); - } - - @NotNull - @Override - public String getId() { - return id; - } - - public void setId(@NotNull String id) { - this.id = id; - } -} diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java index 03d98807be96..e8ee59c457fe 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java @@ -34,14 +34,10 @@ public final class DefaultExternalProject implements ExternalProject, ExternalPr @NotNull private Map tasks; @NotNull - private Map properties = new HashMap(); - @NotNull private Map sourceSets; @NotNull private String externalSystemId; @NotNull - private Map plugins; - @NotNull private List artifacts; @NotNull private Map> artifactsByConfiguration; @@ -50,7 +46,6 @@ public final class DefaultExternalProject implements ExternalProject, ExternalPr childProjects = new HashMap(0); tasks = new HashMap(0); sourceSets = new HashMap(0); - plugins = new HashMap(0); artifacts = new ArrayList(0); artifactsByConfiguration = new HashMap>(0); } @@ -85,12 +80,6 @@ public final class DefaultExternalProject implements ExternalProject, ExternalPr sourceSets.put(entry.getKey(), new DefaultExternalSourceSet(entry.getValue())); } - Map externalProjectPlugins = externalProject.getPlugins(); - plugins = new HashMap(externalProjectPlugins.size()); - for (Map.Entry entry : externalProjectPlugins.entrySet()) { - this.plugins.put(entry.getKey(), new DefaultExternalPlugin(entry.getValue())); - } - artifacts = new ArrayList(externalProject.getArtifacts()); artifactsByConfiguration = new HashMap>(externalProject.getArtifactsByConfiguration()); } @@ -215,32 +204,6 @@ public final class DefaultExternalProject implements ExternalProject, ExternalPr this.tasks = tasks; } - @NotNull - @Override - public Map getPlugins() { - return plugins; - } - - public void setPlugins(@NotNull Map plugins) { - this.plugins = plugins; - } - - @NotNull - @Override - public Map getProperties() { - return properties; - } - - public void setProperties(@NotNull Map properties) { - this.properties = properties; - } - - @Nullable - @Override - public Object getProperty(String name) { - return properties.get(name); - } - @NotNull @Override public Map getSourceSets() { diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy index 75a02de435c4..b57b00a70e8f 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy @@ -106,9 +106,6 @@ class ExternalProjectBuilderImpl extends AbstractModelBuilderService { defaultExternalProject.sourceSets = getSourceSets(project, isPreview, resolveSourceSetDependencies, sourceSetFinder) defaultExternalProject.tasks = getTasks(project, tasksFactory) - defaultExternalProject.plugins = getPlugins(project) - //defaultExternalProject.setProperties(project.getProperties()) - addArtifactsData(project, defaultExternalProject) final Map childProjects = new TreeMap() @@ -154,17 +151,6 @@ class ExternalProjectBuilderImpl extends AbstractModelBuilderService { externalProject.setArtifactsByConfiguration(artifactsByConfiguration) } - static Map getPlugins(Project project) { - def result = [:] as Map - project.convention.plugins.each { key, value -> - DefaultExternalPlugin externalPlugin = new DefaultExternalPlugin() - externalPlugin.id = key - result.put(key, externalPlugin) - } - - result - } - static Map getTasks(Project project, TasksFactory tasksFactory) { def result = [:] as Map