diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/CheckProcessor.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/CheckProcessor.java index 8bd4e8be..43fdc00a 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/CheckProcessor.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/CheckProcessor.java @@ -16,8 +16,6 @@ package com.antgroup.openspg.builder.core.physical.process; import com.antgroup.openspg.builder.model.pipeline.config.BaseNodeConfig; import com.antgroup.openspg.builder.model.pipeline.enums.NodeTypeEnum; import com.antgroup.openspg.builder.model.record.BaseRecord; -import com.antgroup.openspg.builder.model.record.BaseSPGRecord; -import com.antgroup.openspg.builder.model.record.SPGRecordTypeEnum; import java.util.List; public class CheckProcessor extends BaseProcessor { @@ -39,66 +37,6 @@ public class CheckProcessor extends BaseProcessor process(List inputs) { - for (BaseRecord record : inputs) { - BaseSPGRecord spgRecord = (BaseSPGRecord) record; - if (SPGRecordTypeEnum.RELATION.equals(spgRecord.getRecordType())) { - // checkSubProperty(((RelationRecord) spgRecord)); - } else { - // checkProperty(((BaseAdvancedRecord) spgRecord)); - } - } return inputs; } - - // private void checkProperty(BaseAdvancedRecord advancedRecord) { - // for (Property property : advancedRecord.getSpgType().getProperties()) { - // if (property.getObjectTypeRef().isBasicType()) { - // if (property.getConstraint() == null) { - // continue; - // } - // SPGPropertyRecord propertyRecord = advancedRecord.getPropertyRecord(property); - // Object stdValue = (propertyRecord == null ? null : propertyRecord.getValue().getStd()); - // doCheckBasicProperty( - // property.getName(), stdValue, property.getConstraint().getConstraintItems()); - // } - // } - // } - // - // private void checkSubProperty(RelationRecord relationRecord) { - // for (SubProperty subProperty : relationRecord.getRelationType().getSubProperties()) { - // if (subProperty.getObjectTypeRef().isBasicType()) { - // if (subProperty.getConstraint() == null) { - // continue; - // } - // SPGSubPropertyRecord subPropertyRecord = - // relationRecord.getSubPropertyRecord(subProperty); - // Object stdValue = - // (subPropertyRecord == null ? null : subPropertyRecord.getValue().getStd()); - // doCheckBasicProperty( - // subProperty.getName(), stdValue, subProperty.getConstraint().getConstraintItems()); - // } - // } - // } - // - // private void doCheckBasicProperty( - // String propertyName, Object stdValue, List constraintItems) { - // Object[] values = new Object[] {stdValue}; - // for (BaseConstraintItem constraintItem : constraintItems) { - // for (Object value : values) { - // if (!constraintItem.checkIsLegal(value)) { - // throw new BuilderRecordException( - // this, - // "the property {}={} violates constraints:{}", - // propertyName, - // stdValue, - // constraintItem.getConstraintTypeEnum().name()); - // } - // } - // if (constraintItem instanceof MultiValConstraint) { - // if (stdValue != null) { - // values = stdValue.toString().split(","); - // } - // } - // } - // } } diff --git a/builder/runner/local/src/main/java/com/antgroup/openspg/builder/runner/local/LocalBuilderMain.java b/builder/runner/local/src/main/java/com/antgroup/openspg/builder/runner/local/LocalBuilderMain.java index 250c7aef..a21a63e0 100644 --- a/builder/runner/local/src/main/java/com/antgroup/openspg/builder/runner/local/LocalBuilderMain.java +++ b/builder/runner/local/src/main/java/com/antgroup/openspg/builder/runner/local/LocalBuilderMain.java @@ -98,7 +98,6 @@ public class LocalBuilderMain { try { commandLine = parser.parse(options, args); } catch (ParseException e) { - System.out.println(e.getMessage()); helper.printHelp("Usage: ", options); System.exit(0); } diff --git a/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/io/odps/OdpsUtils.java b/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/io/odps/OdpsUtils.java index 027ccb5b..34370aaf 100644 --- a/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/io/odps/OdpsUtils.java +++ b/reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/io/odps/OdpsUtils.java @@ -138,6 +138,7 @@ public class OdpsUtils { return false; } + /* List neededType = schemaNeeded.getColumns().stream() .map(column -> column.getTypeInfo().getOdpsType()) @@ -149,7 +150,6 @@ public class OdpsUtils { .map(column -> column.getTypeInfo().getOdpsType()) .sorted(Enum::compareTo) .collect(Collectors.toList()); - /* Comment it out and wait for the type inference to complete if (!neededType.equals(realType)) { log.error( diff --git a/server/api/http-server/src/main/java/com/antgroup/openspg/server/api/http/server/HttpBizCallback.java b/server/api/http-server/src/main/java/com/antgroup/openspg/server/api/http/server/HttpBizCallback.java index bc1f47a2..28487476 100644 --- a/server/api/http-server/src/main/java/com/antgroup/openspg/server/api/http/server/HttpBizCallback.java +++ b/server/api/http-server/src/main/java/com/antgroup/openspg/server/api/http/server/HttpBizCallback.java @@ -13,15 +13,11 @@ package com.antgroup.openspg.server.api.http.server; -import com.antgroup.openspg.server.common.model.exception.IllegalParamsException; import org.springframework.http.ResponseEntity; public interface HttpBizCallback { - /** - * Perform some pre-validation, and if the validation fails, throw an {@link - * IllegalParamsException} exception directly. - */ + /** Perform some pre-validation */ void check(); /**