From f17661af47cd36d4df5339edf0dd5349123bfe53 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Thu, 6 May 2021 16:08:23 +0100
Subject: Improve some proto message/field names

---
 .../main/java/me/lucko/spark/common/sampler/async/AsyncSampler.java   | 4 ++--
 .../src/main/java/me/lucko/spark/common/sampler/java/JavaSampler.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'spark-common/src/main/java/me/lucko/spark/common/sampler')

diff --git a/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncSampler.java b/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncSampler.java
index 1e23124..c76274b 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncSampler.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncSampler.java
@@ -146,8 +146,8 @@ public class AsyncSampler implements Sampler {
     @Override
     public SparkProtos.SamplerData toProto(PlatformInfo platformInfo, CommandSender creator, Comparator<? super Map.Entry<String, ThreadNode>> outputOrder, String comment, MergeMode mergeMode) {
         final SparkProtos.SamplerMetadata.Builder metadata = SparkProtos.SamplerMetadata.newBuilder()
-                .setPlatform(platformInfo.toData().toProto())
-                .setUser(creator.toData().toProto())
+                .setPlatformMetadata(platformInfo.toData().toProto())
+                .setCreator(creator.toData().toProto())
                 .setStartTime(this.startTime)
                 .setInterval(this.interval)
                 .setThreadDumper(this.threadDumper.getMetadata())
diff --git a/spark-common/src/main/java/me/lucko/spark/common/sampler/java/JavaSampler.java b/spark-common/src/main/java/me/lucko/spark/common/sampler/java/JavaSampler.java
index 0ee5f86..5fe5add 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/sampler/java/JavaSampler.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/sampler/java/JavaSampler.java
@@ -163,8 +163,8 @@ public class JavaSampler implements Sampler, Runnable {
     @Override
     public SamplerData toProto(PlatformInfo platformInfo, CommandSender creator, Comparator<? super Map.Entry<String, ThreadNode>> outputOrder, String comment, MergeMode mergeMode) {
         final SamplerMetadata.Builder metadata = SamplerMetadata.newBuilder()
-                .setPlatform(platformInfo.toData().toProto())
-                .setUser(creator.toData().toProto())
+                .setPlatformMetadata(platformInfo.toData().toProto())
+                .setCreator(creator.toData().toProto())
                 .setStartTime(this.startTime)
                 .setInterval(this.interval)
                 .setThreadDumper(this.threadDumper.getMetadata())
-- 
cgit