Revert "Merge pull request #12351 from vespa-engine/revert-11875-bratseth/node-metrics"

This reverts commit 37f6c5b31cb2809a54c34dc3a4e51307f3320fbd, reversing
changes made to 76221d0b9b7bda577ac61ce8a79c7b6ee3a8dbb4.

4 files changed, 6 insertions, 8 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
index 76eef33d6c0..aa3d6a2c0f8 100644
--- a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
+++ b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
@@ -48,7 +48,6 @@ public class IndexFacts {
     static final String unionName = "unionOfAllKnown";
 
     /** A search definition which contains the union of all settings. */
-    @SuppressWarnings("deprecation")
     private SearchDefinition unionSearchDefinition = new SearchDefinition(unionName);
 
     private boolean frozen;
diff --git a/container-search/src/main/java/com/yahoo/search/Result.java b/container-search/src/main/java/com/yahoo/search/Result.java
index 4080b09f40b..ab48d5797b2 100644
--- a/container-search/src/main/java/com/yahoo/search/Result.java
+++ b/container-search/src/main/java/com/yahoo/search/Result.java
@@ -89,7 +89,6 @@ public final class Result extends com.yahoo.processing.Response implements Clone
      * with a result. It should <b>always</b> be called when adding
      * hits from a result, but there is no constraints on the order of the calls.
      */
-    @SuppressWarnings("deprecation")
     public void mergeWith(Result result) {
         totalHitCount += result.getTotalHitCount();
         deepHitCount += result.getDeepHitCount();
diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
index 5f1cfccf549..6243dc694c2 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
@@ -39,8 +39,8 @@ class FederationResult {
     }
 
     /**
-     * Wait on each target for that targets timeout
-     * On the worst case this is the same as waiting for the max target timeout,
+     * Wait on each target for that targets timeout.
+     * In the worst case this is the same as waiting for the max target timeout,
      * in the average case it may be much better because lower timeout sources do not get to
      * drive the timeout above their own timeout value.
      * When this completes, results can be accessed from the TargetResults with no blocking
diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
index 421544b5b49..60c5d42c531 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
@@ -354,7 +354,7 @@ public class FederationSearcher extends ForkingSearcher {
     }
 
     private void warnIfUnresolvedSearchChains(List<UnresolvedSearchChainException> missingTargets,
-                                      HitGroup errorHitGroup) {
+                                              HitGroup errorHitGroup) {
         if (!missingTargets.isEmpty()) {
             errorHitGroup.addError(missingSearchChainsErrorMessage(missingTargets));
         }
@@ -492,9 +492,9 @@ public class FederationSearcher extends ForkingSearcher {
      * TODO This is probably a dirty hack for bug 4711376. There are probably better ways.
      * But I will leave that to trd-processing@
      *
-     * @param group  The merging hitgroup to be updated if necessary
-     * @param orderer The per provider hit orderer.
-     * @return The hitorderer chosen
+     * @param group the merging hitgroup to be updated if necessary
+     * @param orderer the per provider hit orderer
+     * @return he hitorderer chosen
      */
     private HitOrderer dirtyCopyIfModifiedOrderer(HitGroup group, HitOrderer orderer) {
         if (orderer != null) {