Renamed getPriority->getPriorityValue

Signed-off-by: jansupol <[email protected]>
eclipse-ee4j · Nov 20, 2023 · 52beb65 · 52beb65
1 parent 3e62527
commit 52beb65
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/core-common/src/main/java/org/glassfish/jersey/JerseyPriorities.java b/core-common/src/main/java/org/glassfish/jersey/JerseyPriorities.java
@@ -41,11 +41,11 @@ private JerseyPriorities() {
     /**
      * Return the value of priority annotation on a given class, if exists. Return the default value if not present.
      * @param prioritized the provider class that potentially has a priority.
-     * @param _default the default priority if not {@link @Priority) present
+     * @param defaultValue the default priority value if not {@link @Priority) present
      * @return the value of Priority annotation if present or the default otherwise.
      */
-    public static int getPriority(Class<?> prioritized, int _default) {
+    public static int getPriorityValue(Class<?> prioritized, int defaultValue) {
         final Priority priority = prioritized.getAnnotation(Priority.class);
-        return priority != null ? priority.value() : _default;
+        return priority != null ? priority.value() : defaultValue;
     }
 }
diff --git a/...ain/java/org/glassfish/jersey/internal/config/ExternalPropertiesConfigurationFactory.java b/...ain/java/org/glassfish/jersey/internal/config/ExternalPropertiesConfigurationFactory.java
@@ -152,8 +152,8 @@ private static class ConfigComparator implements Comparator<ExternalConfiguratio
 
         @Override
         public int compare(ExternalConfigurationProvider config1, ExternalConfigurationProvider config2) {
-            int priority1 = JerseyPriorities.getPriority(config1.getClass(), Priorities.USER);
-            int priority2 = JerseyPriorities.getPriority(config2.getClass(), Priorities.USER);
+            int priority1 = JerseyPriorities.getPriorityValue(config1.getClass(), Priorities.USER);
+            int priority2 = JerseyPriorities.getPriorityValue(config2.getClass(), Priorities.USER);
 
             if (priority1 == priority2) {
                 return config1.getClass().getName().compareTo(config2.getClass().getName());

diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/inject/Providers.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/Providers.java
@@ -358,7 +358,7 @@ private static <T> T holder2service(ServiceHolder<T> holder) {
     }
 
     private static int getPriority(Class<?> serviceClass) {
-        return JerseyPriorities.getPriority(serviceClass, /* default priority */ Priorities.USER);
+        return JerseyPriorities.getPriorityValue(serviceClass, /* default priority */ Priorities.USER);
     }
 
     private static <T> Class<T> getImplementationClass(Class<T> contract, ServiceHolder<T> serviceHolder) {

diff --git a/core-common/src/main/java/org/glassfish/jersey/message/internal/TracingLogger.java b/core-common/src/main/java/org/glassfish/jersey/message/internal/TracingLogger.java
@@ -314,7 +314,7 @@ private static String formatInstance(final Object instance) {
             } else {
                 textSB.append('[');
                 formatInstance(instance, textSB);
-                final int priority = JerseyPriorities.getPriority(instance.getClass(), -1);
+                final int priority = JerseyPriorities.getPriorityValue(instance.getClass(), -1);
                 if (priority != -1) {
                     textSB.append(" #").append(priority);
                 }

diff --git a/core-common/src/main/java/org/glassfish/jersey/model/internal/CommonConfig.java b/core-common/src/main/java/org/glassfish/jersey/model/internal/CommonConfig.java
@@ -130,7 +130,7 @@ private static int priority(Class<? extends Feature> featureClass, int priority)
             if (priority != ContractProvider.NO_PRIORITY) {
                 return priority;
             }
-            return JerseyPriorities.getPriority(featureClass, Priorities.USER);
+            return JerseyPriorities.getPriorityValue(featureClass, Priorities.USER);
         }
 
         /**
@@ -586,8 +586,8 @@ public void configureAutoDiscoverableProviders(final InjectionManager injectionM
         // Check whether meta providers have been initialized for a config this config has been loaded from.
         if (!disableMetaProviderConfiguration) {
             final Set<AutoDiscoverable> providers = new TreeSet<>((o1, o2) -> {
-                final int p1 = JerseyPriorities.getPriority(o1.getClass(), Priorities.USER);
-                final int p2 = JerseyPriorities.getPriority(o2.getClass(), Priorities.USER);
+                final int p1 = JerseyPriorities.getPriorityValue(o1.getClass(), Priorities.USER);
+                final int p2 = JerseyPriorities.getPriorityValue(o2.getClass(), Priorities.USER);
 
                 return (p1 < p2 || p1 == p2) ? -1 : 1;
             });

diff --git a/core-common/src/main/java/org/glassfish/jersey/model/internal/RankedProvider.java b/core-common/src/main/java/org/glassfish/jersey/model/internal/RankedProvider.java
@@ -83,7 +83,7 @@ private int computeRank(final T provider, final int rank) {
                 clazz = clazz.getSuperclass();
             }
 
-            return JerseyPriorities.getPriority(clazz, Priorities.USER);
+            return JerseyPriorities.getPriorityValue(clazz, Priorities.USER);
         }
     }
 

diff --git a/...ent/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientBuilderImpl.java b/...ent/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientBuilderImpl.java
@@ -299,7 +299,7 @@ private int getProviderPriority(Class<?> restClientInterface, Class<?> providerC
         } else if (providerPriorityJersey instanceof Integer) {
             return (int) providerPriorityJersey;
         }
-        return JerseyPriorities.getPriority(providerClass, -1);
+        return JerseyPriorities.getPriorityValue(providerClass, -1);
     }
 
     @Override
@@ -523,7 +523,7 @@ public AsyncInvocationInterceptor newInterceptor() {
 
         Integer getPriority() {
             if (priority == null) {
-                priority = JerseyPriorities.getPriority(factory.getClass(), Priorities.USER);
+                priority = JerseyPriorities.getPriorityValue(factory.getClass(), Priorities.USER);
             }
             return priority;
         }

diff --git a/...-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/JerseyBean.java b/...-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/JerseyBean.java
@@ -161,13 +161,13 @@ public int getRank() {
             return binding.getRank();
         }
 
-        int _default = 1;
+        int defaultValue = 1;
         Class<T> type = binding.getImplementationType();
         if (type != null) {
-            return JerseyPriorities.getPriority(type, _default);
+            return JerseyPriorities.getPriorityValue(type, defaultValue);
         }
 
-        return _default;
+        return defaultValue;
     }
 
     @Override

diff --git a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/JerseyBean.java b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/JerseyBean.java
@@ -151,14 +151,14 @@ public int getRank() {
         if (binding.getRank() != null) {
             return binding.getRank();
         }
-        int _default = 1;
+        int defaultValue = 1;
 
         Class<T> type = binding.getImplementationType();
         if (type != null) {
-            return JerseyPriorities.getPriority(type, _default);
+            return JerseyPriorities.getPriorityValue(type, defaultValue);
         }
 
-        return _default;
+        return defaultValue;
     }
 
     @Override