From 71daaaef99bbd0eb975543aedf31a858b66d65eb Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Wed, 25 May 2022 00:05:08 -0500
Subject: [PATCH] Fix circular dependency and checkstyle on
 ComponentCustomizationAutoConfiguration (#280)

---
 common/config-common/pom.xml                                 | 4 ++--
 .../config/ComponentCustomizationAutoConfiguration.java      | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/config-common/pom.xml b/common/config-common/pom.xml
index 2479c580..208472bc 100644
--- a/common/config-common/pom.xml
+++ b/common/config-common/pom.xml
@@ -4,9 +4,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.fn</groupId>
-        <artifactId>spring-functions-parent</artifactId>
+        <artifactId>java-functions-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../../spring-functions-parent</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>config-common</artifactId>
diff --git a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizationAutoConfiguration.java b/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizationAutoConfiguration.java
index 758ed4a6..4199e7bc 100644
--- a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizationAutoConfiguration.java
+++ b/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizationAutoConfiguration.java
@@ -19,6 +19,7 @@ package org.springframework.cloud.fn.common.config;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * An auto-configuration to expose customizer strategy beans to accept user-provided component customizers.
@@ -29,6 +30,8 @@ import org.springframework.context.annotation.Bean;
  *
  * @see ComponentCustomizerBeanPostProcessor
  */
+// @checkstyle:off HideUtilityClassConstructor
+@Configuration(proxyBeanMethods = false)
 public class ComponentCustomizationAutoConfiguration {
 
 	@Bean
@@ -36,5 +39,5 @@ public class ComponentCustomizationAutoConfiguration {
 	static BeanPostProcessor componentCustomizerBeanPostProcessor() {
 		return new ComponentCustomizerBeanPostProcessor();
 	}
-
 }
+// @checkstyle:on