Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure event direction in topic connector #7749

Merged
merged 2 commits into from
Jun 27, 2023
Merged

Configure event direction in topic connector #7749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f9394c
Configure event direction in topic connector
mandy-chessell Jun 26, 2023
5b87fe2
Merge branch 'main' of https://github.com/odpi/egeria into code2023
mandy-chessell Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ain/java/org/odpi/openmetadata/accessservices/assetconsumer/admin/AssetConsumerAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.ASSET_CONSUMER_OMAS.getAccessServiceFullName(),
AssetConsumerOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.ASSET_CONSUMER_OMAS.getAccessServiceFullName(),
AssetConsumerOutTopicServerProvider.class.getName(),
auditLog);
AssetConsumerOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
AssetConsumerOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/org/odpi/openmetadata/accessservices/assetmanager/admin/AssetManagerAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.ASSET_MANAGER_OMAS.getAccessServiceFullName(),
AssetManagerOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.ASSET_MANAGER_OMAS.getAccessServiceFullName(),
AssetManagerOutTopicServerProvider.class.getName(),
auditLog);
AssetManagerOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
AssetManagerOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/org/odpi/openmetadata/accessservices/assetowner/admin/AssetOwnerAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceFullName(),
AssetOwnerOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceFullName(),
AssetOwnerOutTopicServerProvider.class.getName(),
auditLog);
AssetOwnerOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
AssetOwnerOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
8 changes: 4 additions & 4 deletions ...va/org/odpi/openmetadata/accessservices/communityprofile/admin/CommunityProfileAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.COMMUNITY_PROFILE_OMAS.getAccessServiceFullName(),
CommunityProfileOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.COMMUNITY_PROFILE_OMAS.getAccessServiceFullName(),
CommunityProfileOutTopicServerProvider.class.getName(),
auditLog);
CommunityProfileOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
CommunityProfileOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
6 changes: 1 addition & 5 deletions ...in/java/org/odpi/openmetadata/accessservices/dataengine/server/admin/DataEngineAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ public void initialize(AccessServiceConfig accessServiceConfig, OMRSTopicConnect
accessServiceConfig.getAccessServiceName(), auditLog);

instance = new DataEngineServicesInstance(repositoryConnector, supportedZones, defaultZones, auditLog, serverUserName,
repositoryConnector.getMaxPageSize(),
super.getOutTopicConnection(accessServiceConfig.getAccessServiceInTopic(),
AccessServiceDescription.DATA_ENGINE_OMAS.getAccessServiceFullName(),
DataEngineInTopicClientProvider.class.getName(),
auditLog)); //TODO: using getOutTopicConnection temporary, we need getInTopicConnection... Check the correct way to create connection for the omas instance - using dedicated client provider class name (current impl.) or provided by the accessServiceConfig.getAccessServiceInTopic() (?)
repositoryConnector.getMaxPageSize(), accessServiceConfig.getAccessServiceInTopic());

serverName = instance.getServerName();

Expand Down
2 changes: 1 addition & 1 deletion ...g/odpi/openmetadata/accessservices/dataengine/server/admin/DataEngineInstanceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public Connection getInTopicConnection(String userId, String serverName, String
DataEngineServicesInstance instance = (DataEngineServicesInstance) super.getServerServiceInstance(userId, serverName, serviceOperationName);

if (instance != null) {
return instance.getInTopicConnection();
return instance.getInTopicClientConnection(serverName);
}

return null;
Expand Down
14 changes: 3 additions & 11 deletions .../odpi/openmetadata/accessservices/dataengine/server/admin/DataEngineServicesInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import lombok.AccessLevel;
import lombok.Getter;
import org.odpi.openmetadata.accessservices.dataengine.connectors.intopic.DataEngineInTopicClientProvider;
import org.odpi.openmetadata.accessservices.dataengine.ffdc.DataEngineErrorCode;
import org.odpi.openmetadata.accessservices.dataengine.model.Attribute;
import org.odpi.openmetadata.accessservices.dataengine.model.Collection;
Expand Down Expand Up @@ -131,14 +132,6 @@ public class DataEngineServicesInstance extends OMASServiceInstance {
@Getter
private final DataEngineRelationalDataHandler dataEngineRelationalDataHandler;

/**
* -- GETTER --
* Returns the connection used in the client to create a connector that produces events on the input topic.
* @return connection object for client
*/
@Getter
private final Connection inTopicConnection;

/**
* -- GETTER --
* Returns the Data Engine file handler.
Expand Down Expand Up @@ -221,9 +214,8 @@ public class DataEngineServicesInstance extends OMASServiceInstance {


super(description.getAccessServiceFullName(), repositoryConnector, supportedZones, defaultZones, null, auditLog,
localServerUserId, maxPageSize);

this.inTopicConnection = inTopicConnection;
localServerUserId, maxPageSize, DataEngineInTopicClientProvider.class.getName(), inTopicConnection,
null, null);

if (repositoryHandler == null) {
final String methodName = "new ServiceInstance";
Expand Down
8 changes: 4 additions & 4 deletions ...rc/main/java/org/odpi/openmetadata/accessservices/datamanager/admin/DataManagerAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.DATA_MANAGER_OMAS.getAccessServiceFullName(),
DataManagerOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.DATA_MANAGER_OMAS.getAccessServiceFullName(),
DataManagerOutTopicServerProvider.class.getName(),
auditLog);
DataManagerOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
DataManagerOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
8 changes: 4 additions & 4 deletions .../odpi/openmetadata/accessservices/digitalarchitecture/admin/DigitalArchitectureAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.DIGITAL_ARCHITECTURE_OMAS.getAccessServiceFullName(),
DigitalArchitectureOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.DIGITAL_ARCHITECTURE_OMAS.getAccessServiceFullName(),
DigitalArchitectureOutTopicServerProvider.class.getName(),
auditLog);
DigitalArchitectureOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
DigitalArchitectureOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
8 changes: 4 additions & 4 deletions ...va/org/odpi/openmetadata/accessservices/governanceengine/admin/GovernanceEngineAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.GOVERNANCE_ENGINE_OMAS.getAccessServiceFullName(),
GovernanceEngineOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.GOVERNANCE_ENGINE_OMAS.getAccessServiceFullName(),
GovernanceEngineOutTopicServerProvider.class.getName(),
auditLog);
GovernanceEngineOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
GovernanceEngineOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
8 changes: 4 additions & 4 deletions ...va/org/odpi/openmetadata/accessservices/itinfrastructure/admin/ITInfrastructureAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.IT_INFRASTRUCTURE_OMAS.getAccessServiceFullName(),
ITInfrastructureOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.IT_INFRASTRUCTURE_OMAS.getAccessServiceFullName(),
ITInfrastructureOutTopicServerProvider.class.getName(),
auditLog);
ITInfrastructureOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
ITInfrastructureOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
8 changes: 4 additions & 4 deletions ...java/org/odpi/openmetadata/accessservices/securitymanager/admin/SecurityManagerAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ public void initialize(AccessServiceConfig accessServiceConfig,
Endpoint endpoint = outTopicEventBusConnection.getEndpoint();

AuditLog outTopicAuditLog = auditLog.createNewAuditLog(OMRSAuditingComponent.OMAS_OUT_TOPIC);
Connection serverSideOutTopicConnection = this.getOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.SECURITY_MANAGER_OMAS.getAccessServiceFullName(),
SecurityManagerOutTopicServerProvider.class.getName(),
auditLog);
Connection serverSideOutTopicConnection = this.getServerSideOutTopicConnection(accessServiceConfig.getAccessServiceOutTopic(),
AccessServiceDescription.SECURITY_MANAGER_OMAS.getAccessServiceFullName(),
SecurityManagerOutTopicServerProvider.class.getName(),
auditLog);
SecurityManagerOutTopicServerConnector outTopicServerConnector = super.getTopicConnector(serverSideOutTopicConnection,
SecurityManagerOutTopicServerConnector.class,
outTopicAuditLog,
Expand Down
Loading