SpringCloud/spring-cloud-build
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed improper packaging and config props parsing

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-05-26 13:56:43 +02:00
parent bdd2ae3ed3
commit e2019664e2
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/pom.xml
View File

@@ -47,6 +47,14 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main</directory>
<excludes>
<exclude>java/**/*.*</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>

8
docs/src/main/java/org/springframework/cloud/internal/Main.java
View File

@@ -22,7 +22,7 @@ import org.springframework.util.StreamUtils;
*/
public class Main {
static void main(String... args) {
public static void main(String... args) {
String outputFile = args[0];
String inclusionPattern = args.length > 1 ? args[1] : ".*";
File parent = new File(outputFile).getParentFile();
@@ -55,12 +55,12 @@ public class Main {
List<Map<String, Object>> properties = (List<Map<String, Object>>) response.get("properties");
properties.forEach(val -> {
propertyCount.incrementAndGet();
String name = (String) val.get("name");
String name = String.valueOf(val.get("name"));
if (!pattern.matcher(name).matches()) {
return;
}
String description = (String) val.get("description");
String defaultValue = (String) val.get("defaultValue");
String description = String.valueOf(val.get("description"));
String defaultValue = String.valueOf(val.get("defaultValue"));
matchingPropertyCount.incrementAndGet();
names.add(name);
descriptions.put(name, new ConfigValue(name, description, defaultValue));