Polish alibaba/spring-cloud-alibaba/#1222 : Combining the code-based and starter modules

spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml

@@ -11,14 +11,53 @@
     <name>Spring Cloud Starter Alibaba Cloud SchedulerX</name>
 
     <dependencies>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alicloud-schedulerx</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alicloud-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.edas</groupId>
+            <artifactId>schedulerX-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-edas</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>

spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.alibaba.alicloud.scx;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * placeholder configuration.
+ *
+ * @author xiaolongzuo
+ */
+@Configuration(proxyBeanMethods = false)
+public class ScxAutoConfiguration {
+
+}

spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.alibaba.alicloud.scx.endpoint;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.scx.ScxProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
+
+/**
+ * @author xiaolongzuo
+ */
+@Endpoint(id = "scx")
+public class ScxEndpoint {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ScxEndpoint.class);
+
+	private ScxProperties scxProperties;
+
+	private EdasProperties edasProperties;
+
+	public ScxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) {
+		this.edasProperties = edasProperties;
+		this.scxProperties = scxProperties;
+	}
+
+	/**
+	 * @return scx endpoint
+	 */
+	@ReadOperation
+	public Map<String, Object> invoke() {
+		Map<String, Object> scxEndpoint = new HashMap<>();
+		LOGGER.info("SCX endpoint invoke, scxProperties is {}", scxProperties);
+		scxEndpoint.put("namespace",
+				edasProperties == null ? "" : edasProperties.getNamespace());
+		scxEndpoint.put("scxProperties", scxProperties);
+		return scxEndpoint;
+	}
+
+}

spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.alibaba.alicloud.scx.endpoint;
+
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.scx.ScxProperties;
+
+import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * @author xiaolongzuo
+ */
+@ConditionalOnWebApplication
+@ConditionalOnClass(Endpoint.class)
+public class ScxEndpointAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnEnabledEndpoint
+	public ScxEndpoint scxEndpoint(EdasProperties edasProperties,
+			ScxProperties scxProperties) {
+		return new ScxEndpoint(edasProperties, scxProperties);
+	}
+
+}

spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.alibaba.alicloud.scx.endpoint.ScxEndpointAutoConfiguration,\
+  com.alibaba.alicloud.scx.ScxAutoConfiguration