Merge branch '4.2.x' into 4.3.x

Author: ryanjbaxter

spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java

@@ -193,6 +193,13 @@ private Set<Path> getFileRepo() {
 			try {
 				for (AbstractScmEnvironmentRepository repository : scmRepositories) {
 					repositoryUri = repository.getUri();
+					// Skip URIs with placeholders - they cannot be resolved at startup
+					if (repositoryUri != null && repositoryUri.contains("{")) {
+						if (log.isWarnEnabled()) {
+							log.warn("Skipping file monitoring for placeholder URI: " + repositoryUri);
+						}
+						continue;
+					}
 					Resource resource = this.resourceLoader.getResource(repositoryUri);
 					if (resource instanceof FileSystemResource || resource instanceof FileUrlResource) {
 						paths.add(Paths.get(resource.getURI()));

spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/FileMonitorConfigurationTest.java

@@ -145,6 +145,58 @@ public void testStart_withTwoMixedPathAndFileUrlScmRepositories() {
 		assertOnDirectory(2);
 	}
 
+	@Test
+	public void testStart_withPlaceholderUriShouldBeSkipped() {
+		// given
+		AbstractScmEnvironmentRepository repository = createScmEnvironmentRepository(
+				"file:/var/opt/config-service/{application}");
+		addScmRepository(repository);
+
+		// when
+		fileMonitorConfiguration.start();
+
+		// then
+		Set<Path> directory = getDirectory();
+		assertThat(directory).isNotNull();
+		assertThat(directory).isEmpty();
+	}
+
+	@Test
+	public void testStart_withMixedPlaceholderAndValidUriShouldSkipOnlyPlaceholder() {
+		// given
+		AbstractScmEnvironmentRepository placeholderRepository = createScmEnvironmentRepository(
+				"file:/var/opt/config-service/{application}");
+		AbstractScmEnvironmentRepository validRepository = createScmEnvironmentRepository(SAMPLE_PATH);
+		addScmRepository(placeholderRepository);
+		addScmRepository(validRepository);
+
+		// when
+		fileMonitorConfiguration.start();
+
+		// then
+		assertOnDirectory(1);
+	}
+
+	@Test
+	public void testStart_withMultiplePlaceholderTypesShouldBeSkipped() {
+		// given
+		AbstractScmEnvironmentRepository applicationPlaceholder = createScmEnvironmentRepository(
+				"file:/config/{application}");
+		AbstractScmEnvironmentRepository profilePlaceholder = createScmEnvironmentRepository("file:/config/{profile}");
+		AbstractScmEnvironmentRepository labelPlaceholder = createScmEnvironmentRepository("file:/config/{label}");
+		addScmRepository(applicationPlaceholder);
+		addScmRepository(profilePlaceholder);
+		addScmRepository(labelPlaceholder);
+
+		// when
+		fileMonitorConfiguration.start();
+
+		// then
+		Set<Path> directory = getDirectory();
+		assertThat(directory).isNotNull();
+		assertThat(directory).isEmpty();
+	}
+
 	private void addScmRepository(AbstractScmEnvironmentRepository... repository) {
 		repositories.addAll(Arrays.asList(repository));
 		ReflectionTestUtils.setField(fileMonitorConfiguration, "scmRepositories", repositories);