diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java index db6ba6feb..4a7a3f1e9 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionProperties.java @@ -45,13 +45,6 @@ public class FunctionProperties implements EnvironmentAware, ApplicationContextA */ public final static String PREFIX = "spring.cloud.function"; - /** - * Name of the header to be used to instruct function catalog to skip input type conversion. - * @deprecated since 3.1. Not used anymore - */ - @Deprecated - public final static String SKIP_CONVERSION_HEADER = "skip-input-type-conversion"; - /** * Name of the header to be used to instruct function to apply this content type for output conversion. */ diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/EnableFunctionDeployer.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/EnableFunctionDeployer.java deleted file mode 100644 index 233dfc223..000000000 --- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/EnableFunctionDeployer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012-2019 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.function.deployer; - -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 org.springframework.context.annotation.Import; - -/** - * Annotation to be used on a Spring Boot application if it wants to deploy a jar file - * containing a function definition. - * @author Dave Syer - * - * @deprecated since 3.0. No longer required. Deployer will kick in simply by including - * spring-cloud-function-deployer dependency - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Import(FunctionDeployerConfiguration.class) -@Deprecated -public @interface EnableFunctionDeployer { - -}