From d545e45f8290deb00f600efbe01fd213a1472813 Mon Sep 17 00:00:00 2001
From: Manfred Moser <manfred@simpligility.ca>
Date: Fri, 18 Oct 2024 16:30:21 -0700
Subject: [PATCH] Order annotations consistently

---
 .../server/protocol/spooling/SpoolingConfig.java     |  4 ++--
 .../filesystem/FileSystemSpoolingConfig.java         | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java
index 3e05501123e2a..d7bfd90393086 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java
@@ -113,8 +113,8 @@ public boolean isInlineSegments()
         return inlineSegments;
     }
 
-    @ConfigDescription("Allow protocol to inline data")
     @Config("protocol.spooling.inline-segments")
+    @ConfigDescription("Allow protocol to inline data")
     public SpoolingConfig setInlineSegments(boolean inlineSegments)
     {
         this.inlineSegments = inlineSegments;
@@ -126,8 +126,8 @@ public Optional<SecretKey> getSharedEncryptionKey()
         return sharedEncryptionKey;
     }
 
-    @ConfigDescription("256 bit, base64-encoded secret key used to secure segment identifiers")
     @Config("protocol.spooling.shared-secret-key")
+    @ConfigDescription("256 bit, base64-encoded secret key used to secure segment identifiers")
     @ConfigSecuritySensitive
     public SpoolingConfig setSharedEncryptionKey(String sharedEncryptionKey)
     {
diff --git a/plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingConfig.java b/plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingConfig.java
index 74a9e523a4cae..6631414258786 100644
--- a/plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingConfig.java
+++ b/plugin/trino-spooling-filesystem/src/main/java/io/trino/spooling/filesystem/FileSystemSpoolingConfig.java
@@ -89,7 +89,7 @@ public Layout getLayout()
     }
 
     @Config("fs.layout")
-    @ConfigDescription("Spooled segments filesystem layout")
+    @ConfigDescription("Spooling segments file system layout")
     public FileSystemSpoolingConfig setLayout(Layout layout)
     {
         this.layout = layout;
@@ -101,8 +101,8 @@ public Duration getTtl()
         return ttl;
     }
 
-    @ConfigDescription("Maximum duration for the client to retrieve spooled segment before it expires")
     @Config("fs.segment.ttl")
+    @ConfigDescription("Maximum duration for the client to retrieve spooled segment before it expires")
     public FileSystemSpoolingConfig setTtl(Duration ttl)
     {
         this.ttl = ttl;
@@ -114,8 +114,8 @@ public boolean isEncryptionEnabled()
         return encryptionEnabled;
     }
 
-    @ConfigDescription("Encrypt segments with ephemeral keys")
     @Config("fs.segment.encryption")
+    @ConfigDescription("Encrypt segments with ephemeral keys")
     public FileSystemSpoolingConfig setEncryptionEnabled(boolean encryptionEnabled)
     {
         this.encryptionEnabled = encryptionEnabled;
@@ -127,8 +127,8 @@ public boolean isPruningEnabled()
         return pruningEnabled;
     }
 
-    @ConfigDescription("Prune expired segments periodically")
     @Config("fs.segment.pruning.enabled")
+    @ConfigDescription("Prune expired segments periodically")
     public FileSystemSpoolingConfig setPruningEnabled(boolean pruningEnabled)
     {
         this.pruningEnabled = pruningEnabled;
@@ -140,8 +140,8 @@ public Duration getPruningInterval()
         return pruningInterval;
     }
 
-    @ConfigDescription("Interval to prune expired segments")
     @Config("fs.segment.pruning.interval")
+    @ConfigDescription("Interval to prune expired segments")
     public FileSystemSpoolingConfig setPruningInterval(Duration pruningInterval)
     {
         this.pruningInterval = pruningInterval;
@@ -153,8 +153,8 @@ public long getPruningBatchSize()
         return pruningBatchSize;
     }
 
-    @ConfigDescription("Prune expired segments in batches of provided size")
     @Config("fs.segment.pruning.batch-size")
+    @ConfigDescription("Prune expired segments in batches of provided size")
     public FileSystemSpoolingConfig setPruningBatchSize(long pruningBatchSize)
     {
         this.pruningBatchSize = pruningBatchSize;