From 632b2bf6ab2302fd8304fb8b93f615ce5fe12942 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 6 Feb 2019 15:31:31 +0100
Subject: [PATCH] interim

---
 ...ntextFunctionCatalogAutoConfiguration.java | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
index b0865e097..021a858e3 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
@@ -216,10 +216,6 @@ public class ContextFunctionCatalogAutoConfiguration {
 			this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
 		}
 
-		public <T> void register(FunctionRegistration<T> function) {
-			wrap(function, function.getNames().iterator().next());
-		}
-
 		@PreDestroy
 		public void close() {
 			if (this.applicationEventPublisher != null) {
@@ -241,6 +237,10 @@ public class ContextFunctionCatalogAutoConfiguration {
 			}
 		}
 
+		<T> void register(FunctionRegistration<T> function) {
+			wrap(function, function.getNames().iterator().next());
+		}
+
 		FunctionRegistration<?> getRegistration(Object function) {
 			if (names.containsKey(function)) {
 				return new FunctionRegistration<>(function, this.names.get(function))
@@ -261,6 +261,20 @@ public class ContextFunctionCatalogAutoConfiguration {
 			return (Consumer<?>) lookup(name, this.consumers, Consumer.class);
 		}
 
+		// @checkstyle:off
+		/**
+		 * @deprecated Was never intended for public use.
+		 */
+		@Deprecated
+		@SuppressWarnings("rawtypes")
+		Set<FunctionRegistration<?>> merge(Map<String, FunctionRegistration> initial,
+				Map<String, Consumer> consumers, Map<String, Supplier> suppliers,
+				Map<String, Function> functions) {
+			this.doMerge(initial, consumers, suppliers, functions);
+			return null;
+		}
+		// @checkstyle:on
+
 		@SuppressWarnings("unchecked")
 		private Object lookup(String name, @SuppressWarnings("rawtypes") Map lookup,
 				Class<?> typeOfFunction) {
@@ -276,20 +290,6 @@ public class ContextFunctionCatalogAutoConfiguration {
 			return null;
 		}
 
-		// @checkstyle:off
-		/**
-		 * @deprecated Was never intended for public use.
-		 */
-		@Deprecated
-		@SuppressWarnings("rawtypes")
-		Set<FunctionRegistration<?>> merge(Map<String, FunctionRegistration> initial,
-				Map<String, Consumer> consumers, Map<String, Supplier> suppliers,
-				Map<String, Function> functions) {
-			this.doMerge(initial, consumers, suppliers, functions);
-			return null;
-		}
-		// @checkstyle:on
-
 		private String normalizeName(String name) {
 			return name.replaceAll(",", "|").trim();
 		}