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/registry/systems/pom.xml
View File

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

2
system/registry/systems/system-api/pom.xml
View File

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

14
system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/System.java
View File

@ -32,7 +32,7 @@ import java.util.Set;
name = "system-entity-graph",
attributeNodes = {
@NamedAttributeNode(value = "connectors", subgraph = "connectors-subgraph"),
@NamedAttributeNode("exportAlloweds"),
@NamedAttributeNode("exportAllowed"),
@NamedAttributeNode("bundleEntity"),
},
subgraphs = {
@ -84,7 +84,7 @@ public class System {
private Set<Connector> connectors;
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@JoinColumn(name = "system_id")
private Set<ExportAllowed> exportAlloweds;
private Set<ExportAllowed> exportAllowed;
@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@JoinColumn(name = "bundle_id")
private BundleEntity bundleEntity;
@ -185,12 +185,12 @@ public class System {
this.connectors = connectors;
}
public Set<ExportAllowed> getExportAlloweds() {
return exportAlloweds;
public Set<ExportAllowed> getExportAllowed() {
return exportAllowed;
}
public void setExportAlloweds(Set<ExportAllowed> exportAlloweds) {
this.exportAlloweds = exportAlloweds;
public void setExportAllowed(Set<ExportAllowed> exportAllowed) {
this.exportAllowed = exportAllowed;
}
public BundleEntity getBundleEntity() {
@ -230,7 +230,7 @@ public class System {
@Override
public int hashCode() {
return Objects.hash(id, uuid, name, description, createDate, editDate, createdBy,
editedBy, version, type, origin, connectors, exportAlloweds);
editedBy, version, type, origin, connectors, exportAllowed);
}
@Override

2
system/registry/systems/system-component/pom.xml
View File

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

2
system/registry/systems/system-impl/pom.xml
View File

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

6
system/registry/systems/system-impl/src/main/java/ru/entaxy/esb/system/jpa/impl/SystemServiceImpl.java
View File

@ -265,11 +265,11 @@ public class SystemServiceImpl implements SystemService {
@Override
public ExportAllowed addExportAllowed(System system, String exportAllowedName) {
ExportAllowed exportAllowed = getExportAllowed(system.getExportAlloweds(), exportAllowedName);
ExportAllowed exportAllowed = getExportAllowed(system.getExportAllowed(), exportAllowedName);
if (exportAllowed == null) {
exportAllowed = new ExportAllowed();
exportAllowed.setName(exportAllowedName);
system.getExportAlloweds().add(exportAllowed);
system.getExportAllowed().add(exportAllowed);
saveOrUpdate(system);
}
return exportAllowed;
@ -342,7 +342,7 @@ public class SystemServiceImpl implements SystemService {
try (Session session = getSession()) {
session.getTransaction().begin();
ExportAllowed exportAllowed = getExportAllowed(system.getExportAlloweds(), esbName);
ExportAllowed exportAllowed = getExportAllowed(system.getExportAllowed(), esbName);
session.delete(ExportAllowed.class.getName(), exportAllowed);
session.getTransaction().commit();

2
system/registry/systems/system-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View File

@ -96,7 +96,7 @@
</setHeader>
<log message="Set id 0 ${header.SYSTEM.setId(0)}"/>
<log message="Set methods null ${header.SYSTEM.setExportAlloweds(null)}"/>
<log message="Set methods null ${header.SYSTEM.setExportAllowed(null)}"/>
<log message="Set uuid 777 ${header.SYSTEM.setUuid('777')}"/>
<log message="Set name TestSystem ${header.SYSTEM.setName('TestSystem')}"/>
<log message="CREATE NEW Registry with uuid 777"/>

2
system/registry/systems/system-profile/pom.xml
View File

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

2
system/registry/systems/system-profile/system-profile-api/pom.xml
View File

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

2
system/registry/systems/system-profile/system-profile-collector/pom.xml
View File

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

2
system/registry/systems/system-profile/system-profile-impl-default/pom.xml
View File

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