Merge pull request #459 from yahoo/bratseth/yql-doublequotes

Bratseth/yql doublequotes

3 files changed, 8 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java
index 7bd590f6c84..465b3a18907 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java
@@ -145,7 +145,6 @@ public class DefaultMetricConsumers {
         metrics.add(new Metric("vds.visitor.sum.failed.rate"));
 
         // Cluster Controller
-
         metrics.add(new Metric("cluster-controller.down.count.last"));
         metrics.add(new Metric("cluster-controller.initializing.count.last"));
         metrics.add(new Metric("cluster-controller.maintenance.count.last"));
@@ -159,7 +158,7 @@ public class DefaultMetricConsumers {
         // DO NOT RELY ON THIS METRIC YET.
         metrics.add(new Metric("cluster-controller.node-event.count"));
 
-        //Errors from qrserver
+        // Errors from qrserver
         metrics.add(new Metric("error.timeout.rate","error.timeout"));
         metrics.add(new Metric("error.backends_oos.rate","error.backends_oos"));
         metrics.add(new Metric("error.plugin_failure.rate","error.plugin_failure"));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 0a6384e18f4..8a4868a8168 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -302,6 +302,7 @@ public final class ContainerCluster
     }
 
     public void prepare() {
+        if (1==1) throw new RuntimeException();
         addAndSendApplicationBundles();
         sendUserConfiguredFiles();
         setApplicationMetaData();
@@ -619,8 +620,9 @@ public final class ContainerCluster
     @Override
     public void getConfig(BundlesConfig.Builder builder) {
         Stream.concat(applicationBundles.stream().map(FileReference::value),
-                      platformBundles.stream().map(ContainerCluster::toFileReferenceString))
-                .forEach(builder::bundle);
+                      platformBundles.stream()
+                                     .map(ContainerCluster::toFileReferenceString))
+                                     .forEach(builder::bundle);
     }
 
     private static String toFileReferenceString(Path path) {
@@ -792,18 +794,12 @@ public final class ContainerCluster
         return concreteDocumentTypes;
     }
 
-    /**
-     * The configured service aliases for the service in this cluster
-     * @return alias list
-     */
+    /** The configured service aliases for the service in this cluster */
     public List<String> serviceAliases() {
         return serviceAliases;
     }
 
-    /**
-     * The configured endpoint aliases (fqdn) for the service in this cluster
-     * @return alias list
-     */
+    /** The configured endpoint aliases (fqdn) for the service in this cluster */
     public List<String> endpointAliases() {
         return endpointAliases;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
index 12de5a3fbb0..4ab9ed3af85 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
@@ -33,7 +33,7 @@ public class FileSender implements Serializable {
                                                    Collection<? extends AbstractService> services) {
         if (services.isEmpty()) {
             throw new IllegalStateException("'sendFileToServices called for empty services!" +
-                    " - This should never happen!");
+                                            " - This should never happen!");
         }
         FileReference fileref = null;
         for (AbstractService service : services) {