Fix a bunch of non-final static fields (#119185)

Fixing almost all missing `final` spots, who knows maybe we get a small speedup from
some constant folding here and there.

Author: original-brownbear

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java

@@ -14,14 +14,14 @@
 import java.util.List;
 
 public class InternalElasticsearchDistributionTypes {
-    public static ElasticsearchDistributionType DEB = new DebElasticsearchDistributionType();
-    public static ElasticsearchDistributionType RPM = new RpmElasticsearchDistributionType();
-    public static ElasticsearchDistributionType DOCKER = new DockerElasticsearchDistributionType();
-    public static ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
-    public static ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
-    public static ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType DEB = new DebElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType RPM = new RpmElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType DOCKER = new DockerElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
 
-    public static List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
+    public static final List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
         DEB,
         RPM,
         DOCKER,

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rerun/TestRerunTaskExtension.java

@@ -30,7 +30,7 @@ public class TestRerunTaskExtension {
     /**
      * The name of the extension added to each test task.
      */
-    public static String NAME = "rerun";
+    public static final String NAME = "rerun";
 
     private final Property<Integer> maxReruns;
 

build-tools/src/main/java/org/elasticsearch/gradle/distribution/ElasticsearchDistributionTypes.java

@@ -12,6 +12,6 @@
 import org.elasticsearch.gradle.ElasticsearchDistributionType;
 
 public class ElasticsearchDistributionTypes {
-    public static ElasticsearchDistributionType ARCHIVE = new ArchiveElasticsearchDistributionType();
-    public static ElasticsearchDistributionType INTEG_TEST_ZIP = new IntegTestZipElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType ARCHIVE = new ArchiveElasticsearchDistributionType();
+    public static final ElasticsearchDistributionType INTEG_TEST_ZIP = new IntegTestZipElasticsearchDistributionType();
 }

libs/grok/src/main/java/org/elasticsearch/grok/PatternBank.java

@@ -23,7 +23,7 @@
 
 public class PatternBank {
 
-    public static PatternBank EMPTY = new PatternBank(Map.of());
+    public static final PatternBank EMPTY = new PatternBank(Map.of());
 
     private final Map<String, String> bank;
 

libs/h3/src/main/java/org/elasticsearch/h3/Constants.java

@@ -29,27 +29,27 @@ final class Constants {
     /**
      * sqrt(3) / 2.0
      */
-    public static double M_SQRT3_2 = 0.8660254037844386467637231707529361834714;
+    public static final double M_SQRT3_2 = 0.8660254037844386467637231707529361834714;
     /**
      * 2.0 * PI
      */
     public static final double M_2PI = 2.0 * Math.PI;
     /**
      * The number of H3 base cells
      */
-    public static int NUM_BASE_CELLS = 122;
+    public static final int NUM_BASE_CELLS = 122;
     /**
      * The number of vertices in a hexagon
      */
-    public static int NUM_HEX_VERTS = 6;
+    public static final int NUM_HEX_VERTS = 6;
     /**
      * The number of vertices in a pentagon
      */
-    public static int NUM_PENT_VERTS = 5;
+    public static final int NUM_PENT_VERTS = 5;
     /**
      * H3 index modes
      */
-    public static int H3_CELL_MODE = 1;
+    public static final int H3_CELL_MODE = 1;
     /**
      * square root of 7
      */
@@ -64,14 +64,14 @@ final class Constants {
      * (or distance between adjacent cell center points
      * on the plane) to gnomonic unit length.
      */
-    public static double RES0_U_GNOMONIC = 0.38196601125010500003;
+    public static final double RES0_U_GNOMONIC = 0.38196601125010500003;
     /**
      * rotation angle between Class II and Class III resolution axes
      * (asin(sqrt(3.0 / 28.0)))
      */
-    public static double M_AP7_ROT_RADS = 0.333473172251832115336090755351601070065900389;
+    public static final double M_AP7_ROT_RADS = 0.333473172251832115336090755351601070065900389;
     /**
      * threshold epsilon
      */
-    public static double EPSILON = 0.0000000000000001;
+    public static final double EPSILON = 0.0000000000000001;
 }

libs/h3/src/main/java/org/elasticsearch/h3/H3.java

@@ -33,7 +33,7 @@ public final class H3 {
     /**
      * max H3 resolution; H3 version 1 has 16 resolutions, numbered 0 through 15
      */
-    public static int MAX_H3_RES = 15;
+    public static final int MAX_H3_RES = 15;
 
     private static final long[] NORTH = new long[MAX_H3_RES + 1];
     private static final long[] SOUTH = new long[MAX_H3_RES + 1];

libs/h3/src/main/java/org/elasticsearch/h3/H3Index.java

@@ -41,22 +41,22 @@ public static boolean H3_is_pentagon(long h3) {
         return BaseCells.isBaseCellPentagon(H3Index.H3_get_base_cell(h3)) && H3Index.h3LeadingNonZeroDigit(h3) == 0;
     }
 
-    public static long H3_INIT = 35184372088831L;
+    public static final long H3_INIT = 35184372088831L;
 
     /**
      * The bit offset of the mode in an H3 index.
      */
-    public static int H3_MODE_OFFSET = 59;
+    public static final int H3_MODE_OFFSET = 59;
 
     /**
      * 1's in the 4 mode bits, 0's everywhere else.
      */
-    public static long H3_MODE_MASK = 15L << H3_MODE_OFFSET;
+    public static final long H3_MODE_MASK = 15L << H3_MODE_OFFSET;
 
     /**
      * 0's in the 4 mode bits, 1's everywhere else.
      */
-    public static long H3_MODE_MASK_NEGATIVE = ~H3_MODE_MASK;
+    public static final long H3_MODE_MASK_NEGATIVE = ~H3_MODE_MASK;
 
     public static long H3_set_mode(long h3, long mode) {
         return (h3 & H3_MODE_MASK_NEGATIVE) | (mode << H3_MODE_OFFSET);
@@ -65,16 +65,16 @@ public static long H3_set_mode(long h3, long mode) {
     /**
      * The bit offset of the base cell in an H3 index.
      */
-    public static int H3_BC_OFFSET = 45;
+    public static final int H3_BC_OFFSET = 45;
     /**
      * 1's in the 7 base cell bits, 0's everywhere else.
      */
-    public static long H3_BC_MASK = 127L << H3_BC_OFFSET;
+    public static final long H3_BC_MASK = 127L << H3_BC_OFFSET;
 
     /**
      * 0's in the 7 base cell bits, 1's everywhere else.
      */
-    public static long H3_BC_MASK_NEGATIVE = ~H3_BC_MASK;
+    public static final long H3_BC_MASK_NEGATIVE = ~H3_BC_MASK;
 
     /**
      * Sets the integer base cell of h3 to bc.
@@ -83,26 +83,26 @@ public static long H3_set_base_cell(long h3, long bc) {
         return (h3 & H3_BC_MASK_NEGATIVE) | (bc << H3_BC_OFFSET);
     }
 
-    public static int H3_RES_OFFSET = 52;
+    public static final int H3_RES_OFFSET = 52;
     /**
      * 1's in the 4 resolution bits, 0's everywhere else.
      */
-    public static long H3_RES_MASK = 15L << H3_RES_OFFSET;
+    public static final long H3_RES_MASK = 15L << H3_RES_OFFSET;
 
     /**
      * 0's in the 4 resolution bits, 1's everywhere else.
      */
-    public static long H3_RES_MASK_NEGATIVE = ~H3_RES_MASK;
+    public static final long H3_RES_MASK_NEGATIVE = ~H3_RES_MASK;
 
     /**
      * The bit offset of the max resolution digit in an H3 index.
      */
-    public static int H3_MAX_OFFSET = 63;
+    public static final int H3_MAX_OFFSET = 63;
 
     /**
      * 1 in the highest bit, 0's everywhere else.
      */
-    public static long H3_HIGH_BIT_MASK = (1L << H3_MAX_OFFSET);
+    public static final long H3_HIGH_BIT_MASK = (1L << H3_MAX_OFFSET);
 
     /**
      * Gets the highest bit of the H3 index.
@@ -121,12 +121,12 @@ public static long H3_set_resolution(long h3, long res) {
     /**
      * The bit offset of the reserved bits in an H3 index.
      */
-    public static int H3_RESERVED_OFFSET = 56;
+    public static final int H3_RESERVED_OFFSET = 56;
 
     /**
      * 1's in the 3 reserved bits, 0's everywhere else.
      */
-    public static long H3_RESERVED_MASK = (7L << H3_RESERVED_OFFSET);
+    public static final long H3_RESERVED_MASK = (7L << H3_RESERVED_OFFSET);
 
     /**
      * Gets a value in the reserved space. Should always be zero for valid indexes.
@@ -149,12 +149,12 @@ public static int H3_get_resolution(long h3) {
     /**
      * The number of bits in a single H3 resolution digit.
      */
-    public static int H3_PER_DIGIT_OFFSET = 3;
+    public static final int H3_PER_DIGIT_OFFSET = 3;
 
     /**
      * 1's in the 3 bits of res 15 digit bits, 0's everywhere else.
      */
-    public static long H3_DIGIT_MASK = 7L;
+    public static final long H3_DIGIT_MASK = 7L;
 
     /**
      * Gets the resolution res integer digit (0-7) of h3.

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/ingest/IngestDocumentBridge.java

@@ -20,8 +20,6 @@
 
 public class IngestDocumentBridge extends StableBridgeAPI.Proxy<IngestDocument> {
 
-    public static String INGEST_KEY = IngestDocument.INGEST_KEY;
-
     public static IngestDocumentBridge wrap(final IngestDocument ingestDocument) {
         if (ingestDocument == null) {
             return null;

libs/tdigest/src/main/java/org/elasticsearch/tdigest/MergingDigest.java

@@ -111,7 +111,7 @@ public class MergingDigest extends AbstractTDigest {
     // based on accumulated k-index. This can be much faster since we
     // scale functions are more expensive than the corresponding
     // weight limits.
-    public static boolean useWeightLimit = true;
+    public static final boolean useWeightLimit = true;
 
     static MergingDigest create(TDigestArrays arrays, double compression) {
         arrays.adjustBreaker(SHALLOW_SIZE);

modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintAnalyzerProvider.java

@@ -24,11 +24,11 @@
  */
 public class FingerprintAnalyzerProvider extends AbstractIndexAnalyzerProvider<Analyzer> {
 
-    public static ParseField SEPARATOR = new ParseField("separator");
-    public static ParseField MAX_OUTPUT_SIZE = new ParseField("max_output_size");
+    public static final ParseField SEPARATOR = new ParseField("separator");
+    public static final ParseField MAX_OUTPUT_SIZE = new ParseField("max_output_size");
 
-    public static int DEFAULT_MAX_OUTPUT_SIZE = 255;
-    public static CharArraySet DEFAULT_STOP_WORDS = CharArraySet.EMPTY_SET;
+    public static final int DEFAULT_MAX_OUTPUT_SIZE = 255;
+    public static final CharArraySet DEFAULT_STOP_WORDS = CharArraySet.EMPTY_SET;
     public static final char DEFAULT_SEPARATOR = ' ';
 
     private final FingerprintAnalyzer analyzer;