Skip to content

Commit 7c47ba7

Browse files
CC11001100CC11001100
committed
fix: review & fix conflict
1 parent 42580c7 commit 7c47ba7

File tree

7 files changed

+46
-58
lines changed

7 files changed

+46
-58
lines changed

‎dongtai-common/src/main/java/io/dongtai/iast/common/string/ObjectFormatter.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ private static ObjectFormatResult objArray2StringV2(Object[] objArray, int charL
9292

9393
String s = objList.get(headIndex).toString();
9494
headIndex++;
95+
// 如果这个地方的字符串比较长怎么办？是不是应该截断一下？还是有优化空间的
9596
header.append(s);
9697
r.originalLength += s.length();
9798

@@ -117,6 +118,7 @@ private static ObjectFormatResult objArray2StringV2(Object[] objArray, int charL
117118
tailStringList.forEach(new Consumer<String>() {
118119
@Override
119120
public void accept(String s) {
121+
// 是不是应该避免一下不必要的拼接拷贝？某些特殊数据下还是可能会发生占用较长时间
120122
header.append(s);
121123
}
122124
});

‎dongtai-common/src/test/java/io/dongtai/iast/common/string/StringUtilsBenchmarkTest.java‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
package io.dongtai.iast.core.utils;
1+
package io.dongtai.iast.common.string;
22

3-
import org.openjdk.jmh.annotations.*;
4-
import org.openjdk.jmh.results.format.ResultFormatType;
5-
import org.openjdk.jmh.runner.Runner;
6-
import org.openjdk.jmh.runner.options.Options;
7-
import org.openjdk.jmh.runner.options.OptionsBuilder;
8-
9-
import java.util.concurrent.TimeUnit;
10-
11-
/**
12-
* @author CC11001100
13-
*/
14-
@BenchmarkMode(Mode.All)
15-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
16-
@State(Scope.Thread)
17-
@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
18-
@Measurement(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
19-
@Threads(1)
20-
public class StringUtilsBenchmarkTest {
21-
22-
@Benchmark
23-
public void formatClassNameToSlashDelimiterTest() {
24-
String s = StringUtils.formatClassNameToSlashDelimiter("com.foo.bar");
25-
}
26-
27-
@Benchmark
28-
public void replace() {
29-
String s = "com.foo.bar".replace(".", "/");
30-
}
31-
32-
public static void main(String[] args) throws Exception {
33-
Options opts = new OptionsBuilder()
34-
.include(StringUtilsBenchmarkTest.class.getSimpleName())
35-
.resultFormat(ResultFormatType.JSON)
36-
.build();
37-
new Runner(opts).run();
38-
}
39-
40-
}
3+
//import org.openjdk.jmh.annotations.*;
4+
//import org.openjdk.jmh.results.format.ResultFormatType;
5+
//import org.openjdk.jmh.runner.Runner;
6+
//import org.openjdk.jmh.runner.options.Options;
7+
//import org.openjdk.jmh.runner.options.OptionsBuilder;
8+
//
9+
//import java.util.concurrent.TimeUnit;
10+
//
11+
///**
12+
// * @author CC11001100
13+
// */
14+
//@BenchmarkMode(Mode.All)
15+
//@OutputTimeUnit(TimeUnit.MILLISECONDS)
16+
//@State(Scope.Thread)
17+
//@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
18+
//@Measurement(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
19+
//@Threads(1)
20+
//public class StringUtilsBenchmarkTest {
21+
//
22+
// @Benchmark
23+
// public void formatClassNameToSlashDelimiterTest() {
24+
// String s = StringUtils.formatClassNameToSlashDelimiter("com.foo.bar");
25+
// }
26+
//
27+
// @Benchmark
28+
// public void replace() {
29+
// String s = "com.foo.bar".replace(".", "/");
30+
// }
31+
//
32+
// public static void main(String[] args) throws Exception {
33+
// Options opts = new OptionsBuilder()
34+
// .include(StringUtilsBenchmarkTest.class.getSimpleName())
35+
// .resultFormat(ResultFormatType.JSON)
36+
// .build();
37+
// new Runner(opts).run();
38+
// }
39+
//
40+
//}

‎dongtai-core/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,6 @@
258258
<scope>test</scope>
259259
</dependency>
260260
-->
261-
<dependency>
262-
<groupId>org.openjdk.jmh</groupId>
263-
<artifactId>jmh-generator-annprocess</artifactId>
264-
<scope>test</scope>
265-
</dependency>
266261
</dependencies>
267262

268263
</project>

‎dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/IastClassDiagram.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import java.util.concurrent.ConcurrentHashMap;
1010
import java.util.function.Consumer;
1111

12-
import static io.dongtai.iast.core.utils.StringUtils.formatClassNameToDotDelimiter;
13-
import static io.dongtai.iast.core.utils.StringUtils.formatClassNameToSlashDelimiter;
12+
import static io.dongtai.iast.common.string.StringUtils.formatClassNameToDotDelimiter;
13+
import static io.dongtai.iast.common.string.StringUtils.formatClassNameToSlashDelimiter;
1414

1515
/**
1616
* 用于存储类名称到祖先类的映射关系：类的名字 --> Set<祖先类的名称集合>

‎dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/MethodEvent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public void setCallStack(StackTraceElement callStack) {
293293
*/
294294
@Deprecated()
295295
public static String obj2String(Object value) {
296-
int taintValueLength = PropertyUtils.getInstance().getTaintToStringCharLimit();
296+
int taintValueLength = PropertyUtils.getTaintToStringCharLimit();
297297
StringBuilder sb = new StringBuilder();
298298
if (null == value) {
299299
return "";
@@ -329,6 +329,7 @@ public static String obj2String(Object value) {
329329
return sb.toString();
330330
}
331331

332+
@Deprecated
332333
private static void appendWithMaxLength(StringBuilder sb, String content, int maxLength) {
333334
if (sb.length() + content.length() > maxLength) {
334335
int remainingSpace = maxLength - sb.length();

‎dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommand.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.dongtai.iast.core.handler.hookpoint.models.taint.range;
22

3+
34
import io.dongtai.iast.common.string.StringUtils;
45

56
import java.util.HashMap;

‎pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<gson.version>2.8.9</gson.version>
4040
<fastjson2.version>2.0.28</fastjson2.version>
4141
<jmh.version>1.23</jmh.version>
42-
<mockito.version>4.11.0</mockito.version>
4342
</properties>
4443

4544
<groupId>io.dongtai.iast</groupId>
@@ -179,16 +178,6 @@
179178
<version>${jmh.version}</version>
180179
<scope>test</scope>
181180
</dependency>
182-
183-
<!-- 基准测试模拟输入啥的 -->
184-
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
185-
<dependency>
186-
<groupId>org.mockito</groupId>
187-
<artifactId>mockito-core</artifactId>
188-
<version>${mockito.version}</version>
189-
<scope>test</scope>
190-
</dependency>
191-
192181
</dependencies>
193182

194183
<profiles>

0 commit comments

Comments
 (0)