test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java

@@ -30,19 +30,19 @@
 import jdk.test.lib.jittester.Statement;
 import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class StatementFactory extends Factory {
-    private final Rule rule;
+class StatementFactory extends Factory<Statement> {
+    private final Rule<IRNode> rule;
     private final boolean needSemicolon;
 
     StatementFactory(long complexityLimit, int operatorLimit,
             TypeKlass ownerClass, boolean exceptionSafe,
             boolean noconsts, boolean needSemicolon ){
         this.needSemicolon = needSemicolon;
-        rule = new Rule("statement");
+        rule = new Rule<>("statement");
         IRNodeBuilder builder = new IRNodeBuilder()
                 .setComplexityLimit(complexityLimit)
                 .setOperatorLimit(operatorLimit)
                 .setOwnerKlass(ownerClass)
                 .setExceptionSafe(exceptionSafe)

@@ -52,11 +52,11 @@
         rule.add("assignment", builder.getAssignmentOperatorFactory());
         rule.add("function", builder.getFunctionFactory(), 0.1);
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Statement produce() throws ProductionFailedException {
         ProductionLimiter.setLimit();
         try {
             return new Statement(rule.produce(), needSemicolon);
         } finally {
             ProductionLimiter.setUnlimited();