Revert "Add some tests and nonfunctional cleanup."

2 files changed, 6 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
index 215e4253d08..a99300cfd32 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
@@ -5,6 +5,7 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.document.Field;
 import com.yahoo.searchdefinition.derived.SummaryClass;
 import com.yahoo.searchdefinition.document.Attribute;
+import com.yahoo.searchdefinition.document.ImmutableImportedSDField;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
 import com.yahoo.searchdefinition.document.ImportedFields;
 import com.yahoo.searchdefinition.document.SDDocumentType;
@@ -21,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -31,9 +33,9 @@ import java.util.logging.Logger;
 import java.util.stream.Stream;
 
 /**
- * A search definition describes (or uses) some document types, defines how these are turned into a relevancy tuned
+ * <p>A search definition describes (or uses) some document types, defines how these are turned into a relevancy tuned
  * index through indexing and how data from documents should be served at search time.</p> <p>The identity of this
- * class is its name.
+ * class is its name.</p>
  *
  * @author bratseth
  */
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
index f88da34428d..56cfb2a595c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
@@ -27,12 +27,12 @@ public class SummaryClass extends Derived {
     public static final String DOCUMENT_ID_FIELD = "documentid";
 
     /** True if this summary class needs to access summary information on disk */
-    private boolean accessingDiskSummary = false;
+    private boolean accessingDiskSummary=false;
 
     /** The summary fields of this indexed by name */
     private Map<String,SummaryClassField> fields = new java.util.LinkedHashMap<>();
 
-    private DeployLogger deployLogger;
+    private DeployLogger deployLogger = new BaseDeployLogger();
 
     private final Random random = new Random(7);