- Test that deprecation warning is given if specified inside match-phase {}.

- Test that exception is thrown if specified twice.

1 files changed, 13 insertions, 1 deletions

diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj
index a386b63cb58..c9eff88764f 100644
--- a/config-model/src/main/javacc/SchemaParser.jj
+++ b/config-model/src/main/javacc/SchemaParser.jj
@@ -1892,7 +1892,7 @@ void matchPhaseItem(ParsedRankProfile profile, MatchPhaseSettings settings) :
 }
 {
     ( <ATTRIBUTE> <COLON> str = identifier() { settings.setAttribute(str); }
-      | diversity(profile)
+      | diversityDeprecated(profile)
       | <ORDER> <COLON> ( <ASCENDING> { settings.setAscending(true); } 
                           | <DESCENDING> { settings.setAscending(false); } )
       | <MAX_HITS> <COLON> num = integer() { settings.setMaxHits(num); }
@@ -1918,6 +1918,18 @@ void diversity(ParsedRankProfile profile) :
     }
 }
 
+void diversityDeprecated(ParsedRankProfile profile) :
+{
+    DiversitySettings settings = new DiversitySettings();
+}
+{
+    <DIVERSITY> lbrace() (diversityItem(settings) (<NL>)*)* <RBRACE>
+    {
+ 	    profile.setDiversity(settings);
+        deployLogger.logApplicationPackage(Level.WARNING, "'diversity is deprecated inside 'match-phase'. Specify it at 'rank-profile' level.");
+    }
+}
+
 void diversityItem(DiversitySettings settings) :
 {
     String str;