42
42
import org .apache .hugegraph .util .E ;
43
43
import org .apache .hugegraph .util .Log ;
44
44
import org .apache .tinkerpop .gremlin .structure .Edge ;
45
+ import org .apache .tinkerpop .gremlin .structure .Vertex ;
45
46
import org .slf4j .Logger ;
46
47
47
48
import com .codahale .metrics .annotation .Timed ;
@@ -169,7 +170,7 @@ public String post(@Context GraphManager manager,
169
170
QueryResults .emptyIterator ());
170
171
}
171
172
172
- Iterator <? > iterVertex ;
173
+ Iterator <Vertex > iterVertex = Collections . emptyIterator () ;
173
174
Set <Id > vertexIds = new HashSet <>(neighbors );
174
175
if (request .withPath ) {
175
176
for (HugeTraverser .Path p : paths ) {
@@ -179,18 +180,12 @@ public String post(@Context GraphManager manager,
179
180
if (request .withVertex && !vertexIds .isEmpty ()) {
180
181
iterVertex = g .vertices (vertexIds .toArray ());
181
182
measure .addIterCount (vertexIds .size (), 0L );
182
- } else {
183
- iterVertex = vertexIds .iterator ();
184
183
}
185
184
186
- Iterator <? > iterEdge = Collections .emptyIterator ();
187
- if (request .withPath ) {
185
+ Iterator <Edge > iterEdge = Collections .emptyIterator ();
186
+ if (request .withPath && request . withEdge ) {
188
187
Set <Edge > edges = results .edgeResults ().getEdges (paths );
189
- if (request .withEdge ) {
190
- iterEdge = edges .iterator ();
191
- } else {
192
- iterEdge = HugeTraverser .EdgeRecord .getEdgeIds (edges ).iterator ();
193
- }
188
+ iterEdge = edges .iterator ();
194
189
}
195
190
196
191
return manager .serializer (g , measure .measures ())
0 commit comments