Avoid reflection in zal

pom.xml

@@ -10,9 +10,9 @@
   <packaging>jar</packaging>
 
   <properties>
-    <revision>4.32.0</revision>
+    <revision>4.32.0.avoid-reflection-in-zal</revision>
     <changelist>-SNAPSHOT</changelist>
-    <carbonio.version>4.28.0</carbonio.version>
+      <carbonio.version>4.28.1.avoid-reflection-in-zal-SNAPSHOT</carbonio.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jackson.version>2.15.4</jackson.version>
     <jfreechart.version>1.0.15</jfreechart.version>
@@ -706,39 +706,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <version>1.0.1</version>
-        <executions>
-          <execution>
-            <id>rename-DataExtractor</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <sourceFile>
-                ${project.build.directory}/classes/com/zimbra/cs/redolog/op/DataExtractor.class</sourceFile>
-              <destinationFile>
-                ${project.build.directory}/classes/com/zimbra/cs/redolog/op/DataExtractor</destinationFile>
-            </configuration>
-          </execution>
-          <execution>
-            <id>rename-VolumeBlobProxy</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <sourceFile>
-                ${project.build.directory}/classes/com/zimbra/cs/store/file/VolumeBlobProxy.class</sourceFile>
-              <destinationFile>
-                ${project.build.directory}/classes/com/zimbra/cs/store/file/VolumeBlobProxy</destinationFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
@@ -778,10 +745,6 @@
                   <Zimbra-Extension-Class>org.openzal.zal.extension.ZalEntrypointImpl</Zimbra-Extension-Class>
                 </manifestEntries>
               </archive>
-              <excludes>
-                <exclude>com/zimbra/cs/redolog/op/DataExtractor.class</exclude>
-                <exclude>com/zimbra/cs/store/file/VolumeBlobProxy.class</exclude>
-              </excludes>
             </configuration>
           </execution>
           <execution>

src/main/java/org/openzal/zal/BlobWrap.java

@@ -20,7 +20,7 @@
 
 package org.openzal.zal;
 
-import com.zimbra.cs.store.file.VolumeBlobProxy;
+import com.zimbra.cs.store.file.VolumeBlob;
 import com.zimbra.cs.store.file.VolumeMailboxBlob;
 import com.zimbra.cs.store.file.VolumeStagedBlob;
 import javax.annotation.Nonnull;
@@ -55,9 +55,9 @@ public BlobWrap(
     {
       throw new RuntimeException("Cannot handle blob of type " + blob.getClass());
     }
-    if (VolumeBlobProxy.isVolumeBlob(blob))
+    if (VolumeBlobUtils.isVolumeBlob(blob))
     {
-      volumeId = String.valueOf(new VolumeBlobProxy(blob).getVolumeId());
+      volumeId = String.valueOf(new VolumeBlob((VolumeBlob) blob).getVolumeId());
     }
 
     mVolumeId = volumeId;
@@ -133,8 +133,7 @@ public BlobWrap setSize(long size)
   }
 
   @Override
-  public long getStoredFileSize() throws IOException
-  {
+  public long getStoredFileSize() {
     return mBlob.getFile().length();
   }
 

src/main/java/org/openzal/zal/Flag.java

@@ -20,9 +20,7 @@
 
 package org.openzal.zal;
 
-import java.lang.reflect.*;
 
-import org.openzal.zal.log.ZimbraLog;
 import javax.annotation.Nonnull;
 
 
@@ -68,40 +66,9 @@ public final class Flag extends Item
   public static int BITMASK_ARCHIVED    = com.zimbra.cs.mailbox.Flag.BITMASK_ARCHIVED;
   public static int BITMASK_IN_DUMPSTER = com.zimbra.cs.mailbox.Flag.BITMASK_IN_DUMPSTER;
 
-  private static Method sFlagOf;
-
-  static
-  {
-    try
-    {
-      Class partypes[] = new Class[1];
-      partypes[0] = int.class;
-
-      sFlagOf = com.zimbra.cs.mailbox.Flag.FlagInfo.class.getDeclaredMethod("of", partypes);
-      sFlagOf.setAccessible(true);
-    }
-    catch (Throwable ex)
-    {
-      ZimbraLog.extensions.fatal("ZAL Reflection Initialization Exception: " + Utils.exceptionToString(ex));
-      throw new RuntimeException(ex);
-    }
-  }
-
-
   static com.zimbra.cs.mailbox.Flag.FlagInfo of(int id)
   {
-    try
-    {
-      Object parameters[] = new Object[1];
-      parameters[0] = id;
-
-      return (com.zimbra.cs.mailbox.Flag.FlagInfo) sFlagOf.invoke(null, parameters);
-    }
-    catch (Throwable ex)
-    {
-      ZimbraLog.extensions.fatal("ZAL Reflection Initialization Exception: " + Utils.exceptionToString(ex));
-      throw new RuntimeException(ex);
-    }
+    return com.zimbra.cs.mailbox.Flag.FlagInfo.of(id);
   }
 
   public static int BITMASK_FROM_ME           = com.zimbra.cs.mailbox.Flag.BITMASK_FROM_ME;

src/main/java/org/openzal/zal/InternalOverrideBlobWithMailboxInfo.java

@@ -28,14 +28,17 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-class InternalOverrideBlobWithMailboxInfo extends com.zimbra.cs.store.file.VolumeBlobProxy
+import static org.openzal.zal.VolumeBlobUtils.VOLUME_BLOB_DEFAULT_FILE;
+import static org.openzal.zal.VolumeBlobUtils.VOLUME_BLOB_DEFAULT_VOLUME_ID;
+
+class InternalOverrideBlobWithMailboxInfo extends com.zimbra.cs.store.file.VolumeBlob
 {
   private final Blob   mBlob;
   private final String mVolumeId;
 
   public InternalOverrideBlobWithMailboxInfo(Blob blob)
   {
-    super();
+    super(VOLUME_BLOB_DEFAULT_FILE, VOLUME_BLOB_DEFAULT_VOLUME_ID);
     mBlob = blob;
     mVolumeId = blob.getVolumeId();
   }

src/main/java/org/openzal/zal/InternalOverrideVolumeBlob.java

@@ -20,7 +20,7 @@
 
 package org.openzal.zal;
 
-import com.zimbra.cs.store.file.VolumeBlobProxy;
+import com.zimbra.cs.store.file.VolumeBlob;
 import org.apache.commons.io.IOUtils;
 
 import java.io.BufferedInputStream;
@@ -29,14 +29,17 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-class InternalOverrideVolumeBlob extends VolumeBlobProxy
+import static org.openzal.zal.VolumeBlobUtils.VOLUME_BLOB_DEFAULT_FILE;
+import static org.openzal.zal.VolumeBlobUtils.VOLUME_BLOB_DEFAULT_VOLUME_ID;
+
+class InternalOverrideVolumeBlob extends VolumeBlob
 {
   private final Blob   mBlob;
   private final String mVolumeId;
 
   public InternalOverrideVolumeBlob(Blob blob)
   {
-    super();
+    super(VOLUME_BLOB_DEFAULT_FILE, VOLUME_BLOB_DEFAULT_VOLUME_ID);
     mBlob = blob;
     mVolumeId = blob.getVolumeId();
   }