Skip to content

4.x: Replace manual casts on pattern with instanceof in HoconConfigParser #9209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2024
Merged

4.x: Replace manual casts on pattern with instanceof in HoconConfigParser #9209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions config/hocon/src/main/java/io/helidon/config/hocon/HoconConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2022 Oracle and/or its affiliates.
* Copyright (c) 2020, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -155,10 +155,10 @@ private static ObjectNode fromConfig(ConfigObject config) {
ObjectNode.Builder builder = ObjectNode.builder();
config.forEach((unescapedKey, value) -> {
String key = io.helidon.config.Config.Key.escapeName(unescapedKey);
if (value instanceof ConfigList) {
builder.addList(key, fromList((ConfigList) value));
} else if (value instanceof ConfigObject) {
builder.addObject(key, fromConfig((ConfigObject) value));
if (value instanceof ConfigList configList) {
builder.addList(key, fromList(configList));
} else if (value instanceof ConfigObject configObject) {
builder.addObject(key, fromConfig(configObject));
} else {
try {
Object unwrapped = value.unwrapped();
Expand All @@ -181,10 +181,10 @@ private static ObjectNode fromConfig(ConfigObject config) {
private static ListNode fromList(ConfigList list) {
ListNode.Builder builder = ListNode.builder();
list.forEach(value -> {
if (value instanceof ConfigList) {
builder.addList(fromList((ConfigList) value));
} else if (value instanceof ConfigObject) {
builder.addObject(fromConfig((ConfigObject) value));
if (value instanceof ConfigList configList) {
builder.addList(fromList(configList));
} else if (value instanceof ConfigObject configObject) {
builder.addObject(fromConfig(configObject));
} else {
try {
Object unwrapped = value.unwrapped();
Expand Down