aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src/main/java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2018-01-10 10:49:19 +0100
committerJon Bratseth <bratseth@yahoo-inc.com>2018-01-10 10:49:19 +0100
commit857fb41a3a453ccdc2a530767c08466fffe5bdfd (patch)
treec534e0a66deaf2e79a9cb3e676b8b39206066526 /searchlib/src/main/java
parentba6a11e6e2674a2b5c1ef967319fb269f989a216 (diff)
Use type parameter
Diffstat (limited to 'searchlib/src/main/java')
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java8
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java
index 1b8239ba643..216b677f6ff 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java
@@ -16,7 +16,7 @@ import java.util.List;
*
* @author bratseth
*/
-public class ConstantDereferencer extends ExpressionTransformer {
+public class ConstantDereferencer extends ExpressionTransformer<TransformContext> {
@Override
public ExpressionNode transform(ExpressionNode node, TransformContext context) {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java
index c585c0dea1f..e5d0b4671c0 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java
@@ -13,20 +13,20 @@ import java.util.List;
*
* @author bratseth
*/
-public abstract class ExpressionTransformer {
+public abstract class ExpressionTransformer<CONTEXT extends TransformContext> {
- public RankingExpression transform(RankingExpression expression, TransformContext context) {
+ public RankingExpression transform(RankingExpression expression, CONTEXT context) {
return new RankingExpression(expression.getName(), transform(expression.getRoot(), context));
}
/** Transforms an expression node and returns the transformed node */
- public abstract ExpressionNode transform(ExpressionNode node, TransformContext context);
+ public abstract ExpressionNode transform(ExpressionNode node, CONTEXT context);
/**
* Utility method which calls transform on each child of the given node and return the resulting transformed
* composite
*/
- protected CompositeNode transformChildren(CompositeNode node, TransformContext context) {
+ protected CompositeNode transformChildren(CompositeNode node, CONTEXT context) {
List<ExpressionNode> children = node.children();
List<ExpressionNode> transformedChildren = new ArrayList<>(children.size());
for (ExpressionNode child : children)
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
index 9e8491340b0..e8e2fdf2454 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
@@ -20,7 +20,7 @@ import java.util.List;
*
* @author bratseth
*/
-public class Simplifier extends ExpressionTransformer {
+public class Simplifier extends ExpressionTransformer<TransformContext> {
@Override
public ExpressionNode transform(ExpressionNode node, TransformContext context) {