You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by lu...@apache.org on 2022/04/30 09:03:27 UTC
[skywalking] 08/24: fix pom and fix style issues
This is an automated email from the ASF dual-hosted git repository.
lujiajing pushed a commit to branch banyandb-integration-stream
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 4f41af33689ddab6d11de227f30cfc5501bdb1f7
Author: Megrez Lu <lu...@gmail.com>
AuthorDate: Sun Dec 5 23:05:56 2021 +0800
fix pom and fix style issues
---
oap-server/server-storage-plugin/storage-banyandb-plugin/pom.xml | 2 +-
.../plugin/banyandb/deserializer/AlarmMessageDeserializer.java | 2 +-
.../server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java | 1 -
.../storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java | 4 ++--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/pom.xml b/oap-server/server-storage-plugin/storage-banyandb-plugin/pom.xml
index 76848c1b4b..d5ebbfc969 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/pom.xml
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>server-storage-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
- <version>8.9.0-SNAPSHOT</version>
+ <version>8.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/deserializer/AlarmMessageDeserializer.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/deserializer/AlarmMessageDeserializer.java
index 3165d60afa..2df0ef739b 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/deserializer/AlarmMessageDeserializer.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/deserializer/AlarmMessageDeserializer.java
@@ -34,7 +34,7 @@ import org.apache.skywalking.oap.server.core.query.type.KeyValue;
import java.util.List;
public class AlarmMessageDeserializer extends AbstractBanyanDBDeserializer<AlarmMessage> {
- private final Gson GSON = new Gson();
+ private static final Gson GSON = new Gson();
public AlarmMessageDeserializer() {
super(AlarmRecord.INDEX_NAME,
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java
index d0daa3375f..71d45dc7b6 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java
@@ -53,7 +53,6 @@ public abstract class AbstractBanyanDBDAO extends AbstractDAO<BanyanDBStorageCli
return resp.getElements().stream().map(deserializer::map).collect(Collectors.toList());
}
-
interface QueryBuilder {
void apply(final StreamQuery query);
}
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java
index bee6508cd2..b3b6fece70 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java
@@ -87,7 +87,7 @@ public class BanyanDBMetadataQueryDAO extends AbstractBanyanDBDAO implements IMe
public void apply(StreamQuery query) {
query.appendCondition(PairQueryCondition.LongQueryCondition.eq("searchable", ServiceTraffic.NODE_TYPE, (long) nodeType.value()));
}
- }).stream().filter((s) -> s.getName().contains(keyword)) // TODO: support analyzer in database
+ }).stream().filter(s -> s.getName().contains(keyword)) // TODO: support analyzer in database
.collect(Collectors.toList());
}
@@ -111,7 +111,7 @@ public class BanyanDBMetadataQueryDAO extends AbstractBanyanDBDAO implements IMe
public void apply(StreamQuery query) {
query.appendCondition(PairQueryCondition.StringQueryCondition.eq("searchable", EndpointTraffic.SERVICE_ID, serviceId));
}
- }).stream().filter((e) -> e.getName().contains(keyword))
+ }).stream().filter(e -> e.getName().contains(keyword))
.limit(limit).collect(Collectors.toList());
}