Virtual apps bad performance #10015

enonic · Mar 14, 2023 · a3c6b9d · a3c6b9d
1 parent 3cf7fb3
commit a3c6b9d
Show file tree

Hide file tree

Showing 97 changed files with 982 additions and 1,228 deletions.
diff --git a/modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/portal/AdminToolHandler.java b/modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/portal/AdminToolHandler.java
@@ -59,7 +59,7 @@ protected WebResponse doHandle( final WebRequest webRequest, final WebResponse w
         }
 
         trace.put( "path", webRequest.getPath() );
-        trace.put( "method", webRequest.getMethod().toString() );
+        trace.put( "method", webRequest.getMethod() );
         trace.put( "host", webRequest.getHost() );
         trace.put( "httpRequest", webRequest );
         trace.put( "httpResponse", webResponse );

diff --git a/...re/blobstore-file/src/main/java/com/enonic/xp/internal/blobstore/file/FileBlobRecord.java b/...re/blobstore-file/src/main/java/com/enonic/xp/internal/blobstore/file/FileBlobRecord.java
@@ -1,6 +1,7 @@
 package com.enonic.xp.internal.blobstore.file;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
@@ -39,7 +40,7 @@ public long getLength()
         }
         catch ( IOException e )
         {
-            return 0;
+            throw new UncheckedIOException( e );
         }
     }
 

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/blob/NodeVersionKey.java b/modules/core/core-api/src/main/java/com/enonic/xp/blob/NodeVersionKey.java
@@ -4,7 +4,7 @@
 
 import com.google.common.base.Preconditions;
 
-public class NodeVersionKey
+public final class NodeVersionKey
 {
     private final BlobKey nodeBlobKey;
 
@@ -41,7 +41,7 @@ public boolean equals( final Object o )
         {
             return true;
         }
-        if ( o == null || getClass() != o.getClass() )
+        if ( !( o instanceof NodeVersionKey ) )
         {
             return false;
         }
@@ -58,11 +58,10 @@ public int hashCode()
 
     public static NodeVersionKey from( final BlobKey nodeBlobKey, final BlobKey indexConfigBlobKey, final BlobKey accessControlBlobKey )
     {
-        return create().
-            nodeBlobKey( nodeBlobKey ).
-            indexConfigBlobKey( indexConfigBlobKey ).
-            accessControlBlobKey( accessControlBlobKey ).
-            build();
+        return create().nodeBlobKey( nodeBlobKey )
+            .indexConfigBlobKey( indexConfigBlobKey )
+            .accessControlBlobKey( accessControlBlobKey )
+            .build();
     }
 
     public static NodeVersionKey from( final String nodeBlobKey, final String indexConfigBlobKey, final String accessControlBlobKey )

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/content/Content.java b/modules/core/core-api/src/main/java/com/enonic/xp/content/Content.java
@@ -303,6 +303,7 @@ public boolean isPageTemplate()
         return this instanceof PageTemplate;
     }
 
+    @Deprecated
     public boolean hasPage()
     {
         return page != null;

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/content/EditableContent.java b/modules/core/core-api/src/main/java/com/enonic/xp/content/EditableContent.java
@@ -63,7 +63,7 @@ public EditableContent( final Content source )
         this.displayName = source.getDisplayName();
         this.data = source.getData().copy();
         this.extraDatas = source.getAllExtraData().copy();
-        this.page = source.hasPage() ? source.getPage().copy() : null;
+        this.page = source.getPage() != null ? source.getPage().copy() : null;
         this.valid = source.isValid();
         this.thumbnail = source.getThumbnail();
         this.inheritPermissions = source.inheritsPermissions();

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/data/PropertyPath.java b/modules/core/core-api/src/main/java/com/enonic/xp/data/PropertyPath.java
@@ -29,8 +29,6 @@ public final class PropertyPath
 
     private final boolean relative;
 
-    private final PropertyPath parentPath;
-
     public static PropertyPath from( final PropertyPath parentPath, final String element )
     {
         Preconditions.checkNotNull( parentPath, "parentPath cannot be null" );
@@ -83,7 +81,6 @@ private PropertyPath()
     {
         this.elements = ImmutableList.of();
         this.relative = false;
-        this.parentPath = null;
     }
 
     private PropertyPath( final ImmutableList<Element> pathElements )
@@ -92,23 +89,12 @@ private PropertyPath( final ImmutableList<Element> pathElements )
 
         this.elements = pathElements;
         this.relative = this.elements.isEmpty() || !this.elements.get( 0 ).getName().startsWith( ELEMENT_DIVIDER );
-
-        final List<Element> parentPathElements = new ArrayList<>();
-        for ( int i = 0; i < this.elements.size(); i++ )
-        {
-            if ( i < this.elements.size() - 1 )
-            {
-                parentPathElements.add( this.elements.get( i ) );
-            }
-        }
-        this.parentPath = parentPathElements.isEmpty() ? null :PropertyPath.from( parentPathElements );
     }
 
     private PropertyPath( final PropertyPath parentPath, final Element element )
     {
         Preconditions.checkNotNull( parentPath, "parentPath cannot be null" );
         Preconditions.checkNotNull( element, "element cannot be null" );
-        this.parentPath = parentPath;
 
         final ImmutableList.Builder<Element> elementBuilder = ImmutableList.builder();
         elementBuilder.addAll( parentPath.pathElements() ).add( element );
@@ -118,7 +104,7 @@ private PropertyPath( final PropertyPath parentPath, final Element element )
 
     public PropertyPath getParent()
     {
-        return parentPath;
+        return this.elements.size() <= 1 ? null : PropertyPath.from( this.elements.subList( 0, this.elements.size() - 1 ) );
     }
 
     public boolean isRelative()
@@ -203,9 +189,9 @@ public PropertyPath removeFirstPathElement()
     public PropertyPath removeIndexFromLastElement()
     {
 
-        if ( this.parentPath != null )
+        if ( this.elements.size() > 1 )
         {
-            return PropertyPath.from( this.parentPath, this.getLastElement().getName() );
+            return PropertyPath.from( this.getParent(), this.getLastElement().getName() );
         }
         else
         {

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/index/AbstractIndexConfigDocument.java b/modules/core/core-api/src/main/java/com/enonic/xp/index/AbstractIndexConfigDocument.java
@@ -1,5 +1,7 @@
 package com.enonic.xp.index;
 
+import java.util.Objects;
+
 import com.enonic.xp.annotation.PublicApi;
 
 @PublicApi
@@ -19,6 +21,27 @@ public String getAnalyzer()
         return this.analyzer;
     }
 
+    @Override
+    public boolean equals( final Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+        final AbstractIndexConfigDocument that = (AbstractIndexConfigDocument) o;
+        return Objects.equals( analyzer, that.analyzer );
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash( analyzer );
+    }
+
     static class Builder<B extends Builder>
     {
         private String analyzer;

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/index/AllTextIndexConfig.java b/modules/core/core-api/src/main/java/com/enonic/xp/index/AllTextIndexConfig.java
@@ -1,18 +1,16 @@
 package com.enonic.xp.index;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import com.google.common.collect.ImmutableList;
 
 public final class AllTextIndexConfig
 {
-    private final List<String> languages;
+    private final ImmutableList<String> languages;
 
-    private AllTextIndexConfig( final Builder builder )
+    private AllTextIndexConfig( final ImmutableList<String> languages )
     {
-        this.languages = ImmutableList.copyOf( builder.languages );
+        this.languages = languages;
     }
 
     public static Builder create()
@@ -30,38 +28,31 @@ public List<String> getLanguages()
         return languages;
     }
 
+
     @Override
     public boolean equals( final Object o )
     {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() )
-        {
-            return false;
-        }
-        final AllTextIndexConfig that = (AllTextIndexConfig) o;
-        return Objects.equals( languages, that.languages );
+        return this == o || o instanceof AllTextIndexConfig && languages.equals( ( (AllTextIndexConfig) o ).languages );
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash( languages );
+        return languages.hashCode();
     }
 
     public static class Builder
     {
-        private List<String> languages = new ArrayList<>();
+        private final ImmutableList.Builder<String> languages;
 
         Builder()
         {
+            languages = ImmutableList.builder();
         }
 
         Builder( final AllTextIndexConfig source )
         {
-            this.languages = new ArrayList<>( source.languages );
+            this.languages = ImmutableList.<String>builder().addAll( source.languages );
         }
 
         public Builder addLanguage( final String language )
@@ -72,7 +63,7 @@ public Builder addLanguage( final String language )
 
         public AllTextIndexConfig build()
         {
-            return new AllTextIndexConfig( this );
+            return new AllTextIndexConfig( languages.build() );
         }
     }
 }
diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/index/PatternIndexConfigDocument.java b/modules/core/core-api/src/main/java/com/enonic/xp/index/PatternIndexConfigDocument.java
@@ -15,7 +15,7 @@
 import static com.google.common.base.Strings.nullToEmpty;
 
 @PublicApi
-public class PatternIndexConfigDocument
+public final class PatternIndexConfigDocument
     extends AbstractIndexConfigDocument
 {
     private final ImmutableSortedSet<PathIndexConfig> pathIndexConfigs;
@@ -105,22 +105,23 @@ public boolean equals( final Object o )
         {
             return true;
         }
-        if ( !( o instanceof PatternIndexConfigDocument ) )
+        if ( o == null || getClass() != o.getClass() )
         {
             return false;
         }
-
-        final PatternIndexConfigDocument that = (PatternIndexConfigDocument) o;
-
-        if ( !Objects.equals( defaultConfig, that.defaultConfig ) )
+        if ( !super.equals( o ) )
         {
             return false;
         }
-        if ( !Objects.equals( pathIndexConfigs, that.pathIndexConfigs ) )
-        {
-            return false;
-        }
-        return Objects.equals( this.allTextConfig, that.allTextConfig );
+        final PatternIndexConfigDocument that = (PatternIndexConfigDocument) o;
+        return Objects.equals( pathIndexConfigs, that.pathIndexConfigs ) &&
+            Objects.equals( defaultConfig, that.defaultConfig ) && Objects.equals( allTextConfig, that.allTextConfig );
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash( super.hashCode(), pathIndexConfigs, defaultConfig, allTextConfig );
     }
 
     public static final class Builder
@@ -209,12 +210,4 @@ public PatternIndexConfigDocument build()
             return new PatternIndexConfigDocument( this );
         }
     }
-
-    @Override
-    public int hashCode()
-    {
-        int result = pathIndexConfigs != null ? pathIndexConfigs.hashCode() : 0;
-        result = 31 * result + ( defaultConfig != null ? defaultConfig.hashCode() : 0 );
-        return result;
-    }
 }
diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/node/AttachedBinaries.java b/modules/core/core-api/src/main/java/com/enonic/xp/node/AttachedBinaries.java
@@ -1,7 +1,6 @@
 package com.enonic.xp.node;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Set;
 
 import com.google.common.collect.ImmutableSet;
@@ -56,7 +55,7 @@ public static Builder create()
 
     public static class Builder
     {
-        private final Set<AttachedBinary> nodeAttachedBinaries = new HashSet<>();
+        private final ImmutableSet.Builder<AttachedBinary> nodeAttachedBinaries = ImmutableSet.builder();
 
         public Builder add( final AttachedBinary attachedBinary )
         {
@@ -67,12 +66,12 @@ public Builder add( final AttachedBinary attachedBinary )
         @Deprecated
         public Set<AttachedBinary> getNodeAttachedBinaries()
         {
-            return nodeAttachedBinaries;
+            return nodeAttachedBinaries.build();
         }
 
         public AttachedBinaries build()
         {
-            return fromInternal( ImmutableSet.copyOf( nodeAttachedBinaries ) );
+            return fromInternal( nodeAttachedBinaries.build() );
         }
     }
 

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/node/NodeType.java b/modules/core/core-api/src/main/java/com/enonic/xp/node/NodeType.java
@@ -29,18 +29,7 @@ public String getName()
     @Override
     public boolean equals( final Object o )
     {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() )
-        {
-            return false;
-        }
-
-        final NodeType that = (NodeType) o;
-
-        return name.equals( that.name );
+        return this == o || o instanceof NodeType && name.equals( ( (NodeType) o ).name );
     }
 
     @Override

diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/node/NodeVersion.java b/modules/core/core-api/src/main/java/com/enonic/xp/node/NodeVersion.java
@@ -115,31 +115,35 @@ public static final class Builder
     {
         private NodeId id;
 
-        private NodeType nodeType = NodeType.DEFAULT_NODE_COLLECTION;
+        private NodeType nodeType;
 
-        private PropertyTree data = new PropertyTree();
+        private PropertyTree data;
 
         private IndexConfigDocument indexConfigDocument;
 
         private ChildOrder childOrder;
 
         private Long manualOrderValue;
 
-        private AccessControlList permissions = AccessControlList.empty();
+        private AccessControlList permissions;
 
         private boolean inheritPermissions;
 
-        private AttachedBinaries attachedBinaries = AttachedBinaries.empty();
+        private AttachedBinaries attachedBinaries;
 
         private Builder()
         {
+            this.nodeType = NodeType.DEFAULT_NODE_COLLECTION;
+            this.data = new PropertyTree();
+            permissions = AccessControlList.empty();
+            attachedBinaries = AttachedBinaries.empty();
         }
 
         private Builder( NodeVersion nodeVersion )
         {
             this.id = nodeVersion.id;
             this.nodeType = nodeVersion.nodeType;
-            this.data = nodeVersion.data;
+            this.data = nodeVersion.data.copy();
             this.indexConfigDocument = nodeVersion.indexConfigDocument;
             this.childOrder = nodeVersion.childOrder;
             this.manualOrderValue = nodeVersion.manualOrderValue;