entaxy/entaxy-public
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ENTAXY-374 release 1.8.2

Browse Source
This commit is contained in:
Сергей Крючков
2022-08-23 13:40:11 +03:00
parent b68642f81c
commit f495628c75
618 changed files with 61269 additions and 3202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/system-management/profile-manager/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManagerImpl.java
View File

@ -159,7 +159,7 @@ public class ProfileManagerImpl implements ProfileManager {
}
}
BridgeProfileDto bridgeProfileDto = profileMapper.toBridgeProfileDto(system);
for (ExportAllowed exportAllowed : system.getExportAlloweds()) {
for (ExportAllowed exportAllowed : system.getExportAllowed()) {
bridgeProfileDto.setEsbName(exportAllowed.getName());
bridgeProfileManager.stopBridgeProfile(bridgeProfileDto);
}
@ -172,7 +172,7 @@ public class ProfileManagerImpl implements ProfileManager {
}
}
BridgeProfileDto bridgeProfileDto = profileMapper.toBridgeProfileDto(system);
for (ExportAllowed exportAllowed : system.getExportAlloweds()) {
for (ExportAllowed exportAllowed : system.getExportAllowed()) {
bridgeProfileDto.setEsbName(exportAllowed.getName());
bridgeProfileManager.uninstallBridgeProfile(bridgeProfileDto);
}

10
system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/dto/ProfileDto.java
View File

@ -37,7 +37,7 @@ public class ProfileDto {
private String type;
private String status;
private Set<ConnectorDto> connectors;
private Set<String> exportAlloweds;
private Set<String> exportAllowed;
public String getUuid() {
return uuid;
@ -119,12 +119,12 @@ public class ProfileDto {
this.connectors = connectors;
}
public Set<String> getExportAlloweds() {
return exportAlloweds;
public Set<String> getExportAllowed() {
return exportAllowed;
}
public void setExportAlloweds(Set<String> exportAlloweds) {
this.exportAlloweds = exportAlloweds;
public void setExportAllowed(Set<String> exportAllowed) {
this.exportAllowed = exportAllowed;
}
public String getStatus() {

4
system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/mapper/ProfileMapper.java
View File

@ -61,9 +61,9 @@ public interface ProfileMapper {
})
BundleDto toBundleDto(BundleEntity bundle);
Set<ExportAllowed> toExportAllowedEntities(Set<String> exportAlloweds);
Set<ExportAllowed> toExportAllowedEntities(Set<String> exportAllowed);
Set<String> toExportAlloweds(Set<ExportAllowed> exportAlloweds);
Set<String> toExportAllowed(Set<ExportAllowed> exportAllowed);
default ExportAllowed map(String exportAllowed) {
ExportAllowed exportAllowedEntity = new ExportAllowed();