diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/property/PropertyNormalizerFactory.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/property/PropertyNormalizerFactory.java index 563027a3..0b4683e9 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/property/PropertyNormalizerFactory.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/property/PropertyNormalizerFactory.java @@ -3,12 +3,12 @@ package com.antgroup.openspg.builder.core.property; import com.antgroup.openspg.builder.core.property.impl.PropertyIdEqualsNormalizer; import com.antgroup.openspg.builder.core.property.impl.PropertyOperatorNormalizer; import com.antgroup.openspg.builder.model.pipeline.config.OperatorPropertyNormalizerConfig; -import com.antgroup.openspg.builder.model.pipeline.config.PropertyNormalizerConfig; +import com.antgroup.openspg.builder.model.pipeline.config.BasePropertyNormalizerConfig; import com.antgroup.openspg.builder.model.pipeline.enums.PropertyNormalizerTypeEnum; public class PropertyNormalizerFactory { - public static PropertyNormalizer getPropertyNormalizer(PropertyNormalizerConfig config) { + public static PropertyNormalizer getPropertyNormalizer(BasePropertyNormalizerConfig config) { PropertyNormalizerTypeEnum normalizerType = config.getNormalizerType(); switch (normalizerType) { case OPERATOR: diff --git a/builder/model/src/main/java/com/antgroup/openspg/builder/model/BuilderJsonUtils.java b/builder/model/src/main/java/com/antgroup/openspg/builder/model/BuilderJsonUtils.java index 712163f3..caf96137 100644 --- a/builder/model/src/main/java/com/antgroup/openspg/builder/model/BuilderJsonUtils.java +++ b/builder/model/src/main/java/com/antgroup/openspg/builder/model/BuilderJsonUtils.java @@ -35,7 +35,7 @@ public class BuilderJsonUtils { .recognizeSubtypes()) .registerTypeAdapterFactory( RuntimeTypeAdapterFactory.of( - PropertyNormalizerConfig.class, DEFAULT_TYPE_FIELD_NAME) + BasePropertyNormalizerConfig.class, DEFAULT_TYPE_FIELD_NAME) .registerSubtype( OperatorPropertyNormalizerConfig.class, PropertyNormalizerTypeEnum.OPERATOR.name()) diff --git a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BaseMappingNodeConfig.java b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BaseMappingNodeConfig.java index 69a46b62..48c1be1b 100644 --- a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BaseMappingNodeConfig.java +++ b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BaseMappingNodeConfig.java @@ -24,7 +24,7 @@ public abstract class BaseMappingNodeConfig extends BaseNodeConfig { public static class MappingConfig { private final String source; private final String target; - private final PropertyNormalizerConfig normalizerConfig; + private final BasePropertyNormalizerConfig normalizerConfig; } public abstract List getIdentifiers(); diff --git a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BasePropertyMounterConfig.java b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BasePropertyMounterConfig.java deleted file mode 100644 index 5443ed4b..00000000 --- a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BasePropertyMounterConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.antgroup.openspg.builder.model.pipeline.config; - -import com.antgroup.openspg.builder.model.pipeline.enums.PropertyNormalizerTypeEnum; -import lombok.Getter; - -@Getter -public abstract class BasePropertyMounterConfig { - - /** the type of property mounter */ - private final PropertyNormalizerTypeEnum type; - - protected BasePropertyMounterConfig(PropertyNormalizerTypeEnum type) { - this.type = type; - } -} diff --git a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/PropertyNormalizerConfig.java b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BasePropertyNormalizerConfig.java similarity index 69% rename from builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/PropertyNormalizerConfig.java rename to builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BasePropertyNormalizerConfig.java index 6647fd04..89345d80 100644 --- a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/PropertyNormalizerConfig.java +++ b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/BasePropertyNormalizerConfig.java @@ -5,11 +5,11 @@ import com.antgroup.openspg.server.common.model.base.BaseValObj; import lombok.Getter; @Getter -public abstract class PropertyNormalizerConfig extends BaseValObj { +public abstract class BasePropertyNormalizerConfig extends BaseValObj { private final PropertyNormalizerTypeEnum normalizerType; - public PropertyNormalizerConfig(PropertyNormalizerTypeEnum normalizerType) { + public BasePropertyNormalizerConfig(PropertyNormalizerTypeEnum normalizerType) { this.normalizerType = normalizerType; } } diff --git a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/IdEqualsPropertyNormalizerConfig.java b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/IdEqualsPropertyNormalizerConfig.java index ba540e28..ae493419 100644 --- a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/IdEqualsPropertyNormalizerConfig.java +++ b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/IdEqualsPropertyNormalizerConfig.java @@ -2,7 +2,7 @@ package com.antgroup.openspg.builder.model.pipeline.config; import com.antgroup.openspg.builder.model.pipeline.enums.PropertyNormalizerTypeEnum; -public class IdEqualsPropertyNormalizerConfig extends PropertyNormalizerConfig { +public class IdEqualsPropertyNormalizerConfig extends BasePropertyNormalizerConfig { public IdEqualsPropertyNormalizerConfig() { super(PropertyNormalizerTypeEnum.ID_EQUALS); diff --git a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/OperatorPropertyNormalizerConfig.java b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/OperatorPropertyNormalizerConfig.java index c731cf43..2350ef9d 100644 --- a/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/OperatorPropertyNormalizerConfig.java +++ b/builder/model/src/main/java/com/antgroup/openspg/builder/model/pipeline/config/OperatorPropertyNormalizerConfig.java @@ -4,7 +4,7 @@ import com.antgroup.openspg.builder.model.pipeline.enums.PropertyNormalizerTypeE import lombok.Getter; @Getter -public class OperatorPropertyNormalizerConfig extends PropertyNormalizerConfig { +public class OperatorPropertyNormalizerConfig extends BasePropertyNormalizerConfig { private final OperatorConfig operatorConfig;