Skip to content

Commit 80176af

Browse files
author
Thomas Draier
committed
Added optional to fix circular dependencies
1 parent 8f51759 commit 80176af

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/main/java/graphql/annotations/processor/retrievers/GraphQLTypeRetriever.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
import graphql.annotations.processor.searchAlgorithms.SearchAlgorithm;
2323
import graphql.annotations.processor.typeBuilders.*;
2424
import graphql.schema.*;
25-
import org.osgi.service.component.annotations.Component;
26-
import org.osgi.service.component.annotations.Reference;
27-
import org.osgi.service.component.annotations.ReferencePolicy;
28-
import org.osgi.service.component.annotations.ReferencePolicyOption;
25+
import org.osgi.service.component.annotations.*;
2926

3027
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
3128

@@ -107,7 +104,7 @@ public GraphQLFieldRetriever getGraphQLFieldRetriever() {
107104
return graphQLFieldRetriever;
108105
}
109106

110-
@Reference(policy= ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
107+
@Reference(cardinality = ReferenceCardinality.OPTIONAL, policy= ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
111108
public void setGraphQLObjectInfoRetriever(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever) {
112109
this.graphQLObjectInfoRetriever = graphQLObjectInfoRetriever;
113110
}
@@ -116,7 +113,7 @@ public void unsetGraphQLObjectInfoRetriever(GraphQLObjectInfoRetriever graphQLOb
116113
this.graphQLObjectInfoRetriever = null;
117114
}
118115

119-
@Reference(policy= ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
116+
@Reference(cardinality = ReferenceCardinality.OPTIONAL, policy= ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
120117
public void setGraphQLInterfaceRetriever(GraphQLInterfaceRetriever graphQLInterfaceRetriever) {
121118
this.graphQLInterfaceRetriever = graphQLInterfaceRetriever;
122119
}
@@ -125,7 +122,7 @@ public void unsetGraphQLInterfaceRetriever(GraphQLInterfaceRetriever graphQLInte
125122
this.graphQLInterfaceRetriever = null;
126123
}
127124

128-
@Reference(policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
125+
@Reference(cardinality = ReferenceCardinality.OPTIONAL, policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
129126
public void setGraphQLFieldRetriever(GraphQLFieldRetriever graphQLFieldRetriever) {
130127
this.graphQLFieldRetriever = graphQLFieldRetriever;
131128
}
@@ -134,7 +131,7 @@ public void unsetGraphQLFieldRetriever(GraphQLFieldRetriever graphQLFieldRetriev
134131
this.graphQLFieldRetriever = null;
135132
}
136133

137-
@Reference(target = "(type=field)", policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
134+
@Reference(cardinality = ReferenceCardinality.OPTIONAL, target = "(type=field)", policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
138135
public void setFieldSearchAlgorithm(SearchAlgorithm fieldSearchAlgorithm) {
139136
this.fieldSearchAlgorithm = fieldSearchAlgorithm;
140137
}
@@ -143,7 +140,7 @@ public void unsetFieldSearchAlgorithm(SearchAlgorithm fieldSearchAlgorithm) {
143140
this.fieldSearchAlgorithm = null;
144141
}
145142

146-
@Reference(target = "(type=method)", policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
143+
@Reference(cardinality = ReferenceCardinality.OPTIONAL, target = "(type=method)", policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
147144
public void setMethodSearchAlgorithm(SearchAlgorithm methodSearchAlgorithm) {
148145
this.methodSearchAlgorithm = methodSearchAlgorithm;
149146
}
@@ -152,7 +149,7 @@ public void unsetMethodSearchAlgorithm(SearchAlgorithm methodSearchAlgorithm) {
152149
this.methodSearchAlgorithm = null;
153150
}
154151

155-
@Reference(policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
152+
@Reference(cardinality = ReferenceCardinality.OPTIONAL, policy=ReferencePolicy.DYNAMIC, policyOption= ReferencePolicyOption.GREEDY)
156153
public void setExtensionsHandler(GraphQLExtensionsHandler extensionsHandler) {
157154
this.extensionsHandler = extensionsHandler;
158155
}

0 commit comments

Comments
 (0)