diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2020-07-29 12:09:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-29 12:09:08 +0200 |
commit | fb30d3667ab506976c776817aa3451f97ceed83a (patch) | |
tree | a9deeba3dccc74a29e98214c16c6708b667d8412 /config-application-package | |
parent | fe73d203f2ec9510d90fdf360601fb921e29d738 (diff) | |
parent | c38e1725c1eecb8589438b13c66d460fd2e85fe6 (diff) |
Merge pull request #13944 from vespa-engine/hmusum/configserver-refactoring-24
Config server refactoring, use new file distribution mocks
Diffstat (limited to 'config-application-package')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java index 957531b9f7f..6888626633b 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java @@ -20,31 +20,28 @@ public class PreGeneratedFileRegistry implements FileRegistry { private final String fileSourceHost; private final Map<String, String> path2Hash = new LinkedHashMap<>(); - private static String entryDelimiter = "\t"; - private static Pattern entryDelimiterPattern = Pattern.compile(entryDelimiter, Pattern.LITERAL); + private static final String entryDelimiter = "\t"; + private static final Pattern entryDelimiterPattern = Pattern.compile(entryDelimiter, Pattern.LITERAL); private PreGeneratedFileRegistry(Reader readerArg) { - BufferedReader reader = new BufferedReader(readerArg); - try { + try (BufferedReader reader = new BufferedReader(readerArg)) { fileSourceHost = reader.readLine(); if (fileSourceHost == null) - throw new RuntimeException("Error while reading pre generated file registry"); + throw new RuntimeException("Error while reading pre-generated file registry"); String line; while ((line = reader.readLine()) != null) { addFromLine(line); } - } catch(IOException e) { - throw new RuntimeException("Error while reading pre generated file registry", e); - } finally { - try { - reader.close(); - } catch(IOException e) {} + } catch (IOException e) { + throw new RuntimeException("Error while reading pre-generated file registry", e); } } private void addFromLine(String line) { String[] parts = entryDelimiterPattern.split(line); + if (parts.length < 2) + throw new IllegalArgumentException("Cannot split '" + line + "' into two parts"); addEntry(parts[0], parts[1]); } @@ -58,8 +55,7 @@ public class PreGeneratedFileRegistry implements FileRegistry { builder.append(registry.fileSourceHost()).append('\n'); for (FileRegistry.Entry entry : entries) { - builder.append(entry.relativePath).append(entryDelimiter).append(entry.reference.value()). - append('\n'); + builder.append(entry.relativePath).append(entryDelimiter).append(entry.reference.value()).append('\n'); } return builder.toString(); |