From dc38239ae67ab9cc9a31665af8d0364d04d8448e Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 3 Jan 2022 11:51:41 -0500 Subject: [PATCH] Move IntegrationDsl from .kt to .java Turns out Eclipse Kotlin plugin is not perfect at the moment, and it causes some code parsing problems in the editor. * Move Kotlin annotation to Java to mitigate normal source code flow: Java to Kotlin, not opposite --- .../integration/dsl/IntegrationDsl.java} | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) rename spring-integration-core/src/main/{kotlin/org/springframework/integration/dsl/IntegrationDsl.kt => java/org/springframework/integration/dsl/IntegrationDsl.java} (53%) diff --git a/spring-integration-core/src/main/kotlin/org/springframework/integration/dsl/IntegrationDsl.kt b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationDsl.java similarity index 53% rename from spring-integration-core/src/main/kotlin/org/springframework/integration/dsl/IntegrationDsl.kt rename to spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationDsl.java index 6673d937bc3..53eead6d6d7 100644 --- a/spring-integration-core/src/main/kotlin/org/springframework/integration/dsl/IntegrationDsl.kt +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationDsl.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 the original author or authors. + * Copyright 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. @@ -14,14 +14,27 @@ * limitations under the License. */ -package org.springframework.integration.dsl +package org.springframework.integration.dsl; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import kotlin.DslMarker; /** - * The Kotlin [DslMarker] annotation for classes used in scope of DSL, including all the Java DSL classes. + * The Kotlin {@link DslMarker} annotation for classes used in scope of DSL, including all the Java DSL classes. * * @author Artem Bilan * * @since 5.5.8 */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.CLASS) +@Documented @DslMarker -annotation class IntegrationDsl \ No newline at end of file +public @interface IntegrationDsl { + +}