diff options
7 files changed, 12 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java index 32a7e79d278..ae77cf32920 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java @@ -47,7 +47,7 @@ public class HostsXmlProvisioner implements HostProvisioner { @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity quantity, int groups, ProvisionLogger logger) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException("Prepare on an XML host provisioner is not supported"); } private HostSpec host2HostSpec(Host host) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java index dfa72b03126..ccf4b2190d7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/host/HostRegistry.java @@ -31,7 +31,8 @@ public class HostRegistry<T> implements HostValidator<T> { public void update(T key, Collection<String> newHosts) { verifyHosts(key, newHosts); - log.log(LogLevel.DEBUG, "Setting hosts for key(" + key + "), newHosts(" + newHosts + "), currentHosts(" + getCurrentHosts(key) + ")"); + log.log(LogLevel.DEBUG, "Setting hosts for key(" + key + "), newHosts(" + newHosts + "), " + + "currentHosts(" + getCurrentHosts(key) + ")"); Collection<String> removedHosts = getRemovedHosts(newHosts, getCurrentHosts(key)); removeHosts(removedHosts); addHosts(key, newHosts); @@ -40,7 +41,8 @@ public class HostRegistry<T> implements HostValidator<T> { public void verifyHosts(T key, Collection<String> newHosts) { for (String host : newHosts) { if (hostAlreadyTaken(host, key)) { - throw new IllegalArgumentException("'" + key + "' tried to allocate host '" + host + "', but the host is already taken by '" + host2KeyMap.get(host) + "'"); + throw new IllegalArgumentException("'" + key + "' tried to allocate host '" + host + + "', but the host is already taken by '" + host2KeyMap.get(host) + "'"); } } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java index 85fe56fb15a..ec681bf0a70 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java @@ -22,7 +22,7 @@ public class StaticProvisioner implements HostProvisioner { @Override public HostSpec allocateHost(String alias) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException("Allocating a single host from provisioning info is not supported"); } @Override diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java index 986dde43f6a..2b48918cb70 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -59,7 +59,7 @@ public class OsgiImpl implements Osgi { return (Class<Object>) bundle.loadClass(spec.classId.getName()); } catch (ClassNotFoundException e) { throw new IllegalArgumentException("Could not load class '" + spec.classId.getName() + - "' from bundle " + bundle, e); + "' from bundle " + bundle, e); } } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java index 6509d505c70..3735f3e8480 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java @@ -26,7 +26,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class FelixFramework implements OsgiFramework { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java index 5e0df7068b0..c7f99c84fd8 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java @@ -10,6 +10,7 @@ import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; +import com.yahoo.net.HostName; import junit.framework.TestCase; import org.junit.After; import org.junit.Before; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeFlavors.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeFlavors.java index bf4ca93d3fd..49b3cf96cc6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeFlavors.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeFlavors.java @@ -40,7 +40,7 @@ public class NodeFlavors { public Flavor getFlavorOrThrow(String flavorName) { Optional<Flavor> flavor = getFlavor(flavorName); if ( flavor.isPresent()) return flavor.get(); - throw new IllegalArgumentException("Unknown flavor '" + flavorName + "' Flavors are " + canonicalFlavorNames()); + throw new IllegalArgumentException("Unknown flavor '" + flavorName + "'. Flavors are " + canonicalFlavorNames()); } private List<String> canonicalFlavorNames() { @@ -58,8 +58,8 @@ public class NodeFlavors { Flavor flavor = flavors.get(flavorConfig.name()); for (NodeRepositoryConfig.Flavor.Replaces flavorReplacesConfig : flavorConfig.replaces()) { if (! flavors.containsKey(flavorReplacesConfig.name())) { - throw new IllegalStateException("Replaces for " - + flavor.name() + " pointing to a non existing flavor: " + flavorReplacesConfig.name()); + throw new IllegalStateException("Replaces for " + flavor.name() + + " pointing to a non existing flavor: " + flavorReplacesConfig.name()); } flavor.replaces().add(flavors.get(flavorReplacesConfig.name())); } |