IJPL-245995 Workspace Model: Avoid reflection in loadBuilderFactory

Merge-request: IJ-MR-206724 Merged-by: Kirill Bochkarev <kirill.bochkarev@jetbrains.com> GitOrigin-RevId: a15b3d45379004d933f162bb8e2a79826268513d
2026-09-27 10:03:11 +07:00 · 2026-06-04 16:48:00 +00:00
parent 9c683a042e
commit 04b4c402bf
282 changed files with 571 additions and 572 deletions
@@ -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<Li

 internal object LibraryMavenCoordinateEntityType : EntityType<LibraryMavenCoordinateEntity, LibraryMavenCoordinateEntityBuilder>() {
  override val entityClass: Class<LibraryMavenCoordinateEntity> get() = LibraryMavenCoordinateEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = LibraryMavenCoordinateEntityImpl.Builder::class.java
  operator fun invoke(
    coordinates: MavenCoordinates,
    entitySource: EntitySource,
@@ -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<Mod

 internal object ModuleMavenCoordinateEntityType : EntityType<ModuleMavenCoordinateEntity, ModuleMavenCoordinateEntityBuilder>() {
  override val entityClass: Class<ModuleMavenCoordinateEntity> get() = ModuleMavenCoordinateEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ModuleMavenCoordinateEntityImpl.Builder::class.java
  operator fun invoke(
    coordinates: MavenCoordinates,
    entitySource: EntitySource,
@@ -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<E
 internal object ExternalProjectsBuildClasspathEntityType :
  EntityType<ExternalProjectsBuildClasspathEntity, ExternalProjectsBuildClasspathEntityBuilder>() {
  override val entityClass: Class<ExternalProjectsBuildClasspathEntity> get() = ExternalProjectsBuildClasspathEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ExternalProjectsBuildClasspathEntityImpl.Builder::class.java
  operator fun invoke(
    projectsBuildClasspath: Map<String, ExternalProjectBuildClasspathEntity>,
    entitySource: EntitySource,
@@ -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<Dependenc

 internal object DependencySubstitutionEntityType : EntityType<DependencySubstitutionEntity, DependencySubstitutionEntityBuilder>() {
  override val entityClass: Class<DependencySubstitutionEntity> get() = DependencySubstitutionEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = DependencySubstitutionEntityImpl.Builder::class.java
  operator fun invoke(
    library: LibraryId,
    module: ModuleId,
@@ -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<ExternalProjectE

 internal object ExternalProjectEntityType : EntityType<ExternalProjectEntity, ExternalProjectEntityBuilder>() {
  override val entityClass: Class<ExternalProjectEntity> get() = ExternalProjectEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ExternalProjectEntityImpl.Builder::class.java
  operator fun invoke(
    externalProjectPath: String,
    entitySource: EntitySource,
@@ -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<ScratchRootsEntity>

 internal object ScratchRootsEntityType : EntityType<ScratchRootsEntity, ScratchRootsEntityBuilder>() {
  override val entityClass: Class<ScratchRootsEntity> get() = ScratchRootsEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ScratchRootsEntityImpl.Builder::class.java
  operator fun invoke(
    roots: List<VirtualFileUrl>,
    entitySource: EntitySource,
@@ -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<ChildTestEntity> {
@@ -18,6 +19,7 @@ interface ChildTestEntityBuilder : WorkspaceEntityBuilder<ChildTestEntity> {

 internal object ChildTestEntityType : EntityType<ChildTestEntity, ChildTestEntityBuilder>() {
  override val entityClass: Class<ChildTestEntity> get() = ChildTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildTestEntityImpl.Builder::class.java
  operator fun invoke(
    customChildProperty: String,
    entitySource: EntitySource,
@@ -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<ExcludedTestEntity> {
@@ -18,6 +19,7 @@ interface ExcludedTestEntityBuilder : WorkspaceEntityBuilder<ExcludedTestEntity>

 internal object ExcludedTestEntityType : EntityType<ExcludedTestEntity, ExcludedTestEntityBuilder>() {
  override val entityClass: Class<ExcludedTestEntity> get() = ExcludedTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ExcludedTestEntityImpl.Builder::class.java
  operator fun invoke(
    root: VirtualFileUrl,
    entitySource: EntitySource,
@@ -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<IndexingTestEntity2> {
@@ -20,6 +21,7 @@ interface IndexingTestEntity2Builder : WorkspaceEntityBuilder<IndexingTestEntity

 internal object IndexingTestEntity2Type : EntityType<IndexingTestEntity2, IndexingTestEntity2Builder>() {
  override val entityClass: Class<IndexingTestEntity2> get() = IndexingTestEntity2::class.java
+  override val entityImplBuilderClass: Class<*> get() = IndexingTestEntity2Impl.Builder::class.java
  operator fun invoke(
    roots: List<VirtualFileUrl>,
    excludedRoots: List<VirtualFileUrl>,
@@ -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<IndexingTestEntity> {
@@ -20,6 +21,7 @@ interface IndexingTestEntityBuilder : WorkspaceEntityBuilder<IndexingTestEntity>

 internal object IndexingTestEntityType : EntityType<IndexingTestEntity, IndexingTestEntityBuilder>() {
  override val entityClass: Class<IndexingTestEntity> get() = IndexingTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = IndexingTestEntityImpl.Builder::class.java
  operator fun invoke(
    roots: List<VirtualFileUrl>,
    excludedRoots: List<VirtualFileUrl>,
@@ -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<NonIndexableTestEntity> {
@@ -18,6 +19,7 @@ interface NonIndexableTestEntityBuilder : WorkspaceEntityBuilder<NonIndexableTes

 internal object NonIndexableTestEntityType : EntityType<NonIndexableTestEntity, NonIndexableTestEntityBuilder>() {
  override val entityClass: Class<NonIndexableTestEntity> get() = NonIndexableTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = NonIndexableTestEntityImpl.Builder::class.java
  operator fun invoke(
    root: VirtualFileUrl,
    entitySource: EntitySource,
@@ -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<NonRecursiveTestEntity> {
@@ -18,6 +19,7 @@ interface NonRecursiveTestEntityBuilder : WorkspaceEntityBuilder<NonRecursiveTes

 internal object NonRecursiveTestEntityType : EntityType<NonRecursiveTestEntity, NonRecursiveTestEntityBuilder>() {
  override val entityClass: Class<NonRecursiveTestEntity> get() = NonRecursiveTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = NonRecursiveTestEntityImpl.Builder::class.java
  operator fun invoke(
    root: VirtualFileUrl,
    entitySource: EntitySource,
@@ -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<OneMoreWithReferenceTestEntity> {
@@ -18,6 +19,7 @@ interface OneMoreWithReferenceTestEntityBuilder : WorkspaceEntityBuilder<OneMore

 internal object OneMoreWithReferenceTestEntityType : EntityType<OneMoreWithReferenceTestEntity, OneMoreWithReferenceTestEntityBuilder>() {
  override val entityClass: Class<OneMoreWithReferenceTestEntity> get() = OneMoreWithReferenceTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = OneMoreWithReferenceTestEntityImpl.Builder::class.java
  operator fun invoke(
    references: List<DependencyItem>,
    entitySource: EntitySource,
@@ -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<ParentTestEntity> {
@@ -21,6 +22,7 @@ interface ParentTestEntityBuilder : WorkspaceEntityBuilder<ParentTestEntity> {

 internal object ParentTestEntityType : EntityType<ParentTestEntity, ParentTestEntityBuilder>() {
  override val entityClass: Class<ParentTestEntity> get() = ParentTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ParentTestEntityImpl.Builder::class.java
  operator fun invoke(
    customParentProperty: String,
    parentEntityRoot: VirtualFileUrl,
@@ -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<ReferredTestEntity> {
@@ -19,6 +20,7 @@ interface ReferredTestEntityBuilder : WorkspaceEntityBuilder<ReferredTestEntity>

 internal object ReferredTestEntityType : EntityType<ReferredTestEntity, ReferredTestEntityBuilder>() {
  override val entityClass: Class<ReferredTestEntity> get() = ReferredTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ReferredTestEntityImpl.Builder::class.java
  operator fun invoke(
    name: String,
    file: VirtualFileUrl,
@@ -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<SiblingEntity> {
@@ -18,6 +19,7 @@ interface SiblingEntityBuilder : WorkspaceEntityBuilder<SiblingEntity> {

 internal object SiblingEntityType : EntityType<SiblingEntity, SiblingEntityBuilder>() {
  override val entityClass: Class<SiblingEntity> get() = SiblingEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = SiblingEntityImpl.Builder::class.java
  operator fun invoke(
    customSiblingProperty: String,
    entitySource: EntitySource,
@@ -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<WithReferenceTestEntity> {
@@ -19,6 +20,7 @@ interface WithReferenceTestEntityBuilder : WorkspaceEntityBuilder<WithReferenceT

 internal object WithReferenceTestEntityType : EntityType<WithReferenceTestEntity, WithReferenceTestEntityBuilder>() {
  override val entityClass: Class<WithReferenceTestEntity> get() = WithReferenceTestEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = WithReferenceTestEntityImpl.Builder::class.java
  operator fun invoke(
    name: String,
    references: List<DependencyItem>,
@@ -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<ProjectRootEntity> {

 internal object ProjectRootEntityType : EntityType<ProjectRootEntity, ProjectRootEntityBuilder>() {
  override val entityClass: Class<ProjectRootEntity> get() = ProjectRootEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ProjectRootEntityImpl.Builder::class.java
  operator fun invoke(
    root: VirtualFileUrl,
    entitySource: EntitySource,
@@ -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
@@ -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<ArchiveP

 internal object ArchivePackagingElementEntityType : EntityType<ArchivePackagingElementEntity, ArchivePackagingElementEntityBuilder>() {
  override val entityClass: Class<ArchivePackagingElementEntity> get() = ArchivePackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ArchivePackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    fileName: String,
    entitySource: EntitySource,
@@ -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<ArtifactEntity> {

 internal object ArtifactEntityType : EntityType<ArtifactEntity, ArtifactEntityBuilder>() {
  override val entityClass: Class<ArtifactEntity> get() = ArtifactEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ArtifactEntityImpl.Builder::class.java
  operator fun invoke(
    name: String,
    artifactType: String,
@@ -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<A
 internal object ArtifactOutputPackagingElementEntityType :
  EntityType<ArtifactOutputPackagingElementEntity, ArtifactOutputPackagingElementEntityBuilder>() {
  override val entityClass: Class<ArtifactOutputPackagingElementEntity> get() = ArtifactOutputPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ArtifactOutputPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ArtifactOutputPackagingElementEntityBuilder.() -> Unit)? = null,
@@ -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<ArtifactPrope

 internal object ArtifactPropertiesEntityType : EntityType<ArtifactPropertiesEntity, ArtifactPropertiesEntityBuilder>() {
  override val entityClass: Class<ArtifactPropertiesEntity> get() = ArtifactPropertiesEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ArtifactPropertiesEntityImpl.Builder::class.java
  operator fun invoke(
    providerType: String,
    entitySource: EntitySource,
@@ -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<ArtifactRoot

 internal object ArtifactRootElementEntityType : EntityType<ArtifactRootElementEntity, ArtifactRootElementEntityBuilder>() {
  override val entityClass: Class<ArtifactRootElementEntity> get() = ArtifactRootElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ArtifactRootElementEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ArtifactRootElementEntityBuilder.() -> Unit)? = null,
@@ -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<ArtifactsOrderEnt

 internal object ArtifactsOrderEntityType : EntityType<ArtifactsOrderEntity, ArtifactsOrderEntityBuilder>() {
  override val entityClass: Class<ArtifactsOrderEntity> get() = ArtifactsOrderEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ArtifactsOrderEntityImpl.Builder::class.java
  operator fun invoke(
    orderOfArtifacts: List<String>,
    entitySource: EntitySource,
@@ -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<T : CompositePackagingElementEn
  var artifact: ArtifactEntityBuilder?
  var children: List<PackagingElementEntityBuilder<out PackagingElementEntity>>
 }
-
-internal object CompositePackagingElementEntityType :
-  EntityType<CompositePackagingElementEntity, CompositePackagingElementEntityBuilder<CompositePackagingElementEntity>>() {
-  override val entityClass: Class<CompositePackagingElementEntity> get() = CompositePackagingElementEntity::class.java
-  operator fun invoke(
-    entitySource: EntitySource,
-    init: (CompositePackagingElementEntityBuilder<CompositePackagingElementEntity>.() -> Unit)? = null,
-  ): CompositePackagingElementEntityBuilder<CompositePackagingElementEntity> {
-    val builder = builder()
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-
-  @Deprecated(message = "Use new API instead")
-  fun compatibilityInvoke(
-    entitySource: EntitySource,
-    init: (CompositePackagingElementEntity.Builder<CompositePackagingElementEntity>.() -> Unit)? = null,
-  ): CompositePackagingElementEntity.Builder<CompositePackagingElementEntity> {
-    val builder = builder() as CompositePackagingElementEntity.Builder<CompositePackagingElementEntity>
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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<CustomPac

 internal object CustomPackagingElementEntityType : EntityType<CustomPackagingElementEntity, CustomPackagingElementEntityBuilder>() {
  override val entityClass: Class<CustomPackagingElementEntity> get() = CustomPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = CustomPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    typeId: String,
    propertiesXmlTag: String,
@@ -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<Di
 internal object DirectoryCopyPackagingElementEntityType :
  EntityType<DirectoryCopyPackagingElementEntity, DirectoryCopyPackagingElementEntityBuilder>() {
  override val entityClass: Class<DirectoryCopyPackagingElementEntity> get() = DirectoryCopyPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = DirectoryCopyPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    filePath: VirtualFileUrl,
    entitySource: EntitySource,
@@ -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<Direct
 internal object DirectoryPackagingElementEntityType :
  EntityType<DirectoryPackagingElementEntity, DirectoryPackagingElementEntityBuilder>() {
  override val entityClass: Class<DirectoryPackagingElementEntity> get() = DirectoryPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = DirectoryPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    directoryName: String,
    entitySource: EntitySource,
@@ -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<ExtractedDirectoryPackagingElementEntity, ExtractedDirectoryPackagingElementEntityBuilder>() {
  override val entityClass: Class<ExtractedDirectoryPackagingElementEntity> get() = ExtractedDirectoryPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ExtractedDirectoryPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    filePath: VirtualFileUrl,
    pathInArchive: String,
@@ -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<FileCop

 internal object FileCopyPackagingElementEntityType : EntityType<FileCopyPackagingElementEntity, FileCopyPackagingElementEntityBuilder>() {
  override val entityClass: Class<FileCopyPackagingElementEntity> get() = FileCopyPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = FileCopyPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    filePath: VirtualFileUrl,
    entitySource: EntitySource,
@@ -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<T : FileOrDirectoryPackag
  override var parentEntity: CompositePackagingElementEntityBuilder<out CompositePackagingElementEntity>?
  var filePath: VirtualFileUrl
 }
-
-internal object FileOrDirectoryPackagingElementEntityType :
-  EntityType<FileOrDirectoryPackagingElementEntity, FileOrDirectoryPackagingElementEntityBuilder<FileOrDirectoryPackagingElementEntity>>() {
-  override val entityClass: Class<FileOrDirectoryPackagingElementEntity> get() = FileOrDirectoryPackagingElementEntity::class.java
-  operator fun invoke(
-    filePath: VirtualFileUrl,
-    entitySource: EntitySource,
-    init: (FileOrDirectoryPackagingElementEntityBuilder<FileOrDirectoryPackagingElementEntity>.() -> Unit)? = null,
-  ): FileOrDirectoryPackagingElementEntityBuilder<FileOrDirectoryPackagingElementEntity> {
-    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<FileOrDirectoryPackagingElementEntity>.() -> Unit)? = null,
-  ): FileOrDirectoryPackagingElementEntity.Builder<FileOrDirectoryPackagingElementEntity> {
-    val builder = builder() as FileOrDirectoryPackagingElementEntity.Builder<FileOrDirectoryPackagingElementEntity>
-    builder.filePath = filePath
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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<JavaModuleSet

 internal object JavaModuleSettingsEntityType : EntityType<JavaModuleSettingsEntity, JavaModuleSettingsEntityBuilder>() {
  override val entityClass: Class<JavaModuleSettingsEntity> get() = JavaModuleSettingsEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = JavaModuleSettingsEntityImpl.Builder::class.java
  operator fun invoke(
    inheritedCompilerOutput: Boolean,
    excludeOutput: Boolean,
@@ -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<JavaProjectS

 internal object JavaProjectSettingsEntityType : EntityType<JavaProjectSettingsEntity, JavaProjectSettingsEntityBuilder>() {
  override val entityClass: Class<JavaProjectSettingsEntity> get() = JavaProjectSettingsEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = JavaProjectSettingsEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (JavaProjectSettingsEntityBuilder.() -> Unit)? = null,
@@ -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<JavaR
 internal object JavaResourceRootPropertiesEntityType :
  EntityType<JavaResourceRootPropertiesEntity, JavaResourceRootPropertiesEntityBuilder>() {
  override val entityClass: Class<JavaResourceRootPropertiesEntity> get() = JavaResourceRootPropertiesEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = JavaResourceRootPropertiesEntityImpl.Builder::class.java
  operator fun invoke(
    generated: Boolean,
    relativeOutputPath: String,
@@ -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<JavaSou

 internal object JavaSourceRootPropertiesEntityType : EntityType<JavaSourceRootPropertiesEntity, JavaSourceRootPropertiesEntityBuilder>() {
  override val entityClass: Class<JavaSourceRootPropertiesEntity> get() = JavaSourceRootPropertiesEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = JavaSourceRootPropertiesEntityImpl.Builder::class.java
  operator fun invoke(
    generated: Boolean,
    packagePrefix: String,
@@ -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<Lib
 internal object LibraryFilesPackagingElementEntityType :
  EntityType<LibraryFilesPackagingElementEntity, LibraryFilesPackagingElementEntityBuilder>() {
  override val entityClass: Class<LibraryFilesPackagingElementEntity> get() = LibraryFilesPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = LibraryFilesPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (LibraryFilesPackagingElementEntityBuilder.() -> Unit)? = null,
@@ -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<Mod
 internal object ModuleOutputPackagingElementEntityType :
  EntityType<ModuleOutputPackagingElementEntity, ModuleOutputPackagingElementEntityBuilder>() {
  override val entityClass: Class<ModuleOutputPackagingElementEntity> get() = ModuleOutputPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ModuleOutputPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ModuleOutputPackagingElementEntityBuilder.() -> Unit)? = null,
@@ -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<Mod
 internal object ModuleSourcePackagingElementEntityType :
  EntityType<ModuleSourcePackagingElementEntity, ModuleSourcePackagingElementEntityBuilder>() {
  override val entityClass: Class<ModuleSourcePackagingElementEntity> get() = ModuleSourcePackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ModuleSourcePackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ModuleSourcePackagingElementEntityBuilder.() -> Unit)? = null,
@@ -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<ModuleTestOutputPackagingElementEntity, ModuleTestOutputPackagingElementEntityBuilder>() {
  override val entityClass: Class<ModuleTestOutputPackagingElementEntity> get() = ModuleTestOutputPackagingElementEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ModuleTestOutputPackagingElementEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ModuleTestOutputPackagingElementEntityBuilder.() -> Unit)? = null,
@@ -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<T : PackagingElementEntity> : WorkspaceE
  override var entitySource: EntitySource
  var parentEntity: CompositePackagingElementEntityBuilder<out CompositePackagingElementEntity>?
 }
-
-internal object PackagingElementEntityType : EntityType<PackagingElementEntity, PackagingElementEntityBuilder<PackagingElementEntity>>() {
-  override val entityClass: Class<PackagingElementEntity> get() = PackagingElementEntity::class.java
-  operator fun invoke(
-    entitySource: EntitySource,
-    init: (PackagingElementEntityBuilder<PackagingElementEntity>.() -> Unit)? = null,
-  ): PackagingElementEntityBuilder<PackagingElementEntity> {
-    val builder = builder()
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-
-  @Deprecated(message = "Use new API instead")
-  fun compatibilityInvoke(
-    entitySource: EntitySource,
-    init: (PackagingElementEntity.Builder<PackagingElementEntity>.() -> Unit)? = null,
-  ): PackagingElementEntity.Builder<PackagingElementEntity> {
-    val builder = builder() as PackagingElementEntity.Builder<PackagingElementEntity>
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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<ContentRootEntity> {

 internal object ContentRootEntityType : EntityType<ContentRootEntity, ContentRootEntityBuilder>() {
  override val entityClass: Class<ContentRootEntity> get() = ContentRootEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ContentRootEntityImpl.Builder::class.java
  operator fun invoke(
    url: VirtualFileUrl,
    excludedPatterns: List<String>,
@@ -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<CustomImlComp

 internal object CustomImlComponentEntityType : EntityType<CustomImlComponentEntity, CustomImlComponentEntityBuilder>() {
  override val entityClass: Class<CustomImlComponentEntity> get() = CustomImlComponentEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = CustomImlComponentEntityImpl.Builder::class.java
  operator fun invoke(
    components: Map<String, String>,
    entitySource: EntitySource,
@@ -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<Custo
 internal object CustomSourceRootPropertiesEntityType :
  EntityType<CustomSourceRootPropertiesEntity, CustomSourceRootPropertiesEntityBuilder>() {
  override val entityClass: Class<CustomSourceRootPropertiesEntity> get() = CustomSourceRootPropertiesEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = CustomSourceRootPropertiesEntityImpl.Builder::class.java
  operator fun invoke(
    propertiesXmlTag: String,
    entitySource: EntitySource,
@@ -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<ExcludeUrlEntity> {

 internal object ExcludeUrlEntityType : EntityType<ExcludeUrlEntity, ExcludeUrlEntityBuilder>() {
  override val entityClass: Class<ExcludeUrlEntity> get() = ExcludeUrlEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ExcludeUrlEntityImpl.Builder::class.java
  operator fun invoke(
    url: VirtualFileUrl,
    entitySource: EntitySource,
@@ -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<ExcludeUrlOrderE

 internal object ExcludeUrlOrderEntityType : EntityType<ExcludeUrlOrderEntity, ExcludeUrlOrderEntityBuilder>() {
  override val entityClass: Class<ExcludeUrlOrderEntity> get() = ExcludeUrlOrderEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ExcludeUrlOrderEntityImpl.Builder::class.java
  operator fun invoke(
    order: List<VirtualFileUrl>,
    entitySource: EntitySource,
@@ -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<Exte
 internal object ExternalSystemModuleOptionsEntityType :
  EntityType<ExternalSystemModuleOptionsEntity, ExternalSystemModuleOptionsEntityBuilder>() {
  override val entityClass: Class<ExternalSystemModuleOptionsEntity> get() = ExternalSystemModuleOptionsEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ExternalSystemModuleOptionsEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ExternalSystemModuleOptionsEntityBuilder.() -> Unit)? = null,
@@ -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<FacetEntity>, ModuleSettin

 internal object FacetEntityType : EntityType<FacetEntity, FacetEntityBuilder>() {
  override val entityClass: Class<FacetEntity> get() = FacetEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = FacetEntityImpl.Builder::class.java
  operator fun invoke(
    moduleId: ModuleId,
    name: String,
@@ -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<FacetsOrderEntity> {

 internal object FacetsOrderEntityType : EntityType<FacetsOrderEntity, FacetsOrderEntityBuilder>() {
  override val entityClass: Class<FacetsOrderEntity> get() = FacetsOrderEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = FacetsOrderEntityImpl.Builder::class.java
  operator fun invoke(
    orderOfFacets: List<String>,
    entitySource: EntitySource,
@@ -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<LibraryEntity> {

 internal object LibraryEntityType : EntityType<LibraryEntity, LibraryEntityBuilder>() {
  override val entityClass: Class<LibraryEntity> get() = LibraryEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = LibraryEntityImpl.Builder::class.java
  operator fun invoke(
    name: String,
    tableId: LibraryTableId,
@@ -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<LibraryPropert

 internal object LibraryPropertiesEntityType : EntityType<LibraryPropertiesEntity, LibraryPropertiesEntityBuilder>() {
  override val entityClass: Class<LibraryPropertiesEntity> get() = LibraryPropertiesEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = LibraryPropertiesEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (LibraryPropertiesEntityBuilder.() -> Unit)? = null,
@@ -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<ModuleCustom

 internal object ModuleCustomImlDataEntityType : EntityType<ModuleCustomImlDataEntity, ModuleCustomImlDataEntityBuilder>() {
  override val entityClass: Class<ModuleCustomImlDataEntity> get() = ModuleCustomImlDataEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ModuleCustomImlDataEntityImpl.Builder::class.java
  operator fun invoke(
    customModuleOptions: Map<String, String>,
    entitySource: EntitySource,
@@ -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<ModuleEntity> {

 internal object ModuleEntityType : EntityType<ModuleEntity, ModuleEntityBuilder>() {
  override val entityClass: Class<ModuleEntity> get() = ModuleEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ModuleEntityImpl.Builder::class.java
  operator fun invoke(
    name: String,
    dependencies: List<ModuleDependencyItem>,
@@ -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<ModuleGroupPathE

 internal object ModuleGroupPathEntityType : EntityType<ModuleGroupPathEntity, ModuleGroupPathEntityBuilder>() {
  override val entityClass: Class<ModuleGroupPathEntity> get() = ModuleGroupPathEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ModuleGroupPathEntityImpl.Builder::class.java
  operator fun invoke(
    path: List<String>,
    entitySource: EntitySource,
@@ -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<T : ModuleSettingsFacetBridgeEn
  var moduleId: ModuleId
  var name: String
 }
-
-internal object ModuleSettingsFacetBridgeEntityType :
-  EntityType<ModuleSettingsFacetBridgeEntity, ModuleSettingsFacetBridgeEntityBuilder<ModuleSettingsFacetBridgeEntity>>() {
-  override val entityClass: Class<ModuleSettingsFacetBridgeEntity> get() = ModuleSettingsFacetBridgeEntity::class.java
-  operator fun invoke(
-    moduleId: ModuleId,
-    name: String,
-    entitySource: EntitySource,
-    init: (ModuleSettingsFacetBridgeEntityBuilder<ModuleSettingsFacetBridgeEntity>.() -> Unit)? = null,
-  ): ModuleSettingsFacetBridgeEntityBuilder<ModuleSettingsFacetBridgeEntity> {
-    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<ModuleSettingsFacetBridgeEntity>.() -> Unit)? = null,
-  ): ModuleSettingsFacetBridgeEntity.Builder<ModuleSettingsFacetBridgeEntity> {
-    val builder = builder() as ModuleSettingsFacetBridgeEntity.Builder<ModuleSettingsFacetBridgeEntity>
-    builder.moduleId = moduleId
-    builder.name = name
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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<ProjectSettingsE

 internal object ProjectSettingsEntityType : EntityType<ProjectSettingsEntity, ProjectSettingsEntityBuilder>() {
  override val entityClass: Class<ProjectSettingsEntity> get() = ProjectSettingsEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ProjectSettingsEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ProjectSettingsEntityBuilder.() -> Unit)? = null,
@@ -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<SdkEntity> {

 internal object SdkEntityType : EntityType<SdkEntity, SdkEntityBuilder>() {
  override val entityClass: Class<SdkEntity> get() = SdkEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = SdkEntityImpl.Builder::class.java
  operator fun invoke(
    name: String,
    type: String,
@@ -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<SourceRootEntity> {

 internal object SourceRootEntityType : EntityType<SourceRootEntity, SourceRootEntityBuilder>() {
  override val entityClass: Class<SourceRootEntity> get() = SourceRootEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = SourceRootEntityImpl.Builder::class.java
  operator fun invoke(
    url: VirtualFileUrl,
    rootTypeId: SourceRootTypeId,
@@ -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<SourceRootOrderE

 internal object SourceRootOrderEntityType : EntityType<SourceRootOrderEntity, SourceRootOrderEntityBuilder>() {
  override val entityClass: Class<SourceRootOrderEntity> get() = SourceRootOrderEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = SourceRootOrderEntityImpl.Builder::class.java
  operator fun invoke(
    orderOfSourceRoots: List<VirtualFileUrl>,
    entitySource: EntitySource,
@@ -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<TestModuleP

 internal object TestModulePropertiesEntityType : EntityType<TestModulePropertiesEntity, TestModulePropertiesEntityBuilder>() {
  override val entityClass: Class<TestModulePropertiesEntity> get() = TestModulePropertiesEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = TestModulePropertiesEntityImpl.Builder::class.java
  operator fun invoke(
    productionModuleId: ModuleId,
    entitySource: EntitySource,
@@ -147,7 +147,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(
  @Parent
  val parentEntity: CompositePackagingElementEntity?

-  //region generated code
  @Deprecated(message = "Use PackagingElementEntityBuilder instead")
  interface Builder<T : PackagingElementEntity> : PackagingElementEntityBuilder<T> {
    @Deprecated(message = "Use new API instead")
@@ -159,19 +158,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(
      parentEntity = value
    }
  }
-
-  companion object : EntityType<PackagingElementEntity, Builder<PackagingElementEntity>>() {
-    @Deprecated(message = "Use new API instead")
-    @JvmOverloads
-    @JvmStatic
-    @JvmName("create")
-    operator fun invoke(
-      entitySource: EntitySource,
-      init: (Builder<PackagingElementEntity>.() -> Unit)? = null,
-    ): Builder<PackagingElementEntity> = PackagingElementEntityType.compatibilityInvoke(entitySource, init)
-  }
-  //endregion
-
 }

@Abstract interface CompositePackagingElementEntity : PackagingElementEntity {
@@ -180,7 +166,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(

  val children: List<PackagingElementEntity>

-  //region generated code
  @Deprecated(message = "Use CompositePackagingElementEntityBuilder instead")
  interface Builder<T : CompositePackagingElementEntity> : CompositePackagingElementEntityBuilder<T> {
    @Deprecated(message = "Use new API instead")
@@ -191,19 +176,6 @@ fun MutableEntityStorage.modifyArtifactPropertiesEntity(
      artifact = value
    }
  }
-
-  companion object : EntityType<CompositePackagingElementEntity, Builder<CompositePackagingElementEntity>>() {
-    @Deprecated(message = "Use new API instead")
-    @JvmOverloads
-    @JvmStatic
-    @JvmName("create")
-    operator fun invoke(
-      entitySource: EntitySource,
-      init: (Builder<CompositePackagingElementEntity>.() -> Unit)? = null,
-    ): Builder<CompositePackagingElementEntity> = 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<T : FileOrDirectoryPackagingElementEntity> : FileOrDirectoryPackagingElementEntityBuilder<T>
-  companion object : EntityType<FileOrDirectoryPackagingElementEntity, Builder<FileOrDirectoryPackagingElementEntity>>() {
-    @Deprecated(message = "Use new API instead")
-    @JvmOverloads
-    @JvmStatic
-    @JvmName("create")
-    operator fun invoke(
-      filePath: VirtualFileUrl,
-      entitySource: EntitySource,
-      init: (Builder<FileOrDirectoryPackagingElementEntity>.() -> Unit)? = null,
-    ): Builder<FileOrDirectoryPackagingElementEntity> =
-      FileOrDirectoryPackagingElementEntityType.compatibilityInvoke(filePath, entitySource, init)
-  }
-  //endregion
-
 }

 interface DirectoryCopyPackagingElementEntity : FileOrDirectoryPackagingElementEntity {
@@ -12,21 +12,6 @@ interface ModuleSettingsFacetBridgeEntity : WorkspaceEntityWithSymbolicId {
  val moduleId: ModuleId
  val name: @NlsSafe String

-  //region generated code
  @Deprecated(message = "Use ModuleSettingsFacetBridgeEntityBuilder instead")
  interface Builder<T : ModuleSettingsFacetBridgeEntity> : ModuleSettingsFacetBridgeEntityBuilder<T>
-  companion object : EntityType<ModuleSettingsFacetBridgeEntity, Builder<ModuleSettingsFacetBridgeEntity>>() {
-    @Deprecated(message = "Use new API instead")
-    @JvmOverloads
-    @JvmStatic
-    @JvmName("create")
-    operator fun invoke(
-      moduleId: ModuleId,
-      name: String,
-      entitySource: EntitySource,
-      init: (Builder<ModuleSettingsFacetBridgeEntity>.() -> Unit)? = null,
-    ): Builder<ModuleSettingsFacetBridgeEntity> =
-      ModuleSettingsFacetBridgeEntityType.compatibilityInvoke(moduleId, name, entitySource, init)
-  }
-  //endregion
 }
@@ -76,6 +76,7 @@ a:com.intellij.platform.workspace.storage.EntityType
 - b:<init>(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
@@ -10,26 +10,12 @@ public abstract class EntityType<T : WorkspaceEntity, B : WorkspaceEntity.Builde
  private val base: EntityType<*, *>? = null
 ) {
    protected open val entityClass: Class<T>? = null
+    protected open val entityImplBuilderClass: Class<*>? = null
  
-    private val ival: Class<T> get() = entityClass ?: javaClass.enclosingClass as Class<T> // entityClass as Class<T>
-
-    private val name: String by lazy {
-        if (ival.enclosingClass == null) ival.simpleName else {
-            var topLevelClass: Class<*> = ival
-            val outerNames = mutableListOf<String>()
-            do {
-                outerNames.add(topLevelClass.simpleName)
-                topLevelClass = topLevelClass.enclosingClass ?: break
-            } while (true)
-            outerNames.reversed().joinToString(".")
-        }
-    }
+    private val ival: Class<T> get() = entityClass ?: javaClass.enclosingClass as Class<T>

    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 }
    }
@@ -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
@@ -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<T : AbstractChildEntity> : WorkspaceEntityB
  var data: String
  var parent: ParentWithExtensionEntityBuilder
 }
-
-internal object AbstractChildEntityType : EntityType<AbstractChildEntity, AbstractChildEntityBuilder<AbstractChildEntity>>() {
-  override val entityClass: Class<AbstractChildEntity> get() = AbstractChildEntity::class.java
-  operator fun invoke(
-    data: String,
-    entitySource: EntitySource,
-    init: (AbstractChildEntityBuilder<AbstractChildEntity>.() -> Unit)? = null,
-  ): AbstractChildEntityBuilder<AbstractChildEntity> {
-    val builder = builder()
-    builder.data = data
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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<T : AbstractChildWithLinkTo
  var data: String
 }

-internal object AbstractChildWithLinkToParentEntityType :
-  EntityType<AbstractChildWithLinkToParentEntity, AbstractChildWithLinkToParentEntityBuilder<AbstractChildWithLinkToParentEntity>>() {
-  override val entityClass: Class<AbstractChildWithLinkToParentEntity> get() = AbstractChildWithLinkToParentEntity::class.java
-  operator fun invoke(
-    data: String,
-    entitySource: EntitySource,
-    init: (AbstractChildWithLinkToParentEntityBuilder<AbstractChildWithLinkToParentEntity>.() -> Unit)? = null,
-  ): AbstractChildWithLinkToParentEntityBuilder<AbstractChildWithLinkToParentEntity> {
-    val builder = builder()
-    builder.data = data
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
-
@Parent
 var AbstractChildWithLinkToParentEntityBuilder<out AbstractChildWithLinkToParentEntity>.parent: ParentWithLinkToAbstractChildBuilder?
  by WorkspaceEntity.extensionBuilder(ParentWithLinkToAbstractChild::class.java)
@@ -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<T : AbstractParentEntity> : WorkspaceEntit
  var data: String
  var child: ChildWithExtensionParentBuilder?
 }
-
-internal object AbstractParentEntityType : EntityType<AbstractParentEntity, AbstractParentEntityBuilder<AbstractParentEntity>>() {
-  override val entityClass: Class<AbstractParentEntity> get() = AbstractParentEntity::class.java
-  operator fun invoke(
-    data: String,
-    entitySource: EntitySource,
-    init: (AbstractParentEntityBuilder<AbstractParentEntity>.() -> Unit)? = null,
-  ): AbstractParentEntityBuilder<AbstractParentEntity> {
-    val builder = builder()
-    builder.data = data
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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<AssertConsistencyEntity> {
@@ -17,6 +18,7 @@ interface AssertConsistencyEntityBuilder : WorkspaceEntityBuilder<AssertConsiste

 internal object AssertConsistencyEntityType : EntityType<AssertConsistencyEntity, AssertConsistencyEntityBuilder>() {
  override val entityClass: Class<AssertConsistencyEntity> get() = AssertConsistencyEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = AssertConsistencyEntityImpl.Builder::class.java
  operator fun invoke(
    passCheck: Boolean,
    entitySource: EntitySource,
@@ -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<AttachedEntityList> {
@@ -18,6 +19,7 @@ interface AttachedEntityListBuilder : WorkspaceEntityBuilder<AttachedEntityList>

 internal object AttachedEntityListType : EntityType<AttachedEntityList, AttachedEntityListBuilder>() {
  override val entityClass: Class<AttachedEntityList> get() = AttachedEntityList::class.java
+  override val entityImplBuilderClass: Class<*> get() = AttachedEntityListImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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<AttachedEntity> {
@@ -18,6 +19,7 @@ interface AttachedEntityBuilder : WorkspaceEntityBuilder<AttachedEntity> {

 internal object AttachedEntityType : EntityType<AttachedEntity, AttachedEntityBuilder>() {
  override val entityClass: Class<AttachedEntity> get() = AttachedEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = AttachedEntityImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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<AttachedEntityParentList> {
@@ -19,6 +20,7 @@ interface AttachedEntityParentListBuilder : WorkspaceEntityBuilder<AttachedEntit

 internal object AttachedEntityParentListType : EntityType<AttachedEntityParentList, AttachedEntityParentListBuilder>() {
  override val entityClass: Class<AttachedEntityParentList> get() = AttachedEntityParentList::class.java
+  override val entityImplBuilderClass: Class<*> get() = AttachedEntityParentListImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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<AttachedEntityToNullableParent> {
@@ -19,6 +20,7 @@ interface AttachedEntityToNullableParentBuilder : WorkspaceEntityBuilder<Attache

 internal object AttachedEntityToNullableParentType : EntityType<AttachedEntityToNullableParent, AttachedEntityToNullableParentBuilder>() {
  override val entityClass: Class<AttachedEntityToNullableParent> get() = AttachedEntityToNullableParent::class.java
+  override val entityImplBuilderClass: Class<*> get() = AttachedEntityToNullableParentImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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<AttachedEntityToParent> {
@@ -19,6 +20,7 @@ interface AttachedEntityToParentBuilder : WorkspaceEntityBuilder<AttachedEntityT

 internal object AttachedEntityToParentType : EntityType<AttachedEntityToParent, AttachedEntityToParentBuilder>() {
  override val entityClass: Class<AttachedEntityToParent> get() = AttachedEntityToParent::class.java
+  override val entityImplBuilderClass: Class<*> get() = AttachedEntityToParentImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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<T : BaseEntity> : WorkspaceEntityBuilder<T> {
  override var entitySource: EntitySource
  var parentEntity: CompositeBaseEntityBuilder<out CompositeBaseEntity>?
 }
-
-internal object BaseEntityType : EntityType<BaseEntity, BaseEntityBuilder<BaseEntity>>() {
-  override val entityClass: Class<BaseEntity> get() = BaseEntity::class.java
-  operator fun invoke(
-    entitySource: EntitySource,
-    init: (BaseEntityBuilder<BaseEntity>.() -> Unit)? = null,
-  ): BaseEntityBuilder<BaseEntity> {
-    val builder = builder()
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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.BooleanEntityImpl

@GeneratedCodeApiVersion(3)
 interface BooleanEntityBuilder : WorkspaceEntityBuilder<BooleanEntity> {
@@ -17,6 +18,7 @@ interface BooleanEntityBuilder : WorkspaceEntityBuilder<BooleanEntity> {

 internal object BooleanEntityType : EntityType<BooleanEntity, BooleanEntityBuilder>() {
  override val entityClass: Class<BooleanEntity> get() = BooleanEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = BooleanEntityImpl.Builder::class.java
  operator fun invoke(
    data: Boolean,
    entitySource: EntitySource,
@@ -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.ChainedEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChainedEntityBuilder : WorkspaceEntityBuilder<ChainedEntity> {
@@ -20,6 +21,7 @@ interface ChainedEntityBuilder : WorkspaceEntityBuilder<ChainedEntity> {

 internal object ChainedEntityType : EntityType<ChainedEntity, ChainedEntityBuilder>() {
  override val entityClass: Class<ChainedEntity> get() = ChainedEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChainedEntityImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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.ChainedParentEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChainedParentEntityBuilder : WorkspaceEntityBuilder<ChainedParentEntity> {
@@ -17,6 +18,7 @@ interface ChainedParentEntityBuilder : WorkspaceEntityBuilder<ChainedParentEntit

 internal object ChainedParentEntityType : EntityType<ChainedParentEntity, ChainedParentEntityBuilder>() {
  override val entityClass: Class<ChainedParentEntity> get() = ChainedParentEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChainedParentEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ChainedParentEntityBuilder.() -> Unit)? = null,
@@ -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,19 +13,3 @@ interface ChildAbstractBaseEntityBuilder<T : ChildAbstractBaseEntity> : Workspac
  var commonData: String
  var parentEntity: ParentAbEntityBuilder
 }
-
-internal object ChildAbstractBaseEntityType :
-  EntityType<ChildAbstractBaseEntity, ChildAbstractBaseEntityBuilder<ChildAbstractBaseEntity>>() {
-  override val entityClass: Class<ChildAbstractBaseEntity> get() = ChildAbstractBaseEntity::class.java
-  operator fun invoke(
-    commonData: String,
-    entitySource: EntitySource,
-    init: (ChildAbstractBaseEntityBuilder<ChildAbstractBaseEntity>.() -> Unit)? = null,
-  ): ChildAbstractBaseEntityBuilder<ChildAbstractBaseEntity> {
-    val builder = builder()
-    builder.commonData = commonData
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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.ChildEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildEntityBuilder : WorkspaceEntityBuilder<ChildEntity> {
@@ -18,6 +19,7 @@ interface ChildEntityBuilder : WorkspaceEntityBuilder<ChildEntity> {

 internal object ChildEntityType : EntityType<ChildEntity, ChildEntityBuilder>() {
  override val entityClass: Class<ChildEntity> get() = ChildEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildEntityImpl.Builder::class.java
  operator fun invoke(
    childData: String,
    entitySource: EntitySource,
@@ -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.ChildEntityWithSymbolicIdImpl

@GeneratedCodeApiVersion(3)
 interface ChildEntityWithSymbolicIdBuilder : WorkspaceEntityBuilder<ChildEntityWithSymbolicId> {
@@ -18,6 +19,7 @@ interface ChildEntityWithSymbolicIdBuilder : WorkspaceEntityBuilder<ChildEntityW

 internal object ChildEntityWithSymbolicIdType : EntityType<ChildEntityWithSymbolicId, ChildEntityWithSymbolicIdBuilder>() {
  override val entityClass: Class<ChildEntityWithSymbolicId> get() = ChildEntityWithSymbolicId::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildEntityWithSymbolicIdImpl.Builder::class.java
  operator fun invoke(
    myName: String,
    entitySource: EntitySource,
@@ -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.ChildFirstEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildFirstEntityBuilder : WorkspaceEntityBuilder<ChildFirstEntity>, ChildAbstractBaseEntityBuilder<ChildFirstEntity> {
@@ -19,6 +20,7 @@ interface ChildFirstEntityBuilder : WorkspaceEntityBuilder<ChildFirstEntity>, Ch

 internal object ChildFirstEntityType : EntityType<ChildFirstEntity, ChildFirstEntityBuilder>() {
  override val entityClass: Class<ChildFirstEntity> get() = ChildFirstEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildFirstEntityImpl.Builder::class.java
  operator fun invoke(
    commonData: String,
    firstData: String,
@@ -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.ChildMultipleEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildMultipleEntityBuilder : WorkspaceEntityBuilder<ChildMultipleEntity> {
@@ -18,6 +19,7 @@ interface ChildMultipleEntityBuilder : WorkspaceEntityBuilder<ChildMultipleEntit

 internal object ChildMultipleEntityType : EntityType<ChildMultipleEntity, ChildMultipleEntityBuilder>() {
  override val entityClass: Class<ChildMultipleEntity> get() = ChildMultipleEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildMultipleEntityImpl.Builder::class.java
  operator fun invoke(
    childData: String,
    entitySource: EntitySource,
@@ -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.ChildSampleEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildSampleEntityBuilder : WorkspaceEntityBuilder<ChildSampleEntity> {
@@ -18,6 +19,7 @@ interface ChildSampleEntityBuilder : WorkspaceEntityBuilder<ChildSampleEntity> {

 internal object ChildSampleEntityType : EntityType<ChildSampleEntity, ChildSampleEntityBuilder>() {
  override val entityClass: Class<ChildSampleEntity> get() = ChildSampleEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildSampleEntityImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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.ChildSecondEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildSecondEntityBuilder : WorkspaceEntityBuilder<ChildSecondEntity>, ChildAbstractBaseEntityBuilder<ChildSecondEntity> {
@@ -19,6 +20,7 @@ interface ChildSecondEntityBuilder : WorkspaceEntityBuilder<ChildSecondEntity>,

 internal object ChildSecondEntityType : EntityType<ChildSecondEntity, ChildSecondEntityBuilder>() {
  override val entityClass: Class<ChildSecondEntity> get() = ChildSecondEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildSecondEntityImpl.Builder::class.java
  operator fun invoke(
    commonData: String,
    secondData: String,
@@ -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,19 +13,3 @@ interface ChildSingleAbstractBaseEntityBuilder<T : ChildSingleAbstractBaseEntity
  var commonData: String
  var parentEntity: ParentSingleAbEntityBuilder
 }
-
-internal object ChildSingleAbstractBaseEntityType :
-  EntityType<ChildSingleAbstractBaseEntity, ChildSingleAbstractBaseEntityBuilder<ChildSingleAbstractBaseEntity>>() {
-  override val entityClass: Class<ChildSingleAbstractBaseEntity> get() = ChildSingleAbstractBaseEntity::class.java
-  operator fun invoke(
-    commonData: String,
-    entitySource: EntitySource,
-    init: (ChildSingleAbstractBaseEntityBuilder<ChildSingleAbstractBaseEntity>.() -> Unit)? = null,
-  ): ChildSingleAbstractBaseEntityBuilder<ChildSingleAbstractBaseEntity> {
-    val builder = builder()
-    builder.commonData = commonData
-    builder.entitySource = entitySource
-    init?.invoke(builder)
-    return builder
-  }
-}
@@ -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.ChildSingleFirstEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildSingleFirstEntityBuilder : WorkspaceEntityBuilder<ChildSingleFirstEntity>,
@@ -20,6 +21,7 @@ interface ChildSingleFirstEntityBuilder : WorkspaceEntityBuilder<ChildSingleFirs

 internal object ChildSingleFirstEntityType : EntityType<ChildSingleFirstEntity, ChildSingleFirstEntityBuilder>() {
  override val entityClass: Class<ChildSingleFirstEntity> get() = ChildSingleFirstEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildSingleFirstEntityImpl.Builder::class.java
  operator fun invoke(
    commonData: String,
    firstData: String,
@@ -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.ChildSingleSecondEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildSingleSecondEntityBuilder : WorkspaceEntityBuilder<ChildSingleSecondEntity>,
@@ -20,6 +21,7 @@ interface ChildSingleSecondEntityBuilder : WorkspaceEntityBuilder<ChildSingleSec

 internal object ChildSingleSecondEntityType : EntityType<ChildSingleSecondEntity, ChildSingleSecondEntityBuilder>() {
  override val entityClass: Class<ChildSingleSecondEntity> get() = ChildSingleSecondEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildSingleSecondEntityImpl.Builder::class.java
  operator fun invoke(
    commonData: String,
    secondData: String,
@@ -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.ChildSourceEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildSourceEntityBuilder : WorkspaceEntityBuilder<ChildSourceEntity> {
@@ -18,6 +19,7 @@ interface ChildSourceEntityBuilder : WorkspaceEntityBuilder<ChildSourceEntity> {

 internal object ChildSourceEntityType : EntityType<ChildSourceEntity, ChildSourceEntityBuilder>() {
  override val entityClass: Class<ChildSourceEntity> get() = ChildSourceEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildSourceEntityImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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.ChildSubEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildSubEntityBuilder : WorkspaceEntityBuilder<ChildSubEntity> {
@@ -18,6 +19,7 @@ interface ChildSubEntityBuilder : WorkspaceEntityBuilder<ChildSubEntity> {

 internal object ChildSubEntityType : EntityType<ChildSubEntity, ChildSubEntityBuilder>() {
  override val entityClass: Class<ChildSubEntity> get() = ChildSubEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildSubEntityImpl.Builder::class.java
  operator fun invoke(
    entitySource: EntitySource,
    init: (ChildSubEntityBuilder.() -> Unit)? = null,
@@ -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.ChildSubSubEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildSubSubEntityBuilder : WorkspaceEntityBuilder<ChildSubSubEntity> {
@@ -18,6 +19,7 @@ interface ChildSubSubEntityBuilder : WorkspaceEntityBuilder<ChildSubSubEntity> {

 internal object ChildSubSubEntityType : EntityType<ChildSubSubEntity, ChildSubSubEntityBuilder>() {
  override val entityClass: Class<ChildSubSubEntity> get() = ChildSubSubEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildSubSubEntityImpl.Builder::class.java
  operator fun invoke(
    childData: String,
    entitySource: EntitySource,
@@ -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.ChildWithExtensionParentImpl

@GeneratedCodeApiVersion(3)
 interface ChildWithExtensionParentBuilder : WorkspaceEntityBuilder<ChildWithExtensionParent> {
@@ -19,6 +20,7 @@ interface ChildWithExtensionParentBuilder : WorkspaceEntityBuilder<ChildWithExte

 internal object ChildWithExtensionParentType : EntityType<ChildWithExtensionParent, ChildWithExtensionParentBuilder>() {
  override val entityClass: Class<ChildWithExtensionParent> get() = ChildWithExtensionParent::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildWithExtensionParentImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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.ChildWithIdImpl

@GeneratedCodeApiVersion(3)
 interface ChildWithIdBuilder : WorkspaceEntityBuilder<ChildWithId> {
@@ -18,6 +19,7 @@ interface ChildWithIdBuilder : WorkspaceEntityBuilder<ChildWithId> {

 internal object ChildWithIdType : EntityType<ChildWithId, ChildWithIdBuilder>() {
  override val entityClass: Class<ChildWithId> get() = ChildWithId::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildWithIdImpl.Builder::class.java
  operator fun invoke(
    myId: String,
    entitySource: EntitySource,
@@ -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.ChildWithNullsImpl

@GeneratedCodeApiVersion(3)
 interface ChildWithNullsBuilder : WorkspaceEntityBuilder<ChildWithNulls> {
@@ -19,6 +20,7 @@ interface ChildWithNullsBuilder : WorkspaceEntityBuilder<ChildWithNulls> {

 internal object ChildWithNullsType : EntityType<ChildWithNulls, ChildWithNullsBuilder>() {
  override val entityClass: Class<ChildWithNulls> get() = ChildWithNulls::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildWithNullsImpl.Builder::class.java
  operator fun invoke(
    childData: String,
    entitySource: EntitySource,
@@ -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.ChildWithNullsMultipleImpl

@GeneratedCodeApiVersion(3)
 interface ChildWithNullsMultipleBuilder : WorkspaceEntityBuilder<ChildWithNullsMultiple> {
@@ -19,6 +20,7 @@ interface ChildWithNullsMultipleBuilder : WorkspaceEntityBuilder<ChildWithNullsM

 internal object ChildWithNullsMultipleType : EntityType<ChildWithNullsMultiple, ChildWithNullsMultipleBuilder>() {
  override val entityClass: Class<ChildWithNullsMultiple> get() = ChildWithNullsMultiple::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildWithNullsMultipleImpl.Builder::class.java
  operator fun invoke(
    childData: String,
    entitySource: EntitySource,
@@ -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.ChildWithNullsOppositeMultipleImpl

@GeneratedCodeApiVersion(3)
 interface ChildWithNullsOppositeMultipleBuilder : WorkspaceEntityBuilder<ChildWithNullsOppositeMultiple> {
@@ -18,6 +19,7 @@ interface ChildWithNullsOppositeMultipleBuilder : WorkspaceEntityBuilder<ChildWi

 internal object ChildWithNullsOppositeMultipleType : EntityType<ChildWithNullsOppositeMultiple, ChildWithNullsOppositeMultipleBuilder>() {
  override val entityClass: Class<ChildWithNullsOppositeMultiple> get() = ChildWithNullsOppositeMultiple::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildWithNullsOppositeMultipleImpl.Builder::class.java
  operator fun invoke(
    childData: String,
    entitySource: EntitySource,
@@ -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.ChildWpidSampleEntityImpl

@GeneratedCodeApiVersion(3)
 interface ChildWpidSampleEntityBuilder : WorkspaceEntityBuilder<ChildWpidSampleEntity> {
@@ -18,6 +19,7 @@ interface ChildWpidSampleEntityBuilder : WorkspaceEntityBuilder<ChildWpidSampleE

 internal object ChildWpidSampleEntityType : EntityType<ChildWpidSampleEntity, ChildWpidSampleEntityBuilder>() {
  override val entityClass: Class<ChildWpidSampleEntity> get() = ChildWpidSampleEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ChildWpidSampleEntityImpl.Builder::class.java
  operator fun invoke(
    data: String,
    entitySource: EntitySource,
@@ -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.impl.containers.toMutableWorkspaceSet
+import com.intellij.platform.workspace.storage.testEntities.entities.impl.CollectionFieldEntityImpl

@GeneratedCodeApiVersion(3)
 interface CollectionFieldEntityBuilder : WorkspaceEntityBuilder<CollectionFieldEntity> {
@@ -20,6 +21,7 @@ interface CollectionFieldEntityBuilder : WorkspaceEntityBuilder<CollectionFieldE

 internal object CollectionFieldEntityType : EntityType<CollectionFieldEntity, CollectionFieldEntityBuilder>() {
  override val entityClass: Class<CollectionFieldEntity> get() = CollectionFieldEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = CollectionFieldEntityImpl.Builder::class.java
  operator fun invoke(
    versions: Set<Int>,
    names: List<String>,
@@ -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.ComposedIdSoftRefEntityImpl

@GeneratedCodeApiVersion(3)
 interface ComposedIdSoftRefEntityBuilder : WorkspaceEntityBuilder<ComposedIdSoftRefEntity> {
@@ -18,6 +19,7 @@ interface ComposedIdSoftRefEntityBuilder : WorkspaceEntityBuilder<ComposedIdSoft

 internal object ComposedIdSoftRefEntityType : EntityType<ComposedIdSoftRefEntity, ComposedIdSoftRefEntityBuilder>() {
  override val entityClass: Class<ComposedIdSoftRefEntity> get() = ComposedIdSoftRefEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ComposedIdSoftRefEntityImpl.Builder::class.java
  operator fun invoke(
    myName: String,
    link: NameId,
@@ -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.ComposedLinkEntityImpl

@GeneratedCodeApiVersion(3)
 interface ComposedLinkEntityBuilder : WorkspaceEntityBuilder<ComposedLinkEntity> {
@@ -17,6 +18,7 @@ interface ComposedLinkEntityBuilder : WorkspaceEntityBuilder<ComposedLinkEntity>

 internal object ComposedLinkEntityType : EntityType<ComposedLinkEntity, ComposedLinkEntityBuilder>() {
  override val entityClass: Class<ComposedLinkEntity> get() = ComposedLinkEntity::class.java
+  override val entityImplBuilderClass: Class<*> get() = ComposedLinkEntityImpl.Builder::class.java
  operator fun invoke(
    link: ComposedId,
    entitySource: EntitySource,
--- a/Show More
+++ b/Show More