diff options
Diffstat (limited to 'config/src/main/java/com/yahoo')
18 files changed, 11 insertions, 79 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java b/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java index 7d3fdad43c7..1a110fe8e6c 100644 --- a/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java +++ b/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java @@ -17,9 +17,7 @@ import static java.util.logging.Level.FINEST; * Deserializes config payload (cfg format) to a ConfigPayload. * * @author hmusum - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class CfgConfigPayloadBuilder { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(CfgConfigPayloadBuilder.class.getName()); diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java b/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java index 2fcbdce7030..85aa7a05e17 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java @@ -9,7 +9,6 @@ import java.util.logging.Logger; import static java.util.logging.Level.INFO; // Debug class that provides useful helper routines -@Deprecated(forRemoval = true, since = "7") public class ConfigDebug { public static void logDebug(Logger logger, long timestamp, ConfigKey<?> key, String logmessage) { if (key.getConfigId().matches(".*container.?\\d+.*") || key.getConfigId().matches(".*doc.api.*")) { diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java b/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java index 305ecbd6483..aabfd211fac 100755 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java @@ -17,7 +17,6 @@ import com.yahoo.config.ConfigInstance; public class ConfigGetter<T extends ConfigInstance> { private final Class<T> clazz; - private final ConfigSource source; /** * Creates a ConfigGetter for class <code>clazz</code> @@ -25,22 +24,7 @@ public class ConfigGetter<T extends ConfigInstance> { * @param clazz a config class */ public ConfigGetter(Class<T> clazz) { - this(null, clazz); - } - - /** - * Creates a ConfigGetter for class <code>clazz</code> with the specified - * {@link ConfigSource}. - * - * @param source a {@link ConfigSource} - * @param clazz a config class - * - * @deprecated Config should always be injected via the component class constructor. For unit tests, use config builders. - */ - @Deprecated(forRemoval = true, since = "7") - public ConfigGetter(ConfigSource source, Class<T> clazz) { this.clazz = clazz; - this.source = source; } /** @@ -50,8 +34,7 @@ public class ConfigGetter<T extends ConfigInstance> { * @return an instance of a config class */ public synchronized T getConfig(String configId) { - try (ConfigSubscriber subscriber = - source == null ? new ConfigSubscriber() : new ConfigSubscriber(source)) { + try (ConfigSubscriber subscriber = new ConfigSubscriber()) { ConfigHandle<T> handle = subscriber.subscribe(clazz, configId); subscriber.nextConfig(true); return handle.getConfig(); @@ -70,19 +53,4 @@ public class ConfigGetter<T extends ConfigInstance> { return getter.getConfig(configId); } - /** - * Creates a ConfigGetter instance and returns an instance of the config class <code>c</code>. - * - * @param c a config class - * @param configId a config id to use when getting the config - * @param source a {@link ConfigSource} - * @return an instance of a config class - * - * @deprecated Config should always be injected via the component class constructor. For unit tests, use config builders. - */ - @Deprecated(forRemoval = true, since = "7") - public static <T extends ConfigInstance> T getConfig(Class<T> c, String configId, ConfigSource source) { - ConfigGetter<T> getter = new ConfigGetter<>(source, c); - return getter.getConfig(configId); - } } diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java b/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java index 6b832205211..4ae6122becd 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java @@ -6,13 +6,11 @@ import com.yahoo.config.subscription.impl.ConfigSubscription; /** * A config handle represents one config in the context of one active subscription on a {@link ConfigSubscriber}. - * It will contain meta data of the subscription of that particular config, as well as access to the {@link com.yahoo.config.ConfigInstance} itself. + * It will contain metadata of the subscription of that particular config, as well as access to the {@link com.yahoo.config.ConfigInstance} itself. * * @param <T> the type of the config * @author vegardh - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class ConfigHandle<T extends ConfigInstance> { private final ConfigSubscription<T> sub; diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java index d8062a9f95b..e035991abf4 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java @@ -9,9 +9,7 @@ import com.yahoo.slime.Slime; * Implements a config instance serializer, serializing a config instance to a slime object. * * @author Ulf Lilleengen - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class ConfigInstanceSerializer implements Serializer { private final Slime slime; private final Cursor root; diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java index 5831753eacb..61b421b30e0 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java @@ -1,22 +1,19 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.subscription; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - import com.yahoo.config.ConfigBuilder; import com.yahoo.config.ConfigInstance; import com.yahoo.config.ConfigurationRuntimeException; -import com.yahoo.yolean.Exceptions; -import com.yahoo.vespa.config.*; +import com.yahoo.vespa.config.ConfigPayload; +import com.yahoo.vespa.config.ConfigTransformer; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; /** * @author gjoranv - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class ConfigInstanceUtil { /** diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java index 050b7a81fa2..a7c2c2d9127 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java @@ -4,10 +4,8 @@ package com.yahoo.config.subscription; /** * This exception is thrown when any blocking call within the Config API is interrupted. * @author Ulf Lilleengen - * @deprecated Will be removed in Vespa 8. Only for internal use. */ @SuppressWarnings("serial") -@Deprecated(forRemoval = true, since = "7") public class ConfigInterruptedException extends RuntimeException { public ConfigInterruptedException(Throwable cause) { super(cause); diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java index 36d9047aa87..1b86db6b299 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java @@ -1,19 +1,16 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.subscription; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import com.yahoo.config.ConfigInstance; import com.yahoo.vespa.config.ConfigKey; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** * Config source as a programmatically built set of {@link com.yahoo.config.ConfigInstance}s * * @author Vegard Havdal - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class ConfigSet implements ConfigSource { private final Map<ConfigKey<?>, ConfigInstance.Builder> configs = new ConcurrentHashMap<>(); diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java index b8abeb48c3d..5814a004216 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java @@ -5,9 +5,7 @@ package com.yahoo.config.subscription; * A type of source of config * * @author Vegard Havdal - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public interface ConfigSource { } diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java index 37f91605a54..81aeda52b54 100755 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java @@ -18,9 +18,7 @@ import static java.util.logging.Level.INFO; * upper/lower-casing and whitespaces. * * @author gjoranv - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class ConfigSourceSet implements ConfigSource { private static final Logger log = Logger.getLogger(ConfigSourceSet.class.getName()); diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java index ee6ce37036c..1c516b37783 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java @@ -28,9 +28,7 @@ import static java.util.stream.Collectors.toList; * {@link ConfigHandle} which {@link #subscribe(Class, String)} returned. * * @author Vegard Havdal - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class ConfigSubscriber implements AutoCloseable { private static final Logger log = Logger.getLogger(ConfigSubscriber.class.getName()); diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java b/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java index 46db3c6c83a..f0257457902 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java @@ -1,18 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.subscription; -import java.io.File; - import com.yahoo.config.subscription.impl.JRTConfigRequester; +import java.io.File; /** * A Config URI is a class that can be used to encapsulate a config source and a config id into one * object to simplify parameter passing. * * @author Ulf Lilleengen - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class ConfigURI { private String configId; 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 48d52bd49f3..fbd65ccf597 100644 --- a/config/src/main/java/com/yahoo/config/subscription/DirSource.java +++ b/config/src/main/java/com/yahoo/config/subscription/DirSource.java @@ -6,9 +6,7 @@ import java.io.File; /** * Source specifying config from a local directory * @author Vegard Havdal - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class DirSource implements ConfigSource { private final File dir; diff --git a/config/src/main/java/com/yahoo/config/subscription/FileSource.java b/config/src/main/java/com/yahoo/config/subscription/FileSource.java index bbad7286b4c..2178c64cca3 100644 --- a/config/src/main/java/com/yahoo/config/subscription/FileSource.java +++ b/config/src/main/java/com/yahoo/config/subscription/FileSource.java @@ -7,9 +7,7 @@ import java.io.File; * Source specifying config from one local file * * @author Vegard Havdal - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class FileSource implements ConfigSource { private final File file; diff --git a/config/src/main/java/com/yahoo/config/subscription/JarSource.java b/config/src/main/java/com/yahoo/config/subscription/JarSource.java index f39ee5e9262..c106823b52d 100644 --- a/config/src/main/java/com/yahoo/config/subscription/JarSource.java +++ b/config/src/main/java/com/yahoo/config/subscription/JarSource.java @@ -6,9 +6,7 @@ import java.util.jar.JarFile; /** * Source specifying config as a jar file entry * @author Vegard Havdal - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class JarSource implements ConfigSource { private final String path; private final JarFile jarFile; diff --git a/config/src/main/java/com/yahoo/config/subscription/RawSource.java b/config/src/main/java/com/yahoo/config/subscription/RawSource.java index 28b249c6ece..8b73d2058f5 100644 --- a/config/src/main/java/com/yahoo/config/subscription/RawSource.java +++ b/config/src/main/java/com/yahoo/config/subscription/RawSource.java @@ -5,9 +5,7 @@ package com.yahoo.config.subscription; * Source specifying raw config, where payload is given programmatically * * @author Vegard Havdal - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class RawSource implements ConfigSource { public final String payload; diff --git a/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java b/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java index f7051ab1b38..1e6ebdbd752 100644 --- a/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java +++ b/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java @@ -5,7 +5,5 @@ package com.yahoo.config.subscription; * Thrown when {@link ConfigSubscriber} is closed * * @author bjorncs - * @deprecated Will be removed in Vespa 8. Only for internal use. */ -@Deprecated(forRemoval = true, since = "7") public class SubscriberClosedException extends RuntimeException {} diff --git a/config/src/main/java/com/yahoo/config/subscription/package-info.java b/config/src/main/java/com/yahoo/config/subscription/package-info.java index 6798809dee2..bda7649d184 100644 --- a/config/src/main/java/com/yahoo/config/subscription/package-info.java +++ b/config/src/main/java/com/yahoo/config/subscription/package-info.java @@ -1,10 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage -@PublicApi /** * Classes for subscribing to Vespa config. */ package com.yahoo.config.subscription; -import com.yahoo.api.annotations.PublicApi; import com.yahoo.osgi.annotation.ExportPackage; |