Skip to content

Commit 4366186

Browse files
committed
fix(server): replace Neo4jSinkWriter by GraphStoreSinkWriter in controller
1 parent d569e98 commit 4366186

1 file changed

Lines changed: 11 additions & 13 deletions

File tree

  • server/api/http-server/src/main/java/com/antgroup/openspg/server/api/http/server/openapi

server/api/http-server/src/main/java/com/antgroup/openspg/server/api/http/server/openapi/GraphController.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
import com.antgroup.openspg.builder.core.runtime.BuilderContext;
1919
import com.antgroup.openspg.builder.core.runtime.impl.DefaultBuilderCatalog;
2020
import com.antgroup.openspg.builder.model.pipeline.config.GraphStoreSinkNodeConfig;
21-
import com.antgroup.openspg.builder.model.pipeline.config.Neo4jSinkNodeConfig;
2221
import com.antgroup.openspg.builder.model.record.BaseRecord;
2322
import com.antgroup.openspg.builder.model.record.RecordAlterOperationEnum;
2423
import com.antgroup.openspg.builder.model.record.SubGraphRecord;
2524
import com.antgroup.openspg.builder.runner.local.physical.sink.impl.GraphStoreSinkWriter;
26-
import com.antgroup.openspg.builder.runner.local.physical.sink.impl.Neo4jSinkWriter;
2725
import com.antgroup.openspg.core.schema.model.identifier.SPGTypeIdentifier;
2826
import com.antgroup.openspg.core.schema.model.type.BaseSPGType;
2927
import com.antgroup.openspg.core.schema.model.type.ConceptList;
@@ -41,10 +39,9 @@
4139
import com.antgroup.openspg.server.biz.schema.SchemaManager;
4240
import com.antgroup.openspg.server.biz.service.GraphManager;
4341
import com.google.common.collect.Lists;
44-
import java.util.HashMap;
45-
import java.util.List;
46-
import java.util.Map;
47-
import java.util.UUID;
42+
43+
import java.util.*;
44+
4845
import lombok.extern.slf4j.Slf4j;
4946
import org.apache.commons.collections4.CollectionUtils;
5047
import org.springframework.beans.factory.annotation.Autowired;
@@ -179,12 +176,12 @@ public void check() {
179176
public Boolean action() {
180177
ProjectSchema projectSchema = schemaManager.getProjectSchema(request.getProjectId());
181178
boolean enableLeadTo =
182-
(request.getEnableLeadTo() == null) ? false : request.getEnableLeadTo();
179+
request.getEnableLeadTo() != null && request.getEnableLeadTo();
183180
Map<SPGTypeIdentifier, ConceptList> conceptLists =
184181
getConceptLists(enableLeadTo, projectSchema);
185-
Neo4jSinkWriter writer =
186-
new Neo4jSinkWriter(
187-
UUID.randomUUID().toString(), "图存储", new Neo4jSinkNodeConfig(true));
182+
GraphStoreSinkWriter writer =
183+
new GraphStoreSinkWriter(
184+
UUID.randomUUID().toString(), "图存储", new GraphStoreSinkNodeConfig(true));
188185
BuilderContext context =
189186
new BuilderContext()
190187
.setProjectId(request.getProjectId())
@@ -201,12 +198,13 @@ public Boolean action() {
201198

202199
SubGraphRecord subGraph =
203200
JSON.parseObject(JSON.toJSONString(request.getSubGraph()), SubGraphRecord.class);
204-
writer.writeToNeo4j(subGraph);
201+
List<BaseRecord> records = Lists.newArrayList();
202+
records.add(subGraph);
203+
writer.write(records);
204+
205205
if (context.isEnableLeadTo()) {
206206
ReasonProcessor reasonProcessor = new ReasonProcessor();
207207
reasonProcessor.init(context);
208-
List<BaseRecord> records = Lists.newArrayList();
209-
records.add(subGraph);
210208
List<BaseRecord> reasonResults = reasonProcessor.process(records);
211209
if (CollectionUtils.isNotEmpty(reasonResults)) {
212210
GraphStoreSinkWriter sinkWriter =

0 commit comments

Comments
 (0)