Remove deprecations from previous versions (#8628)

Author: artembilan

spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java

@@ -306,18 +306,6 @@ public void setMessageBuilderFactory(MessageBuilderFactory messageBuilderFactory
 		this.messageBuilderFactory = messageBuilderFactory;
 	}
 
-	/**
-	 * @param  key    Integration property.
-	 * @param  tClass the class to convert a value of Integration property.
-	 * @param <T> The expected type of the property.
-	 * @return the value of the Integration property converted to the provide type.
-	 * @deprecated in favor of {@link #getIntegrationProperties()}
-	 */
-	@Deprecated(since = "6.0")
-	protected <T> T getIntegrationProperty(String key, Class<T> tClass) {
-		return this.defaultConversionService.convert(this.integrationProperties.toProperties().getProperty(key), tClass);
-	}
-
 	@Override
 	public String toString() {
 		return (this.beanName != null) ? getBeanDescription() : super.toString();

spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java

@@ -2401,292 +2401,6 @@ public B log(LoggingHandler.Level level, @Nullable String category, @Nullable Ex
 		return wireTap(loggerChannel);
 	}
 
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the {@code INFO}
-	 * logging level and {@code org.springframework.integration.handler.LoggingHandler}
-	 * as a default logging category.
-	 * <p> The full request {@link Message} will be logged.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply() {
-		return logAndReply(LoggingHandler.Level.INFO);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for provided {@link LoggingHandler.Level}
-	 * logging level and {@code org.springframework.integration.handler.LoggingHandler}
-	 * as a default logging category.
-	 * <p> The full request {@link Message} will be logged.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param level the {@link LoggingHandler.Level}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(LoggingHandler.Level level) {
-		return logAndReply(level, (String) null);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided logging category
-	 * and {@code INFO} logging level.
-	 * <p> The full request {@link Message} will be logged.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param category the logging category to use.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(String category) {
-		return logAndReply(LoggingHandler.Level.INFO, category);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided
-	 * {@link LoggingHandler.Level} logging level and logging category.
-	 * <p> The full request {@link Message} will be logged.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param level the {@link LoggingHandler.Level}.
-	 * @param category the logging category to use.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(LoggingHandler.Level level, @Nullable String category) {
-		return logAndReply(level, category, (Expression) null);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided
-	 * {@link LoggingHandler.Level} logging level, logging category
-	 * and SpEL expression for the log message.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param level the {@link LoggingHandler.Level}.
-	 * @param category the logging category.
-	 * @param logExpression the SpEL expression to evaluate logger message at runtime
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(LoggingHandler.Level level, String category, String logExpression) {
-		Assert.hasText(logExpression, "'logExpression' must not be empty");
-		return logAndReply(level, category, PARSER.parseExpression(logExpression));
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the {@code INFO} logging level,
-	 * the {@code org.springframework.integration.handler.LoggingHandler}
-	 * as a default logging category and {@link Function} for the log message.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param function the function to evaluate logger message at runtime
-	 * @param <P> the expected payload type.
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public <P> IntegrationFlow logAndReply(Function<Message<P>, Object> function) {
-		Assert.notNull(function, FUNCTION_MUST_NOT_BE_NULL);
-		return logAndReply(new FunctionExpression<>(function));
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the {@code INFO} logging level,
-	 * the {@code org.springframework.integration.handler.LoggingHandler}
-	 * as a default logging category and SpEL expression to evaluate
-	 * logger message at runtime against the request {@link Message}.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param logExpression the {@link Expression} to evaluate logger message at runtime
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(Expression logExpression) {
-		return logAndReply(LoggingHandler.Level.INFO, logExpression);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided
-	 * {@link LoggingHandler.Level} logging level,
-	 * the {@code org.springframework.integration.handler.LoggingHandler}
-	 * as a default logging category and SpEL expression to evaluate
-	 * logger message at runtime against the request {@link Message}.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param level the {@link LoggingHandler.Level}.
-	 * @param logExpression the {@link Expression} to evaluate logger message at runtime
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(LoggingHandler.Level level, Expression logExpression) {
-		return logAndReply(level, null, logExpression);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the {@code INFO}
-	 * {@link LoggingHandler.Level} logging level,
-	 * the provided logging category and SpEL expression to evaluate
-	 * logger message at runtime against the request {@link Message}.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param category the logging category.
-	 * @param logExpression the {@link Expression} to evaluate logger message at runtime
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(String category, Expression logExpression) {
-		return logAndReply(LoggingHandler.Level.INFO, category, logExpression);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided
-	 * {@link LoggingHandler.Level} logging level,
-	 * the {@code org.springframework.integration.handler.LoggingHandler}
-	 * as a default logging category and {@link Function} for the log message.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param level the {@link LoggingHandler.Level}.
-	 * @param function the function to evaluate logger message at runtime
-	 * @param <P> the expected payload type.
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public <P> IntegrationFlow logAndReply(LoggingHandler.Level level, Function<Message<P>, Object> function) {
-		return logAndReply(level, null, function);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided
-	 * {@link LoggingHandler.Level} logging level,
-	 * the provided logging category and {@link Function} for the log message.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param category the logging category.
-	 * @param function the function to evaluate logger message at runtime
-	 * @param <P> the expected payload type.
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public <P> IntegrationFlow logAndReply(String category, Function<Message<P>, Object> function) {
-		return logAndReply(LoggingHandler.Level.INFO, category, function);
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided
-	 * {@link LoggingHandler.Level} logging level, logging category
-	 * and {@link Function} for the log message.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param level the {@link LoggingHandler.Level}.
-	 * @param category the logging category.
-	 * @param function the function to evaluate logger message at runtime
-	 * @param <P> the expected payload type.
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public <P> IntegrationFlow logAndReply(LoggingHandler.Level level, @Nullable String category,
-			Function<Message<P>, Object> function) {
-
-		Assert.notNull(function, FUNCTION_MUST_NOT_BE_NULL);
-		return logAndReply(level, category, new FunctionExpression<>(function));
-	}
-
-	/**
-	 * Populate a {@link WireTap} for the {@link #currentMessageChannel}
-	 * with the {@link LoggingHandler} subscriber for the provided
-	 * {@link LoggingHandler.Level} logging level, logging category
-	 * and SpEL expression for the log message.
-	 * <p> A {@link #bridge()} is added after this operator to make the flow reply-producing
-	 * if the {@code replyChannel} header is present.
-	 * <p> This operator can be used only in the end of flow.
-	 * @param level the {@link LoggingHandler.Level}.
-	 * @param category the logging category.
-	 * @param logExpression the {@link Expression} to evaluate logger message at runtime
-	 * against the request {@link Message}.
-	 * @return an {@link IntegrationFlow} instance based on this builder.
-	 * @deprecated since 6.0 in favor of {@link #log} in the end of flow.
-	 * @see #log()
-	 * @see #bridge()
-	 */
-	@Deprecated
-	public IntegrationFlow logAndReply(LoggingHandler.Level level, @Nullable String category,
-			@Nullable Expression logExpression) {
-
-		return log(level, category, logExpression)
-				.bridge()
-				.get();
-	}
-
 	/**
 	 * Populate a {@link ScatterGatherHandler} to the current integration flow position
 	 * based on the provided {@link MessageChannel} for scattering function

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationComponentSpec.java

@@ -69,16 +69,6 @@ public final String getId() {
 		return this.id;
 	}
 
-	/**
-	 * @return the configured component.
-	 * @deprecated since 6.1 with no-op for end-user:
-	 * the {@link #getObject()} is called by the framework at the appropriate phase.
-	 */
-	@Deprecated(since = "6.1", forRemoval = true)
-	public T get() {
-		return getObject();
-	}
-
 	@Override
 	public Class<?> getObjectType() {
 		return getObject().getClass();