From 0045c8ffa7071d4a8c6bed950919fb0af059d9db Mon Sep 17 00:00:00 2001 From: KimJuHyun Date: Wed, 9 Oct 2024 20:37:54 +0900 Subject: [PATCH 1/3] remove: Redundant else keyword --- .../InvocationsRecorderClassTransformer.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java index f9cc6abd17f3..6053c459b96d 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java @@ -71,24 +71,22 @@ private boolean isTransformationCandidate(@Nullable ClassLoader classLoader, Str return false; } // Ignore agent classes and spring-core-test DynamicClassLoader - else if (className.startsWith(AGENT_PACKAGE) || className.equals(AOT_DYNAMIC_CLASSLOADER)) { + if (className.startsWith(AGENT_PACKAGE) || className.equals(AOT_DYNAMIC_CLASSLOADER)) { return false; } // Do not instrument CGlib classes - else if (className.contains("$$")) { + if (className.contains("$$")) { return false; } // Only some packages are instrumented - else { - for (String ignoredPackage : this.ignoredPackages) { - if (className.startsWith(ignoredPackage)) { - return false; - } + for (String ignoredPackage : this.ignoredPackages) { + if (className.startsWith(ignoredPackage)) { + return false; } - for (String instrumentedPackage : this.instrumentedPackages) { - if (className.startsWith(instrumentedPackage)) { - return true; - } + } + for (String instrumentedPackage : this.instrumentedPackages) { + if (className.startsWith(instrumentedPackage)) { + return true; } } return false; From 3e9de4f0ccbe575d329b9e06042807fa4f06666b Mon Sep 17 00:00:00 2001 From: KimJuHyun Date: Wed, 9 Oct 2024 20:40:25 +0900 Subject: [PATCH 2/3] fix: using logger instead of printStackTrace --- .../aot/agent/InvocationsRecorderClassTransformer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java index 6053c459b96d..fb2bb0585142 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java @@ -21,6 +21,8 @@ import java.security.ProtectionDomain; import java.util.Arrays; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.asm.ClassReader; import org.springframework.lang.Nullable; import org.springframework.util.Assert; @@ -43,6 +45,8 @@ class InvocationsRecorderClassTransformer implements ClassFileTransformer { private final String[] ignoredPackages; + private final Log logger = LogFactory.getLog(getClass()); + public InvocationsRecorderClassTransformer(String[] instrumentedPackages, String[] ignoredPackages) { Assert.notNull(instrumentedPackages, "instrumentedPackages must not be null"); Assert.notNull(ignoredPackages, "ignoredPackages must not be null"); @@ -99,7 +103,7 @@ private byte[] attemptClassTransformation(byte[] classfileBuffer) { fileReader.accept(classVisitor, 0); } catch (Exception ex) { - ex.printStackTrace(); + logger.error(ex); return classfileBuffer; } if (classVisitor.isTransformed()) { From 9c300a1171806743fab9f01a04adc14990274b05 Mon Sep 17 00:00:00 2001 From: KimJuHyun Date: Wed, 9 Oct 2024 20:45:20 +0900 Subject: [PATCH 3/3] remove: unthrown exception --- .../aot/agent/InvocationsRecorderClassTransformer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java index fb2bb0585142..26ef05a5e4c7 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java @@ -17,7 +17,6 @@ package org.springframework.aot.agent; import java.lang.instrument.ClassFileTransformer; -import java.lang.instrument.IllegalClassFormatException; import java.security.ProtectionDomain; import java.util.Arrays; @@ -61,7 +60,7 @@ private String[] rewriteToAsmFormat(String[] packages) { @Override public byte[] transform(@Nullable ClassLoader classLoader, String className, Class classBeingRedefined, - ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException { + ProtectionDomain protectionDomain, byte[] classfileBuffer) { if (isTransformationCandidate(classLoader, className)) { return attemptClassTransformation(classfileBuffer);