diff options
author | jonmv <venstad@gmail.com> | 2022-11-01 23:39:22 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-11-01 23:39:22 +0100 |
commit | 2619a4060c8b0e5cbb653942762313394ec6c59e (patch) | |
tree | 90ed40b9e7f1d8f6b62fab13b7bd414b3da9ed42 /config | |
parent | 116afffc4920705f8d0ce2b016700216a2a0cbb3 (diff) |
Cleanup, no effective changes
Diffstat (limited to 'config')
3 files changed, 3 insertions, 9 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/DirSource.java b/config/src/main/java/com/yahoo/config/subscription/DirSource.java index 9172048fe7b..5dfbd5f0bc4 100644 --- a/config/src/main/java/com/yahoo/config/subscription/DirSource.java +++ b/config/src/main/java/com/yahoo/config/subscription/DirSource.java @@ -11,7 +11,7 @@ public class DirSource implements ConfigSource { private final File dir; public DirSource(File dir) { - if (!dir.isDirectory()) throw new IllegalArgumentException("Not a directory: " + dir); + if ( ! dir.isDirectory()) throw new IllegalArgumentException("Not a directory: " + dir); this.dir = dir; } diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java index 15c6ce2441e..41bab257248 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java @@ -22,7 +22,7 @@ public class ConfigSetSubscription<T extends ConfigInstance> extends ConfigSubsc super(key); this.set = cset; this.subKey = new ConfigKey<>(configClass, key.getConfigId()); - if (!set.contains(subKey)) { + if ( ! set.contains(subKey)) { throw new IllegalArgumentException("The given ConfigSet " + set + " does not contain a config for " + subKey); } setGeneration(0L); 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 2c5899df461..c1a6740b6da 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 @@ -159,17 +159,11 @@ public abstract class ConfigSubscription<T extends ConfigInstance> { return new FileConfigSubscription<>(key, new File(dir, getConfigFilename(key))); } - @SuppressWarnings("unchecked") @Override public boolean equals(Object o) { - if (o instanceof ConfigSubscription) { - ConfigSubscription<T> other = (ConfigSubscription<T>) o; - return key.equals(other.key); - } - return false; + return o instanceof ConfigSubscription<?> cs && key.equals(cs.key); } - /** * Called from {@link ConfigSubscriber} when the changed status of this config is propagated to the clients */ |