From 55aad155f811fbbab55bede87aa8ab17b05b26c8 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 20 Oct 2022 11:26:07 +0200 Subject: [PATCH] General code cleanup --- .../context/catalog/FunctionTypeUtils.java | 17 +--------- .../catalog/SimpleFunctionRegistry.java | 2 ++ .../context/config/FunctionContextUtils.java | 31 ++----------------- 3 files changed, 6 insertions(+), 44 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java index eecd0b63d..919c67801 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2019-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. @@ -548,19 +548,4 @@ public final class FunctionTypeUtils { } return functionDefinition; } - - private static boolean isFunctional(Type type) { - if (type instanceof ParameterizedType) { - type = ((ParameterizedType) type).getRawType(); - Assert.isTrue(type instanceof Class, "Must be one of Supplier, Function, Consumer" - + " or FunctionRegistration. Was " + type); - } - - Class candidateType = (Class) type; - return Supplier.class.isAssignableFrom(candidateType) - || Function.class.isAssignableFrom(candidateType) - || Consumer.class.isAssignableFrom(candidateType) - || BiFunction.class.isAssignableFrom(candidateType) - || BiConsumer.class.isAssignableFrom(candidateType); - } } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index a9b2d4029..3943831a1 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -445,6 +445,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry { this.propagateInputHeaders = function.propagateInputHeaders; this.composed = function.composed; this.inputType = function.inputType; + this.composed = function.composed; this.outputType = function.outputType; this.functionDefinition = function.functionDefinition; this.message = this.inputType != null && FunctionTypeUtils.isMessage(this.inputType); @@ -1134,6 +1135,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry { * This is an optional conversion which would only happen if `expected-content-type` is * set as a header in a message or explicitly provided as part of the lookup. */ + @SuppressWarnings("unchecked") private Object convertOutputIfNecessary(Object output, Type type, String[] contentType) { if (output instanceof Message && ((Message) output).getPayload() instanceof byte[]) { return output; diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java index 7a4277da7..5fcf7b989 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java @@ -16,12 +16,9 @@ package org.springframework.cloud.function.context.config; -import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.List; @@ -113,30 +110,8 @@ public abstract class FunctionContextUtils { private static Method[] getCandidateMethods(final Class factoryClass, final RootBeanDefinition mbd) { - if (System.getSecurityManager() != null) { - return AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Method[] run() { - return (mbd.isNonPublicAccessAllowed() - ? ReflectionUtils.getAllDeclaredMethods(factoryClass) - : factoryClass.getMethods()); - } - }); - } - else { - return (mbd.isNonPublicAccessAllowed() - ? ReflectionUtils.getAllDeclaredMethods(factoryClass) - : factoryClass.getMethods()); - } + return (mbd.isNonPublicAccessAllowed() + ? ReflectionUtils.getAllDeclaredMethods(factoryClass) + : factoryClass.getMethods()); } - - private static Object getField(Object target, String name) { - Field field = ReflectionUtils.findField(target.getClass(), name); - if (field == null) { - return null; - } - ReflectionUtils.makeAccessible(field); - return ReflectionUtils.getField(field, target); - } - }