diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-07-05 12:51:09 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-07-05 12:51:09 +0200 |
commit | 9410cda24006955362448f200e9b9db25085c0d2 (patch) | |
tree | 8ebfca6a91a9073a6442ad48b2ac3bd8fa0205fc /config-model/src/main/java/com | |
parent | 15dbc5a5636e10bc8a183630ed9400911e69e14a (diff) |
Don't use unnecessary specific naming
Diffstat (limited to 'config-model/src/main/java/com')
4 files changed, 24 insertions, 29 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java index f0b0d7e67b1..6c665affd1e 100644 --- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java +++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java @@ -435,7 +435,7 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce } // TODO: Make producers depend on AdminModel instead - /** Returns a monitoring service (yamas if that is configured, null otherwise) */ + /** Returns a monitoring service if configured, null otherwise */ protected Monitoring getMonitoringService() { AbstractConfigProducerRoot root = getRoot(); Admin admin = (root == null? null : root.getAdmin()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Service.java b/config-model/src/main/java/com/yahoo/vespa/model/Service.java index 7c879c946ed..620e44bc11a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/Service.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/Service.java @@ -6,7 +6,6 @@ import com.yahoo.config.model.api.ServiceInfo; import java.util.HashMap; import java.util.Optional; - /** * Representation of a process which runs a service * @@ -20,7 +19,7 @@ public interface Service extends ConfigProducer { * configuration. * TODO: Should change this to Optional of String */ - public String getStartupCommand(); + String getStartupCommand(); /** * Services that wish that a command should be run before shutdown @@ -28,32 +27,32 @@ public interface Service extends ConfigProducer { * by the config sentinel before sending SIGTERM to the service. * The command is executed without a timeout. */ - public Optional<String> getPreShutdownCommand(); + Optional<String> getPreShutdownCommand(); /** * Tells if this service should be autostarted by * config-sentinel. Returned value will be used to configure the * config-sentinel. */ - public boolean getAutostartFlag(); + boolean getAutostartFlag(); /** * Tells if this service should be autorestarted by * config-sentinel. Returned value will be used to configure the * config-sentinel. */ - public boolean getAutorestartFlag(); + boolean getAutorestartFlag(); /** * Returns the type of service. E.g. the class-name without the * package prefix. */ - public String getServiceType(); + String getServiceType(); /** * Returns the name that identifies this service for the config-sentinel. */ - public String getServiceName(); + String getServiceName(); /** * Returns the desired base port for this service, or '0' if this @@ -61,7 +60,7 @@ public interface Service extends ConfigProducer { * * @return The desired base port for this service. */ - public int getWantedPort(); + int getWantedPort(); /** * Returns true if the desired base port (returned by @@ -70,37 +69,37 @@ public interface Service extends ConfigProducer { * * @return true if this Service requires the wanted base port. */ - public boolean requiresWantedPort(); + boolean requiresWantedPort(); /** * Returns the number of ports needed by this service. */ - public int getPortCount(); + int getPortCount(); /** * Returns a PortsMeta object, giving access to more information * about the different ports of this service. */ - public PortsMeta getPortsMeta(); + PortsMeta getPortsMeta(); /** * @return the physical host on which this service runs. */ - public Host getHost(); + Host getHost(); /** * Get meta information about service. * @return an instance of {@link com.yahoo.config.model.api.ServiceInfo} */ - public ServiceInfo getServiceInfo(); + ServiceInfo getServiceInfo(); /** * @return The hostname on which this service runs. */ - public String getHostName(); + String getHostName(); /** Optional JVM execution args for this service */ - public String getJvmArgs(); + String getJvmArgs(); /** * Computes and returns the i'th port for this service, based on @@ -110,7 +109,7 @@ public interface Service extends ConfigProducer { * @return the i'th port relative to the base port. * @throws IllegalStateException if i is out of range. */ - public int getRelativePort(int i); + int getRelativePort(int i); /** * Gets a service property value mapped to the given key @@ -120,23 +119,21 @@ public interface Service extends ConfigProducer { * @param defStr default String value returned if no value for key found * @return the associated String value for the given key, or */ - public String getServicePropertyString(String key, String defStr); + String getServicePropertyString(String key, String defStr); - /** - * @return the service health port, to report status to yamas - */ - public int getHealthPort(); + int getHealthPort(); /** * * @return HashMap of default dimensions for metrics. */ - public HashMap<String,String> getDefaultMetricDimensions(); + HashMap<String,String> getDefaultMetricDimensions(); /** * Return the Affinity of this service if it has. * * @return The {@link com.yahoo.vespa.model.Affinity} for this service. */ - public Optional<Affinity> getAffinity(); + Optional<Affinity> getAffinity(); + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java index bf7a839aaa9..e53f92822b5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java @@ -4,10 +4,9 @@ package com.yahoo.vespa.model.admin.monitoring; import java.util.Objects; /** - * Properties for yamas monitoring service + * Monitoring service properties * * @author hmusum - * @since 5.1.20 */ public class DefaultMonitoring implements Monitoring { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java index 4718d496c36..4c1fdd3f92c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java @@ -16,12 +16,11 @@ import java.util.Set; import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; /** - * Helper class for parsing yamasmetric config. + * Helper class for parsing metric config. * * TODO: Remove when 'metric-consumers' under 'admin' is disallowed * - * @author trygve - * @since 5.1 + * @author Trygve Berdal */ public class DomMetricBuilderHelper { |