aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-01-24 16:36:12 +0100
committerJon Bratseth <bratseth@gmail.com>2022-01-24 16:36:12 +0100
commitb9dee04bc057d665b86f7d539647e3681daf4102 (patch)
treefbf7f5d2ec9b035e3e15e6131d7b0f0dded152db /config-model
parent9b8fd57bba00ded1abad67b7eb58ab6116bee0a0 (diff)
Simplify
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java7
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java2
2 files changed, 1 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
index 17261a39566..dac823a3b92 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NamedSchema.java
@@ -14,8 +14,6 @@ public class NamedSchema {
private final Schema schema;
private final String name;
- public static final String fileNameSuffix = ".sd";
-
public Schema getSearch() {
return schema;
}
@@ -29,9 +27,4 @@ public class NamedSchema {
this.schema = schema;
}
- // Used by admin interface
- public String getFilename() {
- return getName() + fileNameSuffix;
- }
-
}
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 0ccbec529ed..25f7f454998 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -96,7 +96,7 @@ public class ApplicationDeployTest {
// Check that getFilename works
ArrayList<String> sdFileNames = new ArrayList<>();
for (NamedSchema sd : schemas)
- sdFileNames.add(sd.getFilename());
+ sdFileNames.add(sd.getName() + ApplicationPackage.SD_NAME_SUFFIX);
Collections.sort(sdFileNames);
assertEquals("laptop.sd", sdFileNames.get(0));
assertEquals("music.sd", sdFileNames.get(1));