Skip to content

Commit

Permalink
Merge pull request #117 from skybber/DELTASPIKE-1426
Browse files Browse the repository at this point in the history 
DELTASPIKE-1426: Improve ProxyFactory performance on start
  • Loading branch information
@tandraschko
tandraschko committed Sep 19, 2021
2 parents 2bf31a3 + 14dd70f commit c529592
Show file tree
Hide file tree
Showing 2 changed files with 211 additions and 3 deletions.
14 changes: 11 additions & 3 deletions ...dules/proxy/api/src/main/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import javax.enterprise.inject.spi.BeanManager;

import org.apache.deltaspike.core.util.ClassUtils;
Expand Down Expand Up @@ -189,14 +192,19 @@ private boolean ignoreMethod(Method method, List<Method> methods)
protected ArrayList<Method> collectAllMethods(Class<?> clazz)
{
ArrayList<Method> methods = new ArrayList<Method>();
for (Method method : clazz.getDeclaredMethods())
Set<Method> abstractMethodLeaves = new HashSet<>();
for (Method method : clazz.getMethods())
{
if (!ignoreMethod(method, methods))
{
methods.add(method);
if (Modifier.isAbstract(method.getModifiers()))
{
abstractMethodLeaves.add(method);
}
}
}
for (Method method : clazz.getMethods())
for (Method method : clazz.getDeclaredMethods())
{
if (!ignoreMethod(method, methods))
{
Expand Down Expand Up @@ -236,7 +244,7 @@ protected ArrayList<Method> collectAllMethods(Class<?> clazz)
while (methodIterator.hasNext())
{
Method method = methodIterator.next();
if (Modifier.isAbstract(method.getModifiers()))
if (Modifier.isAbstract(method.getModifiers()) && !abstractMethodLeaves.contains(method))
{
try
{
Expand Down
200 changes: 200 additions & 0 deletions ...s/proxy/api/src/test/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactoryTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
package org.apache.deltaspike.proxy.api;

import static org.junit.Assert.assertTrue;

import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;

import org.junit.Before;
import org.junit.Test;

public class DeltaSpikeProxyFactoryTest
{
public static class DeltaSpikeProxyFactoryForCollectTest extends DeltaSpikeProxyFactory
{
@Override
protected ArrayList<Method> getDelegateMethods(Class<?> targetClass, ArrayList<Method> allMethods)
{
return null;
}

@Override
protected String getProxyClassSuffix()
{
return null;
}

public ArrayList<Method> collectAllMethodsDelegate(Class<?> clazz)
{
return collectAllMethods(clazz);
}
}

private DeltaSpikeProxyFactoryForCollectTest proxyFactory;

@Before
public void setUp() throws Exception
{
proxyFactory = new DeltaSpikeProxyFactoryForCollectTest();
}

public class Class_NonAbstract
{
public void test()
{
}
}

public abstract class Class_NonAbstractToAbstract extends Class_NonAbstract
{
public abstract void test();
}

public abstract static class Class_C1
{
protected abstract void protectedAbstract_C1_C2(); // will be overridden in Class_C2
protected abstract void protectedAbstract_C1_C3(); // will be overridden in Class_C3
protected abstract void protectedAbstract_C1_C2_C3(); // will be overridden in Class_C2, Class_C3
protected abstract void protectedAbstract_C1(); // will not be overridden

public abstract void publicAbstract_C1_C2(); // will be overridden in Class_C2
public abstract void publicAbstract_C1_C3(); // will be overridden in Class_C3
public abstract void publicAbstract_C1_C2_C3(); // will be overridden in Class_C2, Class_C3
public abstract void publicAbstract_C1(); // will not be overriden at all

public void test(List l) { }
}

public abstract static class Class_C2 extends Class_C1
{
protected void protectedAbstract_C1_C2() // Leave in Class_C2
{
}

public void publicAbstract_C1_C2() // Leave in Class_C2
{
}

protected abstract void protectedAbstract_C2_C3(); // will be overridden in Class_C3
protected abstract void protectedAbstract_C2(); // will not be overridden

public abstract void publicAbstract_C2_C3(); // will be overridden in Class_C3
public abstract void publicAbstract_C2(); // will not be overridden

public abstract void test(List list);
}

public abstract static class Class_C3 extends Class_C2
{
public void protectedAbstract_C1_C3()
{
}

public void publicAbstract_C1_C3()
{
}

public void protectedAbstract_C2_C3()
{
}

public void publicAbstract_C2_C3()
{
}
}

private boolean containsMethod(List<Method> collectedMethods, Class<?> declaringClass, String methodName)
{
for(Method m: collectedMethods)
{
if (m.getDeclaringClass() == declaringClass && methodName.equals(m.getName()))
{
return true;
}
}
return false;
}

private void printCollectedMethods(List<Method> collectedMethods)
{
for(Method m: collectedMethods)
{
if (m.getDeclaringClass() != Object.class)
{
System.out.println(m.getDeclaringClass().getName() + " " + m.getName());
}
}
}

@Test
public void testCollection_NonAbstractToAbstract()
{
ArrayList<Method> collectedMethods = proxyFactory.collectAllMethods(Class_NonAbstractToAbstract.class);
printCollectedMethods(collectedMethods);
}

@Test
public void testMethCollection_C1()
{
ArrayList<Method> collectedMethods = proxyFactory.collectAllMethods(Class_C1.class);
// System.out.println("testCollectitOn0");
// printCollectedMethods(collectedMethods);
assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1_C2"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1_C3"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1"));

assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1_C2"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1_C3"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1"));
}

@Test
public void testMethCollection_C2()
{
ArrayList<Method> collectedMethods = proxyFactory.collectAllMethods(Class_C2.class);
// System.out.println("testMethCollection_C2");
// printCollectedMethods(collectedMethods);
assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C1_C2"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1_C3"));
assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C1_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1"));

assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2"));
assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2"));
assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1"));

assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C2"));

assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C2"));
}


@Test
public void testMethCollection_C3()
{
ArrayList<Method> collectedMethods = proxyFactory.collectAllMethods(Class_C3.class);
// System.out.println("testCollectitOn02");
// printCollectedMethods(collectedMethods);
assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C1_C2"));
assertTrue(containsMethod(collectedMethods, Class_C3.class, "protectedAbstract_C1_C3"));
assertTrue(containsMethod(collectedMethods, Class_C3.class, "protectedAbstract_C1_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1"));

assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2"));
assertTrue(containsMethod(collectedMethods, Class_C3.class, "publicAbstract_C1_C3"));
assertTrue(containsMethod(collectedMethods, Class_C3.class, "publicAbstract_C1_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1"));

assertTrue(containsMethod(collectedMethods, Class_C3.class, "protectedAbstract_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C2"));

assertTrue(containsMethod(collectedMethods, Class_C3.class, "publicAbstract_C2_C3"));
assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C2"));

}

}

0 comments on commit c529592

Please sign in to comment.