Skip to content

fix: Import of service in legacy format does not create spec groups-v0.3 #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NuTTeR merged 7 commits into from
May 20, 2026
Merged

fix: Import of service in legacy format does not create spec groups-v0.3 #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e60f225
fix: legacy service import
zhonniks May 4, 2026
c2385e2
fix: removed old fields
zhonniks May 4, 2026
d6af935
fix: comments
zhonniks May 6, 2026
0e144b6
fix: comments
zhonniks May 6, 2026
ef11dfe
fix: comments
zhonniks May 6, 2026
623a18f
fix: sonarqube comments
zhonniks May 19, 2026
005c7fd
fix: sonarqube comments
zhonniks May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ship/integration/platform/runtime/catalog/service/exportimport/ExportImportConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,5 @@ public class ExportImportConstants {
public static final String ASSUMPTIONS = "assumptions";
public static final String OUT_OF_SCOPE = "outOfScope";
public static final String CONTENT = "content";
public static final String PARENT_ID = "parentId";
}
112 changes: 102 additions & 10 deletions ...ation/platform/runtime/catalog/service/exportimport/deserializer/ServiceDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.jetbrains.annotations.NotNull;
import org.qubership.integration.platform.runtime.catalog.exception.exceptions.ServiceImportException;
import org.qubership.integration.platform.runtime.catalog.model.exportimport.system.IntegrationSystemDto;
import org.qubership.integration.platform.runtime.catalog.model.exportimport.system.SpecificationGroupContentDto;
import org.qubership.integration.platform.runtime.catalog.model.exportimport.system.SpecificationGroupDto;
import org.qubership.integration.platform.runtime.catalog.model.exportimport.system.SystemModelDto;
import org.qubership.integration.platform.runtime.catalog.persistence.configs.entity.system.*;
Expand Down Expand Up @@ -92,19 +93,24 @@ public IntegrationSystem deserializeSystem(File serviceFile) {
Files.readString(serviceFile.toPath()),
importFileMigrations.stream().map(ImportFileMigration.class::cast).toList()
);
IntegrationSystemDto integrationSystemDto = yamlMapper.readValue(serviceData, IntegrationSystemDto.class);
ObjectNode migratedServiceNode = (ObjectNode) yamlMapper.readTree(serviceData);
IntegrationSystemDto integrationSystemDto = yamlMapper.treeToValue(migratedServiceNode, IntegrationSystemDto.class);
IntegrationSystem integrationSystem = integrationSystemDtoMapper.toInternalEntity(integrationSystemDto);

Collection<File> files = listFiles(serviceDirectory);

Stream.concat(getFilesDataDeprecated(files, SPECIFICATION_GROUP_FILE_PREFIX),
getFilesData(files, SPECIFICATION_GROUP_FILE_POSTFIX + appName + YAML_FILE_NAME_POSTFIX))
.forEach(node -> buildAndAddSpecificationGroup(node, versions, integrationSystem));
if (integrationSystemDto.getContent() != null && !integrationSystemDto.getContent().getSpecificationGroups().isEmpty()) {
processLegacyService(integrationSystemDto, integrationSystem, versions, migratedServiceNode, serviceDirectory);
} else {
Stream.concat(getFilesDataDeprecated(files, SPECIFICATION_GROUP_FILE_PREFIX),
getFilesData(files, SPECIFICATION_GROUP_FILE_POSTFIX + appName + YAML_FILE_NAME_POSTFIX))
.forEach(node -> buildAndAddSpecificationGroup(node, versions, integrationSystem));

Stream.concat(getFilesDataDeprecated(files, SPECIFICATION_FILE_PREFIX),
getFilesData(files, SPECIFICATION_FILE_POSTFIX + appName + YAML_FILE_NAME_POSTFIX))
.forEach(node ->
buildAndAddSpecification(node, versions, integrationSystem.getSpecificationGroups(), serviceDirectory));
Stream.concat(getFilesDataDeprecated(files, SPECIFICATION_FILE_PREFIX),
getFilesData(files, SPECIFICATION_FILE_POSTFIX + appName + YAML_FILE_NAME_POSTFIX))
.forEach(node ->
buildAndAddSpecification(node, versions, integrationSystem.getSpecificationGroups(), serviceDirectory));
}

return integrationSystem;
} catch (ServiceImportException e) {
Expand Down Expand Up @@ -158,15 +164,101 @@ private Stream<ObjectNode> getFilesData(Collection<File> files, String namePostf
};
}

private void processLegacyService(
IntegrationSystemDto integrationSystemDto,
IntegrationSystem integrationSystem,
Collection<Integer> versions,
ObjectNode migratedServiceNode,
File serviceDirectory
) {
if (integrationSystemDto.getContent() == null) {
return;
}

List<SpecificationGroupDto> specGroups = integrationSystemDto.getContent().getSpecificationGroups();
if (specGroups == null || specGroups.isEmpty()) {
return;
}

JsonNode specGroupsNode = migratedServiceNode.path(CONTENT).path("specificationGroups");
for (SpecificationGroupDto group : specGroups) {
processSpecificationGroup(group, integrationSystem, versions, specGroupsNode, serviceDirectory);
}
}

private void processSpecificationGroup(
SpecificationGroupDto group,
IntegrationSystem integrationSystem,
Collection<Integer> versions,
JsonNode specGroupsNode,
File serviceDirectory
) {
setGroupParentId(group, integrationSystem);

JsonNode synchronization = specGroupsNode.path("synchronization");
if (!synchronization.isMissingNode() && !synchronization.isNull()) {
group.getContent().setSynchronization(synchronization.asBoolean());
}
buildAndAddSpecificationGroup(yamlMapper.valueToTree(group), versions, integrationSystem);

JsonNode systemModelsList = specGroupsNode.path("systemModels");
if (systemModelsList.isMissingNode() || systemModelsList.isNull()) {
return;
}
processSystemModels(systemModelsList, group, integrationSystem, versions, serviceDirectory);
}

private void setGroupParentId(SpecificationGroupDto group, IntegrationSystem integrationSystem) {
if (integrationSystem.getId() != null) {
if (group.getContent() == null) {
group.setContent(SpecificationGroupContentDto.builder().build());
}
group.getContent().setParentId(integrationSystem.getId());
}
}

private void processSystemModels(
JsonNode systemModelsList,
SpecificationGroupDto group,
IntegrationSystem integrationSystem,
Collection<Integer> versions,
File serviceDirectory
) {
for (JsonNode model : systemModelsList) {
if (model.isMissingNode() || model.isNull()) {
return;
}
ensureModelContentParentId(model, group.getId());
buildAndAddSpecification(
yamlMapper.valueToTree(model),
versions,
integrationSystem.getSpecificationGroups(),
serviceDirectory
);
}
}

private void ensureModelContentParentId(JsonNode model, String groupId) {
JsonNode contentModel = model.path(CONTENT);
if (contentModel.path(CONTENT).isMissingNode() || contentModel.path(CONTENT).isNull()) {
ObjectNode contentNode = yamlMapper.createObjectNode();
contentNode.put(PARENT_ID, groupId);
((ObjectNode) model).set(CONTENT, contentNode);
} else if (contentModel.path(PARENT_ID).isMissingNode() || contentModel.path(PARENT_ID).isNull()) {
((ObjectNode) contentModel).put(PARENT_ID, groupId);
}
}

private void buildAndAddSpecificationGroup(
ObjectNode node,
Collection<Integer> versions,
IntegrationSystem integrationSystem
) {
try {
ObjectNode migratedNode = migrate(node, versions);
ObjectNode migratedNode = node.has(CONTENT) ? node : migrate(node, versions);
SpecificationGroupDto specificationGroupDto = yamlMapper.treeToValue(migratedNode, SpecificationGroupDto.class);
SpecificationGroup specificationGroup = specificationGroupDtoMapper.toInternalEntity(specificationGroupDto);

if (Objects.equals(specificationGroupDto.getContent().getParentId(), integrationSystem.getId())) {
integrationSystem.addSpecificationGroup(specificationGroup);
}
Expand All @@ -184,7 +276,7 @@ private void buildAndAddSpecification(
File resourceDirectory
) {
try {
ObjectNode migratedNode = migrate(node, versions);
ObjectNode migratedNode = node.has(CONTENT) ? node : migrate(node, versions);
SystemModelDto systemModelDto = yamlMapper.treeToValue(migratedNode, SystemModelDto.class);
SystemModel systemModel = systemModelDtoMapper.toInternalEntity(systemModelDto);
specificationGroups.stream()
Expand Down
Loading