spring-cloudGH-592 Logging improvements

Resolves spring-cloud#592

Author: olegz

spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java

@@ -133,6 +133,10 @@ public FunctionRegistration<?> getRegistration(Object function) {
 
 	@Override
 	public <T> void register(FunctionRegistration<T> registration) {
+		Assert.notNull(registration, "'registration' must not be null");
+		if (logger.isDebugEnabled()) {
+			logger.debug("Registering function " + registration.getNames());
+		}
 		this.functionRegistrations.add(registration);
 	}
 
@@ -169,7 +173,7 @@ <T> T doLookup(Class<?> type, String functionDefinition, String[] expectedOutput
 		if (function != null) {
 			function.expectedOutputContentType = expectedOutputMimeTypes;
 		}
-		else {
+		else if (logger.isDebugEnabled()) {
 			logger.debug("Function '" + functionDefinition + "' is not found in cache");
 		}
 
@@ -260,6 +264,9 @@ private FunctionInvocationWrapper compose(Class<?> type, String functionDefiniti
 				this.wrappedFunctionDefinitions.put(composedFunction.functionDefinition, composedFunction);
 			}
 		}
+		if (logger.isDebugEnabled()) {
+			logger.debug("Composed function " + composedFunction);
+		}
 		return composedFunction;
 	}
 
@@ -329,10 +336,16 @@ public class FunctionInvocationWrapper implements Function<Object, Object>, Cons
 		}
 
 		public void setSkipInputConversion(boolean skipInputConversion) {
+			if (logger.isDebugEnabled() && skipInputConversion) {
+				logger.debug("'skipInputConversion' was explicitely set to true. No input conversion will be attempted");
+			}
 			this.skipInputConversion = skipInputConversion;
 		}
 
 		public void setSkipOutputConversion(boolean skipOutputConversion) {
+			if (logger.isDebugEnabled() && skipOutputConversion) {
+				logger.debug("'skipOutputConversion' was explicitely set to true. No output conversion will be attempted");
+			}
 			this.skipOutputConversion = skipOutputConversion;
 		}
 
@@ -398,7 +411,9 @@ public Class<?> getRawInputType() {
 		 */
 		@Override
 		public Object apply(Object input) {
-
+			if (logger.isDebugEnabled() && !(input  instanceof Publisher)) {
+				logger.debug("Invoking function " + this);
+			}
 			Object result = this.doApply(input);
 
 			if (result != null && this.outputType != null) {
@@ -795,9 +810,15 @@ else if (input instanceof Message) {
 							? new OriginalMessageHolder(convertedInput, (Message<?>) input)
 							: convertedInput;
 				}
+				if (convertedInput != null && logger.isDebugEnabled()) {
+					logger.debug("Converted Message: " + input + " to: " + convertedInput);
+				}
 			}
 			else {
 				convertedInput = this.convertNonMessageInputIfNecessary(type, input);
+				if (convertedInput != null && logger.isDebugEnabled()) {
+					logger.debug("Converted input: " + input + " to: " + convertedInput);
+				}
 			}
 			// wrap in Message if necessary
 			if (this.isWrapConvertedInputInMessage(convertedInput)) {
@@ -828,7 +849,6 @@ private Object convertOutputIfNecessary(Object output, Type type, String[] conte
 				return output;
 			}
 
-
 			Object convertedOutput = output;
 			if (FunctionTypeUtils.isMultipleArgumentType(type)) {
 				convertedOutput = this.convertMultipleOutputArgumentTypeIfNecesary(convertedOutput, type, contentType);
@@ -944,7 +964,6 @@ private Object convertInputMessageIfNecessary(Message message, Type type) {
 					return message.getPayload();
 				}
 			}
-			//if (message.getPayload().getClass().isAss) {
 
 			Object convertedInput = message;
 			type = this.extractActualValueTypeIfNecessary(type);