diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index e1c8416bcff..8d66fd2dcf8 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -33,8 +33,13 @@ Apache ZooKeeper 3.4.5 Upgrading from Solr 4.x ---------------------- -The "file" attribute of infoStream in solrconfig.xml is removed. Control this -via your logging configuration (org.apache.solr.update.LoggingInfoStream) instead. +* The "file" attribute of infoStream in solrconfig.xml is removed. Control this + via your logging configuration (org.apache.solr.update.LoggingInfoStream) instead. + +* UniqFieldsUpdateProcessorFactory no longer supports the init + param style that was deprecated in Solr 4.5. If you are still using this syntax, + update your configs to use instead. See SOLR-4249 for more + details. Detailed Change List ---------------------- diff --git a/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java index 42620df27e4..13d497b5bcc 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java @@ -67,22 +67,6 @@ public class UniqFieldsUpdateProcessorFactory extends FieldValueSubsetUpdateProc return FieldMutatingUpdateProcessor.SELECT_NO_FIELDS; } - @SuppressWarnings("unchecked") - @Override - public void init(@SuppressWarnings("rawtypes") NamedList args) { - // legacy init param support, will be removed in 5.0 - // no idea why this was ever implimented as should have just been - NamedList flst = (NamedList) args.remove("fields"); - if(flst != null){ - log.warn("Use of the 'fields' init param in UniqFieldsUpdateProcessorFactory is deprecated, please use 'fieldName' (or another FieldMutatingUpdateProcessorFactory selector option) instead"); - log.info("Replacing 'fields' init param with (individual) 'fieldName' params"); - for (Map.Entry entry : flst) { - args.add("fieldName", entry.getValue()); - } - } - super.init(args); - } - @Override @SuppressWarnings("unchecked") public Collection pickSubset(Collection values) { diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml index da6bb36929a..810aa1d312e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml @@ -518,11 +518,11 @@ - + uniq uniq2 uniq3 - +