Fix constructor bindings

Identify constructors by their binding.
Constructors without binding (null) are implicit/default.

Author: guillep

app/src/main/java/fr/inria/verveine/extractor/java/EntityDictionary.java

@@ -2252,7 +2252,7 @@ public Method ensureFamixMethod(IMethodBinding bnd) {
 	}
 
 	/**
-	 * Returns a Famix Method associated with the IMethodBinding. The Entity is created if it does not exist.
+	 * Returns a Famix Method associated with the IMethodBinding.
 	 * The Entity is created if it does not exist.
 	 * @param name -- the name of the Famix Method (MUST NOT be null, but this is not checked)
 	 * @param ret -- Famix Type returned by the method (ideally should only be null in case of a constructor, but will accept it in any case)
@@ -2422,7 +2422,7 @@ public Initializer ensureFamixInitializer(TWithMethods owner, Boolean isStatic,
 	}
 
 
-	public Initializer ensureImplicitConstructor(TWithMethods owner, String name, Collection<String> parameterTypesNames) {
+	public Initializer ensureImplicitConstructor(IMethodBinding binding, TWithMethods owner, String name, Collection<String> parameterTypesNames) {
 		Initializer fmx = null;
 
 		if (owner != null) {
@@ -2439,10 +2439,17 @@ public Initializer ensureImplicitConstructor(TWithMethods owner, String name, Co
 		}
 
 		if (fmx == null) {
-			fmx = ensureFamixEntity(Initializer.class, null, name);
-			fmx.setParentType(owner);
-			fmx.setSignature(name + "()");
-
+			int modifiers = (binding != null) ? binding.getModifiers() : EntityDictionary.UNKNOWN_MODIFIERS;
+			if (binding == null) {
+				// OK! Binding is null, this is the default constructor!!
+				// It has no source code :)
+				fmx = ensureFamixEntity(Initializer.class, null, name);
+				fmx.setParentType(owner);
+				fmx.setSignature(name + "()");				
+			} else {
+				// But, if we have the binding, that means the constructor exists. Let's just go the normal way
+				fmx = (Initializer) this.ensureFamixMethod(binding, name, parameterTypesNames, /*ret type*/null, owner, modifiers);
+			}
 		}
 
 		return fmx;

app/src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java

@@ -442,7 +442,8 @@ private Invocation methodInvocation(IMethodBinding calledBnd, String calledName,
 				if (calledBnd != null) {
 					parameterTypesNames = Arrays.stream(calledBnd.getParameterTypes()).map(ITypeBinding::getName).toList();
 				}
-				invoked = dico.ensureImplicitConstructor((TWithMethods) owner, calledName, parameterTypesNames );
+				
+				invoked = dico.ensureImplicitConstructor(calledBnd, (TWithMethods) owner, calledName, parameterTypesNames );
 			} else {
 				// static method called on the class (or null receiver)
 				invoked = this.dico.ensureFamixMethod(actualCalledMethodBnd, calledName, unkwnArgs, /* retType */null,

app/src/test/java/fr/inria/verveine/extractor/java/VerveineJTest_Initializers.java

@@ -6,6 +6,7 @@
 import org.moosetechnology.model.famix.famixjavaentities.Class;
 import org.moosetechnology.model.famix.famixtraits.TInvocation;
 import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
 
 import java.lang.Exception;
 import java.util.Collection;
@@ -28,61 +29,47 @@ public void setUp() throws Exception {
     public void testNumberOfMethods() {
         Collection<Method> methods = entitiesOfType(Method.class);
         /*
-        In class SuperClassWithImplicitConstructor: 1
-            SuperClassWithImplicitConstructor(), the implicit constructor
-
-        In class SuperclassWithConstructor: 3
-            <Initializer>
-            SuperclassWithConstructor()
-            initializeFromSuperAttributeDefinition()
-
-        In class ClassWithInitializers: 14
-            - Initializers (4):
-                Static <Initializer> = Static attribute definitions
-                Static initialization block
-                <Initializer> = Attribute definition
-                Initialization block
-            - Constructors (3):
-                ClassWithInitializers()
-                ClassWithInitializers(String)
-                ClassWithInitializers(Boolean)
-            - Methods (7):
-                initializeFromStaticAttributeDefinition()
-                initializeFromStaticInitializationBlock()
-                initializeFromStaticInitializationBlock2()
-                initializeFromAttributeDefinition()
-                initializeFromInstantiationBlock()
-                initializeFromSecondInstantiationBlock()
-                initializeFromConstructor()
-
-        In ClassWithInnerClass: 1
-            <Initializer>
-
-        In class _Anonymous(InnerClass) (in ClassWithInnerClass): 2
-            <Initializer>
-            ClassWithInnerClass(), the implicit constructor
-
+		_Anonymous(InnerClass)._Anonymous(InnerClass)() isStatic:false isInitializationBlock: false
+		ClassWithInitializers.ClassWithInitializers(Boolean) isStatic:false isInitializationBlock: false
+		ClassWithInitializers.<Initializer>() isStatic:true isInitializationBlock: true
+		ClassWithInitializers.initializeFromStaticAttributeDefinition() isStatic:true 
+		_Anonymous(InnerClass).<Initializer>() isStatic:false isInitializationBlock: false
+		ClassWithInitializers.<Initializer>() isStatic:false isInitializationBlock: false
+		ClassWithInitializers.initializeFromInstantiationBlock() isStatic:false 
+		ClassWithInitializers.ClassWithInitializers() isStatic:false isInitializationBlock: false
+		ClassWithInitializers.initializeFromSecondInstantiationBlock() isStatic:false 
+		ClassWithInitializers.initializeFromConstructor() isStatic:false 
+		SuperclassWithImplicitConstructor.SuperclassWithImplicitConstructor() isStatic:false isInitializationBlock: false
+		ClassWithInitializers.initializeFromStaticInitializationBlock2() isStatic:true 
+		SuperclassWithConstructor.SuperclassWithConstructor() isStatic:false isInitializationBlock: false
+		SuperclassWithConstructor.<Initializer>() isStatic:false isInitializationBlock: false
+		ClassWithInnerClass.<Initializer>() isStatic:false isInitializationBlock: false
+		MyClassUserInInitializer.<Initializer>() isStatic:true isInitializationBlock: false
+		ClassWithInitializers.<Initializer>() isStatic:false isInitializationBlock: true
+		SuperclassWithConstructor.initializeFromSuperAttributeDefinition() isStatic:false 
+		ClassWithInitializers.ClassWithInitializers(String) isStatic:false isInitializationBlock: false
+		Object.Object() isStatic:false isInitializationBlock: false
+		ClassWithInitializers.<Initializer>() isStatic:true isInitializationBlock: false
+		ClassWithInitializers.initializeFromAttributeDefinition() isStatic:false 
+		ClassWithInitializers.initializeFromStaticInitializationBlock() isStatic:true 
+		MyClass.MyClass() isStatic:false isInitializationBlock: false
          */
-        for (Class c : entitiesOfType(Class.class)) {
-            if(!c.getIsStub()) {
-                System.out.println(c.getName());
-                for (TMethod m : c.getMethods()) {
-                    System.out.print("    " + m.getName() + " isStatic:" + ((Method) m).getIsClassSide());
-                    if (((Method) m).getIsInitializer()) {
-                        System.out.println(" isInitializationBlock: " + ((Initializer) m).getIsInitializationBlock());
-                    } else {
-                        System.out.println(" ");
-                    }
-                }
+        for (TMethod m : methods) {
+        	System.out.print(((TNamedEntity)m.getParentType()).getName() + "." + m.getSignature() + " isStatic:" + ((Method) m).getIsClassSide());
+            if (((Method) m).getIsInitializer()) {
+            	System.out.println(" isInitializationBlock: " + ((Initializer) m).getIsInitializationBlock());
+            } else {
+            	System.out.println(" ");
             }
-        };
-        assertEquals(21,methods.size());
+        }
+
+        assertEquals(24,methods.size());
     }
 
     @Test
     public void testNumberOfInitializers() {
         Collection<Initializer> initializers = entitiesOfType(Initializer.class);
-        assertEquals(13, initializers.size());
+        assertEquals(16, initializers.size());
     }
 
     @Test
@@ -97,9 +84,11 @@ public void testConstructors() {
             ClassWithInitializers(String)
             ClassWithInitializers(Boolean)
         In class InnerClass (in ClassWithInnerClass): 1, the implicit constructor.
+        MyClass()
+        Object() default constructor
         */
 
-        assertEquals(6, constructors.size());
+        assertEquals(8, constructors.size());
 
         for (Initializer constructor : constructors) {
             assertEquals(((Type)constructor.getParentType()).getName(), constructor.getName());
@@ -175,5 +164,20 @@ public void testInnerClass() {
         var foundAttribute = firstElt(firstElt(initializer.getAccesses()).getCandidates());
         assertEquals(firstElt(innerClass.getAttributes()), foundAttribute);
     }
+    
+    @Test
+    public void testInitializerOfClassUsedInStaticInitializer() {
+    	parser = new VerveineJParser();
+        repo = parser.getFamixRepo();
+        parser.configure( new String[] {
+        		"src/test/resources/initializers/MyClassUserInInitializer.java",
+        		"src/test/resources/initializers/MyClass.java"
+        		});
+        parser.parse();
+        
+        PrimitiveType voidType = detectFamixElement(PrimitiveType.class, "void");
+        Initializer initializer = (Initializer)detectFamixElement(Class.class, "MyClass").getMethods().iterator().next();
+        assertEquals(voidType, initializer.getTyping().getDeclaredType());
+    }
 
 }

app/src/test/resources/initializers/MyClass.java

@@ -0,0 +1,7 @@
+package initializers;
+
+public class MyClass {
+    public MyClass() {
+        super();
+    }
+}

app/src/test/resources/initializers/MyClassUserInInitializer.java

@@ -0,0 +1,7 @@
+package initializers;
+
+public class MyClassUserInInitializer {
+
+    public static final MyClass X = new MyClass();
+    
+}