diff --git a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/exception/ErrorCodes.java b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/exception/ErrorCodes.java index 0ebc56d2eeeeae1288a35d413143cd3aceffef08..79bb62bec2da4cb5bd23fb9962f514fe89446e86 100644 --- a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/exception/ErrorCodes.java +++ b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/exception/ErrorCodes.java @@ -42,6 +42,10 @@ public enum ErrorCodes { * 未能正常获取序列化器,请检查配置。类型为[{0}] */ ECP_CONFIG_RESOLVE_DEV_0006, + /** + * 此类型元数据:[{0}],在配置文件中不存在。 + */ + ECP_CONFIG_RESOLVE_DEV_0007, /** * 序列化失败[{0}] @@ -395,6 +399,18 @@ public enum ErrorCodes { * 工程[{0}]与工程[{1}]不在一个业务对象内 */ ECP_METADATA_DEV_0048, + /** + * 数据库中不存在此元数据[{0}] + */ + ECP_METADATA_DEV_0049, + /** + * [{0}]中的原数据包[{1}]不包含此元数据:[{2}] + */ + ECP_METADATA_DEV_0050, + /** + * 在工程[{0}]及其依赖中,无法找到元数据[{1}] + */ + ECP_METADATA_DEV_0051, /** * 获取maven本地仓库地址出错,请检查settings.xml配置 diff --git a/metadata-service-dev-api/src/main/resources/metadata_dev_exception.en.properties b/metadata-service-dev-api/src/main/resources/metadata_dev_exception.en.properties index 5b8f07d1fc5518773a5e7e861a3152f6bd4ffccf..f81c38ed27d624c36e7f19b7bad801d39b0ebc9d 100644 --- a/metadata-service-dev-api/src/main/resources/metadata_dev_exception.en.properties +++ b/metadata-service-dev-api/src/main/resources/metadata_dev_exception.en.properties @@ -19,7 +19,7 @@ ECP_METADATA_DEPLOY_DEV_0001=Incorrect database type: [{0}] ECP_CONFIG_RESOLVE_DEV_0001=Failed to retrieve configuration class [{0}] ECP_CONFIG_RESOLVE_DEV_0002=Failed to read configuration file: [{0}] ECP_CONFIG_RESOLVE_DEV_0006=Failed to obtain serializer properly. Please check the configuration. Type: [{0}] - +ECP_CONFIG_RESOLVE_DEV_0007=This type of metadata: [{0}], does not exist in the configuration file. ECP_PARSE_DEV_0001=Serialization failed: [{0}] ECP_PARSE_DEV_0002=Deserialization failed: [{0}] ECP_PARSE_DEV_0010=Failed to parse file: [{0}] @@ -102,7 +102,9 @@ ECP_METADATA_DEV_0045=The current path is not a valid metadata project path: [{0 ECP_METADATA_DEV_0046=The [{0}] field only support alphanumeric combinations starting with a letter. ECP_METADATA_DEV_0047=The [{0}] field only support lowercase letters. ECP_METADATA_DEV_0048=Project [{0}] and project [{1}] are not within the same business object. - +ECP_METADATA_DEV_0049=The metadata [{0}] does not exist in the database. +ECP_METADATA_DEV_0050=The metadata package [{1}] in [{0}] does not contain this metadata: [{2}]. +ECP_METADATA_DEV_0051=In the project [{0}] and its dependencies, the metadata [{1}] cannot be found. ECP_MAVEN_DEV_0001=Error retrieving the local repository address for Maven. Please check the settings.xml configuration. ECP_MAVEN_DEV_0002=Please configure the Maven environment variable! MAVEN_HOME=... ECP_MAVEN_DEV_0003=Failed to write the POM file [{0}]-[{1}]. diff --git a/metadata-service-dev-api/src/main/resources/metadata_dev_exception.properties b/metadata-service-dev-api/src/main/resources/metadata_dev_exception.properties index e107fae35384c159b894004c7ff5699a9f64afae..34f7d68e89be0a99293e123c81437748de9bf203 100644 --- a/metadata-service-dev-api/src/main/resources/metadata_dev_exception.properties +++ b/metadata-service-dev-api/src/main/resources/metadata_dev_exception.properties @@ -19,7 +19,7 @@ ECP_METADATA_DEPLOY_DEV_0001=\u6570\u636E\u5E93\u7C7B\u578B\u4E0D\u6B63\u786E[{0 ECP_CONFIG_RESOLVE_DEV_0001=\u83B7\u53D6\u914D\u7F6E\u7C7B\u5931\u8D25[{0}] ECP_CONFIG_RESOLVE_DEV_0002=\u8BFB\u53D6\u914D\u7F6E\u6587\u4EF6\u5931\u8D25[{0}] ECP_CONFIG_RESOLVE_DEV_0006=\u672A\u80FD\u6B63\u5E38\u83B7\u53D6\u5E8F\u5217\u5316\u5668\uFF0C\u8BF7\u68C0\u67E5\u914D\u7F6E\u3002\u7C7B\u578B\u4E3A[{0}] - +ECP_CONFIG_RESOLVE_DEV_0007=\u6B64\u7C7B\u578B\u5143\u6570\u636E\uFF1A[{0}]\uFF0C\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u4E0D\u5B58\u5728 ECP_PARSE_DEV_0001=\u5E8F\u5217\u5316\u5931\u8D25[{0}] ECP_PARSE_DEV_0002=\u53CD\u5E8F\u5217\u5316\u5931\u8D25[{0}] ECP_PARSE_DEV_0010=\u89E3\u6790\u6587\u4EF6\u5931\u8D25[{0}] @@ -102,7 +102,9 @@ ECP_METADATA_DEV_0045=\u5F53\u524D\u8DEF\u5F84\u4E0D\u662F\u6709\u6548\u7684\u51 ECP_METADATA_DEV_0046=[{0}]\u5B57\u6BB5\u4EC5\u652F\u6301\u4EE5\u5B57\u6BCD\u5F00\u5934\u7684\u5B57\u6BCD\u6570\u5B57\u7EC4\u5408\u3002 ECP_METADATA_DEV_0047=[{0}]\u5B57\u6BB5\u4EC5\u652F\u6301\u5C0F\u5199\u5B57\u6BCD\u3002 ECP_METADATA_DEV_0048=\u5DE5\u7A0B[{0}]\u4E0E\u5DE5\u7A0B[{1}]\u4E0D\u5728\u4E00\u4E2A\u4E1A\u52A1\u5BF9\u8C61\u5185\u3002 - +ECP_METADATA_DEV_0049=\u6570\u636E\u5E93\u4E2D\u4E0D\u5B58\u5728\u6B64\u5143\u6570\u636E[{0}] +ECP_METADATA_DEV_0050=[{0}]\u4E2D\u7684\u539F\u6570\u636E\u5305[{1}]\u4E0D\u5305\u542B\u6B64\u5143\u6570\u636E\uFF1A[{2}] +ECP_METADATA_DEV_0051=\u5728\u5DE5\u7A0B[{0}]\u53CA\u5176\u4F9D\u8D56\u4E2D\uFF0C\u65E0\u6CD5\u627E\u5230\u5143\u6570\u636E[{1}] ECP_MAVEN_DEV_0001=\u83B7\u53D6maven\u672C\u5730\u4ED3\u5E93\u5730\u5740\u51FA\u9519\uFF0C\u8BF7\u68C0\u67E5settings.xml\u914D\u7F6E ECP_MAVEN_DEV_0002=\u8BF7\u914D\u7F6Emaven\u73AF\u5883\u53D8\u91CF\uFF01MAVEN_HOME=... ECP_MAVEN_DEV_0003=\u5199\u5165pom\u6587\u4EF6\u5931\u8D25[{0}]-[{1}] diff --git a/metadata-service-dev-api/src/main/resources/metadata_dev_exception.zh-CHT.properties b/metadata-service-dev-api/src/main/resources/metadata_dev_exception.zh-CHT.properties index 3e7f500765ab6a689be2fddd1910435ac1c149b2..8f97cde13c9d3909db6b3364a5128b4d5063e319 100644 --- a/metadata-service-dev-api/src/main/resources/metadata_dev_exception.zh-CHT.properties +++ b/metadata-service-dev-api/src/main/resources/metadata_dev_exception.zh-CHT.properties @@ -19,7 +19,7 @@ ECP_METADATA_DEPLOY_DEV_0001=\u8CC7\u6599\u5EAB\u985E\u578B\u4E0D\u6B63\u78BA\uF ECP_CONFIG_RESOLVE_DEV_0001=\u7372\u53D6\u914D\u7F6E\u985E\u5931\u6557[{0}] ECP_CONFIG_RESOLVE_DEV_0002=\u8B80\u53D6\u914D\u7F6E\u6587\u4EF6\u5931\u6557\uFF1A[{0}] ECP_CONFIG_RESOLVE_DEV_0006=\u7121\u6CD5\u6B63\u5E38\u7372\u53D6\u5E8F\u5217\u5316\u5668\uFF0C\u8ACB\u6AA2\u67E5\u914D\u7F6E\u3002\u985E\u578B\u70BA\uFF1A[{0}] - +ECP_CONFIG_RESOLVE_DEV_0007=\u6B64\u985E\u578B\u5143\u6578\u64DA\uFF1A[{0}]\uFF0C\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u4E0D\u5B58\u5728 ECP_PARSE_DEV_0001=\u5E8F\u5217\u5316\u5931\u6557\uFF1A[{0}] ECP_PARSE_DEV_0002=\u53CD\u5E8F\u5217\u5316\u5931\u6557\uFF1A[{0}] ECP_PARSE_DEV_0010=\u89E3\u6790\u6587\u4EF6\u5931\u6557\uFF1A[{0}] @@ -102,7 +102,9 @@ ECP_METADATA_DEV_0045=\u7576\u524D\u8DEF\u5F91\u4E0D\u662F\u6709\u6548\u7684\u51 ECP_METADATA_DEV_0046=[{0}] \u6B04\u4F4D\u50C5\u652F\u63F4\u4EE5\u5B57\u6BCD\u958B\u982D\u7684\u5B57\u6BCD\u6578\u5B57\u7D44\u5408\u3002 ECP_METADATA_DEV_0047=[{0}] \u6B04\u4F4D\u50C5\u652F\u63F4\u5C0F\u5BEB\u5B57\u6BCD ECP_METADATA_DEV_0048=\u5C08\u6848[{0}]\u8207\u5C08\u6848[{1}]\u4E0D\u5728\u540C\u4E00\u500B\u696D\u52D9\u5C0D\u8C61\u5167\u3002 - +ECP_METADATA_DEV_0049=\u8CC7\u6599\u5EAB\u4E2D\u4E0D\u5B58\u5728\u6B64\u5143\u6578\u64DA[{0}] +ECP_METADATA_DEV_0050=[{0}]\u4E2D\u7684\u5143\u6578\u64DA\u5305[{1}]\u4E0D\u5305\u542B\u6B64\u5143\u6578\u64DA\uFF1A[{2}] +ECP_METADATA_DEV_0051=\u5728\u5DE5\u7A0B[{0}]\u53CA\u5176\u4F9D\u8CF4\u4E2D\uFF0C\u7121\u6CD5\u627E\u5230\u5143\u6578\u64DA[{1}] ECP_MAVEN_DEV_0001=\u7372\u53D6maven\u672C\u5730\u5009\u5EAB\u5730\u5740\u51FA\u932F\uFF0C\u8ACB\u6AA2\u67E5settings.xml\u914D\u7F6E ECP_MAVEN_DEV_0002=\u8ACB\u914D\u7F6Emaven\u74B0\u5883\u8B8A\u91CF\uFF01MAVEN_HOME=... ECP_MAVEN_DEV_0003=\u5BEB\u5165pom\u6587\u4EF6\u5931\u6557[{0}]-[{1}] diff --git a/metadata-service-dev-common/src/main/java/com/inspur/edp/lcm/metadata/common/Utils.java b/metadata-service-dev-common/src/main/java/com/inspur/edp/lcm/metadata/common/Utils.java index 1572b6f8d277e4a85320929a6a6c2660ecb25039..b7ab058989e6f668e3e00e3031c4a11f53c9896f 100644 --- a/metadata-service-dev-common/src/main/java/com/inspur/edp/lcm/metadata/common/Utils.java +++ b/metadata-service-dev-common/src/main/java/com/inspur/edp/lcm/metadata/common/Utils.java @@ -26,7 +26,6 @@ import com.inspur.edp.lcm.metadata.api.exception.LcmFileDevException; import com.inspur.edp.lcm.metadata.api.exception.LcmMetadataDevException; import com.inspur.edp.lcm.metadata.common.configuration.GspProjectExtendHelper; import com.inspur.edp.lcm.metadata.common.configuration.MetadataTypeHelper; -import com.inspur.edp.lcm.metadata.common.configuration.WorkspaceHelper; import com.inspur.edp.lcm.metadata.devcommon.ManagerUtils; import io.iec.edp.caf.boot.context.CAFContext; import io.iec.edp.caf.commons.runtime.CafEnvironment; @@ -447,4 +446,17 @@ public class Utils extends ServiceUtils { } return null; } + + /** + * NPE异常校验 + * + * @param obj + * @param errorCodes + * @param params + */ + public static void checkNPE(Object obj, ErrorCodes errorCodes, String... params) { + if (obj == null) { + throw new LcmMetadataDevException(errorCodes, params); + } + } } diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/I18nCoreService.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/I18nCoreService.java index 9cb79887f0c3d161c5dc88cface719b7fa8579a0..b0b62f62b96ca0c4c5b0df83c6187a2c4e581d4a 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/I18nCoreService.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/I18nCoreService.java @@ -153,7 +153,7 @@ public class I18nCoreService { private String getMetadataSuffix(String type) { MetadataType metadataType = MetadataTypeHelper.getInstance().getMetadataTypes().stream().filter(mt -> type.equals(mt.getTypeCode())).findFirst().orElse(null); - Utils.checkNPE(metadataType, "此类型元数据:" + type + ",在配置文件中不存在。"); + Utils.checkNPE(metadataType, ErrorCodes.ECP_CONFIG_RESOLVE_DEV_0007, type); return metadataType.getPostfix(); } diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataCoreManager.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataCoreManager.java index 643c4be7de10d521517500f858802b2c5ce3b265..3f7eefbcc382ac8765ed6a42b4f1c5dcce1d54be 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataCoreManager.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataCoreManager.java @@ -121,7 +121,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; @@ -322,7 +321,7 @@ public class MetadataCoreManager { public GspMetadata loadMetadataByMetadataId(String metadataId, String absolutePath) { final List metadataList = getMetadataList(absolutePath); GspMetadata metadata = metadataList.stream().filter(md -> md.getHeader().getId().equals(metadataId)).findFirst().orElse(null); - Utils.checkNPE(metadata, "工程" + absolutePath + "中找不到元数据" + metadataId); + Utils.checkNPE(metadata, ErrorCodes.ECP_METADATA_DEV_0035, metadataId, absolutePath); return getI18nMetadata(metadata.getHeader().getFileName(), metadata.getRelativePath(), RuntimeContext.getLanguage()); } @@ -793,7 +792,7 @@ public class MetadataCoreManager { public boolean isMetadataExistInProject(String projPath, String metadataID) { MetadataProject metadataProjInfo = metadataProjectCoreService.getMetadataProjInfo(projPath); - Utils.checkNPE(metadataProjInfo, "获取的元数据工程信息为空,参数为projPath:" + projPath); + Utils.checkNPE(metadataProjInfo, ErrorCodes.ECP_METADATA_DEV_0004, projPath); List metadataList = getMetadataList(metadataProjInfo.getProjectPath()); return metadataList.stream().anyMatch(metadata -> metadata.getHeader().getId().equals(metadataID)); } @@ -806,7 +805,7 @@ public class MetadataCoreManager { */ public GspMetadata loadMetadataInProjectByMetadataID(String projPath, String metadataID) { MetadataProject metadataProjInfo = metadataProjectCoreService.getMetadataProjInfo(projPath); - Utils.checkNPE(metadataProjInfo, "获取的元数据工程信息为空,参数为projPath:" + projPath); + Utils.checkNPE(metadataProjInfo, ErrorCodes.ECP_METADATA_DEV_0004, projPath); List metadataList = getMetadataList(metadataProjInfo.getProjectPath()); return metadataList.stream().filter(metadata -> metadata.getHeader().getId().equals(metadataID)).findFirst().orElse(null); } @@ -818,7 +817,7 @@ public class MetadataCoreManager { public MetadataHeader getRefMetadataHeader(String metadataID, String absolutePath) { GspMetadata metadata = getRefMetadata(metadataID, absolutePath); - Utils.checkNPE(metadata, "在工程" + absolutePath + "及其依赖中,无法找到元数据" + metadataID); + Utils.checkNPE(metadata, ErrorCodes.ECP_METADATA_DEV_0051, absolutePath, metadataID); return metadata.getHeader(); } @@ -1545,7 +1544,7 @@ public class MetadataCoreManager { private Metadata4Ref pickRefedMdIndex(String currentPath, MetadataIndexItemDto metadataIndexItemDto, boolean isNeedMdDto, String packagePath, String mavenPath) { validateRemoteMdIndex(metadataIndexItemDto); MetadataProject metadataProject = getMetadataProjInfo(currentPath); - Utils.checkNPE(metadataProject, "Path is invalid project folder:" + currentPath); + Utils.checkNPE(metadataProject, ErrorCodes.ECP_METADATA_DEV_0004, currentPath); String groupId = metadataIndexItemDto.getRepoPkg().get(0).getGroupId(); String artifactId = metadataIndexItemDto.getRepoPkg().get(0).getArtifactId(); @@ -1570,7 +1569,7 @@ public class MetadataCoreManager { if (isNeedMdDto) { String metadataPackagePath = fileService.getCombinePath(mavenPath, groupId + '-' + artifactId + '-' + version); metadata = getMetadataFromPackage(metadataIndexItemDto.getMdPkgName(), metadataPackagePath, metadataIndexItemDto.getId()); - Utils.checkNPE(metadata, metadataPackagePath + "中的原数据包" + metadataIndexItemDto.getMdPkgName() + "不包含此元数据:" + metadataIndexItemDto.getId()); + Utils.checkNPE(metadata, ErrorCodes.ECP_METADATA_DEV_0050, metadataPackagePath, metadataIndexItemDto.getMdPkgName(), metadataIndexItemDto.getId()); } return metadata; @@ -1579,7 +1578,7 @@ public class MetadataCoreManager { private Metadata4Ref pickRemoteMdIndex(String currentPath, MetadataIndexItemDto metadataIndexItemDto, boolean isNeedMdDto, String packagePath, String mavenPath) { validateRemoteMdIndex(metadataIndexItemDto); MetadataProject metadataProject = getMetadataProjInfo(currentPath); - Utils.checkNPE(metadataProject, "Path is invalid project folder:" + currentPath); + Utils.checkNPE(metadataProject, ErrorCodes.ECP_METADATA_DEV_0004, currentPath); String groupId = metadataIndexItemDto.getRepoPkg().get(0).getGroupId(); String artifactId = metadataIndexItemDto.getRepoPkg().get(0).getArtifactId(); @@ -1608,7 +1607,8 @@ public class MetadataCoreManager { if (isNeedMdDto) { String metadataPackagePath = fileService.getCombinePath(mavenPath, groupId + '-' + artifactId + '-' + version); metadata = getMetadataFromPackage(metadataIndexItemDto.getMdPkgName(), metadataPackagePath, metadataIndexItemDto.getId()); - Utils.checkNPE(metadata, metadataPackagePath + "中的原数据包" + metadataIndexItemDto.getMdPkgName() + "不包含此元数据:" + metadataIndexItemDto.getId()); + Utils.checkNPE(metadata, ErrorCodes.ECP_METADATA_DEV_0050, metadataPackagePath, metadataIndexItemDto.getMdPkgName(), metadataIndexItemDto.getId()); + } MetadataPackageHeader metadataPackageHeader = new MetadataPackageHeader(); @@ -1633,7 +1633,7 @@ public class MetadataCoreManager { String mdPkgFullName = mdPkgName + Utils.getMetadataPackageExtension(); // 获取工程信息 MetadataProject metadataProject = getMetadataProjInfo(currentPath); - Utils.checkNPE(metadataProject, "Path is invalid project folder:" + currentPath); + Utils.checkNPE(metadataProject, ErrorCodes.ECP_METADATA_DEV_0004, currentPath); // 本地是否存在 if (!MetadataIndexCacheService.getInstance().isExistInLocalPackages(mdPkgName)) { throw new IllegalArgumentException("Local package: " + mdPkgName + " not exists"); @@ -1643,7 +1643,7 @@ public class MetadataCoreManager { if (isNeedMdDto) { String metadataPackagePath = fileService.getCombinePath(packagePath, mdPkgFullName); metadata = getMetadataFromPackage(mdPkgFullName, metadataPackagePath, metadataIndexItemDto.getId()); - Utils.checkNPE(metadata, metadataPackagePath + "中的元数据包" + metadataIndexItemDto.getMdPkgName() + "不包含此元数据:" + metadataIndexItemDto.getId()); + Utils.checkNPE(metadata, ErrorCodes.ECP_METADATA_DEV_0050, metadataPackagePath, metadataIndexItemDto.getMdPkgName(), metadataIndexItemDto.getId()); } MetadataPackageHeader metadataPackageHeader = new MetadataPackageHeader(); @@ -1657,7 +1657,7 @@ public class MetadataCoreManager { private Metadata4RefForDB pickDBMdIndex(String currentPath, MetadataIndexItemDto metadataIndexItemDto, boolean isNeedMdDto) { // 获取工程信息 MetadataProject metadataProject = getMetadataProjInfo(currentPath); - Utils.checkNPE(metadataProject, "Path is invalid project folder:" + currentPath); + Utils.checkNPE(metadataProject, ErrorCodes.ECP_METADATA_DEV_0004, currentPath); Metadata4RefForDB metadata4Ref = new Metadata4RefForDB(); if (isNeedMdDto) { @@ -1667,7 +1667,7 @@ public class MetadataCoreManager { metadataCustomizationFilter.setMetadataId(metadataIndexItemDto.getId()); metadataCustomizationFilter.setIsI18n(false); GspMetadata gspMetadata = getMetadataRTService().getMetadata(metadataCustomizationFilter); - Utils.checkNPE(gspMetadata, "数据库中不存在此元数据: " + metadataIndexItemDto.getId()); + Utils.checkNPE(gspMetadata, ErrorCodes.ECP_METADATA_DEV_0049, metadataIndexItemDto.getId()); if (Objects.isNull(gspMetadata.getHeader().getFileName())) { gspMetadata.getHeader().setFileName(gspMetadata.getHeader().getName()); } @@ -1685,7 +1685,7 @@ public class MetadataCoreManager { } else { // 查询mdpkg元数据信息 Metadata4Ref re = getMetadata4Ref(metadataIndexItemDto.getId()); - Utils.checkNPE(re, "数据库中不存在此元数据: " + metadataIndexItemDto.getId()); + Utils.checkNPE(re, ErrorCodes.ECP_METADATA_DEV_0049, metadataIndexItemDto.getId()); metadata4Ref.setMetadata(re.getMetadata()); metadata4Ref.setPackageHeader(re.getPackageHeader()); // 白名单过滤:平台及产品部公共元数据不提示跨SU引用信息 @@ -1697,7 +1697,7 @@ public class MetadataCoreManager { } } } - } else if (Objects.isNull(metadataIndexItemDto.getMdPkgName())){ + } else if (Objects.isNull(metadataIndexItemDto.getMdPkgName())) { // 不需要返回元数据信息时, 元数据不为包下元数据时需要判断其是否运行时定制元数据,若为运行时定制,则获取其包信息 Metadata4Ref pkgMetadata = getBasicPkgMetadataByExtMdId(metadataIndexItemDto.getId(), null); if (pkgMetadata != null && pkgMetadata.getPackageHeader() != null) { diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataProjectCoreService.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataProjectCoreService.java index 51a23fbc09d7132f862439c52a7ab03936626991..cde29e4356a80a91694fc695331ae48e085e2d4a 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataProjectCoreService.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/MetadataProjectCoreService.java @@ -170,7 +170,7 @@ public class MetadataProjectCoreService { public ProcessMode getProcessMode(String absolutePath) { final MetadataProject metadataProjInfo = getMetadataProjInfo(absolutePath); - Utils.checkNPE(metadataProjInfo, "无法获取元数据工程信息:" + absolutePath); + Utils.checkNPE(metadataProjInfo, ErrorCodes.ECP_METADATA_DEV_0004, absolutePath); return metadataProjInfo.getMetadataPackageInfo().getProcessMode() == null ? ProcessMode.generation : metadataProjInfo.getMetadataPackageInfo().getProcessMode(); } diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/NoCodeCoreService.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/NoCodeCoreService.java index afcacfeef2eaeb64ac00152d90ac03baf9c0d63c..668905b98d30c7a528dee7e1518121c9cdbcb2bb 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/NoCodeCoreService.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/NoCodeCoreService.java @@ -111,7 +111,7 @@ public class NoCodeCoreService { try { response = client.invoke(MetadataDto.class, "com.inspur.edp.lcm.metadata.serverapi.NoCodeServerService.getMetadata", "Lcm", params, null); } catch (Exception e) { - throw new LcmMetadataDevException(e, ErrorCodes.ECP_METADATA_DEV_0008, "com.inspur.edp.lcm.metadata.serverapi.NoCodeServerService.getMetadata", metadata.getHeader().getId()); + throw new LcmMetadataDevException(e, ErrorCodes.ECP_METADATA_DEV_0008, "com.inspur.edp.lcm.metadata.serverapi.NoCodeServerService.getMetadata", metadataId); } metadata = MetadataDtoConverter.asMetadata(response); if (metadata == null) { diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java index b19b0a9d7b327e995de75588ff08b7c557df22d9..858654b36a29d1338e9b362f1e4cfcac4161b45a 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java @@ -101,7 +101,6 @@ import java.io.StringWriter; import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; @@ -314,7 +313,7 @@ public class PackageCoreService { MetadataProjectCoreService projectCoreService = new MetadataProjectCoreService(); absolutePath = projectCoreService.getProjPath(absolutePath); MetadataProject metadataProjInfo = projectCoreService.getMetadataProjInfo(absolutePath); - Utils.checkNPE(metadataProjInfo, "获取元数据工程信息失败,工程路径为:" + absolutePath); + Utils.checkNPE(metadataProjInfo, ErrorCodes.ECP_METADATA_DEV_0004, absolutePath); List mavenPackageRefsList = metadataProjInfo.getMavenPackageRefs(); if (Utils.isNullOrEmpty(mavenPackageRefsList)) { diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/persistence/SourceDataRepository.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/persistence/SourceDataRepository.java index c08b2fbc747cfc1107be3011a8d1d0d1f4c7fb79..8d05b100a35d561fde4b1924743305a7930f9242 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/persistence/SourceDataRepository.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/persistence/SourceDataRepository.java @@ -17,6 +17,7 @@ package com.inspur.edp.lcm.metadata.core.persistence; import com.inspur.edp.lcm.metadata.api.entity.OperationEnum; +import com.inspur.edp.lcm.metadata.api.exception.ErrorCodes; import com.inspur.edp.lcm.metadata.common.FileServiceImp; import com.inspur.edp.lcm.metadata.common.Utils; import com.inspur.edp.lcm.metadata.common.util.PropertiesUtil; @@ -123,7 +124,7 @@ public class SourceDataRepository { * @return 文件是否变化 */ public boolean isFileChanged(String projPath, String key, String value, OperationEnum operationEnum) { - Utils.checkNPE(value, "value不可为空"); + Utils.checkNPE(value, ErrorCodes.ECP_METADATA_DEV_0005, "value"); String recordFilePath = FileServiceImp.combinePath(projPath, Utils.getMetadataProjPath(), Utils.getMetadataBinPath(), operationEnum.toString()); if (!new File(recordFilePath).exists()) { return true; diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/refi18n/RefLocationFilter.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/refi18n/RefLocationFilter.java index ba2e75c6f0a4128a8c3e84843e2c186c8d9e07b4..ef87fe20ea71cd164bb229a5be0c7b43beb02fae 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/refi18n/RefLocationFilter.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/refi18n/RefLocationFilter.java @@ -17,9 +17,8 @@ package com.inspur.edp.lcm.metadata.core.refi18n; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; -import com.inspur.edp.lcm.metadata.api.entity.Metadata4Ref; -import com.inspur.edp.lcm.metadata.api.entity.MetadataPackage; import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; +import com.inspur.edp.lcm.metadata.api.exception.ErrorCodes; import com.inspur.edp.lcm.metadata.api.service.FileService; import com.inspur.edp.lcm.metadata.common.Utils; import com.inspur.edp.lcm.metadata.core.MetadataCoreManager; @@ -27,7 +26,6 @@ import com.inspur.edp.lcm.metadata.core.MetadataProjectCoreService; import com.inspur.edp.lcm.metadata.core.index.ProjectMetadataCacheService; import io.iec.edp.caf.commons.utils.SpringBeanUtils; -import java.io.File; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -41,7 +39,7 @@ public class RefLocationFilter implements IRefI18nFilter { public List getRefI18nMetadata(String resourceMdID, String resourceFileName, String path) { //从工程引用范围内,查找包依赖的元数据内容 MetadataProject metadataProject = MetadataProjectCoreService.getCurrent().getMetadataProjInfo(path); - Utils.checkNPE(metadataProject, "获取的元数据工程信息为null,参数为projPath:" + path); + Utils.checkNPE(metadataProject, ErrorCodes.ECP_METADATA_DEV_0004, path); // 从当前工程及bo下的引用的工程下搜索 List metadataFromProjects = getMetadataFromProjects(resourceMdID, metadataProject); diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/thread/BoGraphThreadLocalHolder.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/thread/BoGraphThreadLocalHolder.java index c60b233aeb7b31433e19dfe2deca6dbdb2ac27d8..a7f153df5e61e945ff0736816200ede99f2d935a 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/thread/BoGraphThreadLocalHolder.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/thread/BoGraphThreadLocalHolder.java @@ -79,20 +79,20 @@ public class BoGraphThreadLocalHolder { if (dependencyGraphBoPathSet.get() == null) { return false; } - return dependencyGraphBoPathSet.get().contains(boPath); + return dependencyGraphBoPathSet.get().contains(Utils.handlePath(boPath)); } public static void put(String boPath) { if (dependencyGraphBoPathSet.get() == null) { return; } - dependencyGraphBoPathSet.get().add(boPath); + dependencyGraphBoPathSet.get().add(Utils.handlePath(boPath)); } public static void remove(String boPath) { if (dependencyGraphBoPathSet.get() == null) { return; } - dependencyGraphBoPathSet.get().remove(boPath); + dependencyGraphBoPathSet.get().remove(Utils.handlePath(boPath)); } } diff --git a/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MdServiceWebApi.java b/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MdServiceWebApi.java index 3873ff5525946986d5e390471755df0414c17173..94dbb07df990bd57b70cd58c892f752edf4d7b0e 100644 --- a/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MdServiceWebApi.java +++ b/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MdServiceWebApi.java @@ -372,7 +372,7 @@ public class MdServiceWebApi { @Path(value = "/metadata") public MetadataDto loadMetadataByMetadataId(String metadataId, String path) { final GspMetadata metadata = getMetadataService().loadMetadataByMetadataId(metadataId, path); - Utils.checkNPE(metadata, "工程" + path + "中找不到元数据:" + metadataId); + Utils.checkNPE(metadata, ErrorCodes.ECP_METADATA_DEV_0035, metadataId, path); return MetadataDtoConverter.asDto(metadata); } diff --git a/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MetadataServiceWebApi.java b/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MetadataServiceWebApi.java index aa22da5d48bfed86d261aadcca9d52fc1450524c..d0680121bebdbdc9f5d9102499e85167d208ea5f 100644 --- a/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MetadataServiceWebApi.java +++ b/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/MetadataServiceWebApi.java @@ -556,7 +556,7 @@ public class MetadataServiceWebApi { @Path(value = "/metadata") public MetadataDto loadMetadataByMetadataId(@QueryParam(value = "metadataId") String metadataId, @QueryParam(value = "path") String path) { final GspMetadata metadata = getMetadataService().loadMetadataByMetadataId(metadataId, path); - Utils.checkNPE(metadata, "工程" + path + "中找不到元数据:" + metadataId); + Utils.checkNPE(metadata, ErrorCodes.ECP_METADATA_DEV_0035, metadataId, path); return MetadataDtoConverter.asDto(metadata); }