Skip to content

Commit d004b6a

Browse files
kamilkrzywanskiskybber
kamilkrzywanski
authored and
skybber
committed
Refactor - String concatenation as argument to 'StringBuilder.append()' call
1 parent 2b243d2 commit d004b6a

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎hotswap-agent-core/src/main/java/org/hotswap/agent/util/PluginManagerInvoker.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public static String buildCallPluginMethod(String appClassLoaderVar, Class plugi
133133
b.append(managerClass);
134134
b.append(".getInstance().getPlugin(");
135135
b.append(pluginClass.getName());
136-
b.append(".class.getName(), " + appClassLoaderVar + ");");
136+
b.append(".class.getName(), ").append(appClassLoaderVar).append(");");
137137

138138
// Class __pluginClass = __pluginClassLoader.loadClass("org.hotswap.agent.plugin.TestPlugin");
139139
b.append("Class __pluginClass = ");
@@ -142,10 +142,10 @@ public static String buildCallPluginMethod(String appClassLoaderVar, Class plugi
142142
b.append("\");");
143143

144144
// param types
145-
b.append("Class[] paramTypes = new Class[" + paramCount + "];");
145+
b.append("Class[] paramTypes = new Class[").append(paramCount).append("];");
146146
for (int i = 0; i < paramCount; i++) {
147147
// paramTypes[i] = = __pluginClassLoader.loadClass("my.test.TestClass").getClass();
148-
b.append("paramTypes[" + i + "] = __pluginClassLoader.loadClass(\"" + paramValueAndType[(i * 2) + 1] + "\");");
148+
b.append("paramTypes[").append(i).append("] = __pluginClassLoader.loadClass(\"").append(paramValueAndType[(i * 2) + 1]).append("\");");
149149
}
150150

151151
// java.lang.reflect.Method __pluginMethod = __pluginClass.getDeclaredMethod("method", paramType1, paramType2);
@@ -154,9 +154,9 @@ public static String buildCallPluginMethod(String appClassLoaderVar, Class plugi
154154
b.append("\", paramTypes");
155155
b.append(");");
156156

157-
b.append("Object[] params = new Object[" + paramCount + "];");
157+
b.append("Object[] params = new Object[").append(paramCount).append("];");
158158
for (int i = 0; i < paramCount; i = i + 1) {
159-
b.append("params[" + i + "] = " + paramValueAndType[i * 2] + ";");
159+
b.append("params[").append(i).append("] = ").append(paramValueAndType[i * 2]).append(";");
160160
}
161161

162162
// __pluginMethod.invoke(__pluginInstance, param1, param2);

‎hotswap-agent-core/src/main/java/org/hotswap/agent/util/signature/ClassSignatureBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected String annotationToString(Object[] a) {
9797
value = arrayToString(value);
9898
}
9999

100-
b.append(method.getName() + "=" + value.getClass() + ":" + value);
100+
b.append(method.getName()).append("=").append(value.getClass()).append(":").append(value);
101101
}
102102
}
103103
}

‎hotswap-agent-core/src/main/java/org/hotswap/agent/util/signature/CtClassSignature.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private String getName(CtClass ctClass) {
121121

122122
private String getConstructorString(CtConstructor method) throws ClassNotFoundException, NotFoundException {
123123
StringBuilder strBuilder = new StringBuilder();
124-
strBuilder.append(Modifier.toString(method.getModifiers()) + " ");
124+
strBuilder.append(Modifier.toString(method.getModifiers())).append(" ");
125125
strBuilder.append(method.getDeclaringClass().getName());
126126
strBuilder.append(getParams(method.getParameterTypes()));
127127
if (hasElement(ClassSignatureElement.METHOD_ANNOTATION))
@@ -136,8 +136,8 @@ private String getConstructorString(CtConstructor method) throws ClassNotFoundEx
136136

137137
private String getMethodString(CtMethod method) throws NotFoundException, ClassNotFoundException {
138138
StringBuilder strBuilder = new StringBuilder();
139-
strBuilder.append(Modifier.toString(method.getModifiers()) + " ");
140-
strBuilder.append(getName(method.getReturnType()) + " " + method.getName());
139+
strBuilder.append(Modifier.toString(method.getModifiers())).append(" ");
140+
strBuilder.append(getName(method.getReturnType())).append(" ").append(method.getName());
141141
strBuilder.append(getParams(method.getParameterTypes()));
142142
if (hasElement(ClassSignatureElement.METHOD_ANNOTATION))
143143
strBuilder.append(annotationToString(method.getAvailableAnnotations()));
@@ -174,7 +174,7 @@ private String toStringException(CtClass[] a) {
174174
StringBuilder b = new StringBuilder();
175175
b.append('[');
176176
for (int i = 0;; i++) {
177-
b.append("class " + a[i].getName());
177+
b.append("class ").append(a[i].getName());
178178
if (i == iMax)
179179
return b.append(']').toString();
180180
b.append(", ");

‎hotswap-agent-core/src/main/java/org/hotswap/agent/util/signature/JavaClassSignature.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public String getValue() throws Exception {
113113

114114
private String getConstructorString(Constructor<?> method) {
115115
StringBuilder strBuilder = new StringBuilder();
116-
strBuilder.append(Modifier.toString(method.getModifiers()) + " ");
116+
strBuilder.append(Modifier.toString(method.getModifiers())).append(" ");
117117
strBuilder.append(method.getName());
118118
strBuilder.append(getParams(method.getParameterTypes()));
119119
if (hasElement(ClassSignatureElement.METHOD_ANNOTATION))
@@ -128,8 +128,8 @@ private String getConstructorString(Constructor<?> method) {
128128

129129
private String getMethodString(Method method) {
130130
StringBuilder strBuilder = new StringBuilder();
131-
strBuilder.append(Modifier.toString(method.getModifiers()) + " ");
132-
strBuilder.append(getName(method.getReturnType()) + " " + method.getName());
131+
strBuilder.append(Modifier.toString(method.getModifiers())).append(" ");
132+
strBuilder.append(getName(method.getReturnType())).append(" ").append(method.getName());
133133
strBuilder.append(getParams(method.getParameterTypes()));
134134
if (hasElement(ClassSignatureElement.METHOD_ANNOTATION))
135135
strBuilder.append(annotationToString(method.getDeclaredAnnotations()));

‎plugin/hotswap-agent-ibatis-plugin/src/main/java/org/hotswap/agent/plugin/ibatis/IBatisTransformers.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class IBatisTransformers {
4848
@OnClassLoadEvent(classNameRegexp = "com.ibatis.sqlmap.engine.builder.xml.SqlMapConfigParser")
4949
public static void patchSqlMapConfigParser(CtClass ctClass, ClassPool classPool) throws CannotCompileException, NotFoundException {
5050
StringBuilder src = new StringBuilder("{");
51-
src.append(IBatisConfigurationHandler.class.getName() + ".setSqlMapConfigParser(this);");
51+
src.append(IBatisConfigurationHandler.class.getName()).append(".setSqlMapConfigParser(this);");
5252
src.append("}");
5353
CtClass[] constructorParams = new CtClass[] {};
5454
ctClass.getDeclaredConstructor(constructorParams).insertAfter(src.toString());
@@ -69,7 +69,7 @@ public static void patchSqlMapClientFactoryBean(CtClass ctClass, ClassPool class
6969
src.append(PluginManagerInvoker.buildInitializePlugin(IBatisPlugin.class));
7070
src.append(PluginManagerInvoker.buildCallPluginMethod(IBatisPlugin.class, "registConfigFile",IBatisConfigurationHandler.class.getName() + ".toPath(this.configLocations)", "java.lang.String"));
7171
src.append(PluginManagerInvoker.buildCallPluginMethod(IBatisPlugin.class, "registConfigFile",IBatisConfigurationHandler.class.getName() + ".toPath(this.mappingLocations)", "java.lang.String"));
72-
src.append(IBatisConfigurationHandler.class.getName() + ".setMapFiles(this.configLocations,this.mappingLocations,this.sqlMapClientProperties);");
72+
src.append(IBatisConfigurationHandler.class.getName()).append(".setMapFiles(this.configLocations,this.mappingLocations,this.sqlMapClientProperties);");
7373
src.append("}");
7474
CtMethod method = ctClass.getDeclaredMethod("afterPropertiesSet");
7575
method.insertAfter(src.toString());
@@ -86,7 +86,7 @@ public static void patchSqlMapClientFactoryBean(CtClass ctClass, ClassPool class
8686
@OnClassLoadEvent(classNameRegexp = "com.ibatis.sqlmap.engine.builder.xml.SqlMapParser")
8787
public static void patchSqlMapParser(CtClass ctClass, ClassPool classPool) throws CannotCompileException, NotFoundException {
8888
StringBuilder src = new StringBuilder("{");
89-
src.append(IBatisConfigurationHandler.class.getName() + ".setParserState(this.state);");
89+
src.append(IBatisConfigurationHandler.class.getName()).append(".setParserState(this.state);");
9090
src.append("}");
9191
CtClass[] constructorParams = new CtClass[] {
9292
classPool.get("com.ibatis.sqlmap.engine.builder.xml.XmlParserState")

‎plugin/hotswap-agent-mybatis-plugin/src/main/java/org/hotswap/agent/plugin/mybatis/transformers/MyBatisTransformers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static void patchXMLConfigBuilder(CtClass ctClass, ClassPool classPool) t
8888
src.append(PluginManagerInvoker.buildInitializePlugin(MyBatisPlugin.class));
8989
src.append(PluginManagerInvoker.buildCallPluginMethod(MyBatisPlugin.class, "registerConfigurationFile",
9090
XPathParserCaller.class.getName() + ".getSrcFileName(this.parser)", "java.lang.String", "this", "java.lang.Object"));
91-
src.append("this.configuration = " + ConfigurationProxy.class.getName() + ".getWrapper(this).proxy(this.configuration);");
91+
src.append("this.configuration = ").append(ConfigurationProxy.class.getName()).append(".getWrapper(this).proxy(this.configuration);");
9292
src.append("}");
9393

9494
XMLConfigBuilderUtils.getBuilderInstrumentConstructor(ctClass, classPool).insertAfter(src.toString());

‎plugin/hotswap-agent-mybatis-plus-plugin/src/main/java/org/hotswap/agent/plugin/mybatisplus/transformers/MyBatisPlusTransformers.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public static void patchXMLConfigBuilder(CtClass ctClass, ClassPool classPool) t
8989
src.append(PluginManagerInvoker.buildInitializePlugin(MyBatisPlusPlugin.class));
9090
src.append(PluginManagerInvoker.buildCallPluginMethod(MyBatisPlusPlugin.class, "registerConfigurationFile",
9191
XPathParserCaller.class.getName() + ".getSrcFileName(this.parser)", "java.lang.String", "this", "java.lang.Object"));
92-
src.append("this.configuration = " + ConfigurationPlusProxy.class.getName() + ".getWrapper(this).proxy(this.configuration);");
92+
src.append("this.configuration = ").append(ConfigurationPlusProxy.class.getName()).append(".getWrapper(this).proxy(this.configuration);");
9393
src.append("}");
9494

9595
XMLConfigBuilderUtils.getBuilderInstrumentConstructor(ctClass, classPool).insertAfter(src.toString());
@@ -103,7 +103,7 @@ public static void patchMybatisXMLConfigBuilder(CtClass ctClass, ClassPool class
103103
src.append(PluginManagerInvoker.buildInitializePlugin(MyBatisPlusPlugin.class));
104104
src.append(PluginManagerInvoker.buildCallPluginMethod(MyBatisPlusPlugin.class, "registerConfigurationFile",
105105
XPathParserCaller.class.getName() + ".getSrcFileName(this.parser)", "java.lang.String", "this", "java.lang.Object"));
106-
src.append("this.configuration = " + ConfigurationPlusProxy.class.getName() + ".getWrapper(this).proxy(this.configuration);");
106+
src.append("this.configuration = ").append(ConfigurationPlusProxy.class.getName()).append(".getWrapper(this).proxy(this.configuration);");
107107
src.append("}");
108108

109109
CtConstructor instrumentConstructor = XMLConfigBuilderUtils.getBuilderInstrumentConstructor(ctClass, classPool);

0 commit comments

Comments
 (0)