diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/operator/PythonRecordConvertor.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/operator/PythonRecordConvertor.java index 6b2a195a..11477cfd 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/operator/PythonRecordConvertor.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/operator/PythonRecordConvertor.java @@ -26,7 +26,7 @@ public class PythonRecordConvertor { } BaseAdvancedRecord advancedRecord = VertexRecordConvertor.toAdvancedRecord(spgType, recordId, pythonRecord.getProperties()); - recordLinking.propertyLinking(advancedRecord); + recordLinking.linking(advancedRecord); return advancedRecord; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/RelationMappingProcessor.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/RelationMappingProcessor.java index 0aec230c..88d47088 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/RelationMappingProcessor.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/RelationMappingProcessor.java @@ -59,7 +59,7 @@ public class RelationMappingProcessor extends BaseMappingProcessor fusedRecords = subGraphFusing.subGraphFusing(advancedRecord); - fusedRecords.forEach(r -> recordLinking.propertyLinking(r)); - recordPredicating.propertyPredicating(advancedRecord); + fusedRecords.forEach(r -> recordLinking.linking(r)); + recordPredicating.predicting(advancedRecord); advancedRecords.addAll(fusedRecords); } } - return (List) subjectFusing.subjectFusing(advancedRecords); + return (List) subjectFusing.fusing(advancedRecords); } @Override diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/reason/ReasonProcessor.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/reason/ReasonProcessor.java index 2176d942..1a14c3c4 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/reason/ReasonProcessor.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/reason/ReasonProcessor.java @@ -82,7 +82,7 @@ public class ReasonProcessor extends BaseProcessor entityFusing(List records) throws FusingException; + List fusing(List records) throws FusingException; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java index 5730c6a3..1421eb7c 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java @@ -58,8 +58,8 @@ public class SubGraphFusingImpl implements SubGraphFusing { continue; } List advancedRecords = toAdvancedRecords(propertyRecord); - advancedRecords.forEach(recordLinking::propertyLinking); - List fusedRecords = entityFusing.entityFusing(advancedRecords); + advancedRecords.forEach(recordLinking::linking); + List fusedRecords = entityFusing.fusing(advancedRecords); modifyPropertyRecord(propertyRecord, fusedRecords); results.addAll(fusedRecords); } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusing.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusing.java index 08a38bd4..60a5fa95 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusing.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusing.java @@ -10,6 +10,6 @@ public interface SubjectFusing { void init(BuilderContext context) throws BuilderException; - List subjectFusing(List advancedRecords) + List fusing(List advancedRecords) throws FusingException; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusingImpl.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusingImpl.java index c72cc233..4fb622fc 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusingImpl.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusingImpl.java @@ -21,8 +21,8 @@ public class SubjectFusingImpl implements SubjectFusing { } @Override - public List subjectFusing(List advancedRecords) + public List fusing(List advancedRecords) throws FusingException { - return entityFusing.entityFusing(advancedRecords); + return entityFusing.fusing(advancedRecords); } } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/NewInstanceFusing.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/NewInstanceFusing.java index 954b1dde..50ea34ff 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/NewInstanceFusing.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/NewInstanceFusing.java @@ -17,7 +17,7 @@ public class NewInstanceFusing implements EntityFusing { public void init(BuilderContext context) throws BuilderException {} @Override - public List entityFusing(List records) + public List fusing(List records) throws FusingException { return records; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/OperatorFusing.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/OperatorFusing.java index d940d9ee..aaa4f1a3 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/OperatorFusing.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/impl/OperatorFusing.java @@ -49,7 +49,7 @@ public class OperatorFusing implements EntityFusing { } @Override - public List entityFusing(List records) + public List fusing(List records) throws FusingException { List> pythonRecords = CollectionsUtils.listMap(records, r -> PythonRecordConvertor.toPythonRecord(r).toMap()); diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/PropertyLinking.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/PropertyLinking.java index 4863ae05..b8123103 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/PropertyLinking.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/PropertyLinking.java @@ -11,5 +11,5 @@ public interface PropertyLinking { void init(BuilderContext context) throws BuilderException; /** Input an SPG property record and link the property value. */ - void propertyLinking(BasePropertyRecord record) throws LinkingException; + void linking(BasePropertyRecord record) throws LinkingException; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinking.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinking.java index f270062b..3c6cc6a9 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinking.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinking.java @@ -9,7 +9,7 @@ public interface RecordLinking { void init(BuilderContext context) throws BuilderException; - void propertyLinking(BaseSPGRecord spgRecord) throws LinkingException; + void linking(BaseSPGRecord spgRecord) throws LinkingException; void setDefaultPropertyLinking(PropertyLinking defaultPropertyLinking); } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinkingImpl.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinkingImpl.java index c216bfc8..11893753 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinkingImpl.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/RecordLinkingImpl.java @@ -53,20 +53,20 @@ public class RecordLinkingImpl implements RecordLinking { } @Override - public void propertyLinking(BaseSPGRecord spgRecord) throws LinkingException { + public void linking(BaseSPGRecord spgRecord) throws LinkingException { for (BasePropertyRecord propertyRecord : spgRecord.getProperties()) { if (propertyRecord.isSemanticProperty()) { PropertyLinking propertyLinking = semanticPropertyLinking.get(propertyRecord.getName()); if (propertyLinking != null) { // we use user-defined normalizer to normalize property value - propertyLinking.propertyLinking(propertyRecord); + propertyLinking.linking(propertyRecord); } else { // we use default normalizer to normalize property value - defaultPropertyLinking.propertyLinking(propertyRecord); + defaultPropertyLinking.linking(propertyRecord); } } else { // we use basic normalizer to normalize property value - basicPropertyLinking.propertyLinking(propertyRecord); + basicPropertyLinking.linking(propertyRecord); } } } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/BasicPropertyLinking.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/BasicPropertyLinking.java index 0319ba8f..2a97abff 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/BasicPropertyLinking.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/BasicPropertyLinking.java @@ -13,7 +13,7 @@ public class BasicPropertyLinking implements PropertyLinking { public void init(BuilderContext context) throws BuilderException {} @Override - public void propertyLinking(BasePropertyRecord record) throws LinkingException { + public void linking(BasePropertyRecord record) throws LinkingException { SPGTypeRef objectTypeRef = record.getObjectTypeRef(); if (!objectTypeRef.isBasicType()) { throw new IllegalStateException(); diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/IdEqualsLinking.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/IdEqualsLinking.java index a4670588..de985523 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/IdEqualsLinking.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/IdEqualsLinking.java @@ -18,7 +18,7 @@ public class IdEqualsLinking implements PropertyLinking { public void init(BuilderContext context) throws BuilderException {} @Override - public void propertyLinking(BasePropertyRecord record) throws LinkingException { + public void linking(BasePropertyRecord record) throws LinkingException { SPGTypeRef objectTypeRef = record.getObjectTypeRef(); if (!objectTypeRef.isAdvancedType()) { throw new IllegalStateException(); diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/OperatorLinking.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/OperatorLinking.java index 7aac8e07..75653e9a 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/OperatorLinking.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/OperatorLinking.java @@ -37,7 +37,7 @@ public class OperatorLinking implements PropertyLinking { } @Override - public void propertyLinking(BasePropertyRecord record) throws LinkingException { + public void linking(BasePropertyRecord record) throws LinkingException { List rawValues = record.getRawValues(); List ids = new ArrayList<>(rawValues.size()); diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/SearchBasedLinking.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/SearchBasedLinking.java index 0c447c49..2ca53502 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/SearchBasedLinking.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/linking/impl/SearchBasedLinking.java @@ -29,7 +29,7 @@ public class SearchBasedLinking implements PropertyLinking { } @Override - public void propertyLinking(BasePropertyRecord record) throws LinkingException { + public void linking(BasePropertyRecord record) throws LinkingException { SPGTypeRef objectTypeRef = record.getObjectTypeRef(); List rawValues = record.getRawValues(); diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/PropertyPredicting.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/PropertyPredicting.java index 0f34f449..14efb415 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/PropertyPredicting.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/PropertyPredicting.java @@ -12,5 +12,5 @@ public interface PropertyPredicting { void init(BuilderContext context) throws BuilderException; /** Input an SPG property record and predict the property value. */ - List propertyPredicting(BaseAdvancedRecord record) throws PredictingException; + List predicting(BaseAdvancedRecord record) throws PredictingException; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredicting.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredicting.java index da642ba1..96ed018b 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredicting.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredicting.java @@ -9,5 +9,5 @@ public interface RecordPredicting { void init(BuilderContext context) throws BuilderException; - void propertyPredicating(BaseAdvancedRecord advancedRecord) throws PredictingException; + void predicting(BaseAdvancedRecord advancedRecord) throws PredictingException; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredictingImpl.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredictingImpl.java index e3f84786..80995dfc 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredictingImpl.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/RecordPredictingImpl.java @@ -39,7 +39,7 @@ public class RecordPredictingImpl implements RecordPredicting { } @Override - public void propertyPredicating(BaseAdvancedRecord advancedRecord) throws PredictingException { + public void predicting(BaseAdvancedRecord advancedRecord) throws PredictingException { Map propertyMap = advancedRecord.getSpgType().getPropertyMap(); for (Map.Entry entry : semanticPropertyPredicating.entrySet()) { String propertyKey = entry.getKey(); @@ -50,7 +50,7 @@ public class RecordPredictingImpl implements RecordPredicting { continue; } - List predictedRecords = predicting.propertyPredicting(advancedRecord); + List predictedRecords = predicting.predicting(advancedRecord); if (CollectionUtils.isEmpty(predictedRecords)) { continue; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/impl/OperatorPredicting.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/impl/OperatorPredicting.java index e53a497b..dbd98125 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/impl/OperatorPredicting.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/predicting/impl/OperatorPredicting.java @@ -50,7 +50,7 @@ public class OperatorPredicting implements PropertyPredicting { } @Override - public List propertyPredicting(BaseAdvancedRecord record) + public List predicting(BaseAdvancedRecord record) throws PredictingException { Map pythonRecord = PythonRecordConvertor.toPythonRecord(record).toMap(); InvokeResultWrapper> invokeResultWrapper = null; diff --git a/builder/core/src/test/groovy/com/antgroup/openspg/builder/core/strategy/impl/BasicPropertyNormalizerTest.groovy b/builder/core/src/test/groovy/com/antgroup/openspg/builder/core/strategy/impl/BasicPropertyNormalizerTest.groovy index 24b76332..8fed9d24 100644 --- a/builder/core/src/test/groovy/com/antgroup/openspg/builder/core/strategy/impl/BasicPropertyNormalizerTest.groovy +++ b/builder/core/src/test/groovy/com/antgroup/openspg/builder/core/strategy/impl/BasicPropertyNormalizerTest.groovy @@ -18,7 +18,7 @@ class BasicPropertyNormalizerTest extends Specification { def propertyRecord = new SPGPropertyRecord(property, new SPGPropertyValue(rawValue)) expect: - normalizer.propertyLinking(propertyRecord) + normalizer.linking(propertyRecord) propertyRecord.getValue().getStds() == expectValues where: @@ -33,7 +33,7 @@ class BasicPropertyNormalizerTest extends Specification { def propertyRecord = new SPGPropertyRecord(property, new SPGPropertyValue(rawValue)) when: - normalizer.propertyLinking(propertyRecord) + normalizer.linking(propertyRecord) propertyRecord.getValue().getStds() then: @@ -50,7 +50,7 @@ class BasicPropertyNormalizerTest extends Specification { def subPropertyRecord = new SPGSubPropertyRecord(subProperty, new SPGPropertyValue(rawValue)) expect: - normalizer.propertyLinking(subPropertyRecord) + normalizer.linking(subPropertyRecord) subPropertyRecord.getValue().getStds() == expectValues where: