From edfa95e339e95c9cadd00f232c14d49d14b2c81e Mon Sep 17 00:00:00 2001 From: wulingxiao <1251605638@qqcom> Date: Mon, 22 Aug 2022 21:35:06 +0800 Subject: [PATCH] feature:add example and drop useless code --- .../discovery-callee-service/pom.xml | 5 ++ .../src/main/resources/bootstrap.yml | 3 ++ .../discovery-caller-service/pom.xml | 4 ++ .../src/main/resources/bootstrap.yml | 3 ++ .../ConditionalOnPushGatewayEnabled.java | 35 -------------- .../condition/PushGatewayCondition.java | 46 ------------------- 6 files changed, 15 insertions(+), 81 deletions(-) delete mode 100644 spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/ConditionalOnPushGatewayEnabled.java delete mode 100644 spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/PushGatewayCondition.java diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml index 235ed173a..5d76407e8 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml @@ -19,6 +19,11 @@ spring-cloud-starter-tencent-polaris-discovery + + com.tencent.cloud + spring-cloud-tencent-pushgateway-plugin + + diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml index 1e42dc349..f2fbae18d 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml @@ -14,6 +14,9 @@ spring: stat: enabled: true port: 28082 + pushgateway: + enabled: true + address: 127.0.0.1:9091 tencent: metadata: content: diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml index fd2eed66a..f1e88d78b 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml @@ -23,6 +23,10 @@ spring-cloud-starter-tencent-polaris-discovery + + com.tencent.cloud + spring-cloud-tencent-pushgateway-plugin + diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml index d0f01ffae..a471b124a 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml @@ -18,6 +18,9 @@ spring: stat: enabled: true port: 28081 + pushgateway: + enabled: true + address: 127.0.0.1 # consul: # port: 8500 # host: 127.0.0.1 diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/ConditionalOnPushGatewayEnabled.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/ConditionalOnPushGatewayEnabled.java deleted file mode 100644 index e8e8406f9..000000000 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/ConditionalOnPushGatewayEnabled.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making Spring Cloud Tencent available. - * - * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the BSD 3-Clause License (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://opensource.org/licenses/BSD-3-Clause - * - * Unless required by applicable law or agreed to in writing, software distributed - * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - */ - -package com.tencent.cloud.rpc.enhancement.condition; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.springframework.context.annotation.Conditional; - -/** - * @author lingxiao.wlx - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE, ElementType.METHOD}) -@Conditional(PushGatewayCondition.class) -public @interface ConditionalOnPushGatewayEnabled { -} diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/PushGatewayCondition.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/PushGatewayCondition.java deleted file mode 100644 index a22775d34..000000000 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/condition/PushGatewayCondition.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making Spring Cloud Tencent available. - * - * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the BSD 3-Clause License (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://opensource.org/licenses/BSD-3-Clause - * - * Unless required by applicable law or agreed to in writing, software distributed - * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - */ - -package com.tencent.cloud.rpc.enhancement.condition; - -import org.springframework.boot.autoconfigure.condition.ConditionOutcome; -import org.springframework.boot.autoconfigure.condition.SpringBootCondition; -import org.springframework.context.annotation.ConditionContext; -import org.springframework.core.env.Environment; -import org.springframework.core.type.AnnotatedTypeMetadata; - -/** - * @author lingxiao.wlx - */ -public class PushGatewayCondition extends SpringBootCondition { - - private static final String POLARIS_STAT_PUSH_GATEWAY_ENABLED = "spring.cloud.polaris.stat.pushgateway.enabled"; - - private static final String POLARIS_STAT_ENABLED = "spring.cloud.polaris.stat.enabled"; - - @Override - public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { - Environment environment = context.getEnvironment(); - Boolean statEnabled = environment.getProperty(POLARIS_STAT_ENABLED, Boolean.class, false); - Boolean statPushGatewayEnabled = environment.getProperty(POLARIS_STAT_PUSH_GATEWAY_ENABLED, Boolean.class, false); - if (statEnabled && statPushGatewayEnabled) { - return ConditionOutcome.match("matched"); - } - return ConditionOutcome.noMatch("matched"); - } -}