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

Jump to bottom

sendEvents Async #7138

Merged
merged 14 commits into from
Jan 24, 2023
Merged

sendEvents Async #7138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d5894ab
send instance, types, registrations events async. Use the default thr…
Nov 27, 2022
0c6a676
Merge branch 'main' into send-events-async
marius-patrascu Nov 28, 2022
710c1f8
unwrap connectorException when sending events
Nov 28, 2022
dc18881
Merge remote-tracking branch 'origin/send-events-async' into send-eve…
Nov 28, 2022
57525e2
improved error handling
Nov 29, 2022
925c28b
name fixes
Nov 29, 2022
04e8edd
logic fix for send registry event
Dec 1, 2022
4e50d03
reverted app props changes
Dec 1, 2022
28de320
Merge branch 'main' into send-events-async
marius-patrascu Dec 1, 2022
a13b422
Merge branch 'main' into send-events-async
marius-patrascu Dec 2, 2022
29ba5bd
Merge branch 'main' into send-events-async
marius-patrascu Dec 5, 2022
6aa75be
Merge branch 'main' into send-events-async
Dec 20, 2022
f4f0de7
Merge branch 'main' into send-events-async
Dec 20, 2022
9a8d504
Merge branch 'main' into send-events-async
Jan 20, 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
15 changes: 14 additions & 1 deletion ...ccessservices/assetconsumer/connectors/outtopic/AssetConsumerOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* AssetConsumerOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(AssetConsumerOutTopicEvent event) throws InvalidParameterE
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(AssetConsumerOutTopicEvent event) throws InvalidParameterE
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion .../accessservices/assetmanager/connectors/outtopic/AssetManagerOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* AssetManagerOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(AssetManagerOutTopicEvent event) throws InvalidParameterEx
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(AssetManagerOutTopicEvent event) throws InvalidParameterEx
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion ...data/accessservices/assetowner/connectors/outtopic/AssetOwnerOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* AssetOwnerOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(AssetOwnerOutTopicEvent event) throws InvalidParameterExce
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(AssetOwnerOutTopicEvent event) throws InvalidParameterExce
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion ...ervices/communityprofile/connectors/outtopic/CommunityProfileOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* CommunityProfileOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(CommunityProfileOutboundEvent event) throws InvalidParamet
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(CommunityProfileOutboundEvent event) throws InvalidParamet
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
6 changes: 2 additions & 4 deletions .../odpi/openmetadata/accessservices/dataengine/server/handlers/DataEngineCommonHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Date;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
Expand Down Expand Up @@ -209,11 +208,10 @@ protected void upsertExternalRelationship(String userId, String firstGUID, Strin

TypeDef relationshipTypeDef = repositoryHelper.getTypeDefByName(userId, relationshipTypeName);

genericHandler.linkElementToElement(userId, externalSourceGUID, externalSourceName, firstGUID,
genericHandler.uncheckedLinkElementToElement(userId, externalSourceGUID, externalSourceName, firstGUID,
CommonMapper.GUID_PROPERTY_NAME, firstEntityTypeName, secondGUID, CommonMapper.GUID_PROPERTY_NAME,
secondEntityTypeName, false, false, null,
relationshipTypeDef.getGUID(), relationshipTypeName, relationshipProperties, null,
null, getNow(), methodName);
relationshipTypeDef.getGUID(), relationshipTypeName, relationshipProperties, getNow(), methodName);
} else {
Relationship originalRelationship = relationship.get();
String relationshipGUID = originalRelationship.getGUID();
Expand Down
4 changes: 2 additions & 2 deletions ...i/openmetadata/accessservices/dataengine/server/handlers/DataEngineCommonHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ void upsertExternalRelationship() throws InvalidParameterException, PropertyServ
ENTITY_TYPE_NAME, EXTERNAL_SOURCE_DE_QUALIFIED_NAME, null);

verify(invalidParameterHandler, times(1)).validateUserId(USER, methodName);
verify(genericHandler, times(1)).linkElementToElement(USER, EXTERNAL_SOURCE_DE_GUID, EXTERNAL_SOURCE_DE_QUALIFIED_NAME, FIRST_GUID,
verify(genericHandler, times(1)).uncheckedLinkElementToElement(USER, EXTERNAL_SOURCE_DE_GUID, EXTERNAL_SOURCE_DE_QUALIFIED_NAME, FIRST_GUID,
CommonMapper.GUID_PROPERTY_NAME, ENTITY_TYPE_NAME, SECOND_GUID, CommonMapper.GUID_PROPERTY_NAME,
ENTITY_TYPE_NAME, false, false, null,
RELATIONSHIP_TYPE_GUID, RELATIONSHIP_TYPE_NAME, null, null, null, null, methodName);
RELATIONSHIP_TYPE_GUID, RELATIONSHIP_TYPE_NAME, null, null, methodName);
}

@Test
Expand Down
14 changes: 13 additions & 1 deletion ...tadata/accessservices/dataengine/connectors/intopic/DataEngineInTopicClientConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
Expand All @@ -36,7 +37,7 @@ public void sendEvent(DataEngineEventHeader event) throws InvalidParameterExcept
{

String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -46,6 +47,17 @@ public void sendEvent(DataEngineEventHeader event) throws InvalidParameterExcept
}

}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion ...ta/accessservices/datamanager/connectors/outtopic/DataManagerOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* DataManagerOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(DataManagerOutboundEvent event) throws InvalidParameterExc
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(DataManagerOutboundEvent event) throws InvalidParameterExc
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion ...s/digitalarchitecture/connectors/outtopic/DigitalArchitectureOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* DigitalArchitectureOutTopicServerConnector is the java implementation of the
Expand All @@ -34,7 +36,7 @@ public void sendEvent(DigitalArchitectureOutTopicEvent event) throws InvalidPara
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -43,6 +45,17 @@ public void sendEvent(DigitalArchitectureOutTopicEvent event) throws InvalidPara
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion ...ervices/governanceengine/connectors/outtopic/GovernanceEngineOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* GovernanceEngineOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(GovernanceEngineEvent event) throws InvalidParameterExcept
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(GovernanceEngineEvent event) throws InvalidParameterExcept
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion ...ervices/itinfrastructure/connectors/outtopic/ITInfrastructureOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* ITInfrastructureOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(ITInfrastructureOutTopicEvent event) throws InvalidParamet
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(ITInfrastructureOutTopicEvent event) throws InvalidParamet
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
15 changes: 14 additions & 1 deletion ...sservices/securitymanager/connectors/outtopic/SecurityManagerOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicSenderConnectorBase;

import java.util.concurrent.CompletionException;


/**
* SecurityManagerOutTopicServerConnector is the java implementation of the
Expand All @@ -33,7 +35,7 @@ public void sendEvent(SecurityManagerOutTopicEvent event) throws InvalidParamete
try
{
String eventString = objectMapper.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand All @@ -42,6 +44,17 @@ public void sendEvent(SecurityManagerOutTopicEvent event) throws InvalidParamete
eventString);
}
}
catch (CompletionException error)
{
if (error.getCause() instanceof ConnectorCheckedException)
{
throw (ConnectorCheckedException) error.getCause();
}
else if (error.getCause() instanceof InvalidParameterException)
{
throw (InvalidParameterException) error.getCause();
}
}
catch (InvalidParameterException | ConnectorCheckedException error)
{
throw error;
Expand Down
Loading