SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduction of hints for Spring Task

Browse Source 
Updated to support timestamp demonstration of native task.

Remove experimental when appropriate for the hints and remove this `spring.aop.proxy-target-class=false` from
application.properties for timestamp demo

Updated versions to the latest boot snapshot.
This commit is contained in:
Glenn Renfro
2022-07-22 14:49:41 -04:00
parent a58410cae4
commit 82fcb25ac1
15 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -102,8 +102,8 @@
<properties>
<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-deployer.version>2.8.0-M1</spring-cloud-deployer.version>
<spring-cloud-deployer-local.version>2.8.0-M1
<spring-cloud-deployer.version>2.8.0-SNAPSHOT</spring-cloud-deployer.version>
<spring-cloud-deployer-local.version>2.8.0-SNAPSHOT
</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>${spring-cloud-stream.version}
</spring-cloud-stream-binder-rabbit.version>

71
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskRuntimeHints.java Normal file
View File

@@ -0,0 +1,71 @@
/*
* Copyright 2022-2022 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 org.springframework.cloud.task.configuration;
import java.sql.Statement;
import org.springframework.aop.SpringProxy;
import org.springframework.aop.framework.Advised;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
import org.springframework.cloud.task.repository.TaskExplorer;
import org.springframework.cloud.task.repository.TaskRepository;
import org.springframework.core.DecoratingProxy;
import org.springframework.util.ClassUtils;
/**
* Native Hints for Spring Cloud Task.
*
* @author Glenn Renfro
* @since 3.0
*/
public class TaskRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
hints.reflection().registerType(TypeReference.of("java.sql.DatabaseMetaData"), hint -> {
});
hints.resources().registerPattern("org/springframework/cloud/task/schema-h2.sql");
hints.resources().registerPattern("org/springframework/cloud/task/schema-mysql.sql");
hints.resources().registerPattern("org/springframework/cloud/task/schema-oracle.sql");
hints.resources().registerPattern("org/springframework/cloud/task/schema-postgresql.sql");
hints.resources().registerPattern("org/springframework/cloud/task/schema-hsqldb.sql");
hints.resources().registerPattern("org/springframework/cloud/task/schema-sqlserver.sql");
hints.reflection().registerType(
TypeReference.of("org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer"),
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
MemberCategory.INVOKE_DECLARED_METHODS));
hints.proxies().registerJdkProxy(builder -> builder.proxiedInterfaces(TaskRepository.class)
.proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class));
hints.proxies().registerJdkProxy(builder -> builder.proxiedInterfaces(TaskExplorer.class)
.proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class));
// Experimental - These can be removed in the future possibly.
if (!ClassUtils.isPresent("com.zaxxer.hikari.HikariDataSource", classLoader)) {
return;
}
hints.reflection().registerType(Statement[].class, hint -> {
});
hints.reflection().registerType(TypeReference.of("com.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry[]"),
hint -> {
});
}
}

4
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/annotation/AfterTask.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 the original author or authors.
* Copyright 2016-2022 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.
@@ -22,6 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.aot.hint.annotation.Reflective;
import org.springframework.cloud.task.listener.TaskExecutionListener;
import org.springframework.cloud.task.repository.TaskExecution;
@@ -43,6 +44,7 @@ import org.springframework.cloud.task.repository.TaskExecution;
@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Reflective
public @interface AfterTask {
}

4
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/annotation/BeforeTask.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 the original author or authors.
* Copyright 2016-2022 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.
@@ -22,6 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.aot.hint.annotation.Reflective;
import org.springframework.cloud.task.listener.TaskExecutionListener;
import org.springframework.cloud.task.repository.TaskExecution;
@@ -43,6 +44,7 @@ import org.springframework.cloud.task.repository.TaskExecution;
@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Reflective
public @interface BeforeTask {
}

4
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/annotation/FailedTask.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 the original author or authors.
* Copyright 2016-2022 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.
@@ -22,6 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.aot.hint.annotation.Reflective;
import org.springframework.cloud.task.listener.TaskExecutionListener;
import org.springframework.cloud.task.repository.TaskExecution;
@@ -43,6 +44,7 @@ import org.springframework.cloud.task.repository.TaskExecution;
@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Reflective
public @interface FailedTask {
}

2
spring-cloud-task-core/src/main/resources/META-INF/spring/aot.factories Normal file
View File

@@ -0,0 +1,2 @@
org.springframework.aot.hint.RuntimeHintsRegistrar=\
org.springframework.cloud.task.configuration.TaskRuntimeHints

2
spring-cloud-task-samples/batch-job/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>

2
spring-cloud-task-samples/jpa-sample/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>

2
spring-cloud-task-samples/multiple-datasources/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>

4
spring-cloud-task-samples/partitioned-batch-job/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -20,7 +20,7 @@
<spring-cloud-commons.version>4.0.0-SNAPSHOT</spring-cloud-commons.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<spring-cloud-deployer>2.8.0-M1</spring-cloud-deployer>
<spring-cloud-deployer>2.8.0-SNAPSHOT</spring-cloud-deployer>
</properties>
<dependencyManagement>

2
spring-cloud-task-samples/single-step-batch-job/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>

2
spring-cloud-task-samples/task-observations/pom.xml
View File

@@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>

2
spring-cloud-task-samples/tasksink/pom.xml
View File

@@ -24,7 +24,7 @@
<skipInstall>true</skipInstall>
<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-task.version>3.0.0-SNAPSHOT</spring-cloud-task.version>
<spring-cloud-deployer-version>2.8.0-M1</spring-cloud-deployer-version>
<spring-cloud-deployer-version>2.8.0-SNAPSHOT</spring-cloud-deployer-version>
</properties>
<dependencyManagement>

6
spring-cloud-task-samples/timestamp/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -62,6 +62,10 @@
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies>
<pluginRepositories>

2
spring-cloud-task-samples/timestamp/src/main/resources/application.properties
View File

@@ -1,2 +1,4 @@
spring.application.name=Demo Timestamp Task
logging.level.org.springframework.cloud.task=DEBUG
spring.aop.proxy-target-class=false