From 11dacd3d51573551da5152c94dd6ecddb8e24324 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Thu, 2 Sep 2021 07:59:14 +0200
Subject: Deprecate and stop using ConfigDefinition constructor with version

---
 .../yahoo/config/subscription/impl/ConfigSubscription.java   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java')

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
index b58817305e9..9c535d7114f 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
@@ -149,7 +149,7 @@ public abstract class ConfigSubscription<T extends ConfigInstance> {
             dir = ((DirSource)source).getDir().toString();
         }
         if (!dir.endsWith(File.separator)) dir = dir + File.separator;
-        String name = getConfigFilenameNoVersion(key);
+        String name = getConfigFilename(key);
         File file = new File(dir + name);
         if (!file.exists()) {
             throw new IllegalArgumentException("Could not find a config file for '" + key.getName() + "' in '" + dir + "'");
@@ -300,15 +300,13 @@ public abstract class ConfigSubscription<T extends ConfigInstance> {
     }
 
     /**
-     * Returns the file name corresponding to the given key's defName and version.
+     * Returns the file name corresponding to the given key's defName.
      *
      * @param key a {@link ConfigKey}
-     * @return file name with version number.
+     * @return file name
      */
-    static <T extends ConfigInstance> String getConfigFilenameNoVersion(ConfigKey<T> key) {
-        StringBuilder filename = new StringBuilder(key.getName());
-        filename.append(".cfg");
-        return filename.toString();
+    static <T extends ConfigInstance> String getConfigFilename(ConfigKey<T> key) {
+        return key.getName() + ".cfg";
     }
 
     /**
-- 
cgit v1.2.3