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 9a29627efcf1b3edf55dcfb6becb0c3e1d532218..e5b68b25436480bb13687f00d6d98230995b0aa2 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 c401a49eecbd1c2427f7eea32fc31315f98cca7b..60d83f66124a2bb1474c1e66615521e54514616e 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 753cd458a5fc1b73e102feaf5629e05ad496b519..f84a555a4c7361034212335b0fe49f48117157be 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 69ef98506ef169b1d29f67197e946eb0809a7d4d..5c479f79852c73e5a0da215d432ad45d89ae7be6 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 d56f33632202fc9f0785a56aa9fed03ca6186bad..0c470d3e45c5791e28292b72ffb293622e66d77f 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 3a47639d4231b8023d4bfd72b01421753b5ad066..c5cf11854ec6e1b2c1dcb74e3339ea1539bed04b 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 e1ccdecce5094439cd6edff1b2ae309dfdcc1091..297efee0cbfcaa89ec8cc2a420d6d3b2fd4959dd 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 7dfacd14ceda07ed03f8a7632de5493291bb2af6..b5f9281cdacb6a056ffc43b831fa4c6e7e2999e0 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 144d1515f2f9ae17dbb2da062ac0d31271063555..2ad37491b7ff51dec1256e0a6453cbd9107269ab 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 e190adaa09a542e5e9188c0c1d7a63d2ebbd44ca..5f970358e4871ded796d661444bac1964797c07f 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 9e75b522ef6b516d2ec28aaa449a3d1c101e5558..1ad31073e4ef4be6157d6ceaa8d2e267ff2ce632 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 2a586118694193397e4b6260bbaff54374ecef22..81a22111932f2db2f38376885e7d825dec9dcb14 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 f345968c8308acd84ac5965057474fadcf6b2f6b..fd473305d2f80ce1e6c46d94a46b6b7ba1455d50 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 6d38a26ae002189d73d18c43083d12effe1328bb..4e25959a52ac4e50d7d3d6f76d8794bf3e4653c9 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 c13bf1ab5449d16394ed511f32770678e379e1ba..fbeba124ef75ff84c76479d0f35c3c9d0953b9d4 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 c640a6292055480b73aee1fcfcc60ec6ff1075d1..f2658fb856946a7c51824c582730fdbacbe0e53c 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 dafb04d60571754bff164e5ce711a017dface7aa..335e9d716ba3f41e85f1c006fdc9ddd59d53895d 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 4e10badf2f28ea3d6f2c9421e08528177ab6ce51..e456d5e7ddc8758dd79be9b3e13e4b3a36926115 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 b846a9869a08bd91c28b84e9e0c9411df275d9b3..f56cde36012a76b1d59eaf13cc90f7d753a85be2 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 c2428baa69c8fef83f50469e84f4499bc7e4a9c1..3737bf703cd3811b2a7115e937be0d8777338c9c 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 edd24b39a05eab1d57dc8cd406fbe0729770ad30..9c58789518fe3baa02102b7749f307bcac3c3c39 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 3a637165c38f5fcb1dd4528193ac51838bf0ed2a..7d639d753f44fc21f60e24fb80148deb80aee058 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 a6f6961a41648e2041a5c6977c91a020418ba0b8..73e6bd4b8fe3044be494da42bb4e2abf7f3167d1 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 8eb5d5c4e7a6c9b0fb09e54daf9b58baa46cb674..466af3b3ef9d125aea8e40381e70e1b201627324 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 fdba1ee5dadad01c0565858d9df4d803525d27e3..b0f553390df1f687f72cccca699628ad75e45431 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 940b3783c9835f6dcf5dbc1537a4ab1d112df741..2ebc734672d702078f748707345657803900406b 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 6851172bb5519157313547aa41d1746a22999e9d..115cbc8b06820d637af28d6a5c46664f6a4beb42 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 a725d04122de81178605e04193ae85ee77275b64..9e1de1dba33fe52b052967cf03dbcf419e44db44 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 ba09d1fe154f3d3f674c02cab01838617b1286c6..7c02f09e73266a138c9ddfe402431db6cd303e8b 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 2c90dd149e339b42b3f585bae6427343c3a43a7c..2c50bb9eb06d0e715ddfde56f3aa3b5811371e94 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 ade603ca6e83d7443efd2827c1226d19bd7e9039..bd2c3d4d8210a5e3d23c85f9404085e86c5a05b6 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 0cf16c556e4360740764ca8e3cfe02cd71ba9047..25e448301a1c8d1fc6490fc984c8fffe0548140c 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 a237f15b348dd75ccf0adc8ed1e63c0e96a2dce9..8e62abc4645a98b782e635d99e49579cd84dd58f 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 c1a7879bf6a1832777ed80c06ee782746adfea4d..fed59e866694a3d01a8e8eb33d6e9075b998dfa0 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 6f67b3439fbddb555cc554c0882b06ff6ebdca80..642dd6a7963ad83ce5b63821dec7bd133adb6958 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 76513cd95f778e49b1574883c787c4d797fc5c3a..a55e7c33666e0f6026427bda31836942a95b6652 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 73676aadce1b76c6657d112f8f196ed4ed6bbcb2..576ce590fe9ba20659e92a991f5b28620cea8799 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 b363efa1919fa7015d17a1902a7fe4fe63ebfe20..cf88b5b43d4113d3c54eeb218fb949b677af3975 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 6ed4aff80a515e38b790b2208e1d41e0aa3f76eb..70b0feccd6f1f64c8229f0dbf04ed013e78d3d28 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 7eb7b0d0d244277169f3e7a05c0e5b2f359d699d..8f6add0f935c84d47d424ee81126f7d12df5e436 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 4690853980b44974ad7a43f091c4b1ec74ac2777..747286cc39c578ff7f7f52b28ea15af804290f3f 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 184ec5d6e460a9578cfe70e6fa81c3c2a337a52c..bdcab4b645de86c7d5b937f1dd75cdb427a57e35 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 f4d3d357707fa896c1835ec335795b457c587420..07bd2d2ca5bd6ff0f085d62a6c84009270c42e30 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 603a5f0ab9dab2df847511048f599b8a790c29d4..df51562ee60b28f17be5f6c50e336bcef74441d8 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 8b03e4e8ec7a06b7c7f1c1a34edeb123c367f10e..81f3f668c5b7f75bb352511871d33fa3be91acf7 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 d9869402de3ba6740d478044cda745a43b8b41eb..a939895a76e513df9c23a61d105ea74c272b5bae 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 84026fcd1894d218320772308440168ee8b80b5e..f9a7abf37ea42f3c44828079edc35543e6039f30 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 393cf39e1b3dda182e06ab1624a5cbac23372c4b..1ea9ed5533618fc6d5ddc9c4652f9ff9d6a8295f 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 fb9b6067c94c40ddcd31c43a7a5f688c0fbc308a..921499c2cddcfb0e162d110eaaeb8a76eb25f76a 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 67b1b016b3ebfce13f8287db07384901077bcbd7..c7347760e3d45680431f13839ff878323ae1a7cb 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 6666c8bd624ba231a0d90faa569d13ab9b368207..a79c59e82071c84a05da20b06b81fa36d71f4377 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 8e4efcd3636a06edd27690b0cbc2efc07af20277..eca40d447e9cc1b689cd4e10c7ecfedbc17df80f 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 6c577cb81b698c983957f5fb8c26f93c6c833e76..7a6952f9de32602a3e517b2ad100dfee7cd52ec5 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 1ff536b37f5b32ff36530ed616a747acd1e85d5c..8528e4daba0d0b522e46b88a428fe8cf140e647e 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 6df96431e60a49b0941e3ac8e0a0aa440bb80c08..f2a980e1c97df3abf5fc4740017ba1699e6eee6f 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 4bf617f8e0e9f13131e2937fedb94d346450110e..2f45b81f80c9993b579c7f4edfbeecab4ae2ce6a 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 e78f74e0eba75fdc6d5c7243c9f6eafd37839cc1..290eeb546e6202c81c8a9be7e1295d960245e3b9 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 3b9824e222d69501db34ddb28349524b7937332e..9ec8b4fdf8f30809eed6f9588affaf1157187c67 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 103198c4a8a8e8271d0ef2557137d3a4863e34b1..4b4b5bbc7a2c18136d3daa0b429b3416506d9caa 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 1bf3d4f3ee63b89cff06c960e2219022c58b3017..cc78f7bb670d750b6c2cdd638f45c3eb8ce56ce3 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 38425d36460a8333309ccc6b6652f5e4757ed2aa..dc18ae5a83332c64c6aff436ae618374dc934c50 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 889e80096aec2735cfeba588d314912e73b6bd1c..d4c251df4c9903e8fc402c1a51095f83ceac16e3 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 c96165ebc829b9a0b7cb8f510d7e28ca2176a8d6..c8652e99ebeaa38bc887048cac2e57c08625d911 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 886532d9ea2cfe84d645d35e6c597cfa36b20c91..e2d3c447c4a2a314d2b19d9cc3f4fcdbb379d17f 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 3f27556570a26a05a6cf37aff516788df65ea461..af0583286d4fa75bf03fb591dc1e217f769c99aa 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 6801ff1726e0c0de52584f07e02619ddd17d2e3c..c59a68af3817f46b0910d0de276e1cd8c651cb69 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 43396756d678e0f6a572a7fa0d6d647df7a1e60b..abe3b4731cfb48a520a55f6f4fe3d1a22f492693 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 c7507266c3b501a4ac1fdecc112acab8e414b725..10cc69c01f79c6ce306ebc1b54d8ed168e0d6684 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 7a287e33be6d0a12a92f58de361c703804a09528..1a28f35f3b90aa692d8c08af2f1eb535473ae7a6 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 af4c35a32127b551525b16a916fd720e2206defd..3b1aba2b565600d02beb382c288e4531086b6d05 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 c9194770b69b4a921d06878ef9a93fc794cdb3ac..8963c7e5111580a1665eaf83e9fa56c704613392 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 ea3c164453531bd09f1ec36dfd935a1e86a97272..7c778aae058cc3a2ca5fc7e3be5fa60b2b4be30e 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 8033a2beffe436f9c78f0b6657f4b5d4a4f3c4d9..4e1037e40a4cc90f9d6db109b4334f898fbe367f 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 a4f9ef677ef9ccb6d095f516868d8e5d939e130d..c8e74e4d758f18f63ade8443317d4a2f2fccb8d7 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 8d97580b397cefb71d085815178c47aa7b8b8fdf..3687bd390ca6889fbe5db9901765306e93aa60d5 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 46e73fcd919274393d6e7b6459e97ae89711dc23..bef24d0767146414adc650016cb52efd758a5ae3 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 169930821ba9a391a504fa7d6177939422d59c70..2eb02283abdb826f0ec6f1fd27b4040d1eba2048 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;