#64036 - Replace reflection calls in factories for Java 9+ - Escher factories

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1873187 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 30 deletions

diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
index e9eb2b1479..416022e7a9 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
@@ -17,11 +17,11 @@
 
 package org.apache.poi.hslf.record;
 
-import java.lang.reflect.Constructor;
-import java.util.Map;
+import java.util.function.Supplier;
 
-import org.apache.poi.ddf.*;
-import org.apache.poi.util.LittleEndian;
+import org.apache.poi.ddf.DefaultEscherRecordFactory;
+import org.apache.poi.ddf.EscherRecord;
+import org.apache.poi.ddf.EscherRecordFactory;
 
 /**
  * Generates escher records when provided the byte array containing those records.
@@ -29,39 +29,20 @@ import org.apache.poi.util.LittleEndian;
  * @see EscherRecordFactory
  */
 public class HSLFEscherRecordFactory extends DefaultEscherRecordFactory {
-    private static Class<?>[] escherRecordClasses = { EscherPlaceholder.class, HSLFEscherClientDataRecord.class };
-    private static Map<Short, Constructor<? extends EscherRecord>> recordsMap = recordsToMap( escherRecordClasses );
-
-    
     /**
      * Creates an instance of the escher record factory
      */
     public HSLFEscherRecordFactory() {
         // no instance initialisation
     }
-    
-    @Override
-    public EscherRecord createRecord(byte[] data, int offset) {
-        short options = LittleEndian.getShort( data, offset );
-        short recordId = LittleEndian.getShort( data, offset + 2 );
-        // int remainingBytes = LittleEndian.getInt( data, offset + 4 );
 
-        Constructor<? extends EscherRecord> recordConstructor = recordsMap.get(Short.valueOf(recordId));
-        if (recordConstructor == null) {
-            return super.createRecord(data, offset);
-        }
-        EscherRecord escherRecord = null;
-        try {
-            escherRecord = recordConstructor.newInstance(new Object[] {});
-        } catch (Exception e) {
-            return super.createRecord(data, offset);
-        }
-        escherRecord.setRecordId(recordId);
-        escherRecord.setOptions(options);
-        if (escherRecord instanceof EscherContainerRecord) {
-            escherRecord.fillFields(data, offset, this);
+    @Override
+    protected Supplier<? extends EscherRecord> getConstructor(short options, short recordId) {
+        if (recordId == EscherPlaceholder.RECORD_ID) {
+            return EscherPlaceholder::new;
+        } else if (recordId == HSLFEscherClientDataRecord.RECORD_ID) {
+            return HSLFEscherClientDataRecord::new;
         }
-        
-        return escherRecord;
+        return super.getConstructor(options, recordId);
     }
 }