Skip to content

Commit e84fb92

Browse files
mandy-chessellmandy-chessell
authored
Merge pull request #8662 from mandy-chessell/oak2025
Auto-configure JDBC Integration Connector from Postgres Server Integration Connector
2 parents 0cba093 + 5698f57 commit e84fb92

File tree

215 files changed

+3375
-3366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+3375
-3366
lines changed

‎CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ open-metadata-implementation/platform-chassis/ @mandy-chessell
4848
open-metadata-implementation/platform-chassis/platform-chassis-spring/ @bogdan-sava @lpalashevski
4949
open-metadata-implementation/user-interface/ui-chassis/ @bogdan-sava @marius-patrascu
5050
open-metadata-implementation/view-services/ @mandy-chessell
51-
open-metadata-implementation/server-chassis/ @lpalashevski @mandy-chessell
5251

5352
# Resources
5453

‎Content-Organization.md

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ The Egeria core repository contains the core Egeria functionality, and is organi
109109

110110
* **[platform-chassis](open-metadata-implementation/platform-chassis)** - the platform chassis provides the runtime framework for the OMAG Server Platform.
111111
* **[platform-services](open-metadata-implementation/platform-services)** - the services for querying the status of the OMAG Server Platform that can run multiple OMAG Servers simultaneously.
112-
* **[server-chassis](open-metadata-implementation/server-chassis)** - the service chassis provides the runtime framework for a single OMAG Server. This is call the OMAG Server Runtime.
113112
* **[server-operations](open-metadata-implementation/server-operations)** - the services to start and stop OMAG Server's in either the OMAG Server Runtime or OMAG Server Platform.
114113

115114
* **[user-interfaces](open-metadata-implementation/user-interfaces)** - browser based user interfaces.

‎EgeriaContentPacksGUIDMap.json

+1-1
Large diffs are not rendered by default.

‎content-packs/APIsContentPack.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/ApacheAtlasContentPack.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/ApacheKafkaContentPack.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoBusinessSystemsArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoClinicalTrialsTemplatesArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoComboArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoGovernanceProgramArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoOrganizationArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoSustainabilityArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoTypesArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CoreContentPack.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/ObservabilityContentPack.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/OpenMetadataTypes.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/PostgresContentPack.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/UnityCatalogContentPack.omarchive

+1-1
Large diffs are not rendered by default.

‎open-metadata-implementation/README.md

-5
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ and the [OMAG Servers](https://egeria-project.org/concepts/omag-server/) that ru
7575
implementation of the metadata exchange and federation capabilities for a metadata
7676
repository that supports the open metadata standards.
7777

78-
* **[server-chassis](platform-chassis)** - the server chassis is the base component for the
79-
[OMAG Server Runtime](https://egeria-project.org/concepts/omag-server-runtime/).
80-
This minimal runtime supports the execution of a single OMAG Server and is set up to run in a cloud-native manner.
81-
It includes the web server that receives the REST API requests for the OMAG Server that runs on it.
82-
8378
* **[server-operations](server-operations)** - the server operations supports the starting and shutdown of
8479
[OMAG Servers](https://egeria-project.org/concepts/omag-server/) on either the OMAG Server Platform or
8580
OMAG Server Runtime.

‎open-metadata-implementation/access-services/asset-manager/asset-manager-api/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/metadataelements/ConnectionElement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public void setEmbeddedConnections(List<EmbeddedConnection> embeddedConnections)
234234
public String toString()
235235
{
236236
return "ConnectionElement{" +
237-
"connectionProperties=" + connectionProperties +
237+
"connectionDetails=" + connectionProperties +
238238
", correlationHeaders=" + correlationHeaders +
239239
", elementHeader=" + elementHeader +
240240
", connectorType=" + connectorType +

‎open-metadata-implementation/access-services/asset-manager/asset-manager-client/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/client/exchange/ConnectionExchangeClient.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ public String createConnection(String userId,
167167
PropertyServerException
168168
{
169169
final String methodName = "createConnection";
170-
final String propertiesParameterName = "connectionProperties";
171-
final String qualifiedNameParameterName = "connectionProperties.qualifiedName";
170+
final String propertiesParameterName = "connectionDetails";
171+
final String qualifiedNameParameterName = "connectionDetails.qualifiedName";
172172

173173
invalidParameterHandler.validateUserId(userId, methodName);
174174
invalidParameterHandler.validateObject(connectionProperties, propertiesParameterName, methodName);
@@ -288,8 +288,8 @@ public void updateConnection(String userId,
288288
{
289289
final String methodName = "updateConnection";
290290
final String connectionGUIDParameterName = "connectionGUID";
291-
final String propertiesParameterName = "connectionProperties";
292-
final String qualifiedNameParameterName = "connectionProperties.qualifiedName";
291+
final String propertiesParameterName = "connectionDetails";
292+
final String qualifiedNameParameterName = "connectionDetails.qualifiedName";
293293

294294
invalidParameterHandler.validateUserId(userId, methodName);
295295
invalidParameterHandler.validateGUID(connectionGUID, connectionGUIDParameterName, methodName);

‎open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/ConnectionExchangeHandler.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ public String createConnection(String userId,
329329
UserNotAuthorizedException,
330330
PropertyServerException
331331
{
332-
final String propertiesParameterName = "connectionProperties";
333-
final String qualifiedNameParameterName = "connectionProperties.qualifiedName";
332+
final String propertiesParameterName = "connectionDetails";
333+
final String qualifiedNameParameterName = "connectionDetails.qualifiedName";
334334

335335
invalidParameterHandler.validateUserId(userId, methodName);
336336
invalidParameterHandler.validateObject(connectionProperties, propertiesParameterName, methodName);
@@ -475,8 +475,8 @@ public void updateConnection(String userId,
475475
PropertyServerException
476476
{
477477
final String connectionGUIDParameterName = "connectionGUID";
478-
final String propertiesParameterName = "connectionProperties";
479-
final String qualifiedNameParameterName = "connectionProperties.qualifiedName";
478+
final String propertiesParameterName = "connectionDetails";
479+
final String qualifiedNameParameterName = "connectionDetails.qualifiedName";
480480

481481
invalidParameterHandler.validateUserId(userId, methodName);
482482
invalidParameterHandler.validateGUID(connectionGUID, connectionGUIDParameterName, methodName);

‎open-metadata-implementation/access-services/asset-owner/asset-owner-client/src/main/java/org/odpi/openmetadata/accessservices/assetowner/client/AssetOwner.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2802,7 +2802,7 @@ public String createConnection(String userId,
28022802
{
28032803
final String methodName = "createConnection";
28042804
final String nameParameter = "qualifiedName";
2805-
final String propertiesParameter = "connectionProperties";
2805+
final String propertiesParameter = "connectionDetails";
28062806

28072807
invalidParameterHandler.validateUserId(userId, methodName);
28082808
invalidParameterHandler.validateObject(connectionProperties, propertiesParameter, methodName);
@@ -2881,8 +2881,8 @@ public void updateConnection(String userId,
28812881
{
28822882
final String methodName = "updateConnection";
28832883
final String guidParameter = "connectionGUID";
2884-
final String propertiesParameter = "connectionProperties";
2885-
final String qualifiedNameParameter = "connectionProperties.qualifiedName";
2884+
final String propertiesParameter = "connectionDetails";
2885+
final String qualifiedNameParameter = "connectionDetails.qualifiedName";
28862886

28872887
invalidParameterHandler.validateUserId(userId, methodName);
28882888
invalidParameterHandler.validateGUID(connectionGUID, guidParameter, methodName);

‎open-metadata-implementation/access-services/data-manager/data-manager-client/src/main/java/org/odpi/openmetadata/accessservices/datamanager/client/ConnectionManagerClient.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public String createConnection(String userId,
201201
PropertyServerException
202202
{
203203
final String methodName = "createConnection";
204-
final String propertiesParameterName = "connectionProperties";
204+
final String propertiesParameterName = "connectionDetails";
205205
final String qualifiedNameParameterName = "qualifiedName";
206206

207207
invalidParameterHandler.validateUserId(userId, methodName);
@@ -304,7 +304,7 @@ public void updateConnection(String userId,
304304
{
305305
final String methodName = "updateConnection";
306306
final String elementGUIDParameterName = "connectionGUID";
307-
final String propertiesParameterName = "connectionProperties";
307+
final String propertiesParameterName = "connectionDetails";
308308
final String qualifiedNameParameterName = "qualifiedName";
309309

310310
invalidParameterHandler.validateUserId(userId, methodName);

‎open-metadata-implementation/access-services/digital-architecture/digital-architecture-client/src/main/java/org/odpi/openmetadata/accessservices/digitalarchitecture/client/ConnectionManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public String createConnection(String userId,
158158
{
159159
final String methodName = "createConnection";
160160
final String nameParameter = "qualifiedName";
161-
final String propertiesParameter = "connectionProperties";
161+
final String propertiesParameter = "connectionDetails";
162162

163163
invalidParameterHandler.validateUserId(userId, methodName);
164164
invalidParameterHandler.validateObject(connectionProperties, propertiesParameter, methodName);
@@ -237,8 +237,8 @@ public void updateConnection(String userId,
237237
{
238238
final String methodName = "updateConnection";
239239
final String guidParameter = "connectionGUID";
240-
final String propertiesParameter = "connectionProperties";
241-
final String qualifiedNameParameter = "connectionProperties.qualifiedName";
240+
final String propertiesParameter = "connectionDetails";
241+
final String qualifiedNameParameter = "connectionDetails.qualifiedName";
242242

243243
invalidParameterHandler.validateUserId(userId, methodName);
244244
invalidParameterHandler.validateGUID(connectionGUID, guidParameter, methodName);

‎open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-client/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/client/ConnectionManagerClient.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public String createConnection(String userId,
195195
PropertyServerException
196196
{
197197
final String methodName = "createConnection";
198-
final String propertiesParameterName = "connectionProperties";
198+
final String propertiesParameterName = "connectionDetails";
199199
final String qualifiedNameParameterName = "qualifiedName";
200200

201201
invalidParameterHandler.validateUserId(userId, methodName);
@@ -298,7 +298,7 @@ public void updateConnection(String userId,
298298
{
299299
final String methodName = "updateConnection";
300300
final String elementGUIDParameterName = "connectionGUID";
301-
final String propertiesParameterName = "connectionProperties";
301+
final String propertiesParameterName = "connectionDetails";
302302
final String qualifiedNameParameterName = "qualifiedName";
303303

304304
invalidParameterHandler.validateUserId(userId, methodName);

‎open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/EncryptedFileBasedServerConfigStoreConnector.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import org.odpi.openmetadata.adminservices.store.OMAGServerConfigStoreRetrieveAll;
1313
import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException;
1414
import org.odpi.openmetadata.frameworks.connectors.ffdc.OCFRuntimeException;
15+
import org.odpi.openmetadata.frameworks.connectors.properties.EndpointDetails;
1516
import org.slf4j.Logger;
1617
import org.slf4j.LoggerFactory;
1718
import org.odpi.openmetadata.adminservices.store.OMAGServerConfigStoreConnectorBase;
18-
import org.odpi.openmetadata.frameworks.connectors.properties.EndpointProperties;
1919
import org.odpi.openmetadata.adminservices.configuration.properties.OMAGServerConfig;
2020
import org.apache.commons.io.FileUtils;
2121

@@ -106,8 +106,8 @@ public void start() throws ConnectorCheckedException {
106106
* @return the store template name
107107
*/
108108
private String getStoreTemplateName() {
109-
EndpointProperties endpoint = connectionProperties.getEndpoint();
110-
String configStoreTemplateName = null;
109+
EndpointDetails endpoint = connectionDetails.getEndpoint();
110+
String configStoreTemplateName = null;
111111
if (endpoint != null) {
112112
configStoreTemplateName = endpoint.getAddress();
113113
}

‎open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/test/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/TestEncryptedFileBasedServerConfigStoreConnector.java

-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44

55
import org.junit.jupiter.api.Test;
66
import org.odpi.openmetadata.frameworks.connectors.ffdc.OCFRuntimeException;
7-
import org.odpi.openmetadata.frameworks.connectors.properties.ConnectionProperties;
8-
import org.odpi.openmetadata.frameworks.connectors.properties.beans.SecurityTags;
97

10-
import java.io.File;
11-
import java.io.IOException;
128
import java.util.Set;
139

1410
import static org.junit.jupiter.api.Assertions.*;

‎open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/file/FileBasedServerConfigStoreConnector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;
1313
import org.odpi.openmetadata.adminservices.store.OMAGServerConfigStoreConnectorBase;
14-
import org.odpi.openmetadata.frameworks.connectors.properties.EndpointProperties;
14+
import org.odpi.openmetadata.frameworks.connectors.properties.EndpointDetails;
1515
import org.odpi.openmetadata.adminservices.configuration.properties.OMAGServerConfig;
1616
import org.apache.commons.io.FileUtils;
1717

@@ -87,7 +87,7 @@ public void start() throws ConnectorCheckedException
8787
*/
8888
private String getStoreTemplateName()
8989
{
90-
EndpointProperties endpoint = connectionProperties.getEndpoint();
90+
EndpointDetails endpoint = connectionDetails.getEndpoint();
9191

9292
String configStoreTemplateName = null;
9393
if (endpoint != null)

0 commit comments

Comments
 (0)