fix: add missing import for class generics map (PR #480)

* Fix missing import for class Generics map. * Add import only when needed (in non-inner class declaration) * Remove unneeded import
skylot · Mar 21, 2019 · dd2e7e8 · dd2e7e8
1 parent 9797fe5
commit dd2e7e8
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 5 deletions.
diff --git a/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java b/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
@@ -107,7 +107,7 @@ public boolean overrideProvided(String[] args) {
 		return process(jcw);
 	}
 
-	private boolean process(JCommanderWrapper jcw) {
+	private boolean process(JCommanderWrapper<?> jcw) {
 		if (printHelp) {
 			jcw.printUsage();
 			return false;

diff --git a/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java b/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java
@@ -151,7 +151,7 @@ public void encodeValue(CodeWriter code, Object val) {
 			InsnGen.makeStaticFieldAccess(code, field, classGen);
 		} else if (val instanceof Iterable) {
 			code.add('{');
-			Iterator<?> it = ((Iterable) val).iterator();
+			Iterator<?> it = ((Iterable<?>) val).iterator();
 			while (it.hasNext()) {
 				Object obj = it.next();
 				encodeValue(code, obj);

diff --git a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java b/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
@@ -144,7 +144,7 @@ public void addClassDeclaration(CodeWriter clsCode) {
 		clsCode.attachDefinition(cls);
 		clsCode.add(cls.getShortName());
 
-		addGenericMap(clsCode, cls.getGenericMap());
+		addGenericMap(clsCode, cls.getGenericMap(), true);
 		clsCode.add(' ');
 
 		ArgType sup = cls.getSuperClass();
@@ -175,7 +175,7 @@ public void addClassDeclaration(CodeWriter clsCode) {
 		}
 	}
 
-	public boolean addGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap) {
+	public boolean addGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap, boolean classDeclaration) {
 		if (gmap == null || gmap.isEmpty()) {
 			return false;
 		}
@@ -200,6 +200,10 @@ public boolean addGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap)
 						code.add(g.getObject());
 					} else {
 						useClass(code, g);
+
+						if (classDeclaration && !cls.getAlias().isInner()) {
+							addImport(ClassInfo.extCls(cls.root(), g));
+						}
 					}
 					if (it.hasNext()) {
 						code.add(" & ");

diff --git a/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java b/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
@@ -90,7 +90,7 @@ public boolean addDefinition(CodeWriter code) {
 			code.add(mth.isVirtual() ? "/* virtual */ " : "/* direct */ ");
 		}
 
-		if (classGen.addGenericMap(code, mth.getGenericMap())) {
+		if (classGen.addGenericMap(code, mth.getGenericMap(), false)) {
 			code.add(' ');
 		}
 		if (ai.isConstructor()) {

diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java
@@ -0,0 +1,40 @@
+package jadx.tests.integration.generics;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+import jadx.core.dex.nodes.ClassNode;
+import jadx.tests.api.IntegrationTest;
+
+public class TestImportGenericMap extends IntegrationTest {
+
+	@Test
+	public void test() {
+		ClassNode cls = getClassNode(SuperClass.class);
+		String code = cls.getCode().toString();
+
+		assertThat(code, containsString(
+				"import " + SuperClass.ToImport.class.getName().replace('$', '.') + ';'));
+		assertThat(code, not(containsString(
+				"import " + SuperClass.NotToImport.class.getName().replace('$', '.') + ';')));
+	}
+}
+
+final class SuperClass<O extends SuperClass.ToImport> {
+
+    interface ToImport {
+    }
+
+    interface NotToImport {
+    }
+
+    static final class Class1<C extends NotToImport> {
+    }
+
+    public <C extends NotToImport> SuperClass(Class1<C> zzf) {
+    }
+
+}