@@ -25,23 +25,7 @@ public class AssociationQuery {
25
25
// If non-null, query is either always true or always false
26
26
private final Boolean always ;
27
27
private final List <QueryFieldInfo > qfi ;
28
- private final List <AssociationQueryConjunct > aqConjuncts =new ArrayList <>();
29
28
30
- public static class AssociationQueryConjunct {
31
- public final QueryExpression query ;
32
- public final List <QueryFieldInfo > qfi ;
33
-
34
- AssociationQueryConjunct (QueryExpression q ,List <QueryFieldInfo > qfi ) {
35
- this .query =q ;
36
- this .qfi =qfi ;
37
- }
38
-
39
- @ Override
40
- public String toString () {
41
- return query .toString ();
42
- }
43
- }
44
-
45
29
public AssociationQuery (CompositeMetadata root ,
46
30
CompositeMetadata currentEntity ,
47
31
ResolvedReferenceField reference ,
@@ -64,9 +48,7 @@ public AssociationQuery(CompositeMetadata root,
64
48
// Analyze the query as if it is a root entity query
65
49
AnalyzeQuery aq =new AnalyzeQuery (currentEntity ,null );
66
50
aq .iterate (result .query );
67
- AssociationQueryConjunct q =new AssociationQueryConjunct (result .query ,aq .getFieldInfo ());
68
- aqConjuncts .add (q );
69
- qfi .addAll (q .qfi );
51
+ qfi .addAll (aq .getFieldInfo ());
70
52
}
71
53
fieldBindings .addAll (result .bindings );
72
54
}
@@ -84,10 +66,6 @@ public AssociationQuery(CompositeMetadata root,
84
66
always =null ;
85
67
}
86
68
}
87
-
88
- public List <AssociationQueryConjunct > getConjuncts () {
89
- return aqConjuncts ;
90
- }
91
69
92
70
public List <QueryFieldInfo > getQueryFieldInfo () {
93
71
return qfi ;
0 commit comments