diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-01-24 16:27:16 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-01-24 16:27:16 +0100 |
commit | 2a325fd851d1e5353cc6ec5ef8388343c5662c39 (patch) | |
tree | b039117827a421b5c02d4c1bbeecc2c02a59873e /config-model | |
parent | 9e4475ac75b367361f742324a864799f8bbbbb4c (diff) |
Simplify
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java index 1e3447acb46..c5811b8a603 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/SchemaBuilder.java @@ -151,15 +151,7 @@ public class SchemaBuilder { public void importFromApplicationPackage() { for (NamedReader reader : application.applicationPackage().getSchemas()) { - try { - importFrom(reader); - } catch (ParseException e) { - throw new IllegalArgumentException("Could not parse schema file '" + reader.getName() + "'", e); - } catch (IOException e) { - throw new IllegalArgumentException("Could not read schema file '" + reader.getName() + "'", e); - } finally { - closeIgnoreException(reader.getReader()); - } + importFrom(reader); } } @@ -168,17 +160,22 @@ public class SchemaBuilder { * imported, call {@link #build()}. * * @param reader the reader whose content to import - * @return the name of the imported schema - * @throws ParseException thrown if the file does not contain a valid search definition */ - private String importFrom(NamedReader reader) throws IOException, ParseException { - String schemaName = importString(IOUtils.readAll(reader), reader.getName()); - String schemaFileName = stripSuffix(reader.getName(), ApplicationPackage.SD_NAME_SUFFIX); - if ( ! schemaFileName.equals(schemaName)) { - throw new IllegalArgumentException("The file containing schema '" + schemaName + "' must be named '" + - schemaName + ApplicationPackage.SD_NAME_SUFFIX + "', not " + reader.getName()); + private void importFrom(NamedReader reader) { + try { + String schemaName = importString(IOUtils.readAll(reader), reader.getName()); + String schemaFileName = stripSuffix(reader.getName(), ApplicationPackage.SD_NAME_SUFFIX); + if ( ! schemaFileName.equals(schemaName)) { + throw new IllegalArgumentException("The file containing schema '" + schemaName + "' must be named '" + + schemaName + ApplicationPackage.SD_NAME_SUFFIX + "', not " + reader.getName()); + } + } catch (ParseException e) { + throw new IllegalArgumentException("Could not parse schema file '" + reader.getName() + "'", e); + } catch (IOException e) { + throw new IllegalArgumentException("Could not read schema file '" + reader.getName() + "'", e); + } finally { + closeIgnoreException(reader.getReader()); } - return schemaName; } private static String stripSuffix(String readerName, String suffix) { |