Remove LTRException, move FeatureException. (apache#82)

* Remove hardly used LTRException. Also param name tweaks for FeatureException and ModelException. * Relocate FeatureException from ltr.util to ltr.feature package.
mnilsson23 · Sep 26, 2016 · 4bee76f · 4bee76f
1 parent 269998c
commit 4bee76f
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 50 deletions.
diff --git a/...pache/solr/ltr/util/FeatureException.java → ...he/solr/ltr/feature/FeatureException.java b/...pache/solr/ltr/util/FeatureException.java → ...he/solr/ltr/feature/FeatureException.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ltr.util;
+package org.apache.solr.ltr.feature;
 
-public class FeatureException extends LTRException {
+public class FeatureException extends RuntimeException {
 
   private static final long serialVersionUID = 1L;
 
-  public FeatureException(String msg) {
-    super(msg);
+  public FeatureException(String message) {
+    super(message);
   }
 
-  public FeatureException(String msg, Exception parent) {
-    super(msg, parent);
+  public FeatureException(String message, Exception cause) {
+    super(message, cause);
   }
 
 }
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FeatureStore.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/FeatureStore.java
@@ -21,7 +21,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import org.apache.solr.ltr.ranking.Feature;
-import org.apache.solr.ltr.util.FeatureException;
 
 public class FeatureStore {
 

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/LTRScoringAlgorithm.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/LTRScoringAlgorithm.java
@@ -26,7 +26,6 @@
 import org.apache.solr.ltr.feature.norm.Normalizer;
 import org.apache.solr.ltr.feature.norm.impl.IdentityNormalizer;
 import org.apache.solr.ltr.ranking.Feature;
-import org.apache.solr.ltr.util.FeatureException;
 
 /**
  * Contains all the data needed for loading a model.

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/impl/SolrFeature.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/impl/SolrFeature.java
@@ -33,8 +33,8 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrCore;
+import org.apache.solr.ltr.feature.FeatureException;
 import org.apache.solr.ltr.ranking.Feature;
-import org.apache.solr.ltr.util.FeatureException;
 import org.apache.solr.request.LocalSolrQueryRequest;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.search.QParser;

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/impl/ValueFeature.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/impl/ValueFeature.java
@@ -24,8 +24,8 @@
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
+import org.apache.solr.ltr.feature.FeatureException;
 import org.apache.solr.ltr.ranking.Feature;
-import org.apache.solr.ltr.util.FeatureException;
 import org.apache.solr.ltr.util.LTRUtils;
 import org.apache.solr.request.SolrQueryRequest;
 

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/rest/ManagedFeatureStore.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/rest/ManagedFeatureStore.java
@@ -27,10 +27,10 @@
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.ltr.feature.FeatureException;
 import org.apache.solr.ltr.feature.FeatureStore;
 import org.apache.solr.ltr.ranking.Feature;
 import org.apache.solr.ltr.util.CommonLTRParams;
-import org.apache.solr.ltr.util.FeatureException;
 import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.rest.BaseSolrResource;
 import org.apache.solr.rest.ManagedResource;

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/util/LTRException.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/util/LTRException.java
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/util/ModelException.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/util/ModelException.java
@@ -16,16 +16,16 @@
  */
 package org.apache.solr.ltr.util;
 
-public class ModelException extends LTRException {
+public class ModelException extends RuntimeException {
 
   private static final long serialVersionUID = 1L;
 
   public ModelException(String message) {
     super(message);
   }
 
-  public ModelException(String message, Exception parent) {
-    super(message, parent);
+  public ModelException(String message, Exception cause) {
+    super(message, cause);
   }
 
 }
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
@@ -38,6 +38,7 @@
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.common.util.ContentStreamBase;
 import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.ltr.feature.FeatureException;
 import org.apache.solr.ltr.feature.LTRScoringAlgorithm;
 import org.apache.solr.ltr.feature.impl.ValueFeature;
 import org.apache.solr.ltr.feature.impl.ValueFeature.ValueFeatureWeight;
@@ -46,7 +47,6 @@
 import org.apache.solr.ltr.rest.ManagedFeatureStore;
 import org.apache.solr.ltr.rest.ManagedModelStore;
 import org.apache.solr.ltr.util.CommonLTRParams;
-import org.apache.solr.ltr.util.FeatureException;
 import org.apache.solr.ltr.util.ModelException;
 import org.apache.solr.request.SolrQueryRequestBase;
 import org.apache.solr.response.SolrQueryResponse;

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureMetadata.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureMetadata.java
@@ -23,7 +23,6 @@
 import org.apache.solr.ltr.feature.impl.OriginalScoreFeature;
 import org.apache.solr.ltr.ranking.Feature;
 import org.apache.solr.ltr.rest.ManagedFeatureStore;
-import org.apache.solr.ltr.util.FeatureException;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.junit.AfterClass;

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureStore.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureStore.java
@@ -24,7 +24,6 @@
 import org.apache.solr.ltr.feature.impl.ValueFeature;
 import org.apache.solr.ltr.ranking.Feature;
 import org.apache.solr.ltr.rest.ManagedFeatureStore;
-import org.apache.solr.ltr.util.FeatureException;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/impl/TestRankingFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/impl/TestRankingFeature.java
@@ -85,7 +85,7 @@ public void testRankingSolrFeature() throws Exception {
     query.add("rq", "{!ltr model=powdesS-model reRankDocs=4}");
 
     assertJQ("/query" + query.toQueryString(), 
-        "/error/msg/=='org.apache.solr.ltr.util.FeatureException: " +
+        "/error/msg/=='org.apache.solr.ltr.feature.FeatureException: " +
         "java.lang.UnsupportedOperationException: " +
         "Unable to extract feature for powdesS'");
     // aftertest();

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/impl/TestValueFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/impl/TestValueFeature.java
@@ -19,8 +19,8 @@
 import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.ltr.TestRerankBase;
+import org.apache.solr.ltr.feature.FeatureException;
 import org.apache.solr.ltr.ranking.RankSVMModel;
-import org.apache.solr.ltr.util.FeatureException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;