This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 79981048bf6 Removed the unused class LogLoader (#31583)
79981048bf6 is described below
commit 79981048bf656b4cfde601df4afa27a357ccbef0
Author: jiangML <[email protected]>
AuthorDate: Tue Jun 4 17:10:04 2024 +0800
Removed the unused class LogLoader (#31583)
---
.../test/e2e/agent/file/loader/LogLoader.java | 80 ----------------------
1 file changed, 80 deletions(-)
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/loader/LogLoader.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/loader/LogLoader.java
deleted file mode 100644
index 0e56ff47493..00000000000
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/loader/LogLoader.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.agent.file.loader;
-
-import lombok.SneakyThrows;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Log loader.
- */
-public final class LogLoader {
-
- /**
- * Get log lines.
- *
- * @param logFilePath log file path
- * @param isAdaptedProxy is adapted proxy
- * @return log lines
- */
- @SneakyThrows(IOException.class)
- public static Collection<String> getLogLines(final String logFilePath,
final boolean isAdaptedProxy) {
- Collection<String> result = new LinkedList<>();
- Collection<String> lines = Files.readAllLines(Paths.get(logFilePath));
- Pattern pattern = isAdaptedProxy ? Pattern.compile("^\\[") :
Pattern.compile("^\\d{2}:");
- StringBuilder builder = new StringBuilder();
- boolean hasFind = false;
- for (String each : lines) {
- Matcher matcher = pattern.matcher(each);
- if (matcher.find()) {
- if (hasFind) {
-
result.add(builder.append(System.lineSeparator()).toString());
- builder.delete(0, builder.length());
- }
- builder.append(each);
- hasFind = true;
- continue;
- }
- if (hasFind) {
- builder.append(each);
- }
- }
- if (builder.length() > 0) {
- result.add(builder.append(System.lineSeparator()).toString());
- }
- return result;
- }
-
- /**
- * Get log file path.
- *
- * @param isAdaptedProxy is adapted proxy
- * @return log file path
- */
- public static String getLogFilePath(final boolean isAdaptedProxy) {
- return String.join(File.separator,
Paths.get("").toAbsolutePath().toString(), String.join(File.separator,
"target", isAdaptedProxy ? "proxy" : "jdbc", "logs", "stdout.log"));
- }
-}
