diff --git a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateAutoConfiguration.java b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateAutoConfiguration.java index 8f003bcf60..67ef9de05c 100644 --- a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateAutoConfiguration.java +++ b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateAutoConfiguration.java @@ -32,8 +32,8 @@ */ @AutoConfiguration -@Conditional(PromptTmplNacosConfigCondition.class) -@EnableConfigurationProperties(NacosPromptTmplProperties.class) +@Conditional(PromptTemplateConfigCondition.class) +@EnableConfigurationProperties(PromptTemplateProperties.class) public class PromptTemplateAutoConfiguration { @Bean diff --git a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTmplNacosConfigCondition.java b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateConfigCondition.java similarity index 82% rename from auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTmplNacosConfigCondition.java rename to auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateConfigCondition.java index ee0446af2f..8a5c786eff 100644 --- a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTmplNacosConfigCondition.java +++ b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateConfigCondition.java @@ -29,18 +29,18 @@ * of Nacos log error during startup. */ -public class PromptTmplNacosConfigCondition implements Condition { +public class PromptTemplateConfigCondition implements Condition { - private final Logger logger = LoggerFactory.getLogger(PromptTmplNacosConfigCondition.class); + private final Logger logger = LoggerFactory.getLogger(PromptTemplateConfigCondition.class); - public PromptTmplNacosConfigCondition() { + public PromptTemplateConfigCondition() { } @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { // @formatter:off - String tmplPrefix = NacosPromptTmplProperties.TEMPLATE_PREFIX + ".enabled"; + String tmplPrefix = PromptTemplateProperties.TEMPLATE_PREFIX + ".enabled"; // The default value is false, means that the nacos prompt template is not enabled. Boolean enabled = context.getEnvironment().getProperty(tmplPrefix, Boolean.class, false); @@ -50,7 +50,7 @@ public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) if (!enabled) { System.setProperty("spring.nacos.config.enabled", "false"); } - logger.debug("PromptTmplNacosConfigCondition matches enabled: {}",enabled); + logger.debug("PromptTemplateConfigCondition matches enabled: {}",enabled); // @formatter:on return enabled; diff --git a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/NacosPromptTmplProperties.java b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateProperties.java similarity index 91% rename from auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/NacosPromptTmplProperties.java rename to auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateProperties.java index 9f97b1a1a8..f1ea623f49 100644 --- a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/NacosPromptTmplProperties.java +++ b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/java/com/alibaba/cloud/ai/autoconfigure/prompt/PromptTemplateProperties.java @@ -22,8 +22,8 @@ * @author yuluo */ -@ConfigurationProperties(NacosPromptTmplProperties.TEMPLATE_PREFIX) -public class NacosPromptTmplProperties { +@ConfigurationProperties(PromptTemplateProperties.TEMPLATE_PREFIX) +public class PromptTemplateProperties { public final static String TEMPLATE_PREFIX = "spring.ai.nacos.prompt.template"; diff --git a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/resources/META-INF/spring-configuration-metadata.json b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/resources/META-INF/spring-configuration-metadata.json index 8f69b03ba9..b3930be99f 100644 --- a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/main/resources/META-INF/spring-configuration-metadata.json @@ -20,8 +20,8 @@ }, { "name": "spring.ai.nacos.prompt.template", - "type": "com.alibaba.cloud.ai.autoconfigure.prompt.NacosPromptTmplProperties", - "sourceType": "com.alibaba.cloud.ai.autoconfigure.prompt.NacosPromptTmplProperties", + "type": "com.alibaba.cloud.ai.autoconfigure.prompt.PromptTemplateProperties", + "sourceType": "com.alibaba.cloud.ai.autoconfigure.prompt.PromptTemplateProperties", "description": "Configuration properties for Nacos prompt template integration." } ], @@ -161,7 +161,7 @@ "name": "spring.ai.nacos.prompt.template.enabled", "type": "java.lang.Boolean", "description": "Whether to enable Nacos prompt template support.", - "sourceType": "com.alibaba.cloud.ai.autoconfigure.prompt.NacosPromptTmplProperties", + "sourceType": "com.alibaba.cloud.ai.autoconfigure.prompt.PromptTemplateProperties", "defaultValue": false } ], diff --git a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/test/java/com/alibaba/cloud/ai/autoconfigure/prompt/NacosPromptTmplPropertiesTests.java b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/test/java/com/alibaba/cloud/ai/autoconfigure/prompt/NacosPromptTmplPropertiesTests.java index 8e14e55d97..d060b70014 100644 --- a/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/test/java/com/alibaba/cloud/ai/autoconfigure/prompt/NacosPromptTmplPropertiesTests.java +++ b/auto-configurations/spring-ai-alibaba-autoconfigure-nacos-prompt/src/test/java/com/alibaba/cloud/ai/autoconfigure/prompt/NacosPromptTmplPropertiesTests.java @@ -26,10 +26,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @SpringBootTest -class NacosPromptTmplPropertiesTests { +class PromptTemplatePropertiesTests { @Autowired - private NacosPromptTmplProperties properties; + private PromptTemplateProperties properties; @Test void testDefaultEnabled() { @@ -43,7 +43,7 @@ void testSetEnabled() { } @Configuration - @EnableConfigurationProperties(NacosPromptTmplProperties.class) + @EnableConfigurationProperties(PromptTemplateProperties.class) static class TestConfig { }