Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x

Browse Source 
Closes gh-25176
This commit is contained in:
Andy Wilkinson
2021-02-10 19:42:54 +00:00
parent 9da3b65ff3 b6d2da0f84
commit 3c8a974558
4 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,17 +20,13 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import org.gradle.api.file.FileCollection;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Configuration properties read from one or more
@@ -40,20 +36,18 @@ import org.gradle.api.file.FileCollection;
*/
final class ConfigurationProperties {
private static final Type MAP_TYPE = new MapTypeToken().getType();
private ConfigurationProperties() {
}
@SuppressWarnings("unchecked")
static Map<String, ConfigurationProperty> fromFiles(FileCollection files) {
static Map<String, ConfigurationProperty> fromFiles(Iterable<File> files) {
List<ConfigurationProperty> configurationProperties = new ArrayList<>();
try {
Gson gson = new GsonBuilder().create();
ObjectMapper objectMapper = new ObjectMapper();
for (File file : files) {
try (Reader reader = new FileReader(file)) {
Map<String, Object> json = gson.fromJson(reader, MAP_TYPE);
Map<String, Object> json = objectMapper.readValue(file, Map.class);
List<Map<String, Object>> properties = (List<Map<String, Object>>) json.get("properties");
for (Map<String, Object> property : properties) {
String name = (String) property.get("name");
@@ -74,8 +68,4 @@ final class ConfigurationProperties {
}
}
private static final class MapTypeToken extends TypeToken<Map<String, Object>> {
}
}