diff --git a/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/LibraryMavenCoordinateEntityModifications.kt b/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/LibraryMavenCoordinateEntityModifications.kt
index 5189502258be..a9261bfce329 100644
--- a/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/LibraryMavenCoordinateEntityModifications.kt
+++ b/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/LibraryMavenCoordinateEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.impl.dependencySubstitution
+import com.intellij.java.impl.dependencySubstitution.impl.LibraryMavenCoordinateEntityImpl
import com.intellij.java.library.MavenCoordinates
import com.intellij.platform.workspace.jps.entities.LibraryEntityBuilder
import com.intellij.platform.workspace.storage.EntitySource
@@ -22,6 +23,7 @@ public interface LibraryMavenCoordinateEntityBuilder : WorkspaceEntityBuilder
() {
override val entityClass: Class get() = LibraryMavenCoordinateEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = LibraryMavenCoordinateEntityImpl.Builder::class.java
operator fun invoke(
coordinates: MavenCoordinates,
entitySource: EntitySource,
diff --git a/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/ModuleMavenCoordinateEntityModifications.kt b/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/ModuleMavenCoordinateEntityModifications.kt
index 2ff4f91809c9..cafe275a2189 100644
--- a/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/ModuleMavenCoordinateEntityModifications.kt
+++ b/java/java-impl/gen/com/intellij/java/impl/dependencySubstitution/ModuleMavenCoordinateEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.impl.dependencySubstitution
+import com.intellij.java.impl.dependencySubstitution.impl.ModuleMavenCoordinateEntityImpl
import com.intellij.java.library.MavenCoordinates
import com.intellij.platform.workspace.jps.entities.ModuleEntityBuilder
import com.intellij.platform.workspace.storage.EntitySource
@@ -22,6 +23,7 @@ public interface ModuleMavenCoordinateEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ModuleMavenCoordinateEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ModuleMavenCoordinateEntityImpl.Builder::class.java
operator fun invoke(
coordinates: MavenCoordinates,
entitySource: EntitySource,
diff --git a/platform/external-system-api/gen/com/intellij/openapi/externalSystem/settings/workspaceModel/ExternalProjectsBuildClasspathEntityModifications.kt b/platform/external-system-api/gen/com/intellij/openapi/externalSystem/settings/workspaceModel/ExternalProjectsBuildClasspathEntityModifications.kt
index d13644685c7c..b409fa50417d 100644
--- a/platform/external-system-api/gen/com/intellij/openapi/externalSystem/settings/workspaceModel/ExternalProjectsBuildClasspathEntityModifications.kt
+++ b/platform/external-system-api/gen/com/intellij/openapi/externalSystem/settings/workspaceModel/ExternalProjectsBuildClasspathEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.openapi.externalSystem.settings.workspaceModel
+import com.intellij.openapi.externalSystem.settings.workspaceModel.impl.ExternalProjectsBuildClasspathEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -19,6 +20,7 @@ interface ExternalProjectsBuildClasspathEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ExternalProjectsBuildClasspathEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ExternalProjectsBuildClasspathEntityImpl.Builder::class.java
operator fun invoke(
projectsBuildClasspath: Map,
entitySource: EntitySource,
diff --git a/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/dependencySubstitution/DependencySubstitutionEntityModifications.kt b/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/dependencySubstitution/DependencySubstitutionEntityModifications.kt
index 0d0875040bb2..87dd05e805cb 100644
--- a/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/dependencySubstitution/DependencySubstitutionEntityModifications.kt
+++ b/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/dependencySubstitution/DependencySubstitutionEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.externalSystem.impl.dependencySubstitution
+import com.intellij.platform.externalSystem.impl.dependencySubstitution.impl.DependencySubstitutionEntityImpl
import com.intellij.platform.workspace.jps.entities.DependencyScope
import com.intellij.platform.workspace.jps.entities.LibraryId
import com.intellij.platform.workspace.jps.entities.ModuleEntityBuilder
@@ -27,6 +28,7 @@ interface DependencySubstitutionEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = DependencySubstitutionEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = DependencySubstitutionEntityImpl.Builder::class.java
operator fun invoke(
library: LibraryId,
module: ModuleId,
diff --git a/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/workspaceModel/ExternalProjectEntityModifications.kt b/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/workspaceModel/ExternalProjectEntityModifications.kt
index a94f93662b1a..b9c616f7e8e3 100644
--- a/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/workspaceModel/ExternalProjectEntityModifications.kt
+++ b/platform/external-system-impl/gen/com/intellij/platform/externalSystem/impl/workspaceModel/ExternalProjectEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.externalSystem.impl.workspaceModel
+import com.intellij.platform.externalSystem.impl.workspaceModel.impl.ExternalProjectEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -19,6 +20,7 @@ interface ExternalProjectEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ExternalProjectEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ExternalProjectEntityImpl.Builder::class.java
operator fun invoke(
externalProjectPath: String,
entitySource: EntitySource,
diff --git a/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityModifications.kt b/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityModifications.kt
index 1bc4c9e6106b..cbb02c070471 100644
--- a/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityModifications.kt
+++ b/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.ide.scratch.workspace
+import com.intellij.ide.scratch.workspace.impl.ScratchRootsEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -19,6 +20,7 @@ interface ScratchRootsEntityBuilder : WorkspaceEntityBuilder
internal object ScratchRootsEntityType : EntityType() {
override val entityClass: Class get() = ScratchRootsEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ScratchRootsEntityImpl.Builder::class.java
operator fun invoke(
roots: List,
entitySource: EntitySource,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ChildTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ChildTestEntityModifications.kt
index 57d93ed3bd6b..68634f9d9030 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ChildTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ChildTestEntityModifications.kt
@@ -8,6 +8,7 @@ import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
+import com.intellij.util.indexing.testEntities.impl.ChildTestEntityImpl
@GeneratedCodeApiVersion(3)
interface ChildTestEntityBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface ChildTestEntityBuilder : WorkspaceEntityBuilder {
internal object ChildTestEntityType : EntityType() {
override val entityClass: Class get() = ChildTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ChildTestEntityImpl.Builder::class.java
operator fun invoke(
customChildProperty: String,
entitySource: EntitySource,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ExcludedTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ExcludedTestEntityModifications.kt
index c7fa420be052..a8605bf95a95 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ExcludedTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ExcludedTestEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.util.indexing.testEntities.impl.ExcludedTestEntityImpl
@GeneratedCodeApiVersion(3)
interface ExcludedTestEntityBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface ExcludedTestEntityBuilder : WorkspaceEntityBuilder
internal object ExcludedTestEntityType : EntityType() {
override val entityClass: Class get() = ExcludedTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ExcludedTestEntityImpl.Builder::class.java
operator fun invoke(
root: VirtualFileUrl,
entitySource: EntitySource,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntity2Modifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntity2Modifications.kt
index 575c406fe20a..7122758d0396 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntity2Modifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntity2Modifications.kt
@@ -10,6 +10,7 @@ import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.impl.containers.toMutableWorkspaceList
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.util.indexing.testEntities.impl.IndexingTestEntity2Impl
@GeneratedCodeApiVersion(3)
interface IndexingTestEntity2Builder : WorkspaceEntityBuilder {
@@ -20,6 +21,7 @@ interface IndexingTestEntity2Builder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = IndexingTestEntity2::class.java
+ override val entityImplBuilderClass: Class<*> get() = IndexingTestEntity2Impl.Builder::class.java
operator fun invoke(
roots: List,
excludedRoots: List,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntityModifications.kt
index 9f5623820c9e..b7dd9e6bb6c4 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/IndexingTestEntityModifications.kt
@@ -10,6 +10,7 @@ import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.impl.containers.toMutableWorkspaceList
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.util.indexing.testEntities.impl.IndexingTestEntityImpl
@GeneratedCodeApiVersion(3)
interface IndexingTestEntityBuilder : WorkspaceEntityBuilder {
@@ -20,6 +21,7 @@ interface IndexingTestEntityBuilder : WorkspaceEntityBuilder
internal object IndexingTestEntityType : EntityType() {
override val entityClass: Class get() = IndexingTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = IndexingTestEntityImpl.Builder::class.java
operator fun invoke(
roots: List,
excludedRoots: List,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonIndexableTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonIndexableTestEntityModifications.kt
index 00d3f690f180..5231bf967970 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonIndexableTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonIndexableTestEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.util.indexing.testEntities.impl.NonIndexableTestEntityImpl
@GeneratedCodeApiVersion(3)
interface NonIndexableTestEntityBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface NonIndexableTestEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = NonIndexableTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = NonIndexableTestEntityImpl.Builder::class.java
operator fun invoke(
root: VirtualFileUrl,
entitySource: EntitySource,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonRecursiveTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonRecursiveTestEntityModifications.kt
index 933394b9d408..dba68dbc4e91 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonRecursiveTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/NonRecursiveTestEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.util.indexing.testEntities.impl.NonRecursiveTestEntityImpl
@GeneratedCodeApiVersion(3)
interface NonRecursiveTestEntityBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface NonRecursiveTestEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = NonRecursiveTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = NonRecursiveTestEntityImpl.Builder::class.java
operator fun invoke(
root: VirtualFileUrl,
entitySource: EntitySource,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/OneMoreWithReferenceTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/OneMoreWithReferenceTestEntityModifications.kt
index b94c518a8a40..47fdbd08c920 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/OneMoreWithReferenceTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/OneMoreWithReferenceTestEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.impl.containers.toMutableWorkspaceList
+import com.intellij.util.indexing.testEntities.impl.OneMoreWithReferenceTestEntityImpl
@GeneratedCodeApiVersion(3)
interface OneMoreWithReferenceTestEntityBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface OneMoreWithReferenceTestEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = OneMoreWithReferenceTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = OneMoreWithReferenceTestEntityImpl.Builder::class.java
operator fun invoke(
references: List,
entitySource: EntitySource,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ParentTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ParentTestEntityModifications.kt
index 3a0e97afe4eb..9c98e72838ad 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ParentTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ParentTestEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.util.indexing.testEntities.impl.ParentTestEntityImpl
@GeneratedCodeApiVersion(3)
interface ParentTestEntityBuilder : WorkspaceEntityBuilder {
@@ -21,6 +22,7 @@ interface ParentTestEntityBuilder : WorkspaceEntityBuilder {
internal object ParentTestEntityType : EntityType() {
override val entityClass: Class get() = ParentTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ParentTestEntityImpl.Builder::class.java
operator fun invoke(
customParentProperty: String,
parentEntityRoot: VirtualFileUrl,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ReferredTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ReferredTestEntityModifications.kt
index 3f5090e05276..2d0fa0f72a93 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ReferredTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/ReferredTestEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.util.indexing.testEntities.impl.ReferredTestEntityImpl
@GeneratedCodeApiVersion(3)
interface ReferredTestEntityBuilder : WorkspaceEntityBuilder {
@@ -19,6 +20,7 @@ interface ReferredTestEntityBuilder : WorkspaceEntityBuilder
internal object ReferredTestEntityType : EntityType() {
override val entityClass: Class get() = ReferredTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ReferredTestEntityImpl.Builder::class.java
operator fun invoke(
name: String,
file: VirtualFileUrl,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/SiblingEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/SiblingEntityModifications.kt
index 7eae0d3b1977..564a69a14b28 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/SiblingEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/SiblingEntityModifications.kt
@@ -8,6 +8,7 @@ import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
+import com.intellij.util.indexing.testEntities.impl.SiblingEntityImpl
@GeneratedCodeApiVersion(3)
interface SiblingEntityBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface SiblingEntityBuilder : WorkspaceEntityBuilder {
internal object SiblingEntityType : EntityType() {
override val entityClass: Class get() = SiblingEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = SiblingEntityImpl.Builder::class.java
operator fun invoke(
customSiblingProperty: String,
entitySource: EntitySource,
diff --git a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/WithReferenceTestEntityModifications.kt b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/WithReferenceTestEntityModifications.kt
index a0acffe6d9f1..6faea9502980 100644
--- a/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/WithReferenceTestEntityModifications.kt
+++ b/platform/lang-impl/testEntities/testGen/com/intellij/util/indexing/testEntities/WithReferenceTestEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.impl.containers.toMutableWorkspaceList
+import com.intellij.util.indexing.testEntities.impl.WithReferenceTestEntityImpl
@GeneratedCodeApiVersion(3)
interface WithReferenceTestEntityBuilder : WorkspaceEntityBuilder {
@@ -19,6 +20,7 @@ interface WithReferenceTestEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = WithReferenceTestEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = WithReferenceTestEntityImpl.Builder::class.java
operator fun invoke(
name: String,
references: List,
diff --git a/platform/projectModel-api/gen/com/intellij/workspaceModel/ide/ProjectRootEntityModifications.kt b/platform/projectModel-api/gen/com/intellij/workspaceModel/ide/ProjectRootEntityModifications.kt
index e87bbe367ebd..0327b93bc7be 100644
--- a/platform/projectModel-api/gen/com/intellij/workspaceModel/ide/ProjectRootEntityModifications.kt
+++ b/platform/projectModel-api/gen/com/intellij/workspaceModel/ide/ProjectRootEntityModifications.kt
@@ -9,6 +9,7 @@ import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
+import com.intellij.workspaceModel.ide.impl.ProjectRootEntityImpl
import org.jetbrains.annotations.ApiStatus.Internal
@Internal
@@ -20,6 +21,7 @@ interface ProjectRootEntityBuilder : WorkspaceEntityBuilder {
internal object ProjectRootEntityType : EntityType() {
override val entityClass: Class get() = ProjectRootEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ProjectRootEntityImpl.Builder::class.java
operator fun invoke(
root: VirtualFileUrl,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/api-dump.txt b/platform/workspace/jps/api-dump.txt
index 3c02edb265e6..7dc24ba40915 100644
--- a/platform/workspace/jps/api-dump.txt
+++ b/platform/workspace/jps/api-dump.txt
@@ -220,20 +220,12 @@ f:com.intellij.java.workspace.entities.ArtifactsOrderEntityModifications
- sf:modifyArtifactsOrderEntity(com.intellij.platform.workspace.storage.MutableEntityStorage,com.intellij.java.workspace.entities.ArtifactsOrderEntity,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.ArtifactsOrderEntity
com.intellij.java.workspace.entities.CompositePackagingElementEntity
- com.intellij.java.workspace.entities.PackagingElementEntity
-- sf:Companion:com.intellij.java.workspace.entities.CompositePackagingElementEntity$Companion
-- s:create(com.intellij.platform.workspace.storage.EntitySource):com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder
-- s:create(com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder
- a:getArtifact():com.intellij.java.workspace.entities.ArtifactEntity
- a:getChildren():java.util.List
com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder
- com.intellij.java.workspace.entities.CompositePackagingElementEntityBuilder
- getArtifact():com.intellij.java.workspace.entities.ArtifactEntity$Builder
- setArtifact(com.intellij.java.workspace.entities.ArtifactEntity$Builder):V
-f:com.intellij.java.workspace.entities.CompositePackagingElementEntity$Companion
-- com.intellij.platform.workspace.storage.EntityType
-- f:create(com.intellij.platform.workspace.storage.EntitySource):com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder
-- f:create(com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder
-- bs:create$default(com.intellij.java.workspace.entities.CompositePackagingElementEntity$Companion,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder
com.intellij.java.workspace.entities.CompositePackagingElementEntityBuilder
- com.intellij.java.workspace.entities.PackagingElementEntity$Builder
- com.intellij.platform.workspace.storage.WorkspaceEntity$Builder
@@ -396,17 +388,9 @@ f:com.intellij.java.workspace.entities.FileCopyPackagingElementEntityModificatio
- sf:modifyFileCopyPackagingElementEntity(com.intellij.platform.workspace.storage.MutableEntityStorage,com.intellij.java.workspace.entities.FileCopyPackagingElementEntity,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.FileCopyPackagingElementEntity
com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity
- com.intellij.java.workspace.entities.PackagingElementEntity
-- sf:Companion:com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Companion
-- s:create(com.intellij.platform.workspace.storage.url.VirtualFileUrl,com.intellij.platform.workspace.storage.EntitySource):com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Builder
-- s:create(com.intellij.platform.workspace.storage.url.VirtualFileUrl,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Builder
- a:getFilePath():com.intellij.platform.workspace.storage.url.VirtualFileUrl
com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Builder
- com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntityBuilder
-f:com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Companion
-- com.intellij.platform.workspace.storage.EntityType
-- f:create(com.intellij.platform.workspace.storage.url.VirtualFileUrl,com.intellij.platform.workspace.storage.EntitySource):com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Builder
-- f:create(com.intellij.platform.workspace.storage.url.VirtualFileUrl,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Builder
-- bs:create$default(com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Companion,com.intellij.platform.workspace.storage.url.VirtualFileUrl,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity$Builder
com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntityBuilder
- com.intellij.java.workspace.entities.PackagingElementEntity$Builder
- com.intellij.platform.workspace.storage.WorkspaceEntity$Builder
@@ -701,19 +685,11 @@ f:com.intellij.java.workspace.entities.ModuleTestOutputPackagingElementEntityMod
- sf:modifyModuleTestOutputPackagingElementEntity(com.intellij.platform.workspace.storage.MutableEntityStorage,com.intellij.java.workspace.entities.ModuleTestOutputPackagingElementEntity,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.ModuleTestOutputPackagingElementEntity
com.intellij.java.workspace.entities.PackagingElementEntity
- com.intellij.platform.workspace.storage.WorkspaceEntity
-- sf:Companion:com.intellij.java.workspace.entities.PackagingElementEntity$Companion
-- s:create(com.intellij.platform.workspace.storage.EntitySource):com.intellij.java.workspace.entities.PackagingElementEntity$Builder
-- s:create(com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.PackagingElementEntity$Builder
- a:getParentEntity():com.intellij.java.workspace.entities.CompositePackagingElementEntity
com.intellij.java.workspace.entities.PackagingElementEntity$Builder
- com.intellij.java.workspace.entities.PackagingElementEntityBuilder
- getParentEntity():com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder
- setParentEntity(com.intellij.java.workspace.entities.CompositePackagingElementEntity$Builder):V
-f:com.intellij.java.workspace.entities.PackagingElementEntity$Companion
-- com.intellij.platform.workspace.storage.EntityType
-- f:create(com.intellij.platform.workspace.storage.EntitySource):com.intellij.java.workspace.entities.PackagingElementEntity$Builder
-- f:create(com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.java.workspace.entities.PackagingElementEntity$Builder
-- bs:create$default(com.intellij.java.workspace.entities.PackagingElementEntity$Companion,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.java.workspace.entities.PackagingElementEntity$Builder
com.intellij.java.workspace.entities.PackagingElementEntityBuilder
- com.intellij.platform.workspace.storage.WorkspaceEntity$Builder
- a:getEntitySource():com.intellij.platform.workspace.storage.EntitySource
@@ -1190,18 +1166,10 @@ f:com.intellij.platform.workspace.jps.entities.ModuleId
- hashCode():I
com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity
- com.intellij.platform.workspace.storage.WorkspaceEntityWithSymbolicId
-- sf:Companion:com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Companion
-- s:create(com.intellij.platform.workspace.jps.entities.ModuleId,java.lang.String,com.intellij.platform.workspace.storage.EntitySource):com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Builder
-- s:create(com.intellij.platform.workspace.jps.entities.ModuleId,java.lang.String,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Builder
- a:getModuleId():com.intellij.platform.workspace.jps.entities.ModuleId
- a:getName():java.lang.String
com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Builder
- com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntityBuilder
-f:com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Companion
-- com.intellij.platform.workspace.storage.EntityType
-- f:create(com.intellij.platform.workspace.jps.entities.ModuleId,java.lang.String,com.intellij.platform.workspace.storage.EntitySource):com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Builder
-- f:create(com.intellij.platform.workspace.jps.entities.ModuleId,java.lang.String,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1):com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Builder
-- bs:create$default(com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Companion,com.intellij.platform.workspace.jps.entities.ModuleId,java.lang.String,com.intellij.platform.workspace.storage.EntitySource,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntity$Builder
com.intellij.platform.workspace.jps.entities.ModuleSettingsFacetBridgeEntityBuilder
- com.intellij.platform.workspace.storage.WorkspaceEntity$Builder
- a:getEntitySource():com.intellij.platform.workspace.storage.EntitySource
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityModifications.kt
index c07f99db5d76..bdd617568305 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ArchivePackagingElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -21,6 +22,7 @@ interface ArchivePackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ArchivePackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ArchivePackagingElementEntityImpl.Builder::class.java
operator fun invoke(
fileName: String,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityModifications.kt
index 83ed7f9b67b1..edde5534f729 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ArtifactEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -24,6 +25,7 @@ interface ArtifactEntityBuilder : WorkspaceEntityBuilder {
internal object ArtifactEntityType : EntityType() {
override val entityClass: Class get() = ArtifactEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ArtifactEntityImpl.Builder::class.java
operator fun invoke(
name: String,
artifactType: String,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityModifications.kt
index 631c3bd9e57b..906c7985fb21 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ArtifactOutputPackagingElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -22,6 +23,7 @@ interface ArtifactOutputPackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ArtifactOutputPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ArtifactOutputPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (ArtifactOutputPackagingElementEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityModifications.kt
index 8f22e9f355f3..b01f703bf2e4 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ArtifactPropertiesEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -19,6 +20,7 @@ interface ArtifactPropertiesEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ArtifactPropertiesEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ArtifactPropertiesEntityImpl.Builder::class.java
operator fun invoke(
providerType: String,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityModifications.kt
index f0c5dc2ecdd1..00510d97414c 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ArtifactRootElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -20,6 +21,7 @@ interface ArtifactRootElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ArtifactRootElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ArtifactRootElementEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (ArtifactRootElementEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityModifications.kt
index 6e95315c9695..f27e3aaf6bbf 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ArtifactsOrderEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -18,6 +19,7 @@ interface ArtifactsOrderEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ArtifactsOrderEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ArtifactsOrderEntityImpl.Builder::class.java
operator fun invoke(
orderOfArtifacts: List,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CompositePackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CompositePackagingElementEntityModifications.kt
index a9e6dee31888..3d4eb512b586 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CompositePackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CompositePackagingElementEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.java.workspace.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
@@ -16,28 +15,3 @@ interface CompositePackagingElementEntityBuilder>
}
-
-internal object CompositePackagingElementEntityType :
- EntityType>() {
- override val entityClass: Class get() = CompositePackagingElementEntity::class.java
- operator fun invoke(
- entitySource: EntitySource,
- init: (CompositePackagingElementEntityBuilder.() -> Unit)? = null,
- ): CompositePackagingElementEntityBuilder {
- val builder = builder()
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-
- @Deprecated(message = "Use new API instead")
- fun compatibilityInvoke(
- entitySource: EntitySource,
- init: (CompositePackagingElementEntity.Builder.() -> Unit)? = null,
- ): CompositePackagingElementEntity.Builder {
- val builder = builder() as CompositePackagingElementEntity.Builder
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-}
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityModifications.kt
index 5318e045bc2d..78df6a85f4c1 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.CustomPackagingElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -22,6 +23,7 @@ interface CustomPackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = CustomPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = CustomPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
typeId: String,
propertiesXmlTag: String,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityModifications.kt
index 29bf8ebb8fbc..2a67fdd33a05 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.DirectoryCopyPackagingElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -21,6 +22,7 @@ interface DirectoryCopyPackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = DirectoryCopyPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = DirectoryCopyPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
filePath: VirtualFileUrl,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityModifications.kt
index b443ad1d7348..e19cd25bff84 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.DirectoryPackagingElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -22,6 +23,7 @@ interface DirectoryPackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = DirectoryPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = DirectoryPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
directoryName: String,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityModifications.kt
index 2b7445b00a49..e693c538b98a 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ExtractedDirectoryPackagingElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -22,6 +23,7 @@ interface ExtractedDirectoryPackagingElementEntityBuilder : WorkspaceEntityBuild
internal object ExtractedDirectoryPackagingElementEntityType :
EntityType() {
override val entityClass: Class get() = ExtractedDirectoryPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ExtractedDirectoryPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
filePath: VirtualFileUrl,
pathInArchive: String,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityModifications.kt
index fed8e0fec7ef..327d30481d90 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.FileCopyPackagingElementEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -21,6 +22,7 @@ interface FileCopyPackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = FileCopyPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = FileCopyPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
filePath: VirtualFileUrl,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileOrDirectoryPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileOrDirectoryPackagingElementEntityModifications.kt
index 24d138287308..5061180bf341 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileOrDirectoryPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileOrDirectoryPackagingElementEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.java.workspace.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
@@ -16,32 +15,3 @@ interface FileOrDirectoryPackagingElementEntityBuilder?
var filePath: VirtualFileUrl
}
-
-internal object FileOrDirectoryPackagingElementEntityType :
- EntityType>() {
- override val entityClass: Class get() = FileOrDirectoryPackagingElementEntity::class.java
- operator fun invoke(
- filePath: VirtualFileUrl,
- entitySource: EntitySource,
- init: (FileOrDirectoryPackagingElementEntityBuilder.() -> Unit)? = null,
- ): FileOrDirectoryPackagingElementEntityBuilder {
- val builder = builder()
- builder.filePath = filePath
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-
- @Deprecated(message = "Use new API instead")
- fun compatibilityInvoke(
- filePath: VirtualFileUrl,
- entitySource: EntitySource,
- init: (FileOrDirectoryPackagingElementEntity.Builder.() -> Unit)? = null,
- ): FileOrDirectoryPackagingElementEntity.Builder {
- val builder = builder() as FileOrDirectoryPackagingElementEntity.Builder
- builder.filePath = filePath
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-}
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityModifications.kt
index 6ef3836df218..ae5980065624 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.JavaModuleSettingsEntityImpl
import com.intellij.platform.workspace.jps.entities.ModuleEntityBuilder
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -26,6 +27,7 @@ interface JavaModuleSettingsEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = JavaModuleSettingsEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = JavaModuleSettingsEntityImpl.Builder::class.java
operator fun invoke(
inheritedCompilerOutput: Boolean,
excludeOutput: Boolean,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaProjectSettingsEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaProjectSettingsEntityModifications.kt
index a0d69a456281..81703262e844 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaProjectSettingsEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaProjectSettingsEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.JavaProjectSettingsEntityImpl
import com.intellij.platform.workspace.jps.entities.ProjectSettingsEntityBuilder
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -23,6 +24,7 @@ interface JavaProjectSettingsEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = JavaProjectSettingsEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = JavaProjectSettingsEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (JavaProjectSettingsEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityModifications.kt
index d0eb3ad2b58d..eebf0bcf8a89 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.JavaResourceRootPropertiesEntityImpl
import com.intellij.platform.workspace.jps.entities.SourceRootEntityBuilder
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -22,6 +23,7 @@ interface JavaResourceRootPropertiesEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = JavaResourceRootPropertiesEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = JavaResourceRootPropertiesEntityImpl.Builder::class.java
operator fun invoke(
generated: Boolean,
relativeOutputPath: String,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityModifications.kt
index c1860bec0917..ed8b1de5b373 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.JavaSourceRootPropertiesEntityImpl
import com.intellij.platform.workspace.jps.entities.SourceRootEntityBuilder
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -21,6 +22,7 @@ interface JavaSourceRootPropertiesEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = JavaSourceRootPropertiesEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = JavaSourceRootPropertiesEntityImpl.Builder::class.java
operator fun invoke(
generated: Boolean,
packagePrefix: String,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityModifications.kt
index e4aee66cd18f..63e6a7870d96 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.LibraryFilesPackagingElementEntityImpl
import com.intellij.platform.workspace.jps.entities.LibraryId
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -21,6 +22,7 @@ interface LibraryFilesPackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = LibraryFilesPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = LibraryFilesPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (LibraryFilesPackagingElementEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityModifications.kt
index b5aa8463548f..82fcd187661f 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ModuleOutputPackagingElementEntityImpl
import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -21,6 +22,7 @@ interface ModuleOutputPackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ModuleOutputPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ModuleOutputPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (ModuleOutputPackagingElementEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityModifications.kt
index c099e3fe5610..f0eaa7568704 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ModuleSourcePackagingElementEntityImpl
import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -21,6 +22,7 @@ interface ModuleSourcePackagingElementEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ModuleSourcePackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ModuleSourcePackagingElementEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (ModuleSourcePackagingElementEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityModifications.kt
index 20164cd7ad4b..a660ef736170 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.java.workspace.entities
+import com.intellij.java.workspace.entities.impl.ModuleTestOutputPackagingElementEntityImpl
import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
@@ -21,6 +22,7 @@ interface ModuleTestOutputPackagingElementEntityBuilder : WorkspaceEntityBuilder
internal object ModuleTestOutputPackagingElementEntityType :
EntityType() {
override val entityClass: Class get() = ModuleTestOutputPackagingElementEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ModuleTestOutputPackagingElementEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (ModuleTestOutputPackagingElementEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/PackagingElementEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/PackagingElementEntityModifications.kt
index f34de157451d..e2a12f5005d6 100644
--- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/PackagingElementEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/PackagingElementEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.java.workspace.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
@@ -13,27 +12,3 @@ interface PackagingElementEntityBuilder : WorkspaceE
override var entitySource: EntitySource
var parentEntity: CompositePackagingElementEntityBuilder?
}
-
-internal object PackagingElementEntityType : EntityType>() {
- override val entityClass: Class get() = PackagingElementEntity::class.java
- operator fun invoke(
- entitySource: EntitySource,
- init: (PackagingElementEntityBuilder.() -> Unit)? = null,
- ): PackagingElementEntityBuilder {
- val builder = builder()
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-
- @Deprecated(message = "Use new API instead")
- fun compatibilityInvoke(
- entitySource: EntitySource,
- init: (PackagingElementEntity.Builder.() -> Unit)? = null,
- ): PackagingElementEntity.Builder {
- val builder = builder() as PackagingElementEntity.Builder
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-}
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityModifications.kt
index b0adeffd93d7..ff6253978c27 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ContentRootEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -25,6 +26,7 @@ interface ContentRootEntityBuilder : WorkspaceEntityBuilder {
internal object ContentRootEntityType : EntityType() {
override val entityClass: Class get() = ContentRootEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ContentRootEntityImpl.Builder::class.java
operator fun invoke(
url: VirtualFileUrl,
excludedPatterns: List,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomImlComponentEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomImlComponentEntityModifications.kt
index 55bda07c0428..fd80dc1af855 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomImlComponentEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomImlComponentEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.CustomImlComponentEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -20,6 +21,7 @@ interface CustomImlComponentEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = CustomImlComponentEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = CustomImlComponentEntityImpl.Builder::class.java
operator fun invoke(
components: Map,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityModifications.kt
index af3107bc98c8..54f72e0b49b8 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.CustomSourceRootPropertiesEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -21,6 +22,7 @@ interface CustomSourceRootPropertiesEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = CustomSourceRootPropertiesEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = CustomSourceRootPropertiesEntityImpl.Builder::class.java
operator fun invoke(
propertiesXmlTag: String,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityModifications.kt
index faf1fbb816cd..663482eaafb9 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ExcludeUrlEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -20,6 +21,7 @@ interface ExcludeUrlEntityBuilder : WorkspaceEntityBuilder {
internal object ExcludeUrlEntityType : EntityType() {
override val entityClass: Class get() = ExcludeUrlEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ExcludeUrlEntityImpl.Builder::class.java
operator fun invoke(
url: VirtualFileUrl,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityModifications.kt
index 715a9ef3d75a..64ad30f840b6 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ExcludeUrlOrderEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -22,6 +23,7 @@ interface ExcludeUrlOrderEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ExcludeUrlOrderEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ExcludeUrlOrderEntityImpl.Builder::class.java
operator fun invoke(
order: List,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityModifications.kt
index d93a99435f34..b55e911b2304 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ExternalSystemModuleOptionsEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -27,6 +28,7 @@ interface ExternalSystemModuleOptionsEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ExternalSystemModuleOptionsEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ExternalSystemModuleOptionsEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (ExternalSystemModuleOptionsEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityModifications.kt
index d8e10ea589ba..f6cc8fdb9223 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.FacetEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -23,6 +24,7 @@ interface FacetEntityBuilder : WorkspaceEntityBuilder, ModuleSettin
internal object FacetEntityType : EntityType() {
override val entityClass: Class get() = FacetEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = FacetEntityImpl.Builder::class.java
operator fun invoke(
moduleId: ModuleId,
name: String,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityModifications.kt
index 2d81aa267e7f..4c50f8c7438b 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.FacetsOrderEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -21,6 +22,7 @@ interface FacetsOrderEntityBuilder : WorkspaceEntityBuilder {
internal object FacetsOrderEntityType : EntityType() {
override val entityClass: Class get() = FacetsOrderEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = FacetsOrderEntityImpl.Builder::class.java
operator fun invoke(
orderOfFacets: List,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityModifications.kt
index 4c035e912e36..75fa826709bc 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.LibraryEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -24,6 +25,7 @@ interface LibraryEntityBuilder : WorkspaceEntityBuilder {
internal object LibraryEntityType : EntityType() {
override val entityClass: Class get() = LibraryEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = LibraryEntityImpl.Builder::class.java
operator fun invoke(
name: String,
tableId: LibraryTableId,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityModifications.kt
index 92a0c71f0397..96be26c94d90 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.LibraryPropertiesEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -20,6 +21,7 @@ interface LibraryPropertiesEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = LibraryPropertiesEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = LibraryPropertiesEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (LibraryPropertiesEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityModifications.kt
index 5a5416ddc820..c2a3d33af1b8 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ModuleCustomImlDataEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -21,6 +22,7 @@ interface ModuleCustomImlDataEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ModuleCustomImlDataEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ModuleCustomImlDataEntityImpl.Builder::class.java
operator fun invoke(
customModuleOptions: Map,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityModifications.kt
index c53b814f7ce2..52619d6fbdb5 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ModuleEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -24,6 +25,7 @@ interface ModuleEntityBuilder : WorkspaceEntityBuilder {
internal object ModuleEntityType : EntityType() {
override val entityClass: Class get() = ModuleEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ModuleEntityImpl.Builder::class.java
operator fun invoke(
name: String,
dependencies: List,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityModifications.kt
index 57cc5b6e21ca..363e64193486 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ModuleGroupPathEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -21,6 +22,7 @@ interface ModuleGroupPathEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ModuleGroupPathEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ModuleGroupPathEntityImpl.Builder::class.java
operator fun invoke(
path: List,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleSettingsFacetBridgeEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleSettingsFacetBridgeEntityModifications.kt
index 73c26b374abc..fb289e368c28 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleSettingsFacetBridgeEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleSettingsFacetBridgeEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.platform.workspace.jps.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
@@ -14,36 +13,3 @@ interface ModuleSettingsFacetBridgeEntityBuilder>() {
- override val entityClass: Class get() = ModuleSettingsFacetBridgeEntity::class.java
- operator fun invoke(
- moduleId: ModuleId,
- name: String,
- entitySource: EntitySource,
- init: (ModuleSettingsFacetBridgeEntityBuilder.() -> Unit)? = null,
- ): ModuleSettingsFacetBridgeEntityBuilder {
- val builder = builder()
- builder.moduleId = moduleId
- builder.name = name
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-
- @Deprecated(message = "Use new API instead")
- fun compatibilityInvoke(
- moduleId: ModuleId,
- name: String,
- entitySource: EntitySource,
- init: (ModuleSettingsFacetBridgeEntity.Builder.() -> Unit)? = null,
- ): ModuleSettingsFacetBridgeEntity.Builder {
- val builder = builder() as ModuleSettingsFacetBridgeEntity.Builder
- builder.moduleId = moduleId
- builder.name = name
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-}
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ProjectSettingsEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ProjectSettingsEntityModifications.kt
index e87e3b615bf1..7df6a2c68667 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ProjectSettingsEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ProjectSettingsEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.ProjectSettingsEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -17,6 +18,7 @@ interface ProjectSettingsEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = ProjectSettingsEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = ProjectSettingsEntityImpl.Builder::class.java
operator fun invoke(
entitySource: EntitySource,
init: (ProjectSettingsEntityBuilder.() -> Unit)? = null,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityModifications.kt
index 1822a6a5e928..48c6f24d78e6 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.SdkEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -24,6 +25,7 @@ interface SdkEntityBuilder : WorkspaceEntityBuilder {
internal object SdkEntityType : EntityType() {
override val entityClass: Class get() = SdkEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = SdkEntityImpl.Builder::class.java
operator fun invoke(
name: String,
type: String,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityModifications.kt
index 6eb52aca826c..9323aab3715b 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.SourceRootEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -22,6 +23,7 @@ interface SourceRootEntityBuilder : WorkspaceEntityBuilder {
internal object SourceRootEntityType : EntityType() {
override val entityClass: Class get() = SourceRootEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = SourceRootEntityImpl.Builder::class.java
operator fun invoke(
url: VirtualFileUrl,
rootTypeId: SourceRootTypeId,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityModifications.kt
index 09612dd1129a..6fd4bfc9550c 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.SourceRootOrderEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -22,6 +23,7 @@ interface SourceRootOrderEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = SourceRootOrderEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = SourceRootOrderEntityImpl.Builder::class.java
operator fun invoke(
orderOfSourceRoots: List,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityModifications.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityModifications.kt
index 96ddefbbe39d..6869494a594c 100644
--- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityModifications.kt
+++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityModifications.kt
@@ -3,6 +3,7 @@
package com.intellij.platform.workspace.jps.entities
+import com.intellij.platform.workspace.jps.entities.impl.TestModulePropertiesEntityImpl
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
@@ -20,6 +21,7 @@ interface TestModulePropertiesEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = TestModulePropertiesEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = TestModulePropertiesEntityImpl.Builder::class.java
operator fun invoke(
productionModuleId: ModuleId,
entitySource: EntitySource,
diff --git a/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt b/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt
index e91cb45f6169..a7e671710061 100644
--- a/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt
+++ b/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt
@@ -147,7 +147,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(
@Parent
val parentEntity: CompositePackagingElementEntity?
- //region generated code
@Deprecated(message = "Use PackagingElementEntityBuilder instead")
interface Builder : PackagingElementEntityBuilder {
@Deprecated(message = "Use new API instead")
@@ -159,19 +158,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(
parentEntity = value
}
}
-
- companion object : EntityType>() {
- @Deprecated(message = "Use new API instead")
- @JvmOverloads
- @JvmStatic
- @JvmName("create")
- operator fun invoke(
- entitySource: EntitySource,
- init: (Builder.() -> Unit)? = null,
- ): Builder = PackagingElementEntityType.compatibilityInvoke(entitySource, init)
- }
- //endregion
-
}
@Abstract interface CompositePackagingElementEntity : PackagingElementEntity {
@@ -180,7 +166,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(
val children: List
- //region generated code
@Deprecated(message = "Use CompositePackagingElementEntityBuilder instead")
interface Builder : CompositePackagingElementEntityBuilder {
@Deprecated(message = "Use new API instead")
@@ -191,19 +176,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(
artifact = value
}
}
-
- companion object : EntityType>() {
- @Deprecated(message = "Use new API instead")
- @JvmOverloads
- @JvmStatic
- @JvmName("create")
- operator fun invoke(
- entitySource: EntitySource,
- init: (Builder.() -> Unit)? = null,
- ): Builder = CompositePackagingElementEntityType.compatibilityInvoke(entitySource, init)
- }
- //endregion
-
}
interface DirectoryPackagingElementEntity: CompositePackagingElementEntity {
@@ -461,23 +433,8 @@ fun MutableEntityStorage.modifyModuleTestOutputPackagingElementEntity(
@Abstract interface FileOrDirectoryPackagingElementEntity : PackagingElementEntity {
val filePath: VirtualFileUrl
- //region generated code
@Deprecated(message = "Use FileOrDirectoryPackagingElementEntityBuilder instead")
interface Builder : FileOrDirectoryPackagingElementEntityBuilder
- companion object : EntityType>() {
- @Deprecated(message = "Use new API instead")
- @JvmOverloads
- @JvmStatic
- @JvmName("create")
- operator fun invoke(
- filePath: VirtualFileUrl,
- entitySource: EntitySource,
- init: (Builder.() -> Unit)? = null,
- ): Builder =
- FileOrDirectoryPackagingElementEntityType.compatibilityInvoke(filePath, entitySource, init)
- }
- //endregion
-
}
interface DirectoryCopyPackagingElementEntity : FileOrDirectoryPackagingElementEntity {
diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt
index 091f1faa7db1..f66641987170 100644
--- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt
+++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt
@@ -12,21 +12,6 @@ interface ModuleSettingsFacetBridgeEntity : WorkspaceEntityWithSymbolicId {
val moduleId: ModuleId
val name: @NlsSafe String
- //region generated code
@Deprecated(message = "Use ModuleSettingsFacetBridgeEntityBuilder instead")
interface Builder : ModuleSettingsFacetBridgeEntityBuilder
- companion object : EntityType>() {
- @Deprecated(message = "Use new API instead")
- @JvmOverloads
- @JvmStatic
- @JvmName("create")
- operator fun invoke(
- moduleId: ModuleId,
- name: String,
- entitySource: EntitySource,
- init: (Builder.() -> Unit)? = null,
- ): Builder =
- ModuleSettingsFacetBridgeEntityType.compatibilityInvoke(moduleId, name, entitySource, init)
- }
- //endregion
}
\ No newline at end of file
diff --git a/platform/workspace/storage/api-dump.txt b/platform/workspace/storage/api-dump.txt
index 4ed203d74eb7..09ced1cfa608 100644
--- a/platform/workspace/storage/api-dump.txt
+++ b/platform/workspace/storage/api-dump.txt
@@ -76,6 +76,7 @@ a:com.intellij.platform.workspace.storage.EntityType
- b:(com.intellij.platform.workspace.storage.EntityType,I,kotlin.jvm.internal.DefaultConstructorMarker):V
- pf:builder():com.intellij.platform.workspace.storage.WorkspaceEntity$Builder
- p:getEntityClass():java.lang.Class
+- p:getEntityImplBuilderClass():java.lang.Class
com.intellij.platform.workspace.storage.ExternalEntityMapping
- a:forEach(kotlin.jvm.functions.Function2):V
- a:getDataByEntity(com.intellij.platform.workspace.storage.WorkspaceEntity):java.lang.Object
diff --git a/platform/workspace/storage/src/com/intellij/platform/workspace/storage/EntityType.kt b/platform/workspace/storage/src/com/intellij/platform/workspace/storage/EntityType.kt
index 00f23ebbc654..3cc8a65e7dd7 100644
--- a/platform/workspace/storage/src/com/intellij/platform/workspace/storage/EntityType.kt
+++ b/platform/workspace/storage/src/com/intellij/platform/workspace/storage/EntityType.kt
@@ -10,26 +10,12 @@ public abstract class EntityType? = null
) {
protected open val entityClass: Class? = null
+ protected open val entityImplBuilderClass: Class<*>? = null
- private val ival: Class get() = entityClass ?: javaClass.enclosingClass as Class // entityClass as Class
-
- private val name: String by lazy {
- if (ival.enclosingClass == null) ival.simpleName else {
- var topLevelClass: Class<*> = ival
- val outerNames = mutableListOf()
- do {
- outerNames.add(topLevelClass.simpleName)
- topLevelClass = topLevelClass.enclosingClass ?: break
- } while (true)
- outerNames.reversed().joinToString(".")
- }
- }
+ private val ival: Class get() = entityClass ?: javaClass.enclosingClass as Class
private fun loadBuilderFactory(): () -> B {
- val ivalClass = ival
- val packageName = ivalClass.packageName
- val simpleName = name.replace(".", "")
- val c = ivalClass.classLoader.loadClass("$packageName.impl.${simpleName}Impl\$Builder")
+ val c = entityImplBuilderClass ?: throw RuntimeException("Entity implementation builder class not found for ${ival.simpleName}")
val ctor = c.constructors.find { it.parameterCount == 0 }!!
return { ctor.newInstance() as B }
}
diff --git a/platform/workspace/storage/src/com/intellij/platform/workspace/storage/generatedCodeCompatibility.kt b/platform/workspace/storage/src/com/intellij/platform/workspace/storage/generatedCodeCompatibility.kt
index 0306373b9bad..5f2388549ece 100644
--- a/platform/workspace/storage/src/com/intellij/platform/workspace/storage/generatedCodeCompatibility.kt
+++ b/platform/workspace/storage/src/com/intellij/platform/workspace/storage/generatedCodeCompatibility.kt
@@ -10,7 +10,7 @@ public object CodeGeneratorVersions {
private const val API_VERSION_INTERNAL = 3
private const val IMPL_MAJOR_VERSION_INTERNAL = 7
@Suppress("unused")
- private const val IMPL_MINOR_VERSION_INTERNAL = 20 // is used through reflection
+ private const val IMPL_MINOR_VERSION_INTERNAL = 21 // is used through reflection
@set:TestOnly
public var API_VERSION: Int = API_VERSION_INTERNAL
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildEntityModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildEntityModifications.kt
index 11a5aaaf0e77..d92fdd3265ee 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildEntityModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.platform.workspace.storage.testEntities.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
@@ -14,18 +13,3 @@ interface AbstractChildEntityBuilder : WorkspaceEntityB
var data: String
var parent: ParentWithExtensionEntityBuilder
}
-
-internal object AbstractChildEntityType : EntityType>() {
- override val entityClass: Class get() = AbstractChildEntity::class.java
- operator fun invoke(
- data: String,
- entitySource: EntitySource,
- init: (AbstractChildEntityBuilder.() -> Unit)? = null,
- ): AbstractChildEntityBuilder {
- val builder = builder()
- builder.data = data
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-}
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildWithLinkToParentEntityModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildWithLinkToParentEntityModifications.kt
index 100363143f3e..8f5c5dcd8f91 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildWithLinkToParentEntityModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractChildWithLinkToParentEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.platform.workspace.storage.testEntities.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntity
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
@@ -16,22 +15,6 @@ interface AbstractChildWithLinkToParentEntityBuilder>() {
- override val entityClass: Class get() = AbstractChildWithLinkToParentEntity::class.java
- operator fun invoke(
- data: String,
- entitySource: EntitySource,
- init: (AbstractChildWithLinkToParentEntityBuilder.() -> Unit)? = null,
- ): AbstractChildWithLinkToParentEntityBuilder {
- val builder = builder()
- builder.data = data
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-}
-
@Parent
var AbstractChildWithLinkToParentEntityBuilder.parent: ParentWithLinkToAbstractChildBuilder?
by WorkspaceEntity.extensionBuilder(ParentWithLinkToAbstractChild::class.java)
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractParentEntityModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractParentEntityModifications.kt
index fed84536d9a9..ef5d17771284 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractParentEntityModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AbstractParentEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.platform.workspace.storage.testEntities.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
@@ -14,18 +13,3 @@ interface AbstractParentEntityBuilder : WorkspaceEntit
var data: String
var child: ChildWithExtensionParentBuilder?
}
-
-internal object AbstractParentEntityType : EntityType>() {
- override val entityClass: Class get() = AbstractParentEntity::class.java
- operator fun invoke(
- data: String,
- entitySource: EntitySource,
- init: (AbstractParentEntityBuilder.() -> Unit)? = null,
- ): AbstractParentEntityBuilder {
- val builder = builder()
- builder.data = data
- builder.entitySource = entitySource
- init?.invoke(builder)
- return builder
- }
-}
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityModifications.kt
index 6b2f421ec1da..b1f0b2e3ce8e 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityModifications.kt
@@ -8,6 +8,7 @@ import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
+import com.intellij.platform.workspace.storage.testEntities.entities.impl.AssertConsistencyEntityImpl
@GeneratedCodeApiVersion(3)
interface AssertConsistencyEntityBuilder : WorkspaceEntityBuilder {
@@ -17,6 +18,7 @@ interface AssertConsistencyEntityBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = AssertConsistencyEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = AssertConsistencyEntityImpl.Builder::class.java
operator fun invoke(
passCheck: Boolean,
entitySource: EntitySource,
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListModifications.kt
index 0edde1b51ecf..05e199dfdb43 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListModifications.kt
@@ -8,6 +8,7 @@ import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
+import com.intellij.platform.workspace.storage.testEntities.entities.impl.AttachedEntityListImpl
@GeneratedCodeApiVersion(3)
interface AttachedEntityListBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface AttachedEntityListBuilder : WorkspaceEntityBuilder
internal object AttachedEntityListType : EntityType() {
override val entityClass: Class get() = AttachedEntityList::class.java
+ override val entityImplBuilderClass: Class<*> get() = AttachedEntityListImpl.Builder::class.java
operator fun invoke(
data: String,
entitySource: EntitySource,
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityModifications.kt
index 1ba83706a841..b55c6e938f78 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityModifications.kt
@@ -8,6 +8,7 @@ import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
+import com.intellij.platform.workspace.storage.testEntities.entities.impl.AttachedEntityImpl
@GeneratedCodeApiVersion(3)
interface AttachedEntityBuilder : WorkspaceEntityBuilder {
@@ -18,6 +19,7 @@ interface AttachedEntityBuilder : WorkspaceEntityBuilder {
internal object AttachedEntityType : EntityType() {
override val entityClass: Class get() = AttachedEntity::class.java
+ override val entityImplBuilderClass: Class<*> get() = AttachedEntityImpl.Builder::class.java
operator fun invoke(
data: String,
entitySource: EntitySource,
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListModifications.kt
index 71149b9170bb..bf2599ec377f 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListModifications.kt
@@ -10,6 +10,7 @@ import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntity
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.annotations.Parent
+import com.intellij.platform.workspace.storage.testEntities.entities.impl.AttachedEntityParentListImpl
@GeneratedCodeApiVersion(3)
interface AttachedEntityParentListBuilder : WorkspaceEntityBuilder {
@@ -19,6 +20,7 @@ interface AttachedEntityParentListBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = AttachedEntityParentList::class.java
+ override val entityImplBuilderClass: Class<*> get() = AttachedEntityParentListImpl.Builder::class.java
operator fun invoke(
data: String,
entitySource: EntitySource,
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentModifications.kt
index f6fa5346626a..d220ea3c85c8 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentModifications.kt
@@ -10,6 +10,7 @@ import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntity
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.annotations.Parent
+import com.intellij.platform.workspace.storage.testEntities.entities.impl.AttachedEntityToNullableParentImpl
@GeneratedCodeApiVersion(3)
interface AttachedEntityToNullableParentBuilder : WorkspaceEntityBuilder {
@@ -19,6 +20,7 @@ interface AttachedEntityToNullableParentBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = AttachedEntityToNullableParent::class.java
+ override val entityImplBuilderClass: Class<*> get() = AttachedEntityToNullableParentImpl.Builder::class.java
operator fun invoke(
data: String,
entitySource: EntitySource,
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentModifications.kt
index 50f8f96d99aa..2e06e24fcb79 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentModifications.kt
@@ -10,6 +10,7 @@ import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntity
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
import com.intellij.platform.workspace.storage.annotations.Parent
+import com.intellij.platform.workspace.storage.testEntities.entities.impl.AttachedEntityToParentImpl
@GeneratedCodeApiVersion(3)
interface AttachedEntityToParentBuilder : WorkspaceEntityBuilder {
@@ -19,6 +20,7 @@ interface AttachedEntityToParentBuilder : WorkspaceEntityBuilder() {
override val entityClass: Class get() = AttachedEntityToParent::class.java
+ override val entityImplBuilderClass: Class<*> get() = AttachedEntityToParentImpl.Builder::class.java
operator fun invoke(
data: String,
entitySource: EntitySource,
diff --git a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/BaseEntityModifications.kt b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/BaseEntityModifications.kt
index 6a053191ebb9..d7aac640cddd 100644
--- a/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/BaseEntityModifications.kt
+++ b/platform/workspace/storage/testEntities/testGen/com/intellij/platform/workspace/storage/testEntities/entities/BaseEntityModifications.kt
@@ -4,7 +4,6 @@
package com.intellij.platform.workspace.storage.testEntities.entities
import com.intellij.platform.workspace.storage.EntitySource
-import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.WorkspaceEntityBuilder
@@ -13,16 +12,3 @@ interface BaseEntityBuilder : WorkspaceEntityBuilder