Remove deprecated methods

4 files changed, 3 insertions, 19 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java
index b5a0ecfbe3d..8a7ee78ea91 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java
@@ -17,10 +17,6 @@ public enum Stemming {
      /** No stemming */
     NONE("none"),
 
-    /** @deprecated incorrectly don't stem at all */
-    @Deprecated
-    ALL("all"),
-
     /** select shortest possible stem */
     SHORTEST("shortest"),
 
@@ -43,12 +39,7 @@ public enum Stemming {
     @SuppressWarnings("deprecation")
     public static Stemming get(String stemmingName) {
         try {
-            Stemming stemming = Stemming.valueOf(stemmingName.toUpperCase());
-            if (stemming.equals(ALL)) {
-                log.warning("note: stemming ALL is the same as stemming mode SHORTEST");
-                stemming = SHORTEST;
-            }
-            return stemming;
+            return Stemming.valueOf(stemmingName.toUpperCase());
         } catch (IllegalArgumentException e) {
             throw new IllegalArgumentException("'" + stemmingName + "' is not a valid stemming setting");
         }
@@ -71,7 +62,6 @@ public enum Stemming {
             case MULTIPLE: return StemMode.ALL;
             case BEST : return StemMode.BEST;
             case NONE: return StemMode.NONE;
-            case ALL: return StemMode.SHORTEST; // Intentional; preserve historic behavior
             default: throw new IllegalStateException("Inconvertible stem mode " + this);
         }
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
index 0f162ee9d51..a9d7f407eb5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
@@ -121,12 +121,6 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
 
     public void setImplicit(boolean implicit) { this.implicit=implicit; }
 
-    @Override // override to make public
-    @Deprecated
-    public void setDataType(DataType type) {
-        super.setDataType(type);
-    }
-
     public boolean isImplicit() { return implicit; }
 
     public void setTransform(SummaryTransform transform) {
diff --git a/config-model/src/test/examples/indexsettings.sd b/config-model/src/test/examples/indexsettings.sd
index 6832527f86e..9f6b02d9a4d 100644
--- a/config-model/src/test/examples/indexsettings.sd
+++ b/config-model/src/test/examples/indexsettings.sd
@@ -6,7 +6,7 @@ search indexsettings {
   document indexsettings {
 
     field allstemmed type string {
-        stemming: all
+        stemming: shortest
     }
 
     field usingdefault type string {
diff --git a/config-model/src/test/examples/stemmingsetting.sd b/config-model/src/test/examples/stemmingsetting.sd
index 3780dfb3699..51864193174 100644
--- a/config-model/src/test/examples/stemmingsetting.sd
+++ b/config-model/src/test/examples/stemmingsetting.sd
@@ -25,7 +25,7 @@ search stemmingsetting {
 
     field backward type string {
       indexing: index
-      stemming: all
+      stemming: shortest
     }
   }