Skip to content

Commit 06c3064

Browse files
authored
Merge pull request #19 from andrewshan/main
feat:更新版本号,修改common-polaris为polaris-adapter-dubbo
2 parents bfba508 + 4b03c12 commit 06c3064

File tree

17 files changed

+21
-7
lines changed

17 files changed

+21
-7
lines changed

dubbo/dubbo-plugins/dubbo-registry-polaris/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependencies>
1616
<dependency>
1717
<groupId>com.tencent.polaris</groupId>
18-
<artifactId>common-polaris</artifactId>
18+
<artifactId>polaris-adapter-dubbo</artifactId>
1919
<version>${project.version}</version>
2020
</dependency>
2121
<dependency>

dubbox/dubbox-plugins/dubbox-registry-polaris/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependencies>
1616
<dependency>
1717
<groupId>com.tencent.polaris</groupId>
18-
<artifactId>common-polaris</artifactId>
18+
<artifactId>polaris-adapter-dubbo</artifactId>
1919
<version>${project.version}</version>
2020
</dependency>
2121
<dependency>

common-polaris/pom.xml renamed to polaris-adapter-dubbo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
1212

13-
<artifactId>common-polaris</artifactId>
13+
<artifactId>polaris-adapter-dubbo</artifactId>
1414

1515
<dependencies>
1616
<dependency>
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>org.slf4j</groupId>
2222
<artifactId>slf4j-api</artifactId>
23-
<scope>provided</scope>
23+
<optional>true</optional>
2424
</dependency>
2525
</dependencies>
2626
</project>

common-polaris/src/main/java/com/tencent/polaris/common/registry/PolarisOperator.java renamed to polaris-adapter-dubbo/src/main/java/com/tencent/polaris/common/registry/PolarisOperator.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
import com.tencent.polaris.api.pojo.RetStatus;
2626
import com.tencent.polaris.api.pojo.RouteArgument;
2727
import com.tencent.polaris.api.pojo.ServiceEventKey.EventType;
28+
import com.tencent.polaris.api.pojo.ServiceInfo;
2829
import com.tencent.polaris.api.pojo.ServiceKey;
2930
import com.tencent.polaris.api.pojo.ServiceRule;
3031
import com.tencent.polaris.api.pojo.SourceService;
3132
import com.tencent.polaris.api.rpc.Criteria;
3233
import com.tencent.polaris.api.rpc.GetHealthyInstancesRequest;
3334
import com.tencent.polaris.api.rpc.GetServiceRuleRequest;
35+
import com.tencent.polaris.api.rpc.GetServicesRequest;
3436
import com.tencent.polaris.api.rpc.InstanceDeregisterRequest;
3537
import com.tencent.polaris.api.rpc.InstanceRegisterRequest;
3638
import com.tencent.polaris.api.rpc.InstanceRegisterResponse;
3739
import com.tencent.polaris.api.rpc.InstancesResponse;
3840
import com.tencent.polaris.api.rpc.ServiceCallResult;
3941
import com.tencent.polaris.api.rpc.ServiceRuleResponse;
42+
import com.tencent.polaris.api.rpc.ServicesResponse;
4043
import com.tencent.polaris.api.rpc.UnWatchServiceRequest;
4144
import com.tencent.polaris.api.rpc.WatchServiceRequest;
4245
import com.tencent.polaris.client.api.SDKContext;
@@ -253,6 +256,13 @@ public ServiceRule getServiceRule(String service, EventType eventType) {
253256
return serviceRule.getServiceRule();
254257
}
255258

259+
public List<ServiceInfo> getServices() {
260+
GetServicesRequest getServicesRequest = new GetServicesRequest();
261+
getServicesRequest.setNamespace(polarisConfig.getNamespace());
262+
ServicesResponse services = consumerAPI.getServices(getServicesRequest);
263+
return services.getServices();
264+
}
265+
256266
public PolarisConfig getPolarisConfig() {
257267
return polarisConfig;
258268
}

0 commit comments

Comments
 (0)