Skip to content

Commit 34819f4

Browse files
tomas-langertomas-langer
authored
Use Hson.Struct instead of Hson.Object to prevent confusion with java.lang.Object. (helidon-io#9080)
1 parent 9383fa9 commit 34819f4

16 files changed

Lines changed: 185 additions & 185 deletions

File tree

‎config/metadata/codegen/src/main/java/io/helidon/config/metadata/codegen/ConfigMetadataCodegenExtension.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@ private Stream<TypeInfo> typesToProcess(Set<TypeName> typeNames) {
9292
}
9393

9494
private void storeMetadata() {
95-
List<Hson.Object> root = new ArrayList<>();
95+
List<Hson.Struct> root = new ArrayList<>();
9696

9797
for (var module : moduleTypes.entrySet()) {
9898
String moduleName = module.getKey();
9999
var types = module.getValue();
100-
List<Hson.Object> typeArray = new ArrayList<>();
100+
List<Hson.Struct> typeArray = new ArrayList<>();
101101
types.forEach(it -> newOptions.get(it).write(typeArray));
102-
root.add(Hson.objectBuilder()
102+
root.add(Hson.structBuilder()
103103
.set("module", moduleName)
104-
.setObjects("types", typeArray)
104+
.setStructs("types", typeArray)
105105
.build());
106106
}
107107

‎config/metadata/codegen/src/main/java/io/helidon/config/metadata/codegen/ConfiguredType.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ String prefix() {
8181
return configured.prefix().orElse(null);
8282
}
8383

84-
void write(List<Hson.Object> typeArray) {
85-
var typeObject = Hson.Object.builder();
84+
void write(List<Hson.Struct> typeArray) {
85+
var typeObject = Hson.Struct.builder();
8686

8787
typeObject.set("type", targetClass());
8888
typeObject.set("annotatedType", annotatedClass());
@@ -108,11 +108,11 @@ void write(List<Hson.Object> typeArray) {
108108
.collect(Collectors.toList()));
109109
}
110110

111-
List<Hson.Object> options = new ArrayList<>();
111+
List<Hson.Struct> options = new ArrayList<>();
112112
for (ConfiguredProperty property : allProperties) {
113113
writeProperty(options, "", property);
114114
}
115-
typeObject.setObjects("options", options);
115+
typeObject.setStructs("options", options);
116116

117117
typeArray.add(typeObject.build());
118118
}
@@ -132,11 +132,11 @@ private static String paramsToString(List<TypeName> params) {
132132
.collect(Collectors.joining(", "));
133133
}
134134

135-
private void writeProperty(List<Hson.Object> optionsBuilder,
135+
private void writeProperty(List<Hson.Struct> optionsBuilder,
136136
String prefix,
137137
ConfiguredProperty property) {
138138

139-
var optionBuilder = Hson.Object.builder();
139+
var optionBuilder = Hson.Struct.builder();
140140
if (property.key() != null && !property.key.isBlank()) {
141141
optionBuilder.set("key", prefix(prefix, property.key()));
142142
}
@@ -181,18 +181,18 @@ private void writeProperty(List<Hson.Object> optionsBuilder,
181181
.forEach(it -> writeProperty(optionsBuilder, finalPrefix, it));
182182
}
183183
if (!property.allowedValues.isEmpty()) {
184-
List<Hson.Object> allowedValues = new ArrayList<>();
184+
List<Hson.Struct> allowedValues = new ArrayList<>();
185185

186186
for (ConfiguredOptionData.AllowedValue allowedValue : property.allowedValues) {
187-
var allowedJson = Hson.Object.builder()
187+
var allowedJson = Hson.Struct.builder()
188188
.set("value", allowedValue.value());
189189
if (!allowedValue.description().isBlank()) {
190190
allowedJson.set("description", allowedValue.description().trim());
191191
}
192192
allowedValues.add(allowedJson.build());
193193
}
194194

195-
optionBuilder.setObjects("allowedValues", allowedValues);
195+
optionBuilder.setStructs("allowedValues", allowedValues);
196196
}
197197

198198
optionsBuilder.add(optionBuilder.build());

‎config/metadata/processor/src/main/java/io/helidon/config/metadata/processor/ConfigMetadataHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,16 @@ private void storeMetadata() {
187187
This is to allow merging of files - such as when we would want to create on-the-fly
188188
JSON for a project with only its dependencies.
189189
*/
190-
List<Hson.Object> moduleArray = new ArrayList<>();
190+
List<Hson.Struct> moduleArray = new ArrayList<>();
191191

192192
for (var module : moduleTypes.entrySet()) {
193193
String moduleName = module.getKey();
194194
var types = module.getValue();
195-
List<Hson.Object> typeArray = new ArrayList<>();
195+
List<Hson.Struct> typeArray = new ArrayList<>();
196196
types.forEach(it -> newOptions.get(it).write(typeArray));
197-
moduleArray.add(Hson.Object.builder()
197+
moduleArray.add(Hson.Struct.builder()
198198
.set("module", moduleName)
199-
.setObjects("types", typeArray)
199+
.setStructs("types", typeArray)
200200
.build());
201201
}
202202

‎config/metadata/processor/src/main/java/io/helidon/config/metadata/processor/ConfiguredType.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ String prefix() {
8181
return configured.prefix().orElse(null);
8282
}
8383

84-
void write(List<Hson.Object> typeArray) {
85-
var typeObject = Hson.Object.builder();
84+
void write(List<Hson.Struct> typeArray) {
85+
var typeObject = Hson.Struct.builder();
8686

8787
typeObject.set("type", targetClass());
8888
typeObject.set("annotatedType", annotatedClass());
@@ -108,11 +108,11 @@ void write(List<Hson.Object> typeArray) {
108108
.collect(Collectors.toList()));
109109
}
110110

111-
List<Hson.Object> options = new ArrayList<>();
111+
List<Hson.Struct> options = new ArrayList<>();
112112
for (ConfiguredProperty property : allProperties) {
113113
writeProperty(options, "", property);
114114
}
115-
typeObject.setObjects("options", options);
115+
typeObject.setStructs("options", options);
116116

117117
typeArray.add(typeObject.build());
118118
}
@@ -132,11 +132,11 @@ private static String paramsToString(List<TypeName> params) {
132132
.collect(Collectors.joining(", "));
133133
}
134134

135-
private void writeProperty(List<Hson.Object> optionsBuilder,
135+
private void writeProperty(List<Hson.Struct> optionsBuilder,
136136
String prefix,
137137
ConfiguredProperty property) {
138138

139-
var optionBuilder = Hson.Object.builder();
139+
var optionBuilder = Hson.Struct.builder();
140140
if (property.key() != null && !property.key.isBlank()) {
141141
optionBuilder.set("key", prefix(prefix, property.key()));
142142
}
@@ -181,16 +181,16 @@ private void writeProperty(List<Hson.Object> optionsBuilder,
181181
.forEach(it -> writeProperty(optionsBuilder, finalPrefix, it));
182182
}
183183
if (!property.allowedValues.isEmpty()) {
184-
List<Hson.Object> allowedValues = new ArrayList<>();
184+
List<Hson.Struct> allowedValues = new ArrayList<>();
185185

186186
for (ConfiguredOptionData.AllowedValue allowedValue : property.allowedValues) {
187-
allowedValues.add(Hson.Object.builder()
187+
allowedValues.add(Hson.Struct.builder()
188188
.set("value", allowedValue.value())
189189
.set("description", allowedValue.description())
190190
.build());
191191
}
192192

193-
optionBuilder.setObjects("allowedValues", allowedValues);
193+
optionBuilder.setStructs("allowedValues", allowedValues);
194194
}
195195

196196
optionsBuilder.add(optionBuilder.build());

0 commit comments

Comments
 (0)