Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove reflections in unused (or not working) classes #1161

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Remove reflections in unused (or not working) classes #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions main/HSSF/UserModel/OperationEvaluatorFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ namespace NPOI.HSSF.UserModel
using NPOI.SS.Formula.Eval;

using System.Collections;
using System.Reflection;
using NPOI.SS.Formula.PTG;


// REMOVE-REFLECTION: This class won't work as intended, and not used elsewhere in NPOI. Obsolete and remove.

/**
* This class Creates <c>OperationEval</c> instances to help evaluate <c>OperationPtg</c>
* formula tokens.
Expand Down Expand Up @@ -85,44 +86,39 @@ private static void Add(Hashtable m, Type ptgClass, Type evalClass)
throw new Exception("Eval class must not be abstract");
}

ConstructorInfo constructor;
/*ConstructorInfo constructor;
constructor = evalClass.GetConstructor(OPERATION_CONSTRUCTOR_CLASS_ARRAY);
if (!constructor.IsPublic)
{
throw new Exception("Eval constructor must be public");
}
m[ptgClass] = constructor;
m[ptgClass] = constructor;*/
}

/**
* returns the OperationEval concrete impl instance corresponding
* to the supplied operationPtg
*/
[Obsolete]
public static OperationEval Create(OperationPtg ptg)
{
throw new NotSupportedException();

if (ptg == null)
{
throw new ArgumentException("ptg must not be null");
}

Type ptgClass = ptg.GetType();
// (original comment)
// ExpPtg Is used for array formulas and shared formulas.
// it Is currently Unsupported, and may not even Get implemented here

ConstructorInfo constructor = (ConstructorInfo)_constructorsByPtgClass[ptgClass];
if (constructor == null)
{
if (ptgClass == typeof(ExpPtg))
{
// ExpPtg Is used for array formulas and shared formulas.
// it Is currently Unsupported, and may not even Get implemented here
throw new Exception("ExpPtg currently not supported");
}
throw new Exception("Unexpected operation ptg class (" + ptgClass.Name + ")");
}
/*Type ptgClass = ptg.GetType();

Object result;
Object[] initargs = { ptg };
result = constructor.Invoke(initargs);
return (OperationEval)result;
return (OperationEval)result;*/
}
}
}
34 changes: 1 addition & 33 deletions main/POIFS/NIO/FileBackedDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ limitations under the License.
using NPOI.Util;
using System.Collections.Generic;
using System.Security;
using System.Reflection;
//using System.IO.MemoryMappedFiles;
namespace NPOI.POIFS.NIO
{
Expand Down Expand Up @@ -209,38 +208,7 @@ public override void Close()
// but we at least have unit-tests which will indicate this when run on Windows
private static void unmap(ByteBuffer bb)
{
//TODO: try add clean method for ByteBuffer class.
//Type fcClass = bb.GetType();
//try
//{
// // invoke bb.cleaner().clean(), but do not depend on sun.nio
// // interfaces
// MethodInfo cleanerMethod = fcClass.GetMethod("cleaner");
// //cleanerMethod.setAccessible(true);
// Object cleaner = cleanerMethod.Invoke(bb, null);
// MethodInfo cleanMethod = cleaner.GetType().GetMethod("clean");
// cleanMethod.Invoke(cleaner, null);
//}
//catch (NotSupportedException e)
//{
// // e.printStackTrace();
//}
//catch (SecurityException e)
//{
// // e.printStackTrace();
//}
//catch (MethodAccessException e)
//{
// // e.printStackTrace();
//}
//catch (ArgumentException e)
//{
// // e.printStackTrace();
//}
//catch (TargetException e)
//{
// // e.printStackTrace();
//}
// REMOVE-REFLECTION: This method is Java-specific.
}
}

Expand Down
17 changes: 12 additions & 5 deletions main/SS/Formula/Eval/Forked/ForkedEvaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ limitations under the License.
==================================================================== */

using System;
using System.Reflection;
using NPOI.HSSF.UserModel;
using NPOI.SS.Formula;
using NPOI.SS.Formula.Eval;
Expand All @@ -36,6 +35,9 @@ namespace NPOI.SS.Formula.Eval.Forked
*
* @author Josh Micich
*/

// REMOVE-REFLECTION: This class doesn't work from the beginning because of typo.
// And no elsewhere in NPOI uses this class. Consider removing it.
public class ForkedEvaluator
{

Expand All @@ -58,10 +60,15 @@ private static IEvaluationWorkbook CreateEvaluationWorkbook(IWorkbook wb)
try
{
// TODO: check if this is Java 9 compatible ...
Type evalWB = Type.GetType("NPOI.XSSF.UserModel.XSSFEvaluationWorkbook");
Type xssfWB = Type.GetType("NPOI.XSSF.UserMode.XSSFWorkbook");
MethodInfo createM = evalWB.GetMethod("create", new Type[] { xssfWB });
return (IEvaluationWorkbook)createM.Invoke(null, new object[] { wb });
/*Type evalWB = Type.GetType("NPOI.XSSF.UserModel.XSSFEvaluationWorkbook");
Type xssfWB = Type.GetType("NPOI.XSSF.UserMode.XSSFWorkbook");*/

// REMOVE-REFLECTION: The code is Java-specific and different from the current NPOI object model

/*var createM = evalWB.GetMethod("create", new Type[] { xssfWB });
return (IEvaluationWorkbook)createM.Invoke(null, new object[] { wb });*/

throw new NotSupportedException();
}
catch (Exception e)
{
Expand Down
10 changes: 4 additions & 6 deletions openxml4Net/Util/ZipSecureFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;

namespace NPOI.OpenXml4Net.Util
Expand Down Expand Up @@ -110,18 +109,17 @@ public ZipSecureFile(String name)

public static ThresholdInputStream AddThreshold(Stream zipIS)
{
// REMOVE-REFLCETION: Meaningless reflection is used here as the type FilterInputStream doesn't have a field named "in".
// And obviously this stub does nothing.
// There needs to be another way of handling ZIP bombs.

ThresholdInputStream newInner = null;
if (zipIS is InflaterInputStream)
{
//replace inner stream of zipIS by using a ThresholdInputStream instance??
try
{
FieldInfo f = typeof(FilterInputStream).GetField("in");
//f.SetAccessible(true);
//InputStream oldInner = (InputStream)f.Get(zipIS);
//newInner = new ThresholdInputStream(oldInner, null);
//f.Set(zipIS, newInner);
// REMOVE-REFLECTION: Java-specific code
} catch (Exception ex) {
//logger.Log(POILogger.WARN, "SecurityManager doesn't allow manipulation via reflection for zipbomb detection - continue with original input stream", ex);
newInner = null;
Expand Down
Loading