diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-06-21 14:54:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 14:54:56 +0200 |
| commit | da2d27025a0d82c5a5d5f2533214c0c9a6b99e6f (patch) | |
| tree | c221d10c77dd087ce9b2f02bb722fc22e3f4fb9d /configserver | |
| parent | 899bc1ca0372946239218d94b5652a2f22644c1e (diff) | |
| parent | a848b187ca6def9df1b170859ce5072116ce2136 (diff) | |
Merge pull request #18342 from vespa-engine/musum/remove-compatibility-code
Remove unused legacy code
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java index 9f1bfa0b4e4..fa562c4813b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.zookeeper; import com.google.common.base.Joiner; @@ -138,11 +138,6 @@ public class ZKApplicationPackage implements ApplicationPackage { if (sd.endsWith(SD_NAME_SUFFIX)) schemas.add(new NamedReader(sd, new StringReader(zkApplication.getData(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SCHEMAS_DIR, sd)))); } - // TODO: Remove when 7.414.19 is oldest version in use - for (String sd : zkApplication.getChildren(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SEARCH_DEFINITIONS_DIR)) { - if (sd.endsWith(SD_NAME_SUFFIX)) - schemas.add(new NamedReader(sd, new StringReader(zkApplication.getData(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SEARCH_DEFINITIONS_DIR, sd)))); - } return schemas; } @@ -257,9 +252,7 @@ public class ZKApplicationPackage implements ApplicationPackage { @Override public Reader getRankingExpression(String name) { - Optional<Reader> reader = zkApplication.getOptionalDataReader(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SCHEMAS_DIR, name); - // TODO: Remove when 7.414.19 is oldest version in use - return reader.orElseGet(() -> zkApplication.getDataReader(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SEARCH_DEFINITIONS_DIR, name)); + return zkApplication.getDataReader(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + SCHEMAS_DIR, name); } @Override |