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

ENTAXY-480 release version 1.8.3

Browse Source
This commit is contained in:
Валерия Бородина
2023-08-03 04:44:09 +03:00
parent 603889d627
commit 5844a2e5cf
2546 changed files with 11242 additions and 207556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/registry/connectors/connector-api/pom.xml
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>ru.entaxy.esb.system.registry.connector</groupId>
<artifactId>connectors</artifactId>
<version>1.8.2.2</version>
<version>1.8.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/Connector.java
View File

@ -2,7 +2,7 @@
* ~~~~~~licensing~~~~~~
* connector-api
* ==========
* Copyright (C) 2020 - 2021 EmDev LLC
* Copyright (C) 2020 - 2023 EmDev LLC
* ==========
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/ConnectorParam.java
View File

@ -2,7 +2,7 @@
* ~~~~~~licensing~~~~~~
* connector-api
* ==========
* Copyright (C) 2020 - 2021 EmDev LLC
* Copyright (C) 2020 - 2023 EmDev LLC
* ==========
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

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

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>ru.entaxy.esb.system.registry.connector</groupId>
<artifactId>connectors</artifactId>
<version>1.8.2.2</version>
<version>1.8.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -2,7 +2,7 @@
* ~~~~~~licensing~~~~~~
* connector-impl
* ==========
* Copyright (C) 2020 - 2021 EmDev LLC
* Copyright (C) 2020 - 2023 EmDev LLC
* ==========
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -40,5 +40,7 @@ public interface ConnectorService {
Connector addConnector(System system, Connector connector);
Connector addNewConnector(System system, Connector connector);
Connector setBundleEntity(Connector connector, BundleEntity bundleEntity);
}

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

@ -2,7 +2,7 @@
* ~~~~~~licensing~~~~~~
* connector-impl
* ==========
* Copyright (C) 2020 - 2021 EmDev LLC
* Copyright (C) 2020 - 2023 EmDev LLC
* ==========
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -139,6 +139,21 @@ public class ConnectorServiceImpl implements ConnectorService {
return connectorEntity;
}
@Override
public Connector addNewConnector(System system, Connector connector) {
Connector connectorEntity = getNewConnector(system, connector.getName());
if (connectorEntity == null) {
connectorEntity = connector;
connectorEntity.setSystemId(system.getId());
system.getConnectors().add(connectorEntity);
} else {
connectorEntity.setEditDate(connector.getCreateDate());
connectorEntity.setEditedBy(connector.getCreatedBy());
}
this.saveOrUpdate(system);
return connectorEntity;
}
@Override
public Connector setBundleEntity(Connector connector, BundleEntity bundleEntity) {
bundleEntity.setVersion(connector.getVersion());
@ -177,4 +192,12 @@ public class ConnectorServiceImpl implements ConnectorService {
}
return null;
}
private Connector getNewConnector(System system, String name) {
for (Connector connector : system.getConnectors()) {
if (name.equals(connector.getName()))
return connector;
}
return null;
}
}

2
system/registry/connectors/connector-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml
View File

@ -3,7 +3,7 @@
~~~~~~licensing~~~~~~
connector-impl
==========
Copyright (C) 2020 - 2021 EmDev LLC
Copyright (C) 2020 - 2023 EmDev LLC
==========
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
system/registry/connectors/connector-impl/src/main/resources/hibernate.cfg.xml
View File

@ -3,7 +3,7 @@
~~~~~~licensing~~~~~~
connector-impl
==========
Copyright (C) 2020 - 2021 EmDev LLC
Copyright (C) 2020 - 2023 EmDev LLC
==========
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

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

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>ru.entaxy.esb.system.registry</groupId>
<artifactId>registry</artifactId>
<version>1.8.2.2</version>
<version>1.8.3</version>
<relativePath>../../registry/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>