diff options
Diffstat (limited to 'container-disc/src/main/java/com')
5 files changed, 8 insertions, 18 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index 1cb4e1d4555..eae121604e4 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -39,7 +39,6 @@ import com.yahoo.jrt.slobrok.api.SlobrokList; import com.yahoo.log.LogLevel; import com.yahoo.log.LogSetup; import com.yahoo.net.HostName; -import com.yahoo.osgi.OsgiImpl; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.yolean.Exceptions; @@ -115,7 +114,6 @@ public final class ConfiguredApplication implements Application { } - @SuppressWarnings("deprecation") // TODO: Remove when the Container line below is removed @Inject public ConfiguredApplication(ContainerActivator activator, OsgiFramework osgiFramework, @@ -127,7 +125,6 @@ public final class ConfiguredApplication implements Application { this.subscriberFactory = subscriberFactory; this.configId = System.getProperty("config.id"); this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext())); - Container.get().setOsgi(new OsgiImpl(osgiFramework)); // TODO: Remove, not necessary applicationWithLegacySetup = new ContainerDiscApplication(configId); } @@ -192,7 +189,6 @@ public final class ConfiguredApplication implements Application { try { Container.get().setupFileAcquirer(config.filedistributor()); Container.get().setupUrlDownloader(); - com.yahoo.container.Server.get().initialize(config); } catch (Exception e) { log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e); Runtime.getRuntime().halt(1); diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java index 7bdd2d9cc7b..c9caaa9d4b5 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java @@ -8,8 +8,8 @@ import com.yahoo.jdisc.application.MetricConsumer; import java.util.Map; /** - * <p>If more than one {@link MetricConsumerFactory} is registered in a container, calls to <tt>Metric</tt> need to be - * forwarded to all the underlying <tt>MetricConsumers</tt>. That is the responsibility of this class. Instances of this + * <p>If more than one {@link MetricConsumerFactory} is registered in a container, calls to <code>Metric</code> need to be + * forwarded to all the underlying <code>MetricConsumers</code>. That is the responsibility of this class. Instances of this * class is created by the {@link MetricConsumerProvider} in those cases.</p> * * @author Simon Thoresen Hult diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java index 1e7a4e75385..a300364d848 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java @@ -11,14 +11,14 @@ import com.yahoo.metrics.MetricsPresentationConfig; /** - * <p>The purpose of this class it to be the only provider for the <tt>MetricConsumer</tt> interface in a component + * <p>The purpose of this class it to be the only provider for the <code>MetricConsumer</code> interface in a component * graph. This component is automatically registered in the graph by the config server. Configuring a different - * <tt>MetricConsumer</tt> is done by registering one or more {@link MetricConsumerFactory} in the services-file.</p> + * <code>MetricConsumer</code> is done by registering one or more {@link MetricConsumerFactory} in the services-file.</p> * * <p>Because this class depends on the {@link ComponentRegistry} of {@link MetricConsumerFactory}, any added or removed * {@link MetricConsumerFactory} will cause this component to be reconfigured. Because {@link MetricProvider} depends on - * this class, which means any component that uses <tt>Metric</tt> will be reconfigured. Any component that depends - * directly on <tt>MetricConsumer</tt> will also be reconfigured.</p> + * this class, which means any component that uses <code>Metric</code> will be reconfigured. Any component that depends + * directly on <code>MetricConsumer</code> will also be reconfigured.</p> * * @author Simon Thoresen Hult */ diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java index bcd75c0b36b..57613113e73 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java @@ -6,9 +6,9 @@ import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.application.MetricConsumer; /** - * <p>This class implements a {@link Provider} component of <tt>Metric</tt>. Because this class depends on {@link + * <p>This class implements a {@link Provider} component of <code>Metric</code>. Because this class depends on {@link * MetricConsumerProvider}, any change to the consumer configuration will trigger reconfiguration of this component, - * which in turn triggers reconfiguration of any component that depends on <tt>Metric</tt>.</p> + * which in turn triggers reconfiguration of any component that depends on <code>Metric</code>.</p> * * @author Simon Thoresen Hult */ diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index c2ef789e8fc..98787eaeeeb 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -24,9 +24,6 @@ import java.util.TimerTask; */ public class MetricUpdater extends AbstractComponent { - @Deprecated private static final String DEPRECATED_FREE_MEMORY_BYTES = "freeMemoryBytes"; - @Deprecated private static final String DEPRECATED_USED_MEMORY_BYTES = "usedMemoryBytes"; - @Deprecated private static final String DEPRECATED_TOTAL_MEMORY_BYTES = "totalMemoryBytes"; private static final String FREE_MEMORY_BYTES = "mem.heap.free"; private static final String USED_MEMORY_BYTES = "mem.heap.used"; private static final String TOTAL_MEMORY_BYTES = "mem.heap.total"; @@ -104,9 +101,6 @@ public class MetricUpdater extends AbstractComponent { long freeMemory = runtime.freeMemory(); long totalMemory = runtime.totalMemory(); long usedMemory = totalMemory - freeMemory; - metric.set(DEPRECATED_FREE_MEMORY_BYTES, freeMemory, null); - metric.set(DEPRECATED_USED_MEMORY_BYTES, usedMemory, null); - metric.set(DEPRECATED_TOTAL_MEMORY_BYTES, totalMemory, null); metric.set(FREE_MEMORY_BYTES, freeMemory, null); metric.set(USED_MEMORY_BYTES, usedMemory, null); metric.set(TOTAL_MEMORY_BYTES, totalMemory, null); |