From 020130f6a7a238748fb34928eeec2147e59e10a9 Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Wed, 28 Aug 2024 22:08:04 +0100 Subject: [PATCH] Internal cleanup of AbstractLocationConfigSourceLoader (#1214) --- .../AbstractLocationConfigSourceLoader.java | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/implementation/src/main/java/io/smallrye/config/AbstractLocationConfigSourceLoader.java b/implementation/src/main/java/io/smallrye/config/AbstractLocationConfigSourceLoader.java index 68c7f09ba..0c76c7bc5 100644 --- a/implementation/src/main/java/io/smallrye/config/AbstractLocationConfigSourceLoader.java +++ b/implementation/src/main/java/io/smallrye/config/AbstractLocationConfigSourceLoader.java @@ -123,7 +123,7 @@ protected List tryFileSystem(final URI uri, final int ordinal) { } else if (Files.isDirectory(urlPath)) { try (DirectoryStream paths = Files.newDirectoryStream(urlPath, this::validExtension)) { for (Path path : paths) { - addConfigSource(path.toUri(), ordinal, configSources); + configSources.add(loadConfigSource(path.toUri(), ordinal)); } } catch (IOException e) { throw ConfigMessages.msg.failedToLoadResource(e, uri.toString()); @@ -142,7 +142,7 @@ protected List tryClassPath(final URI uri, final int ordinal, fina } catch (IOException e) { throw ConfigMessages.msg.failedToLoadResource(e, uri.toString()); } catch (IllegalArgumentException e) { - configSources.addAll(fallbackToUnknownProtocol(uri, ordinal, useClassloader)); + return fallbackToUnknownProtocol(uri, ordinal, useClassloader); } return configSources; } @@ -164,7 +164,8 @@ protected List fallbackToUnknownProtocol(final URI uri, final int while (resources.hasMoreElements()) { URL resourceUrl = resources.nextElement(); if (validExtension(resourceUrl.getFile())) { - ConfigSource mainSource = addConfigSource(resourceUrl, ordinal, configSources); + ConfigSource mainSource = loadConfigSourceInternal(resourceUrl, ordinal); + configSources.add(mainSource); configSources.add(new ConfigurableConfigSource((ProfileConfigSourceFactory) profiles -> { List profileSources = new ArrayList<>(); for (int i = profiles.size() - 1; i >= 0; i--) { @@ -174,8 +175,8 @@ protected List fallbackToUnknownProtocol(final URI uri, final int try { Enumeration profileResources = classLoader.getResources(profileUri.toString()); while (profileResources.hasMoreElements()) { - final URL profileUrl = profileResources.nextElement(); - addProfileConfigSource(profileUrl, mainOrdinal, profileSources); + profileSources + .addAll(loadProfileConfigSource(profileResources.nextElement(), mainOrdinal)); } } catch (IOException e) { // It is ok to not find the resource here, because it is an optional profile resource. @@ -195,7 +196,8 @@ protected List fallbackToUnknownProtocol(final URI uri, final int protected List tryHttpResource(final URI uri, final int ordinal) { final List configSources = new ArrayList<>(); if (validExtension(uri.getPath())) { - final ConfigSource mainSource = addConfigSource(uri, ordinal, configSources); + ConfigSource mainSource = loadConfigSource(uri, ordinal); + configSources.add(mainSource); configSources.addAll(tryProfiles(uri, mainSource)); } return configSources; @@ -211,8 +213,8 @@ public Iterable getProfileConfigSources(final List profile int ordinal = mainSource.getOrdinal() + profiles.size() - i; for (String fileExtension : getFileExtensions()) { URI profileUri = addProfileName(uri, profiles.get(i), fileExtension); - AbstractLocationConfigSourceLoader.this.addProfileConfigSource(toURL(profileUri), ordinal, - profileSources); + AbstractLocationConfigSourceLoader loader = AbstractLocationConfigSourceLoader.this; + profileSources.addAll(loader.loadProfileConfigSource(profileUri, ordinal)); } } return profileSources; @@ -234,31 +236,34 @@ private static URL toURL(final URI uri) { } } - private ConfigSource addConfigSource(final URI uri, final int ordinal, final List configSources) { - return addConfigSource(toURL(uri), ordinal, configSources); - } - - private ConfigSource addConfigSource(final URL url, final int ordinal, final List configSources) { + private ConfigSource loadConfigSourceInternal(final URL url, int ordinal) { try { - ConfigSource configSource = loadConfigSource(url, ordinal); - configSources.add(configSource); - return configSource; + return loadConfigSource(url, ordinal); } catch (IOException e) { throw ConfigMessages.msg.failedToLoadResource(e, url.toString()); } } - private void addProfileConfigSource(final URL profileToFileName, final int ordinal, - final List profileSources) { + private ConfigSource loadConfigSource(final URI uri, final int ordinal) { + URL url = toURL(uri); + return loadConfigSourceInternal(url, ordinal); + } + + private List loadProfileConfigSource(final URL url, final int ordinal) { try { - profileSources.add(loadConfigSource(profileToFileName, ordinal)); + return List.of(loadConfigSource(url, ordinal)); } catch (FileNotFoundException | NoSuchFileException e) { // It is ok to not find the resource here, because it is an optional profile resource. + return Collections.emptyList(); } catch (IOException e) { - throw ConfigMessages.msg.failedToLoadResource(e, profileToFileName.toString()); + throw ConfigMessages.msg.failedToLoadResource(e, url.toString()); } } + private List loadProfileConfigSource(final URI uri, final int ordinal) { + return loadProfileConfigSource(toURL(uri), ordinal); + } + private boolean validExtension(final Path fileName) { return validExtension(fileName.getFileName().toString()); } @@ -333,7 +338,8 @@ public ConfigSourcePathConsumer(final int ordinal, final List conf public void accept(final Path path) { final AbstractLocationConfigSourceLoader loader = AbstractLocationConfigSourceLoader.this; if (loader.validExtension(path.getFileName().toString())) { - final ConfigSource mainSource = loader.addConfigSource(path.toUri(), ordinal, configSources); + ConfigSource mainSource = loader.loadConfigSource(path.toUri(), ordinal); + configSources.add(mainSource); configSources.addAll(loader.tryProfiles(path.toUri(), mainSource)); } }