fix:update some modifier order.

pull/1076/head
Haotian Zhang 1 year ago
parent e7c3b0cadb
commit 7c2528c05f

@ -130,17 +130,17 @@ public class OrderConstant {
/** /**
* Discovery config modifier order. * Discovery config modifier order.
*/ */
public static Integer DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE; public static Integer DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE - 10;
/** /**
* Nacos discovery config modifier order. * Nacos discovery config modifier order.
*/ */
public static Integer NACOS_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE; public static Integer NACOS_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE - 10;
/** /**
* Consul discovery config modifier order. * Consul discovery config modifier order.
*/ */
public static Integer CONSUL_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE; public static Integer CONSUL_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE - 10;
/** /**
* Order of discovery configuration modifier. * Order of discovery configuration modifier.

@ -73,7 +73,7 @@
<revision>1.12.0-2020.0.6-SNAPSHOT</revision> <revision>1.12.0-2020.0.6-SNAPSHOT</revision>
<!-- Dependencies --> <!-- Dependencies -->
<polaris.version>1.13.0</polaris.version> <polaris.version>1.14.0-SNAPSHOT</polaris.version>
<guava.version>32.0.1-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
<logback.version>1.2.11</logback.version> <logback.version>1.2.11</logback.version>
<mocktio.version>4.5.1</mocktio.version> <mocktio.version>4.5.1</mocktio.version>

@ -75,17 +75,17 @@ import static org.springframework.http.HttpStatus.VARIANT_ALSO_NEGOTIATES;
*/ */
public final class PolarisEnhancedPluginUtils { public final class PolarisEnhancedPluginUtils {
private PolarisEnhancedPluginUtils() {
}
private static final Logger LOG = LoggerFactory.getLogger(PolarisEnhancedPluginUtils.class); private static final Logger LOG = LoggerFactory.getLogger(PolarisEnhancedPluginUtils.class);
private static final List<HttpStatus> HTTP_STATUSES = toList(NOT_IMPLEMENTED, BAD_GATEWAY, private static final List<HttpStatus> HTTP_STATUSES = toList(NOT_IMPLEMENTED, BAD_GATEWAY,
SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT, HTTP_VERSION_NOT_SUPPORTED, VARIANT_ALSO_NEGOTIATES, SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT, HTTP_VERSION_NOT_SUPPORTED, VARIANT_ALSO_NEGOTIATES,
INSUFFICIENT_STORAGE, LOOP_DETECTED, BANDWIDTH_LIMIT_EXCEEDED, NOT_EXTENDED, NETWORK_AUTHENTICATION_REQUIRED); INSUFFICIENT_STORAGE, LOOP_DETECTED, BANDWIDTH_LIMIT_EXCEEDED, NOT_EXTENDED, NETWORK_AUTHENTICATION_REQUIRED);
private PolarisEnhancedPluginUtils() {
}
/** /**
* createServiceCallResult. * createServiceCallResult.
* @param callerHost caller host ip
* @param calleeServiceName will pick up url host when null * @param calleeServiceName will pick up url host when null
* @param calleeHost will pick up url host when null * @param calleeHost will pick up url host when null
* @param calleePort will pick up url port when null * @param calleePort will pick up url port when null
@ -168,7 +168,8 @@ public final class PolarisEnhancedPluginUtils {
} }
RpcEnhancementReporterProperties reportProperties; RpcEnhancementReporterProperties reportProperties;
try { try {
reportProperties = ApplicationContextAwareUtils.getApplicationContext().getBean(RpcEnhancementReporterProperties.class); reportProperties = ApplicationContextAwareUtils.getApplicationContext()
.getBean(RpcEnhancementReporterProperties.class);
} }
catch (BeansException e) { catch (BeansException e) {
LOG.error("get RpcEnhancementReporterProperties bean err", e); LOG.error("get RpcEnhancementReporterProperties bean err", e);
@ -279,5 +280,4 @@ public final class PolarisEnhancedPluginUtils {
return null; return null;
} }
} }

Loading…
Cancel
Save