From 01a041661db4a76b4a7d9a66f78a8593b155a914 Mon Sep 17 00:00:00 2001 From: Q-Lee Date: Fri, 16 Apr 2021 15:26:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BA=86model->common=E6=A8=A1=E5=9D=97=E4=B8=8B=E6=B6=89?= =?UTF-8?q?=E5=8F=8Alcm=E7=B1=BB=E7=9A=84=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ubml/model/be/definition/GspBusinessEntity.java | 2 +- .../edp/lcm/metadata/api}/AbstractMetadataContent.java | 2 +- .../inspur/edp/lcm/metadata/api}/IMdExtRuleContent.java | 2 +- .../inspur/edp/lcm/metadata/api}/IMetadataContent.java | 2 +- .../inspur/edp/lcm/metadata/api}/entity/GspMetadata.java | 4 +++- .../edp/lcm/metadata/api}/entity/I18nResourceItem.java | 2 +- .../metadata/api}/entity/I18nResourceItemCollection.java | 2 +- .../inspur/edp/lcm/metadata/api}/entity/MetadataHeader.java | 2 +- .../edp/lcm/metadata/api}/entity/MetadataProperties.java | 2 +- .../edp/lcm/metadata/api}/entity/MetadataReference.java | 2 +- .../lcm/metadata/api}/entity/MetadataReferenceDetail.java | 2 +- .../cef/i18n/context/CefResourceExtractContext.java | 4 ++-- .../cef/i18n/context/CefResourceMergeContext.java | 2 +- .../cef/i18n/context/ICefResourceMergeContext.java | 2 +- .../definition/cef/i18n/merger/CefFieldResourceMerger.java | 2 +- .../definition/cef/i18n/merger/DataTypeResourceMerger.java | 2 +- .../definition/commonmodel/entity/GspCommonModel.java | 2 +- .../model/externalapi/definition/entity/ExternalApi.java | 2 +- .../definition/temp/lcm/CustomizationRtService.java | 2 +- .../definition/temp/lcm/CustomizationService.java | 2 +- .../definition/temp/lcm/DimensionExtendEntity.java | 2 +- .../definition/temp/lcm/IMetadataCacheExtService.java | 2 +- .../definition/temp/lcm/IMetadataReferenceManager.java | 4 ++-- .../definition/temp/lcm/IMetadataRtReferenceManager.java | 4 ++-- .../model/externalapi/definition/temp/lcm/JitContext.java | 2 +- .../definition/temp/lcm/MetadataContentManager.java | 2 +- .../externalapi/definition/temp/lcm/MetadataService.java | 2 +- .../externalapi/definition/temp/lcm/RefCommonService.java | 2 +- .../model/externalapi/definition/util/MetadataUtil.java | 2 +- .../externalapi/devtime/api/ExternalApiMetadataService.java | 2 +- .../devtime/core/initializer/ExternalApiInitializer.java | 2 +- .../devtime/core/manager/ExternalApiProviderManager.java | 2 +- .../devtime/core/provider/ExternalApiMetadataBuilder.java | 4 ++-- .../externalapi/devtime/core/provider/MetadataUtils.java | 2 +- .../devtime/core/provider/SimpleViewModelProvider.java | 2 +- .../devtime/core/provider/ViewModelProvider.java | 2 +- .../devtime/core/refer/ExternalApiReferenceConstraint.java | 4 ++-- .../core/service/ExternalApiMetadataServiceImpl.java | 2 +- .../devtime/core/utils/MetadataProjectUtils.java | 2 +- .../ubml/mode/externalapi/devtime/spi/ResourceProvider.java | 2 +- .../externalapi/provider/viewmodel/BasicActionProvider.java | 2 +- .../externalapi/provider/viewmodel/BasicActionSummary.java | 2 +- .../provider/viewmodel/CustomActionProvider.java | 2 +- .../externalapi/provider/viewmodel/CustomActionSummary.java | 2 +- .../provider/viewmodel/SimpleBasicActionProvider.java | 2 +- .../provider/viewmodel/SimpleBasicActionSummary.java | 2 +- .../provider/viewmodel/SimpleCustomActionProvider.java | 2 +- .../provider/viewmodel/SimpleCustomActionSummary.java | 2 +- .../provider/viewmodel/utils/SimpleViewModelUtils.java | 2 +- .../provider/viewmodel/utils/ViewModelUtils.java | 2 +- .../model/externalapi/generator/ExternalApiRtHandler.java | 4 ++-- .../externalapi/generator/dt/ExternalApiDtHandler.java | 4 ++-- .../generator/dt/ExternalApiJavaCodeGenerator.java | 2 +- .../runtime/api/ExternalApiCustomizedMetadataService.java | 2 +- .../externalapi/runtime/api/ExternalApiMetadataService.java | 2 +- .../runtime/core/constraint/ExternalApiRTRefConstraint.java | 4 ++-- .../runtime/core/customize/entity/CustomizeUnitGetter.java | 2 +- .../customize/listener/SgfMdPkgChangedEventListener.java | 2 +- .../listener/SgfMetadataCacheExtServiceListener.java | 2 +- .../externalapi/runtime/core/serializer/JsonSerializer.java | 2 +- .../runtime/core/serializer/TransferSerializer.java | 2 +- .../DefaultExternalApiCustomizedMetadataService.java | 4 ++-- .../core/service/DefaultExternalApiMetadataService.java | 4 ++-- .../runtime/core/service/ExternalApiJavaCodeHandler.java | 2 +- .../inspur/edp/lcm/metadata/api/entity/I18nResource.java | 2 -- .../inspur/edp/lcm/metadata/api/entity/Metadata4Ref.java | 2 -- .../com/inspur/edp/lcm/metadata/api/entity/MetadataDto.java | 2 -- .../inspur/edp/lcm/metadata/api/entity/MetadataPackage.java | 1 - .../edp/lcm/metadata/api/service/RefCommonService.java | 2 +- .../edp/lcm/metadata/spi/IMetadataReferenceManager.java | 4 ++-- .../inspur/edp/lcm/metadata/spi/MetadataContentManager.java | 2 +- .../edp/lcm/metadata/spi/MetadataContentSerializer.java | 2 +- .../edp/lcm/metadata/spi/MetadataTransferSerializer.java | 2 +- .../edp/lcm/metadata/api/service/MetadataService.java | 6 +++--- .../java/com/inspur/edp/jittojava/context/JitContext.java | 2 +- .../edp/jittojava/context/temp/RefCommonServiceImp.java | 2 +- .../org/openatom/ubml/model/vo/definition/GspViewModel.java | 2 +- 77 files changed, 88 insertions(+), 93 deletions(-) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition/entity => com/inspur/edp/lcm/metadata/api}/AbstractMetadataContent.java (95%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition/entity => com/inspur/edp/lcm/metadata/api}/IMdExtRuleContent.java (92%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition/entity => com/inspur/edp/lcm/metadata/api}/IMetadataContent.java (92%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition => com/inspur/edp/lcm/metadata/api}/entity/GspMetadata.java (97%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition => com/inspur/edp/lcm/metadata/api}/entity/I18nResourceItem.java (97%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition => com/inspur/edp/lcm/metadata/api}/entity/I18nResourceItemCollection.java (97%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition => com/inspur/edp/lcm/metadata/api}/entity/MetadataHeader.java (98%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition => com/inspur/edp/lcm/metadata/api}/entity/MetadataProperties.java (95%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition => com/inspur/edp/lcm/metadata/api}/entity/MetadataReference.java (97%) rename model/common/definition/src/main/java/{org/openatom/ubml/model/common/definition => com/inspur/edp/lcm/metadata/api}/entity/MetadataReferenceDetail.java (96%) diff --git a/model/be/definition/src/main/java/org/openatom/ubml/model/be/definition/GspBusinessEntity.java b/model/be/definition/src/main/java/org/openatom/ubml/model/be/definition/GspBusinessEntity.java index 9a29627..e5b68b2 100644 --- a/model/be/definition/src/main/java/org/openatom/ubml/model/be/definition/GspBusinessEntity.java +++ b/model/be/definition/src/main/java/org/openatom/ubml/model/be/definition/GspBusinessEntity.java @@ -34,7 +34,7 @@ import org.openatom.ubml.model.be.definition.operation.internalmgraction.Retriev import org.openatom.ubml.model.common.definition.commonmodel.IGspCommonModel; import org.openatom.ubml.model.common.definition.commonmodel.IGspCommonObject; import org.openatom.ubml.model.common.definition.commonmodel.entity.GspCommonModel; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; /** * The Definition Of Business Entity Metadata diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/AbstractMetadataContent.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/AbstractMetadataContent.java similarity index 95% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/AbstractMetadataContent.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/AbstractMetadataContent.java index c401a49..60d83f6 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/AbstractMetadataContent.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/AbstractMetadataContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api; /** * The type AbstractMetadataContent diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/IMdExtRuleContent.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/IMdExtRuleContent.java similarity index 92% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/IMdExtRuleContent.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/IMdExtRuleContent.java index 753cd45..f84a555 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/IMdExtRuleContent.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/IMdExtRuleContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api; /** * The type IMdExtRuleContent diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/IMetadataContent.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/IMetadataContent.java similarity index 92% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/IMetadataContent.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/IMetadataContent.java index 69ef985..5c479f7 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/IMetadataContent.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/IMetadataContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api; /** * The type IMetadataContent diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/GspMetadata.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/GspMetadata.java similarity index 97% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/GspMetadata.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/GspMetadata.java index d56f336..0c470d3 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/GspMetadata.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/GspMetadata.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api.entity; +import com.inspur.edp.lcm.metadata.api.IMdExtRuleContent; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; import java.util.ArrayList; import java.util.List; import org.openatom.ubml.common.util.StringUtils; diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/I18nResourceItem.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResourceItem.java similarity index 97% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/I18nResourceItem.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResourceItem.java index 3a47639..c5cf118 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/I18nResourceItem.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResourceItem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api.entity; public class I18nResourceItem { diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/I18nResourceItemCollection.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResourceItemCollection.java similarity index 97% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/I18nResourceItemCollection.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResourceItemCollection.java index e1ccdec..297efee 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/I18nResourceItemCollection.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResourceItemCollection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api.entity; import java.util.ArrayList; diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataHeader.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataHeader.java similarity index 98% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataHeader.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataHeader.java index 7dfacd1..b5f9281 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataHeader.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataHeader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api.entity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataProperties.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataProperties.java similarity index 95% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataProperties.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataProperties.java index 144d151..2ad3749 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataProperties.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api.entity; /** * The type MetadataProperties diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataReference.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataReference.java similarity index 97% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataReference.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataReference.java index e190ada..5f97035 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataReference.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataReference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api.entity; import java.util.ArrayList; import java.util.List; diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataReferenceDetail.java b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataReferenceDetail.java similarity index 96% rename from model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataReferenceDetail.java rename to model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataReferenceDetail.java index 9e75b52..1ad3107 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/entity/MetadataReferenceDetail.java +++ b/model/common/definition/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataReferenceDetail.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openatom.ubml.model.common.definition.entity; +package com.inspur.edp.lcm.metadata.api.entity; /** * The type MetadataReferenceDetail diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceExtractContext.java b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceExtractContext.java index 2a58611..81a2211 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceExtractContext.java +++ b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceExtractContext.java @@ -16,8 +16,8 @@ package org.openatom.ubml.model.common.definition.cef.i18n.context; import org.openatom.ubml.model.common.definition.cef.util.DataValidator; -import org.openatom.ubml.model.common.definition.entity.I18nResourceItem; -import org.openatom.ubml.model.common.definition.entity.I18nResourceItemCollection; +import com.inspur.edp.lcm.metadata.api.entity.I18nResourceItem; +import com.inspur.edp.lcm.metadata.api.entity.I18nResourceItemCollection; /** * 多语资源项抽取上下文 diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceMergeContext.java b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceMergeContext.java index f345968..fd47330 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceMergeContext.java +++ b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/CefResourceMergeContext.java @@ -16,7 +16,7 @@ package org.openatom.ubml.model.common.definition.cef.i18n.context; import org.openatom.ubml.model.common.definition.cef.util.DataValidator; -import org.openatom.ubml.model.common.definition.entity.I18nResourceItemCollection; +import com.inspur.edp.lcm.metadata.api.entity.I18nResourceItemCollection; public class CefResourceMergeContext implements ICefResourceMergeContext { diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/ICefResourceMergeContext.java b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/ICefResourceMergeContext.java index 6d38a26..4e25959 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/ICefResourceMergeContext.java +++ b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/context/ICefResourceMergeContext.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.common.definition.cef.i18n.context; -import org.openatom.ubml.model.common.definition.entity.I18nResourceItemCollection; +import com.inspur.edp.lcm.metadata.api.entity.I18nResourceItemCollection; public interface ICefResourceMergeContext { diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/CefFieldResourceMerger.java b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/CefFieldResourceMerger.java index c13bf1a..fbeba12 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/CefFieldResourceMerger.java +++ b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/CefFieldResourceMerger.java @@ -23,7 +23,7 @@ import org.openatom.ubml.model.common.definition.cef.element.GspEnumValue; import org.openatom.ubml.model.common.definition.cef.i18n.context.ICefResourceMergeContext; import org.openatom.ubml.model.common.definition.cef.i18n.names.CefResourceKeyNames; import org.openatom.ubml.model.common.definition.cef.increment.merger.MergeUtils; -import org.openatom.ubml.model.common.definition.entity.I18nResourceItemCollection; +import com.inspur.edp.lcm.metadata.api.entity.I18nResourceItemCollection; public abstract class CefFieldResourceMerger extends AbstractResourceMerger { diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/DataTypeResourceMerger.java b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/DataTypeResourceMerger.java index c640a62..f2658fb 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/DataTypeResourceMerger.java +++ b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/cef/i18n/merger/DataTypeResourceMerger.java @@ -20,7 +20,7 @@ import org.openatom.ubml.model.common.definition.cef.IGspCommonDataType; import org.openatom.ubml.model.common.definition.cef.IGspCommonField; import org.openatom.ubml.model.common.definition.cef.i18n.context.ICefResourceMergeContext; import org.openatom.ubml.model.common.definition.cef.i18n.names.CefResourceKeyNames; -import org.openatom.ubml.model.common.definition.entity.I18nResourceItemCollection; +import com.inspur.edp.lcm.metadata.api.entity.I18nResourceItemCollection; import static org.openatom.ubml.model.common.definition.cef.increment.merger.MergeUtils.getKeyPrefix; diff --git a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/commonmodel/entity/GspCommonModel.java b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/commonmodel/entity/GspCommonModel.java index dafb04d..335e9d7 100644 --- a/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/commonmodel/entity/GspCommonModel.java +++ b/model/common/definition/src/main/java/org/openatom/ubml/model/common/definition/commonmodel/entity/GspCommonModel.java @@ -26,7 +26,7 @@ import org.openatom.ubml.model.common.definition.commonmodel.IGspCommonElement; import org.openatom.ubml.model.common.definition.commonmodel.IGspCommonModel; import org.openatom.ubml.model.common.definition.commonmodel.IGspCommonObject; import org.openatom.ubml.model.common.definition.commonmodel.entity.element.GspCommonAssociation; -import org.openatom.ubml.model.common.definition.entity.AbstractMetadataContent; +import com.inspur.edp.lcm.metadata.api.AbstractMetadataContent; /** * The Definition Of Common Model diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/entity/ExternalApi.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/entity/ExternalApi.java index 4e10bad..e456d5e 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/entity/ExternalApi.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/entity/ExternalApi.java @@ -18,7 +18,7 @@ package org.openatom.ubml.model.externalapi.definition.entity; import java.text.MessageFormat; import java.util.ArrayList; import org.openatom.ubml.common.util.JacksonJsonUtil; -import org.openatom.ubml.model.common.definition.entity.AbstractMetadataContent; +import com.inspur.edp.lcm.metadata.api.AbstractMetadataContent; /** * The Definition of ExternalApi. diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationRtService.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationRtService.java index b846a98..f56cde3 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationRtService.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationRtService.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.externalapi.definition.temp.lcm; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * The type CustomizationRtService diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationService.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationService.java index c2428ba..3737bf7 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationService.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/CustomizationService.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.externalapi.definition.temp.lcm; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * The type CustomizationService diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/DimensionExtendEntity.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/DimensionExtendEntity.java index edd24b3..9c58789 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/DimensionExtendEntity.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/DimensionExtendEntity.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.externalapi.definition.temp.lcm; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * The type DimensionExtendEntity diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataCacheExtService.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataCacheExtService.java index 3a63716..7d639d7 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataCacheExtService.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataCacheExtService.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.externalapi.definition.temp.lcm; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * The type IMetadataCacheExtService diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataReferenceManager.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataReferenceManager.java index a6f6961..73e6bd4 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataReferenceManager.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataReferenceManager.java @@ -16,8 +16,8 @@ package org.openatom.ubml.model.externalapi.definition.temp.lcm; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataReference; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataReference; /** * The type IMetadataReferenceManager diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataRtReferenceManager.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataRtReferenceManager.java index 8eb5d5c..466af3b 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataRtReferenceManager.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/IMetadataRtReferenceManager.java @@ -16,8 +16,8 @@ package org.openatom.ubml.model.externalapi.definition.temp.lcm; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataReference; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataReference; /** * The type IMetadataRtReferenceManager diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/JitContext.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/JitContext.java index fdba1ee..b0f5533 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/JitContext.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/JitContext.java @@ -16,7 +16,7 @@ package org.openatom.ubml.model.externalapi.definition.temp.lcm; import java.util.Map; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; /** diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataContentManager.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataContentManager.java index 940b378..2ebc734 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataContentManager.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataContentManager.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.externalapi.definition.temp.lcm; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * The type MetadataContentManager diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataService.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataService.java index 6851172..115cbc8 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataService.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/MetadataService.java @@ -16,7 +16,7 @@ package org.openatom.ubml.model.externalapi.definition.temp.lcm; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * The type MetadataService diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/RefCommonService.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/RefCommonService.java index a725d04..9e1de1d 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/RefCommonService.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/temp/lcm/RefCommonService.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.externalapi.definition.temp.lcm; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * The type RefCommonService diff --git a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/util/MetadataUtil.java b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/util/MetadataUtil.java index ba09d1f..7c02f09 100644 --- a/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/util/MetadataUtil.java +++ b/model/externalapi/definition/src/main/java/org/openatom/ubml/model/externalapi/definition/util/MetadataUtil.java @@ -17,7 +17,7 @@ package org.openatom.ubml.model.externalapi.definition.util; import java.util.HashMap; import org.openatom.ubml.common.util.JacksonJsonUtil; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.Constants; /** diff --git a/model/externalapi/devtime-api/src/main/java/org/openatom/ubml/externalapi/devtime/api/ExternalApiMetadataService.java b/model/externalapi/devtime-api/src/main/java/org/openatom/ubml/externalapi/devtime/api/ExternalApiMetadataService.java index 2c90dd1..2c50bb9 100644 --- a/model/externalapi/devtime-api/src/main/java/org/openatom/ubml/externalapi/devtime/api/ExternalApiMetadataService.java +++ b/model/externalapi/devtime-api/src/main/java/org/openatom/ubml/externalapi/devtime/api/ExternalApiMetadataService.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.externalapi.devtime.api; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.entity.ProviderType; /** diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/initializer/ExternalApiInitializer.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/initializer/ExternalApiInitializer.java index ade603c..bd2c3d4 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/initializer/ExternalApiInitializer.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/initializer/ExternalApiInitializer.java @@ -16,7 +16,7 @@ package org.openatom.ubml.model.externalapi.devtime.core.initializer; import java.util.UUID; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.temp.lcm.MetadataContentManager; diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/manager/ExternalApiProviderManager.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/manager/ExternalApiProviderManager.java index 0cf16c5..25e4483 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/manager/ExternalApiProviderManager.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/manager/ExternalApiProviderManager.java @@ -19,7 +19,7 @@ import java.text.MessageFormat; import java.util.List; import java.util.Objects; import org.openatom.ubml.mode.externalapi.devtime.spi.ResourceProvider; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.entity.Operation; import org.openatom.ubml.model.externalapi.devtime.core.cache.ResourceProviderCache; diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ExternalApiMetadataBuilder.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ExternalApiMetadataBuilder.java index a237f15..8e62abc 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ExternalApiMetadataBuilder.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ExternalApiMetadataBuilder.java @@ -22,8 +22,8 @@ import java.util.UUID; import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.JacksonJsonUtil; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataHeader; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.entity.Model; diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/MetadataUtils.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/MetadataUtils.java index c1a7879..fed59e8 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/MetadataUtils.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/MetadataUtils.java @@ -20,7 +20,7 @@ import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.StringUtils; import com.inspur.edp.lcm.metadata.api.service.GspProjectService; import com.inspur.edp.lcm.metadata.api.service.MetadataProjectService; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.temp.lcm.RefCommonService; import com.inspur.edp.lcm.metadata.api.entity.GspProject; import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/SimpleViewModelProvider.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/SimpleViewModelProvider.java index 6f67b34..642dd6a 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/SimpleViewModelProvider.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/SimpleViewModelProvider.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; import org.openatom.ubml.common.util.StringUtils; import org.openatom.ubml.mode.externalapi.devtime.spi.ExternalApiResourceProvider; import org.openatom.ubml.mode.externalapi.devtime.spi.ResourceProvider; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.entity.Operation; diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ViewModelProvider.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ViewModelProvider.java index 76513cd..a55e7c3 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ViewModelProvider.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/provider/ViewModelProvider.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.stream.Collectors; import org.openatom.ubml.mode.externalapi.devtime.spi.ExternalApiResourceProvider; import org.openatom.ubml.mode.externalapi.devtime.spi.ResourceProvider; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.entity.Operation; diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/refer/ExternalApiReferenceConstraint.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/refer/ExternalApiReferenceConstraint.java index 73676aa..576ce59 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/refer/ExternalApiReferenceConstraint.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/refer/ExternalApiReferenceConstraint.java @@ -16,8 +16,8 @@ package org.openatom.ubml.model.externalapi.devtime.core.refer; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataReference; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataReference; import org.openatom.ubml.model.externalapi.definition.temp.lcm.IMetadataReferenceManager; /** diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/service/ExternalApiMetadataServiceImpl.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/service/ExternalApiMetadataServiceImpl.java index b363efa..cf88b5b 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/service/ExternalApiMetadataServiceImpl.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/service/ExternalApiMetadataServiceImpl.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import org.openatom.ubml.common.util.StringUtils; import org.openatom.ubml.externalapi.devtime.api.ExternalApiMetadataService; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; diff --git a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/utils/MetadataProjectUtils.java b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/utils/MetadataProjectUtils.java index 6ed4aff..70b0fec 100644 --- a/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/utils/MetadataProjectUtils.java +++ b/model/externalapi/devtime-core/src/main/java/org/openatom/ubml/model/externalapi/devtime/core/utils/MetadataProjectUtils.java @@ -19,7 +19,7 @@ import java.io.IOException; import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.StringUtils; import com.inspur.edp.lcm.metadata.api.service.GspProjectService; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.temp.lcm.RefCommonService; import com.inspur.edp.lcm.metadata.api.entity.GspProject; diff --git a/model/externalapi/devtime-spi/src/main/java/org/openatom/ubml/mode/externalapi/devtime/spi/ResourceProvider.java b/model/externalapi/devtime-spi/src/main/java/org/openatom/ubml/mode/externalapi/devtime/spi/ResourceProvider.java index 7eb7b0d..8f6add0 100644 --- a/model/externalapi/devtime-spi/src/main/java/org/openatom/ubml/mode/externalapi/devtime/spi/ResourceProvider.java +++ b/model/externalapi/devtime-spi/src/main/java/org/openatom/ubml/mode/externalapi/devtime/spi/ResourceProvider.java @@ -16,7 +16,7 @@ package org.openatom.ubml.mode.externalapi.devtime.spi; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.entity.Operation; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionProvider.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionProvider.java index 4690853..747286c 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionProvider.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionProvider.java @@ -19,7 +19,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.entity.Operation; import org.openatom.ubml.model.externalapi.definition.entity.Parameter; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewModel; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionSummary.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionSummary.java index 184ec5d..bdcab4b 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionSummary.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/BasicActionSummary.java @@ -19,7 +19,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewModel; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewObject; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionProvider.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionProvider.java index f4d3d35..07bd2d2 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionProvider.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionProvider.java @@ -17,7 +17,7 @@ package org.openatom.ubml.model.externalapi.provider.viewmodel; import jdk.nashorn.internal.runtime.PropertyMap; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.entity.Operation; import org.openatom.ubml.model.externalapi.definition.entity.Parameter; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewModel; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionSummary.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionSummary.java index 603a5f0..df51562 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionSummary.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/CustomActionSummary.java @@ -18,7 +18,7 @@ package org.openatom.ubml.model.externalapi.provider.viewmodel; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewModel; import org.openatom.ubml.model.externalapi.definition.temp.vo.ViewModelAction; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionProvider.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionProvider.java index 8b03e4e..81f3f66 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionProvider.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionProvider.java @@ -16,7 +16,7 @@ package org.openatom.ubml.model.externalapi.provider.viewmodel; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.entity.Operation; import org.openatom.ubml.model.externalapi.definition.entity.Parameter; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewModel; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionSummary.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionSummary.java index d986940..a939895 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionSummary.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleBasicActionSummary.java @@ -17,7 +17,7 @@ package org.openatom.ubml.model.externalapi.provider.viewmodel; import java.util.ArrayList; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; /** diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionProvider.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionProvider.java index 84026fc..f9a7abf 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionProvider.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionProvider.java @@ -15,7 +15,7 @@ */ package org.openatom.ubml.model.externalapi.provider.viewmodel; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.entity.Operation; import org.openatom.ubml.model.externalapi.definition.entity.Parameter; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewModel; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionSummary.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionSummary.java index 393cf39..1ea9ed5 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionSummary.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/SimpleCustomActionSummary.java @@ -18,7 +18,7 @@ package org.openatom.ubml.model.externalapi.provider.viewmodel; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.temp.vo.GspViewModel; import org.openatom.ubml.model.externalapi.definition.temp.vo.ViewModelAction; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/SimpleViewModelUtils.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/SimpleViewModelUtils.java index fb9b606..921499c 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/SimpleViewModelUtils.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/SimpleViewModelUtils.java @@ -17,7 +17,7 @@ package org.openatom.ubml.model.externalapi.provider.viewmodel.utils; import java.util.ArrayList; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.entity.Operation; import org.openatom.ubml.model.externalapi.provider.viewmodel.SimpleBasicActionProvider; diff --git a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/ViewModelUtils.java b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/ViewModelUtils.java index 67b1b01..c734776 100644 --- a/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/ViewModelUtils.java +++ b/model/externalapi/extension/src/main/java/org/openatom/ubml/model/externalapi/provider/viewmodel/utils/ViewModelUtils.java @@ -17,7 +17,7 @@ package org.openatom.ubml.model.externalapi.provider.viewmodel.utils; import java.util.ArrayList; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.dto.Summary; import org.openatom.ubml.model.externalapi.definition.entity.Operation; import org.openatom.ubml.model.externalapi.provider.viewmodel.BasicActionProvider; diff --git a/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/ExternalApiRtHandler.java b/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/ExternalApiRtHandler.java index 6666c8b..a79c59e 100644 --- a/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/ExternalApiRtHandler.java +++ b/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/ExternalApiRtHandler.java @@ -24,8 +24,8 @@ import java.util.Objects; import java.util.stream.Collectors; import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.entity.Operation; diff --git a/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiDtHandler.java b/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiDtHandler.java index 8e4efcd..eca40d4 100644 --- a/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiDtHandler.java +++ b/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiDtHandler.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.entity.Operation; diff --git a/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiJavaCodeGenerator.java b/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiJavaCodeGenerator.java index 6c577cb..7a6952f 100644 --- a/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiJavaCodeGenerator.java +++ b/model/externalapi/generator/src/main/java/org/openatom/ubml/model/externalapi/generator/dt/ExternalApiJavaCodeGenerator.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; import java.util.Objects; import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.generator.ExternalApiCompileUtils; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.temp.lcm.FileService; diff --git a/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiCustomizedMetadataService.java b/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiCustomizedMetadataService.java index 1ff536b..8528e4d 100644 --- a/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiCustomizedMetadataService.java +++ b/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiCustomizedMetadataService.java @@ -15,7 +15,7 @@ */ package org.opeantom.ubml.externalapi.runtime.api; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * 运行时元数据服务接口 diff --git a/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiMetadataService.java b/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiMetadataService.java index 6df9643..f2a980e 100644 --- a/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiMetadataService.java +++ b/model/externalapi/runtime-api/src/main/java/org/opeantom/ubml/externalapi/runtime/api/ExternalApiMetadataService.java @@ -15,7 +15,7 @@ */ package org.opeantom.ubml.externalapi.runtime.api; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.temp.vo.DimensionInfo; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/constraint/ExternalApiRTRefConstraint.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/constraint/ExternalApiRTRefConstraint.java index 4bf617f..2f45b81 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/constraint/ExternalApiRTRefConstraint.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/constraint/ExternalApiRTRefConstraint.java @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.List; import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataReference; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataReference; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.temp.lcm.CustomizationService; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/entity/CustomizeUnitGetter.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/entity/CustomizeUnitGetter.java index e78f74e..290eeb5 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/entity/CustomizeUnitGetter.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/entity/CustomizeUnitGetter.java @@ -22,7 +22,7 @@ import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.externalapi.runtime.core.jit.compile.JavaSourceCode; import org.openatom.ubml.externalapi.runtime.core.service.ExternalApiJavaCodeHandler; import org.openatom.ubml.externalapi.runtime.core.service.JavaCodeInfo; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.temp.lcm.CustomizationRtService; import org.openatom.ubml.model.externalapi.definition.util.MetadataUtil; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMdPkgChangedEventListener.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMdPkgChangedEventListener.java index 3b9824e..9ec8b4f 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMdPkgChangedEventListener.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMdPkgChangedEventListener.java @@ -28,7 +28,7 @@ import org.openatom.ubml.externalapi.runtime.core.customize.deploy.CustomizeDepl import org.openatom.ubml.externalapi.runtime.core.customize.entity.CustomizeUnit; import org.openatom.ubml.externalapi.runtime.core.customize.entity.CustomizeUnitGetter; import org.openatom.ubml.externalapi.runtime.core.customize.entity.CustomizeUnitUtil; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.temp.lcm.MdPkgChangedArgs; import org.openatom.ubml.model.externalapi.definition.temp.lcm.MdPkgChangedEventListener; import org.openatom.ubml.model.externalapi.definition.util.MetadataUtil; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMetadataCacheExtServiceListener.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMetadataCacheExtServiceListener.java index 103198c..4b4b5bb 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMetadataCacheExtServiceListener.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/customize/listener/SgfMetadataCacheExtServiceListener.java @@ -18,7 +18,7 @@ package org.openatom.ubml.externalapi.runtime.core.customize.listener; import org.openatom.ubml.externalapi.runtime.core.customize.deploy.CustomizeDeploy; import org.openatom.ubml.externalapi.runtime.core.customize.entity.CustomizeUnit; import org.openatom.ubml.externalapi.runtime.core.customize.entity.CustomizeUnitGetter; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.definition.temp.lcm.IMetadataCacheExtService; import org.openatom.ubml.model.externalapi.definition.util.MetadataUtil; import org.slf4j.Logger; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/JsonSerializer.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/JsonSerializer.java index 1bf3d4f..cc78f7b 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/JsonSerializer.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/JsonSerializer.java @@ -18,7 +18,7 @@ package org.openatom.ubml.externalapi.runtime.core.serializer; import com.fasterxml.jackson.databind.JsonNode; import java.util.Objects; import org.openatom.ubml.common.util.JacksonJsonUtil; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import com.inspur.edp.lcm.metadata.spi.MetadataContentSerializer; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/TransferSerializer.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/TransferSerializer.java index 38425d3..dc18ae5 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/TransferSerializer.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/serializer/TransferSerializer.java @@ -17,7 +17,7 @@ package org.openatom.ubml.externalapi.runtime.core.serializer; import org.openatom.ubml.common.util.JacksonJsonUtil; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import com.inspur.edp.lcm.metadata.spi.MetadataTransferSerializer; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiCustomizedMetadataService.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiCustomizedMetadataService.java index 889e800..d4c251d 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiCustomizedMetadataService.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiCustomizedMetadataService.java @@ -24,8 +24,8 @@ import org.opeantom.ubml.externalapi.runtime.api.ExternalApiCustomizedMetadataSe import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.JacksonJsonUtil; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataHeader; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.entity.Model; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiMetadataService.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiMetadataService.java index c96165e..c8652e9 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiMetadataService.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/DefaultExternalApiMetadataService.java @@ -24,8 +24,8 @@ import org.opeantom.ubml.externalapi.runtime.api.ExternalApiMetadataService; import org.openatom.ubml.common.spring.SpringUtils; import org.openatom.ubml.common.util.JacksonJsonUtil; import org.openatom.ubml.common.util.StringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataHeader; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; import org.openatom.ubml.model.externalapi.definition.Constants; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.entity.Model; diff --git a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/ExternalApiJavaCodeHandler.java b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/ExternalApiJavaCodeHandler.java index 886532d..e2d3c44 100644 --- a/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/ExternalApiJavaCodeHandler.java +++ b/model/externalapi/runtime-core/src/main/java/org/openatom/ubml/externalapi/runtime/core/service/ExternalApiJavaCodeHandler.java @@ -17,7 +17,7 @@ package org.openatom.ubml.externalapi.runtime.core.service; import java.text.MessageFormat; import org.openatom.ubml.common.spring.SpringUtils; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import org.openatom.ubml.model.externalapi.generator.ExternalApiRtCodeGenerator; import org.openatom.ubml.model.externalapi.definition.entity.ExternalApi; import org.openatom.ubml.model.externalapi.definition.temp.lcm.CustomizationRtService; diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResource.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResource.java index 3f27556..af05832 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResource.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/I18nResource.java @@ -15,8 +15,6 @@ */ package com.inspur.edp.lcm.metadata.api.entity; -import org.openatom.ubml.model.common.definition.entity.I18nResourceItemCollection; - public class I18nResource { /** diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/Metadata4Ref.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/Metadata4Ref.java index 6801ff1..c59a68a 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/Metadata4Ref.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/Metadata4Ref.java @@ -15,8 +15,6 @@ */ package com.inspur.edp.lcm.metadata.api.entity; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; - /** * @Classname Metadata4Ref * @Description 元数据及包的实体 diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataDto.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataDto.java index 4339675..abe3b47 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataDto.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataDto.java @@ -15,8 +15,6 @@ */ package com.inspur.edp.lcm.metadata.api.entity; -import org.openatom.ubml.model.common.definition.entity.MetadataProperties; - /** * Classname MetadataDto Description 通过WebApi调用时前端往后端传递元数据信息所用实体 Date 2019/11/14 19:54 * diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataPackage.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataPackage.java index c750726..10cc69c 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataPackage.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataPackage.java @@ -16,7 +16,6 @@ package com.inspur.edp.lcm.metadata.api.entity; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; /** * @Classname MetadataPackage diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/service/RefCommonService.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/service/RefCommonService.java index 7a287e3..1a28f35 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/service/RefCommonService.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/api/service/RefCommonService.java @@ -15,7 +15,7 @@ */ package com.inspur.edp.lcm.metadata.api.service; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; /** * 获取依赖元数据 diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/IMetadataReferenceManager.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/IMetadataReferenceManager.java index af4c35a..3b1aba2 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/IMetadataReferenceManager.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/IMetadataReferenceManager.java @@ -16,8 +16,8 @@ package com.inspur.edp.lcm.metadata.spi; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.MetadataReference; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.MetadataReference; public interface IMetadataReferenceManager { List getConstraint(GspMetadata metadata); diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentManager.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentManager.java index c919477..8963c7e 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentManager.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentManager.java @@ -15,7 +15,7 @@ */ package com.inspur.edp.lcm.metadata.spi; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; public interface MetadataContentManager { /** diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentSerializer.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentSerializer.java index ea3c164..7c778aa 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentSerializer.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataContentSerializer.java @@ -16,7 +16,7 @@ package com.inspur.edp.lcm.metadata.spi; import com.fasterxml.jackson.databind.JsonNode; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; public interface MetadataContentSerializer { diff --git a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataTransferSerializer.java b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataTransferSerializer.java index 8033a2b..4e1037e 100644 --- a/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataTransferSerializer.java +++ b/model/framework/common/src/main/java/com/inspur/edp/lcm/metadata/spi/MetadataTransferSerializer.java @@ -15,7 +15,7 @@ */ package com.inspur.edp.lcm.metadata.spi; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; /** * Classname MetadataTransferSerializer Description 元数据调用的序列化器，转换成各元数据实体 Date 2019/11/18 8:50 diff --git a/model/framework/devtime-api/src/main/java/com/inspur/edp/lcm/metadata/api/service/MetadataService.java b/model/framework/devtime-api/src/main/java/com/inspur/edp/lcm/metadata/api/service/MetadataService.java index a4f9ef6..c8e74e4 100644 --- a/model/framework/devtime-api/src/main/java/com/inspur/edp/lcm/metadata/api/service/MetadataService.java +++ b/model/framework/devtime-api/src/main/java/com/inspur/edp/lcm/metadata/api/service/MetadataService.java @@ -16,9 +16,9 @@ package com.inspur.edp.lcm.metadata.api.service; import java.util.List; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; -import org.openatom.ubml.model.common.definition.entity.IMdExtRuleContent; -import org.openatom.ubml.model.common.definition.entity.MetadataHeader; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.IMdExtRuleContent; +import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; import com.inspur.edp.lcm.metadata.api.entity.GspProject; import com.inspur.edp.lcm.metadata.api.entity.Metadata4Ref; import com.inspur.edp.lcm.metadata.api.entity.Metadata4RefDto; diff --git a/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/JitContext.java b/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/JitContext.java index 8d97580..3687bd3 100644 --- a/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/JitContext.java +++ b/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/JitContext.java @@ -18,7 +18,7 @@ package com.inspur.edp.jittojava.context; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.service.RefCommonService; import com.inspur.edp.lcm.metadata.api.entity.GspProject; import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; diff --git a/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/temp/RefCommonServiceImp.java b/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/temp/RefCommonServiceImp.java index 46e73fc..bef24d0 100644 --- a/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/temp/RefCommonServiceImp.java +++ b/model/framework/generator-api/src/main/java/com/inspur/edp/jittojava/context/temp/RefCommonServiceImp.java @@ -15,7 +15,7 @@ */ package com.inspur.edp.jittojava.context.temp; -import org.openatom.ubml.model.common.definition.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.service.RefCommonService; /** diff --git a/model/vo/definition/src/main/java/org/openatom/ubml/model/vo/definition/GspViewModel.java b/model/vo/definition/src/main/java/org/openatom/ubml/model/vo/definition/GspViewModel.java index 1699308..2eb0228 100644 --- a/model/vo/definition/src/main/java/org/openatom/ubml/model/vo/definition/GspViewModel.java +++ b/model/vo/definition/src/main/java/org/openatom/ubml/model/vo/definition/GspViewModel.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.function.Predicate; import org.openatom.ubml.model.common.definition.commonmodel.IGspCommonObject; import org.openatom.ubml.model.common.definition.commonmodel.entity.GspCommonModel; -import org.openatom.ubml.model.common.definition.entity.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; import org.openatom.ubml.model.vo.definition.collection.VMActionCollection; import org.openatom.ubml.model.vo.definition.collection.ValueHelpConfigCollection; import org.openatom.ubml.model.vo.definition.common.TemplateVoInfo; -- Gitee