You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/05/28 01:21:52 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1943] rename
package core.filter to core.registry.discovery
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new ff4d309 [SCB-1943] rename package core.filter to core.registry.discovery
ff4d309 is described below
commit ff4d309d8e39558af9b66e2c8aa57e48cf0cd974
Author: wujimin <wu...@huawei.com>
AuthorDate: Wed May 20 14:32:45 2020 +0800
[SCB-1943] rename package core.filter to core.registry.discovery
---
.../core/handler/impl/SimpleLoadBalanceHandler.java | 2 +-
.../discovery}/EndpointDiscoveryFilter.java | 4 ++--
.../discovery}/OperationInstancesDiscoveryFilter.java | 2 +-
.../org.apache.servicecomb.registry.discovery.DiscoveryFilter | 2 +-
.../discovery}/TestEndpointDiscoveryFilter.java | 10 ++++++++--
.../discovery}/TestOperationInstancesDiscoveryFilter.java | 2 +-
.../servicecomb/loadbalance/filter/ServerDiscoveryFilter.java | 2 +-
7 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/core/src/main/java/org/apache/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java b/core/src/main/java/org/apache/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java
index fdda1c2..b301ba1 100644
--- a/core/src/main/java/org/apache/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java
+++ b/core/src/main/java/org/apache/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java
@@ -25,7 +25,7 @@ import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Handler;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionUtils;
-import org.apache.servicecomb.core.filter.EndpointDiscoveryFilter;
+import org.apache.servicecomb.core.registry.discovery.EndpointDiscoveryFilter;
import org.apache.servicecomb.foundation.common.cache.VersionedCache;
import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import org.apache.servicecomb.registry.discovery.DiscoveryContext;
diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/EndpointDiscoveryFilter.java b/core/src/main/java/org/apache/servicecomb/core/registry/discovery/EndpointDiscoveryFilter.java
similarity index 96%
rename from core/src/main/java/org/apache/servicecomb/core/filter/EndpointDiscoveryFilter.java
rename to core/src/main/java/org/apache/servicecomb/core/registry/discovery/EndpointDiscoveryFilter.java
index 03ef853..a6c3efc 100644
--- a/core/src/main/java/org/apache/servicecomb/core/filter/EndpointDiscoveryFilter.java
+++ b/core/src/main/java/org/apache/servicecomb/core/registry/discovery/EndpointDiscoveryFilter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.core.filter;
+package org.apache.servicecomb.core.registry.discovery;
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Invocation;
@@ -33,7 +33,7 @@ public class EndpointDiscoveryFilter extends AbstractEndpointDiscoveryFilter {
@Override
public int getOrder() {
- return (int) Short.MAX_VALUE;
+ return Short.MAX_VALUE;
}
@Override
diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/OperationInstancesDiscoveryFilter.java b/core/src/main/java/org/apache/servicecomb/core/registry/discovery/OperationInstancesDiscoveryFilter.java
similarity index 99%
rename from core/src/main/java/org/apache/servicecomb/core/filter/OperationInstancesDiscoveryFilter.java
rename to core/src/main/java/org/apache/servicecomb/core/registry/discovery/OperationInstancesDiscoveryFilter.java
index a728874..f70a22e 100644
--- a/core/src/main/java/org/apache/servicecomb/core/filter/OperationInstancesDiscoveryFilter.java
+++ b/core/src/main/java/org/apache/servicecomb/core/registry/discovery/OperationInstancesDiscoveryFilter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.core.filter;
+package org.apache.servicecomb.core.registry.discovery;
import java.util.Comparator;
import java.util.HashMap;
diff --git a/core/src/main/resources/META-INF/services/org.apache.servicecomb.registry.discovery.DiscoveryFilter b/core/src/main/resources/META-INF/services/org.apache.servicecomb.registry.discovery.DiscoveryFilter
index f9189c8..9ff276f 100644
--- a/core/src/main/resources/META-INF/services/org.apache.servicecomb.registry.discovery.DiscoveryFilter
+++ b/core/src/main/resources/META-INF/services/org.apache.servicecomb.registry.discovery.DiscoveryFilter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.core.filter.OperationInstancesDiscoveryFilter
+org.apache.servicecomb.core.registry.discovery.OperationInstancesDiscoveryFilter
diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/TestEndpointDiscoveryFilter.java b/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestEndpointDiscoveryFilter.java
similarity index 88%
rename from core/src/test/java/org/apache/servicecomb/core/filter/TestEndpointDiscoveryFilter.java
rename to core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestEndpointDiscoveryFilter.java
index 91b79e1..461e15a 100644
--- a/core/src/test/java/org/apache/servicecomb/core/filter/TestEndpointDiscoveryFilter.java
+++ b/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestEndpointDiscoveryFilter.java
@@ -15,14 +15,16 @@
* limitations under the License.
*/
-package org.apache.servicecomb.core.filter;
+package org.apache.servicecomb.core.registry.discovery;
+import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.Transport;
import org.apache.servicecomb.core.bootstrap.SCBBootstrap;
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.registry.discovery.DiscoveryContext;
import org.junit.After;
@@ -41,16 +43,20 @@ public class TestEndpointDiscoveryFilter {
@Mocked
Invocation invocation;
- SCBEngine scbEngine = SCBBootstrap.createSCBEngineForTest();
+ SCBEngine scbEngine;
@Before
public void setup() {
+ ArchaiusUtils.resetConfig();
+ ConfigUtil.installDynamicConfig();
context.setInputParameters(invocation);
+ scbEngine = SCBBootstrap.createSCBEngineForTest();
}
@After
public void teardown() {
scbEngine.destroy();
+ ArchaiusUtils.resetConfig();
}
@Test
diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/TestOperationInstancesDiscoveryFilter.java b/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestOperationInstancesDiscoveryFilter.java
similarity index 99%
rename from core/src/test/java/org/apache/servicecomb/core/filter/TestOperationInstancesDiscoveryFilter.java
rename to core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestOperationInstancesDiscoveryFilter.java
index a608abe..54cd21e 100644
--- a/core/src/test/java/org/apache/servicecomb/core/filter/TestOperationInstancesDiscoveryFilter.java
+++ b/core/src/test/java/org/apache/servicecomb/core/registry/discovery/TestOperationInstancesDiscoveryFilter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.core.filter;
+package org.apache.servicecomb.core.registry.discovery;
public class TestOperationInstancesDiscoveryFilter {
// @SwaggerDefinition(basePath = "/v1")
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ServerDiscoveryFilter.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ServerDiscoveryFilter.java
index a3bc65a..4bbdc2c 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ServerDiscoveryFilter.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ServerDiscoveryFilter.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.loadbalance.filter;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.Transport;
-import org.apache.servicecomb.core.filter.EndpointDiscoveryFilter;
+import org.apache.servicecomb.core.registry.discovery.EndpointDiscoveryFilter;
import org.apache.servicecomb.loadbalance.ServiceCombServer;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.registry.cache.CacheEndpoint;