From 207ce6cbbebd13dc96edb452fc4719ee45551f57 Mon Sep 17 00:00:00 2001 From: Ahmed Ashour Date: Mon, 1 Apr 2019 14:19:09 +0200 Subject: [PATCH] chore: fix "unused" warnings (PR #549) --- .../core/dex/visitors/blocksmaker/BlockFinish.java | 7 +------ .../core/dex/visitors/debuginfo/DebugInfoParser.java | 4 ---- .../main/java/jadx/core/xmlgen/BinaryXMLParser.java | 1 + .../java/jadx/core/xmlgen/CommonBinaryParser.java | 1 + .../main/java/jadx/core/xmlgen/ResTableParser.java | 1 + .../java/jadx/tests/integration/TestWrongCode.java | 5 +++-- .../jadx/tests/integration/arith/TestArith3.java | 4 ++-- .../integration/debuginfo/TestLineNumbers2.java | 1 - .../tests/integration/generics/TestGenerics2.java | 4 ++-- .../jadx/tests/integration/inline/TestIssue86.java | 2 +- .../integration/inner/TestAnonymousClass12.java | 4 ++-- .../tests/integration/inner/TestAnonymousClass2.java | 3 ++- .../tests/integration/inner/TestAnonymousClass3.java | 2 +- .../tests/integration/inner/TestAnonymousClass4.java | 1 + .../tests/integration/inner/TestInnerClass4.java | 2 +- .../integration/inner/TestOuterConstructorCall.java | 1 + .../jadx/tests/integration/invoke/TestInvoke1.java | 2 +- .../tests/integration/invoke/TestInvokeInCatch.java | 2 +- .../invoke/TestSuperInvokeWithGenerics.java | 1 - .../tests/integration/loops/TestArrayForEach.java | 2 +- .../tests/integration/loops/TestArrayForEach2.java | 2 +- .../integration/loops/TestArrayForEachNegative.java | 2 +- .../tests/integration/loops/TestBreakInLoop.java | 4 ++-- .../tests/integration/loops/TestContinueInLoop.java | 4 ++-- .../tests/integration/loops/TestIterableForEach.java | 2 +- .../integration/loops/TestIterableForEach3.java | 2 +- .../tests/integration/loops/TestLoopCondition.java | 4 ++-- .../tests/integration/loops/TestLoopCondition5.java | 2 +- .../integration/loops/TestLoopConditionInvoke.java | 2 +- .../tests/integration/loops/TestLoopDetection.java | 2 +- .../tests/integration/loops/TestLoopDetection3.java | 2 +- .../tests/integration/loops/TestLoopDetection4.java | 2 +- .../tests/integration/loops/TestNestedLoops.java | 2 +- .../tests/integration/loops/TestNestedLoops2.java | 2 +- .../tests/integration/names/TestNameAssign2.java | 2 +- .../others/TestDefConstructorNotRemoved.java | 2 +- .../jadx/tests/integration/others/TestFieldInit.java | 8 ++++---- .../tests/integration/others/TestFieldInit2.java | 4 ++-- .../integration/others/TestFieldInitInTryCatch.java | 10 +++++----- .../jadx/tests/integration/others/TestIfInTry.java | 2 +- .../tests/integration/others/TestIfTryInCatch.java | 2 +- .../jadx/tests/integration/others/TestIssue13b.java | 4 ++-- .../tests/integration/others/TestLoopInTry2.java | 4 +--- .../integration/synchronize/TestSynchronized2.java | 1 + .../integration/trycatch/TestNestedTryCatch.java | 2 +- .../tests/integration/trycatch/TestTryCatch.java | 2 +- .../tests/integration/trycatch/TestTryCatch2.java | 2 +- .../tests/integration/trycatch/TestTryCatch4.java | 3 ++- .../tests/integration/trycatch/TestTryCatch7.java | 2 +- .../integration/trycatch/TestTryCatchFinally5.java | 2 +- .../integration/trycatch/TestTryCatchFinally8.java | 2 +- .../jadx/tests/integration/types/TestGenerics.java | 2 +- .../tests/integration/types/TestTypeInheritance.java | 2 +- .../tests/integration/types/TestTypeResolver2.java | 2 +- .../tests/integration/types/TestTypeResolver6.java | 2 +- .../tests/integration/types/TestTypeResolver6a.java | 2 +- .../integration/usethis/TestDontInlineThis.java | 2 +- .../tests/integration/usethis/TestInlineThis.java | 2 +- .../tests/integration/usethis/TestInlineThis2.java | 2 +- .../tests/integration/variables/TestVariables4.java | 2 +- .../src/main/java/jadx/samples/TestGenerics.java | 12 ++++++------ .../src/main/java/jadx/samples/TestTypeResolver.java | 2 +- .../main/java/jadx/samples/TestTypeResolver2.java | 6 +++--- 63 files changed, 86 insertions(+), 90 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockFinish.java b/jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockFinish.java index dd7d47bf6..0650ff7ff 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockFinish.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockFinish.java @@ -3,9 +3,6 @@ package jadx.core.dex.visitors.blocksmaker; import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import jadx.core.dex.attributes.AType; import jadx.core.dex.nodes.BlockNode; import jadx.core.dex.nodes.MethodNode; @@ -16,8 +13,6 @@ import jadx.core.utils.BlockUtils; public class BlockFinish extends AbstractVisitor { - private static final Logger LOG = LoggerFactory.getLogger(BlockFinish.class); - @Override public void visit(MethodNode mth) { if (mth.isNoCode()) { @@ -33,7 +28,7 @@ public class BlockFinish extends AbstractVisitor { } /** - * For evey exception handler must be only one splitter block, + * For every exception handler must be only one splitter block, * select correct one and remove others if necessary. */ private static void fixSplitterBlock(MethodNode mth, BlockNode block) { diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoParser.java b/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoParser.java index 0b79fe710..f2989bfc7 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoParser.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoParser.java @@ -4,9 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.android.dex.Dex.Section; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import jadx.core.dex.attributes.nodes.SourceFileAttr; import jadx.core.dex.instructions.args.RegisterArg; import jadx.core.dex.nodes.DexNode; @@ -15,7 +12,6 @@ import jadx.core.dex.nodes.MethodNode; import jadx.core.utils.exceptions.DecodeException; public class DebugInfoParser { - private static final Logger LOG = LoggerFactory.getLogger(DebugInfoParser.class); private static final int DBG_END_SEQUENCE = 0x00; private static final int DBG_ADVANCE_PC = 0x01; private static final int DBG_ADVANCE_LINE = 0x02; diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java index 8912f4594..3a5259f51 100644 --- a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java +++ b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java @@ -31,6 +31,7 @@ import jadx.core.xmlgen.entry.ValuesParser; Check Element chunk size */ +@SuppressWarnings("unused") public class BinaryXMLParser extends CommonBinaryParser { private static final Logger LOG = LoggerFactory.getLogger(BinaryXMLParser.class); diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java index 532e3d027..e52657ed1 100644 --- a/jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java +++ b/jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java @@ -11,6 +11,7 @@ public class CommonBinaryParser extends ParserConstants { return parseStringPoolNoType(); } + @SuppressWarnings("unused") protected String[] parseStringPoolNoType() throws IOException { long start = is.getPos() - 2; is.checkInt16(0x001c, "String pool header size not 0x001c"); diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java index 8ac5fed57..47544f7bd 100644 --- a/jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java +++ b/jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java @@ -164,6 +164,7 @@ public class ResTableParser extends CommonBinaryParser { return pkg; } + @SuppressWarnings("unused") private void parseTypeSpecChunk() throws IOException { is.checkInt16(0x0010, "Unexpected type spec header size"); /*int size = */ diff --git a/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java b/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java index fbb19754a..b69cd068a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java +++ b/jadx-core/src/test/java/jadx/tests/integration/TestWrongCode.java @@ -14,12 +14,13 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestWrongCode extends IntegrationTest { public static class TestCls { - private int test() { + @SuppressWarnings("null") + public int test() { int[] a = null; return a.length; } - private int test2(int a) { + public int test2(int a) { if (a == 0) { } return a; diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java index 7132e0699..354888aaf 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java @@ -13,9 +13,9 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestArith3 extends IntegrationTest { public static class TestCls { - private int vp; + public int vp; - private void test(byte[] buffer) { + public void test(byte[] buffer) { int n = ((buffer[3] & 255) + 4) + ((buffer[2] & 15) << 8); while (n + 4 < buffer.length) { int c = buffer[n] & 255; diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java index 0e6349b3f..7c899acbf 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java @@ -37,7 +37,6 @@ public class TestLineNumbers2 extends IntegrationTest { public void test() { ClassNode cls = getClassNode(TestCls.class); CodeWriter codeWriter = cls.getCode(); - String code = codeWriter.toString(); Map lineMapping = codeWriter.getLineMapping(); assertEquals("{8=18, 11=22, 12=23, 13=24, 14=28, 16=25, 17=26, 18=28, 21=31, 22=32}", diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java index 427a7666c..45512c327 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java @@ -16,8 +16,8 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestGenerics2 extends IntegrationTest { public static class TestCls { - private static class ItemReference extends WeakReference { - private Object id; + public static class ItemReference extends WeakReference { + public Object id; public ItemReference(V item, Object objId, ReferenceQueue queue) { super(item, queue); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java b/jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java index 8186cf6c0..2b8587f22 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java @@ -24,7 +24,7 @@ public class TestIssue86 extends IntegrationTest { private static final String WEATHER_TAG = "weather-tag"; private static final String DESC_TAG = "desc-tag"; - private List test(String response) { + public List test(String response) { List reportList = new ArrayList<>(); try { System.out.println(response); diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java index 423858c2e..f5dc380e7 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java @@ -16,8 +16,8 @@ public class TestAnonymousClass12 extends IntegrationTest { public abstract void doSomething(); } - private BasicAbstract outer; - private BasicAbstract inner; + public BasicAbstract outer; + public BasicAbstract inner; public void test() { outer = new BasicAbstract() { diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java index 6ded86fe5..9acc7374e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java @@ -13,7 +13,7 @@ public class TestAnonymousClass2 extends IntegrationTest { public static class TestCls { public static class Inner { - private int f; + public int f; public Runnable test() { return new Runnable() { @@ -27,6 +27,7 @@ public class TestAnonymousClass2 extends IntegrationTest { public Runnable test2() { return new Runnable() { @Override + @SuppressWarnings("unused") public void run() { Object obj = Inner.this; } diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java index d5a3d7672..2b2cf6804 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java @@ -13,7 +13,7 @@ public class TestAnonymousClass3 extends IntegrationTest { public static class TestCls { public static class Inner { private int f; - private double d; + public double d; public void test() { new Thread() { diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java index 62c74eedf..10dcba57b 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java @@ -12,6 +12,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestAnonymousClass4 extends IntegrationTest { public static class TestCls { + @SuppressWarnings("unused") public static class Inner { private int f; private double d; diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java index 7b5a57fdb..f026a45b1 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java @@ -19,7 +19,7 @@ public class TestInnerClass4 extends IntegrationTest { } } - private String test() { + public String test() { return new C().c; } } diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java b/jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java index 5d4a44b40..40c525673 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java +++ b/jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java @@ -17,6 +17,7 @@ public class TestOuterConstructorCall extends IntegrationTest { } private class Inner { + @SuppressWarnings("unused") private TestCls test() { return new TestCls(this); } diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java index dde882e03..88a0b8555 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java +++ b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java @@ -16,7 +16,7 @@ public class TestInvoke1 extends IntegrationTest { private A is; - private C test(int start) throws IOException { + public C test(int start) throws IOException { int id = is.readInt32(); String name = is.readString16Fixed(128); diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java index 9f4eac344..2856eb79e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java @@ -17,7 +17,7 @@ public class TestInvokeInCatch extends IntegrationTest { public static class TestCls { private static final String TAG = "TAG"; - private void test(int[] a, int b) { + public void test(int[] a, int b) { try { exc(); } catch (IOException e) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java index a5747f007..f7693bc21 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java +++ b/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java @@ -7,7 +7,6 @@ import jadx.tests.api.IntegrationTest; import static jadx.tests.api.utils.JadxMatchers.containsOne; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.anyOf; public class TestSuperInvokeWithGenerics extends IntegrationTest { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java index 6ff052807..bcf8f78b1 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java @@ -12,7 +12,7 @@ public class TestArrayForEach extends IntegrationTest { public static class TestCls { - private int test(int[] a) { + public int test(int[] a) { int sum = 0; for (int n : a) { sum += n; diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java index 0de2c74ee..575f5f7b4 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java @@ -13,7 +13,7 @@ import static org.hamcrest.Matchers.not; public class TestArrayForEach2 extends IntegrationTest { public static class TestCls { - private void test(String str) { + public void test(String str) { for (String s : str.split("\n")) { String t = s.trim(); if (t.length() > 0) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java index 28a03ba8d..f94e228e8 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java @@ -13,7 +13,7 @@ public class TestArrayForEachNegative extends IntegrationTest { public static class TestCls { - private int test(int[] a, int[] b) { + public int test(int[] a, int[] b) { int sum = 0; for (int i = 0; i < a.length; i += 2) { sum += a[i]; diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java index 042049c00..3094bb260 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java @@ -12,9 +12,9 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestBreakInLoop extends IntegrationTest { public static class TestCls { - private int f; + public int f; - private void test(int[] a, int b) { + public void test(int[] a, int b) { for (int i = 0; i < a.length; i++) { a[i]++; if (i < b) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java index 89de52268..6bfcec8f1 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java @@ -11,9 +11,9 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestContinueInLoop extends IntegrationTest { public static class TestCls { - private int f; + public int f; - private void test(int[] a, int b) { + public void test(int[] a, int b) { for (int i = 0; i < a.length; i++) { int v = a[i]; if (v < b) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java index 587111065..4e1b71da1 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestIterableForEach extends IntegrationTest { public static class TestCls { - private String test(Iterable a) { + public String test(Iterable a) { StringBuilder sb = new StringBuilder(); for (String s : a) { sb.append(s); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java index 782f02887..f609f6111 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java @@ -16,7 +16,7 @@ public class TestIterableForEach3 extends IntegrationTest { private Set a; private Set b; - private void test(T str) { + public void test(T str) { Set set = str.length() == 1 ? a : b; for (T s : set) { if (s.length() == str.length()) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java index f769ab8e0..e99f26abc 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java @@ -16,7 +16,7 @@ public class TestLoopCondition extends IntegrationTest { private void setEnabled(boolean r1z) { } - private void testIfInLoop() { + public void testIfInLoop() { int j = 0; for (int i = 0; i < f.length(); i++) { char ch = f.charAt(i); @@ -31,7 +31,7 @@ public class TestLoopCondition extends IntegrationTest { setEnabled(false); } - private void testMoreComplexIfInLoop(java.util.ArrayList list) throws Exception { + public void testMoreComplexIfInLoop(java.util.ArrayList list) throws Exception { for (int i = 0; i != 16 && i < 255; i++) { list.set(i, "ABC"); if (i == 128) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java index 1dd0c215c..3f5608556 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java @@ -13,7 +13,7 @@ import static org.hamcrest.Matchers.anyOf; public class TestLoopCondition5 extends SmaliTest { public static class TestCls { - private static int lastIndexOf(int[] array, int target, int start, int end) { + public static int lastIndexOf(int[] array, int target, int start, int end) { for (int i = end - 1; i >= start; i--) { if (array[i] == target) { return i; diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java index f2a46db47..b73b64969 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java @@ -14,7 +14,7 @@ public class TestLoopConditionInvoke extends IntegrationTest { private static final char STOP_CHAR = 0; private int pos; - private boolean test(char lastChar) { + public boolean test(char lastChar) { int startPos = pos; char ch; while ((ch = next()) != STOP_CHAR) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java index a002eb675..38b2b72d6 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java @@ -13,7 +13,7 @@ public class TestLoopDetection extends IntegrationTest { public static class TestCls { - private void test(int[] a, int b) { + public void test(int[] a, int b) { int i = 0; while (i < a.length && i < b) { a[i]++; diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java index 4290a6d13..8c63b1694 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java @@ -13,7 +13,7 @@ public class TestLoopDetection3 extends IntegrationTest { public static class TestCls { - private void test(TestCls parent, int pos) { + public void test(TestCls parent, int pos) { Object item; while (--pos >= 0) { item = parent.get(pos); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java index b4852faa6..cc1f1817c 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java @@ -16,7 +16,7 @@ public class TestLoopDetection4 extends IntegrationTest { private Iterator iterator; private SomeCls filter; - private String test() { + public String test() { while (iterator.hasNext()) { String next = iterator.next(); String filtered = filter.filter(next); diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java index f9ca07673..a194dbbea 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java @@ -14,7 +14,7 @@ public class TestNestedLoops extends IntegrationTest { public static class TestCls { - private void test(List l1, List l2) { + public void test(List l1, List l2) { for (String s1 : l1) { for (String s2 : l2) { if (s1.equals(s2)) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java index 044b94f95..c045d7ec8 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java @@ -14,7 +14,7 @@ public class TestNestedLoops2 extends IntegrationTest { public static class TestCls { - private boolean test(List list) { + public boolean test(List list) { int j = 0; for (int i = 0; i < list.size(); i++) { String s = list.get(i); diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java b/jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java index 0e7070dfa..07387b231 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java @@ -21,7 +21,7 @@ public class TestNameAssign2 extends IntegrationTest { public static class TestCls { - private static void test(MethodNode mth, int regNum, LiveVarAnalysis la) { + public static void test(MethodNode mth, int regNum, LiveVarAnalysis la) { List blocks = mth.getBasicBlocks(); int blocksCount = blocks.size(); BitSet hasPhi = new BitSet(blocksCount); diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java index 9c0185199..4871b55a9 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java @@ -19,7 +19,7 @@ public class TestDefConstructorNotRemoved extends IntegrationTest { } public static class A { - private final String s; + public final String s; public A() { s = "a"; diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit.java index 6b8087242..2fb06e82c 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit.java @@ -21,11 +21,11 @@ public class TestFieldInit extends IntegrationTest { public class A { } - private static List s = new ArrayList<>(); + public static List s = new ArrayList<>(); - private A a = new A(); - private int i = 1 + Random.class.getSimpleName().length(); - private int n = 0; + public A a = new A(); + public int i = 1 + Random.class.getSimpleName().length(); + public int n = 0; public TestCls(int z) { this.n = z; diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java index b7d591d8d..18823f282 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java @@ -17,13 +17,13 @@ public class TestFieldInit2 extends IntegrationTest { void doSomething(); } - private BasicAbstract x = new BasicAbstract() { + public BasicAbstract x = new BasicAbstract() { @Override public void doSomething() { y = 1; } }; - private int y = 0; + public int y = 0; public TestCls() { } diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java index b37ccbc85..34634a354 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java @@ -15,7 +15,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestFieldInitInTryCatch extends IntegrationTest { public static class TestCls { - private static final URL a; + public static final URL a; static { try { @@ -27,7 +27,7 @@ public class TestFieldInitInTryCatch extends IntegrationTest { } public static class TestCls2 { - private static final URL[] a; + public static final URL[] a; static { try { @@ -39,7 +39,7 @@ public class TestFieldInitInTryCatch extends IntegrationTest { } public static class TestCls3 { - private static final String[] a; + public static final String[] a; static { try { @@ -58,7 +58,7 @@ public class TestFieldInitInTryCatch extends IntegrationTest { ClassNode cls = getClassNode(TestCls.class); String code = cls.getCode().toString(); - assertThat(code, containsOne("private static final URL a;")); + assertThat(code, containsOne("public static final URL a;")); assertThat(code, containsOne("a = new URL(\"http://www.example.com/\");")); assertThat(code, containsLines(2, "try {", @@ -82,6 +82,6 @@ public class TestFieldInitInTryCatch extends IntegrationTest { ClassNode cls = getClassNode(TestCls3.class); String code = cls.getCode().toString(); - assertThat(code, containsOne("private static final String[] a = new String[]{\"a\"};")); + assertThat(code, containsOne("public static final String[] a = new String[]{\"a\"};")); } } diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java index cb38e5879..0deffd195 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java @@ -15,7 +15,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestIfInTry extends IntegrationTest { public static class TestCls { - private File dir; + public File dir; public int test() { try { diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java index e28849f4c..14319024a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java @@ -12,7 +12,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestIfTryInCatch extends IntegrationTest { public static class TestCls { - private Exception exception; + public Exception exception; private java.lang.Object data; public java.lang.Object test(final Object obj) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java index 272a079e7..0c7446367 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java @@ -22,9 +22,9 @@ public class TestIssue13b extends IntegrationTest { private static final String PROPERTIES_FILE = ""; private static final String TAG = ""; private final CountDownLatch mInitializedLatch = new CountDownLatch(1); - private int mC2KServerPort = 0; + public int mC2KServerPort = 0; private String mSuplServerHost = ""; - private int mSuplServerPort = 0; + public int mSuplServerPort = 0; private String mC2KServerHost = ""; public TestCls() { diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java index a45b636dc..1b208d62f 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry2.java @@ -8,7 +8,6 @@ import com.android.dx.io.instructions.ShortArrayCodeInput; import org.junit.jupiter.api.Test; import jadx.core.dex.nodes.ClassNode; -import jadx.core.dex.nodes.DexNode; import jadx.core.dex.nodes.MethodNode; import jadx.core.utils.exceptions.DecodeException; import jadx.tests.api.IntegrationTest; @@ -20,8 +19,7 @@ public class TestLoopInTry2 extends IntegrationTest { public static class TestCls { private MethodNode method; - private DexNode dex; - private DecodedInstruction[] insnArr; + public DecodedInstruction[] insnArr; public void test(Code mthCode) throws DecodeException { short[] encodedInstructions = mthCode.getInstructions(); diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java index a90aabd47..b599d61af 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java @@ -13,6 +13,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestSynchronized2 extends IntegrationTest { public static class TestCls { + @SuppressWarnings("unused") private static synchronized boolean test(Object obj) { return obj.toString() != null; } diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java index f45ca3ac6..c1f1cefb9 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java @@ -12,7 +12,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestNestedTryCatch extends IntegrationTest { public static class TestCls { - private void f() { + public void f() { try { Thread.sleep(1); try { diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java index b3d616f09..df3c1516f 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java @@ -12,7 +12,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestTryCatch extends IntegrationTest { public static class TestCls { - private void f() { + public void f() { try { Thread.sleep(50); } catch (InterruptedException e) { diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java index 361cd923b..fd07e4ceb 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java @@ -13,7 +13,7 @@ public class TestTryCatch2 extends IntegrationTest { public static class TestCls { private final static Object obj = new Object(); - private static boolean test() { + public static boolean test() { try { synchronized (obj) { obj.wait(5); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java index 091ad5ff0..a81f01426 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch4.java @@ -16,7 +16,8 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestTryCatch4 extends IntegrationTest { public static class TestCls { - private Object test(Object obj) { + @SuppressWarnings({ "resource", "unused" }) + public Object test(Object obj) { FileOutputStream output = null; try { output = new FileOutputStream(new File("f")); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java index 8ae2205e9..5a710cbf6 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestTryCatch7 extends IntegrationTest { public static class TestCls { - private Exception test() { + public Exception test() { Exception e = new Exception(); try { Thread.sleep(50); diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java index 613aa092c..b01f67b5a 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java @@ -15,7 +15,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestTryCatchFinally5 extends IntegrationTest { public static class TestCls { - private List test(A a, B b) { + public List test(A a, B b) { C c = p(a); if (c == null) { return null; diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java index c563faa3f..09d014d39 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java +++ b/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java @@ -16,7 +16,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestTryCatchFinally8 extends IntegrationTest { public static class TestCls { - private Object test(Object obj) { + public Object test(Object obj) { File file = new File("r"); FileOutputStream output = null; try { diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java index 5a4a5e922..fe8a9f04b 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java +++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestGenerics extends IntegrationTest { public static class TestCls { - private T data; + public T data; public TestCls data(T t) { this.data = t; diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java index 8dce850b4..95750f883 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java +++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java @@ -25,7 +25,7 @@ public class TestTypeInheritance extends IntegrationTest { public void b() {} } - private static void test(boolean z) { + public static void test(boolean z) { IBase impl; if (z) { impl = new A(); diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java index 774c05ea0..67716117d 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java @@ -14,7 +14,7 @@ public class TestTypeResolver2 extends IntegrationTest { public static class TestCls { - private static boolean test(Object obj) throws IOException { + public static boolean test(Object obj) throws IOException { if (obj != null) { return true; } diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java index f30740484..024a00266 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java +++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestTypeResolver6 extends IntegrationTest { public static class TestCls { - private final Object obj; + public final Object obj; public TestCls(boolean b) { this.obj = b ? this : makeObj(); diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java index 85c2f1c5f..84aec4f17 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java +++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestTypeResolver6a extends IntegrationTest { public static class TestCls implements Runnable { - private final Runnable runnable; + public final Runnable runnable; public TestCls(boolean b) { this.runnable = b ? this : makeRunnable(); diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java index 7b9e0cd16..3f41b2dc4 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java +++ b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java @@ -15,7 +15,7 @@ public class TestDontInlineThis extends IntegrationTest { public static class TestCls { public int field = new Random().nextInt(); - private TestCls test() { + public TestCls test() { TestCls res; if (field == 7) { res = this; diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java index b9dfc17cd..60bd0119e 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java +++ b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java @@ -15,7 +15,7 @@ public class TestInlineThis extends IntegrationTest { public static class TestCls { public int field; - private void test() { + public void test() { TestCls something = this; something.method(); something.field = 123; diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java index dfcbbf55b..5f3686558 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java +++ b/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java @@ -17,7 +17,7 @@ public class TestInlineThis2 extends IntegrationTest { public static class TestCls { public int field; - private void test() { + public void test() { TestCls thisVar = this; if (Objects.isNull(thisVar)) { System.out.println("null"); diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java index 2674e9583..c5f4f5528 100644 --- a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java +++ b/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java @@ -14,7 +14,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class TestVariables4 extends IntegrationTest { public static class TestCls { - private static boolean runTest(String clsName) { + public static boolean runTest(String clsName) { try { boolean pass = false; String msg = null; diff --git a/jadx-samples/src/main/java/jadx/samples/TestGenerics.java b/jadx-samples/src/main/java/jadx/samples/TestGenerics.java index d3673dce2..3e70e3d1a 100644 --- a/jadx-samples/src/main/java/jadx/samples/TestGenerics.java +++ b/jadx-samples/src/main/java/jadx/samples/TestGenerics.java @@ -13,7 +13,7 @@ public class TestGenerics extends AbstractTest { public Class[] classes; public interface MyComparable { - public int compareTo(T o); + int compareTo(T o); } public static class GenericClass implements MyComparable { @@ -38,9 +38,9 @@ public class TestGenerics extends AbstractTest { public static Box integerBox = new Box<>(); public interface Pair { - public K getKey(); + K getKey(); - public LongGenericType getValue(); + LongGenericType getValue(); } public static class OrderedPair implements Pair { @@ -133,7 +133,7 @@ public class TestGenerics extends AbstractTest { public class Node> { private final T data; - private final Node next; + public final Node next; public Node(T data, Node next) { this.data = data; @@ -145,8 +145,8 @@ public class TestGenerics extends AbstractTest { } } - private class TestConstructor implements Enumeration { - private final TestGenerics a; + public class TestConstructor implements Enumeration { + public final TestGenerics a; TestConstructor(TestGenerics a) { this.a = a; diff --git a/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java b/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java index 11fb0a114..3eb1e1ec4 100644 --- a/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java +++ b/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java @@ -2,7 +2,7 @@ package jadx.samples; public class TestTypeResolver extends AbstractTest { - private final int f1; + public final int f1; public TestTypeResolver() { this.f1 = 2; diff --git a/jadx-samples/src/main/java/jadx/samples/TestTypeResolver2.java b/jadx-samples/src/main/java/jadx/samples/TestTypeResolver2.java index 2ad938b2d..a403fd42d 100644 --- a/jadx-samples/src/main/java/jadx/samples/TestTypeResolver2.java +++ b/jadx-samples/src/main/java/jadx/samples/TestTypeResolver2.java @@ -21,11 +21,11 @@ public class TestTypeResolver2 extends AbstractTest { } } - private static void doPrint(String s1) { + public static void doPrint(String s1) { fail(); } - private static void doPrint(Integer s1) { + public static void doPrint(Integer s1) { fail(); } @@ -43,6 +43,6 @@ public class TestTypeResolver2 extends AbstractTest { } public static void main(String[] args) throws Exception { - (new TestTypeResolver2()).testRun(); + new TestTypeResolver2().testRun(); } }