Add GoalQuery to api (#987)

Signed-off-by: KingSimon <[email protected]>

core/src/main/java/tc/oc/pgm/api/filter/query/GoalQuery.java

@@ -0,0 +1,8 @@
+package tc.oc.pgm.api.filter.query;
+
+import tc.oc.pgm.goals.Goal;
+import tc.oc.pgm.goals.GoalDefinition;
+
+public interface GoalQuery<T extends GoalDefinition> extends MatchQuery {
+  Goal<T> getGoal();
+}

core/src/main/java/tc/oc/pgm/filters/query/GoalQuery.java

@@ -1,20 +1,23 @@
 package tc.oc.pgm.filters.query;
 
 import tc.oc.pgm.goals.Goal;
+import tc.oc.pgm.goals.GoalDefinition;
 
 /**
  * Currently, the only thing this class does is derive the Match from a Goal. In the future, we may
  * have filters that respond specifically to goal queries, but currently we do not.
  */
-public class GoalQuery extends MatchQuery {
-  private final Goal<?> goal;
+public class GoalQuery<T extends GoalDefinition> extends MatchQuery
+    implements tc.oc.pgm.api.filter.query.GoalQuery<T> {
+  private final Goal<T> goal;
 
-  public GoalQuery(Goal<?> goal) {
+  public GoalQuery(Goal<T> goal) {
     super(null, goal.getMatch());
     this.goal = goal;
   }
 
-  public Goal<?> getGoal() {
-    return goal;
+  @Override
+  public Goal<T> getGoal() {
+    return this.goal;
   }
 }