You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2020/07/14 10:58:15 UTC
[GitHub] [shardingsphere-elasticjob-lite] yu199195 commented on a change in pull request #1056: Add SpringBoot Starter for ElasticJob Lite
yu199195 commented on a change in pull request #1056:
URL: https://github.com/apache/shardingsphere-elasticjob-lite/pull/1056#discussion_r454271286
##########
File path: elasticjob-infra/elasticjob-registry-center-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/reg/boot/ElasticJobRegistryCenterAutoConfiguration.java
##########
@@ -7,29 +7,43 @@
* the License. You may obtain a copy of the License at
*
* http://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 org.apache.shardingsphere.elasticjob.lite.example.config;
+package org.apache.shardingsphere.elasticjob.reg.boot;
-import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
-@ConditionalOnExpression("'${regCenter.serverList}'.length() > 0")
-public class RegistryCenterConfig {
-
+public class ElasticJobRegistryCenterAutoConfiguration {
+
+ /**
+ * Create a ZookeeperConfigurationFactory.
+ *
+ * @return ZookeeperConfigurationFactory
+ */
+ @Bean
+ @ConfigurationProperties(prefix = "elasticjob.reg-center")
Review comment:
ZookeeperConfigurationFactory need reame to ZookeeperPropties.
and @ConfigurationProperties need in ZookeeperPropties.
after then use @import(ZookeeperPropties.class)
##########
File path: examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/entity/Foo.java
##########
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://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 org.apache.shardingsphere.elasticjob.lite.example.entity;
+
+import java.io.Serializable;
+
+public final class Foo implements Serializable {
+
+ private static final long serialVersionUID = 2706842871078949451L;
+
+ private final long id;
+
+ private final String location;
+
+ private Status status;
+
+ public Foo(final long id, final String location, final Status status) {
+ this.id = id;
+ this.location = location;
+ this.status = status;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public Status getStatus() {
+ return status;
+ }
+
+ public void setStatus(final Status status) {
+ this.status = status;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("id: %s, location: %s, status: %s", id, location, status);
+ }
+
+ public enum Status {
+ TODO,
+ COMPLETED
+ }
+}
Review comment:
need a blank line
##########
File path: elasticjob-infra/elasticjob-registry-center-spring-boot-starter/pom.xml
##########
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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
+ ~
+ ~ http://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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>elasticjob-infra</artifactId>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <version>3.0.0.M1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>elasticjob-registry-center-spring-boot-starter</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-registry-center</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Review comment:
need a blank line
##########
File path: examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/repository/FooRepository.java
##########
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://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 org.apache.shardingsphere.elasticjob.lite.example.repository;
+
+import org.apache.shardingsphere.elasticjob.lite.example.entity.Foo;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Repository
+public class FooRepository {
+
+ private Map<Long, Foo> data = new ConcurrentHashMap<>(300, 1);
+
+ public FooRepository() {
+ init();
+ }
+
+ private void init() {
+ addData(0L, 100L, "Beijing");
+ addData(100L, 200L, "Shanghai");
+ addData(200L, 300L, "Guangzhou");
+ }
+
+ private void addData(final long idFrom, final long idTo, final String location) {
+ for (long i = idFrom; i < idTo; i++) {
+ data.put(i, new Foo(i, location, Foo.Status.TODO));
+ }
+ }
+
+ public List<Foo> findTodoData(final String location, final int limit) {
+ List<Foo> result = new ArrayList<>(limit);
+ int count = 0;
+ for (Map.Entry<Long, Foo> each : data.entrySet()) {
+ Foo foo = each.getValue();
+ if (foo.getLocation().equals(location) && foo.getStatus() == Foo.Status.TODO) {
+ result.add(foo);
+ count++;
+ if (count == limit) {
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
+ public void setCompleted(final long id) {
+ data.get(id).setStatus(Foo.Status.COMPLETED);
+ }
+}
Review comment:
need a blank line
##########
File path: examples/elasticjob-example-lite-springboot/src/main/resources/application.yml
##########
@@ -1,17 +1,29 @@
-regCenter:
- serverList: localhost:6181
- namespace: elasticjob-lite-springboot
-
-simpleJob:
- cron: 0/5 * * * * ?
- shardingTotalCount: 3
- shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou
-
-dataflowJob:
- cron: 0/5 * * * * ?
- shardingTotalCount: 3
- shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou
-
spring:
profiles:
active: dev
+
+elasticjob:
+ tracing:
+ type: RDB
+ regCenter:
+ serverLists: localhost:6181
+ namespace: elasticjob-lite-springboot
+ jobs:
+ classed:
+ org.apache.shardingsphere.elasticjob.simple.job.SimpleJob:
+ - jobName: simpleJob
+ cron: 0/5 * * * * ?
+ shardingTotalCount: 3
+ shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou
+ org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob:
+ - jobName: dataflowJob
+ cron: 0/5 * * * * ?
+ shardingTotalCount: 3
+ shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou
+ typed:
+ SCRIPT:
+ - jobName: scriptJob
+ cron: 0/10 * * * * ?
+ shardingTotalCount: 3
+ props:
+ script.command.line: "echo SCRIPT Job: "
Review comment:
need a blank line
##########
File path: examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootSimpleJob.java
##########
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://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 org.apache.shardingsphere.elasticjob.lite.example.job;
+
+import org.apache.shardingsphere.elasticjob.api.ShardingContext;
+import org.apache.shardingsphere.elasticjob.lite.example.entity.Foo;
+import org.apache.shardingsphere.elasticjob.lite.example.repository.FooRepository;
+import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class SpringBootSimpleJob implements SimpleJob {
+
+ @Autowired
+ private FooRepository fooRepository;
+
+ @Override
+ public void execute(ShardingContext shardingContext) {
+ System.out.println(String.format("Item: %s | Time: %s | Thread: %s | %s",
+ shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "SIMPLE"));
+ List<Foo> data = fooRepository.findTodoData(shardingContext.getShardingParameter(), 10);
+ for (Foo each : data) {
+ fooRepository.setCompleted(each.getId());
+ }
+ }
+}
Review comment:
need a blank line
##########
File path: elasticjob-lite/elasticjob-lite-spring-boot-starter/pom.xml
##########
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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
+ ~
+ ~ http://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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>elasticjob-lite</artifactId>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <version>3.0.0.M1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>elasticjob-lite-spring-boot-starter</artifactId>
+
+ <name>${project.artifactId}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-lite-core</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP-java7</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-registry-center-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
Review comment:
need a blank line
##########
File path: elasticjob-lite/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/boot/ElasticJobLiteAutoConfiguration.java
##########
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://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 org.apache.shardingsphere.elasticjob.lite.boot;
+
+import org.apache.shardingsphere.elasticjob.api.ElasticJob;
+import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.OneOffJobBootstrap;
+import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap;
+import org.apache.shardingsphere.elasticjob.lite.internal.config.pojo.JobConfigurationPOJO;
+import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
+import org.apache.shardingsphere.elasticjob.reg.boot.ElasticJobRegistryCenterAutoConfiguration;
+import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration;
+import org.assertj.core.util.Strings;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.config.SingletonBeanRegistry;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Map;
+
+@Configuration
+@AutoConfigureAfter(ElasticJobRegistryCenterAutoConfiguration.class)
+@ConditionalOnProperty(name = "elasticjob.enabled", havingValue = "true", matchIfMissing = true)
+@Import(ElasticJobStartupRunner.class)
+public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware {
+
+ private ApplicationContext applicationContext;
+
+ @Override
+ public void setApplicationContext(final ApplicationContext applicationContext) throws BeansException {
+ this.applicationContext = applicationContext;
+ }
+
+ /**
+ * Unmarshal jobs configurations.
+ *
+ * @return unmarshalled ElasticJobDefinitions
+ */
+ @Bean
+ @ConfigurationProperties(prefix = "elasticjob.jobs")
+ public ElasticJobDefinitions elasticJobDefinitions() {
+ return new ElasticJobDefinitions();
Review comment:
ElasticJobDefinitions need renamed. use @Import(xxx.class)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org