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/connectors/connector-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.connector</groupId>
<artifactId>connectors</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/connectors/connector-impl/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.connector</groupId>
<artifactId>connectors</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorServiceImpl.java
View File

@ -128,7 +128,7 @@ public class ConnectorServiceImpl implements ConnectorService {
Connector connectorEntity = getConnector(system, connector.getTemplateName());
if (connectorEntity == null) {
connectorEntity = connector;
connectorEntity.setName(connector.getTemplateName() + "-" + system.getName());
connectorEntity.setName(connector.getTemplateName() + "." + system.getName());
connectorEntity.setSystemId(system.getId());
system.getConnectors().add(connectorEntity);
} else {

2
system/registry/connectors/pom.xml
View File

@ -5,7 +5,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>
<modelVersion>4.0.0</modelVersion>

2
system/registry/pom.xml
View File

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

2
system/registry/processes/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/profile-commons/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>

5
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/Connector.java
View File

@ -26,6 +26,11 @@ import java.util.Map;
public interface Connector {
public static final String HEADERS_START = "NTX_Connector_";
public static final String ROLE = "role";
public static final String TYPE = "type";
public static final String SUBTYPE = "subtype";
String getEndpointName();
String getEndpointType();

3
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/DirectVMInConnectorImpl.java
View File

@ -33,6 +33,9 @@ public class DirectVMInConnectorImpl extends CommonConnector implements InConnec
@Override
public void send(Exchange exchange) {
ProducerTemplate template = exchange.getContext().createProducerTemplate();
exchange.getIn().setHeader(HEADERS_START + ROLE, getParam(ROLE));
exchange.getIn().setHeader(HEADERS_START + TYPE, getParam(TYPE));
exchange.getIn().setHeader(HEADERS_START + SUBTYPE, getParam(SUBTYPE));
template.send("direct-vm:" + endpointName + "-" + endpointType + "-connector-" + systemName +
"?block=true&timeout=60000", exchange);
}

10
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutput.java
View File

@ -25,12 +25,18 @@ import ru.entaxy.esb.system.profile.commons.connectors.out.OutConnector;
import java.util.List;
import static ru.entaxy.esb.system.profile.commons.connectors.Connector.*;
public interface ProfileOutput {
OutConnector getOutConnector(String systemName);
OutConnector getOutConnector(String endpointName, String role, String type, String subtype);
void send(Exchange exchange);
void sendTo(@Header("EndpointName") String endpointName, Exchange exchange);
void sendTo(@Header("EndpointName") String endpointName,
@Header(HEADERS_START + ROLE) String role,
@Header(HEADERS_START + TYPE) String type,
@Header(HEADERS_START + SUBTYPE) String subtype,
Exchange exchange);
public List<String> getReferenceNames();
}

26
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutputImpl.java
View File

@ -31,6 +31,8 @@ import ru.entaxy.esb.system.common.exception.ConnectorNotFound;
import ru.entaxy.esb.system.common.osgi.impl.CommonNamedReferenceListener;
import ru.entaxy.esb.system.profile.commons.connectors.out.OutConnector;
import static ru.entaxy.esb.system.profile.commons.connectors.Connector.*;
public class ProfileOutputImpl extends CommonNamedReferenceListener<OutConnector> implements ProfileOutput {
private static final Logger log = LoggerFactory.getLogger(ProfileOutputImpl.class);
@ -42,8 +44,20 @@ public class ProfileOutputImpl extends CommonNamedReferenceListener<OutConnector
}
@Override
public OutConnector getOutConnector(String endpointName) {
if (endpointName == null || registeredReferences.get(endpointName) == null) {
public OutConnector getOutConnector(String endpointName, String role, String type, String subtype) {
for (OutConnector outConnector : registeredReferences.values()) {
if ((role == null || role.equals(outConnector.getParam(ROLE))) &&
type != null && type.equals(outConnector.getParam(TYPE)) &&
subtype != null && subtype.equals(outConnector.getParam(SUBTYPE))) {
return outConnector;
} else if ((role == null || role.equals(outConnector.getParam(ROLE))) &&
type != null && type.equals(outConnector.getParam(TYPE))) {
return outConnector;
} else if (role != null && role.equals(outConnector.getParam(ROLE))) {
return outConnector;
}
}
if (endpointName == null || registeredReferences.get(endpointName) == null) {
for (OutConnector outConnector : registeredReferences.values()) {
return outConnector;
}
@ -106,9 +120,13 @@ public class ProfileOutputImpl extends CommonNamedReferenceListener<OutConnector
}
@Override
public void sendTo(@Header("ENTAXY_EndpointName") String endpointName, Exchange exchange) {
public void sendTo(@Header("ENTAXY_EndpointName") String endpointName,
@Header(HEADERS_START + ROLE) String role,
@Header(HEADERS_START + TYPE) String type,
@Header(HEADERS_START + SUBTYPE) String subtype,
Exchange exchange) {
try {
getOutConnector(endpointName).send(exchange);
getOutConnector(endpointName, role, type, subtype).send(exchange);
} catch (NullPointerException ex) {
throw new ConnectorNotFound("Out connector for " + systemName + " not found");
}

2
system/registry/system-groups/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/system-groups/system-group-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-groups</artifactId>
<groupId>ru.entaxy.esb.system.registry.system-groups</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/system-groups/system-group-component/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-groups</artifactId>
<groupId>ru.entaxy.esb.system.registry.system-groups</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/system-groups/system-group-impl/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-groups</artifactId>
<groupId>ru.entaxy.esb.system.registry.system-groups</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/system-groups/system-group-profile/pom.xml
View File

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

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

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

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

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

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

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

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>