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

Create Jackson object mapper, readers and writers at class level #7251

Merged
merged 12 commits into from
Jan 25, 2023
Merged

Create Jackson object mapper, readers and writers at class level #7251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0bc3587
Create Jackson object mapper, reader and writers at class level
alexandra-bucur Dec 16, 2022
4307e58
Fix Maven build
alexandra-bucur Dec 16, 2022
3a5e287
Update charset
alexandra-bucur Dec 19, 2022
cb2af6f
Update charset
alexandra-bucur Dec 19, 2022
8ecd1f7
Normalize filepath
alexandra-bucur Dec 19, 2022
331f772
Merge branch 'main' into object-mappers
alexandra-bucur Dec 20, 2022
4fabe9e
Fix sonar issue
alexandra-bucur Dec 20, 2022
efad6fb
Merge remote-tracking branch 'fork/object-mappers' into object-mappers
alexandra-bucur Dec 20, 2022
4b15432
Merge branch 'main' into object-mappers
alexandra-bucur Dec 20, 2022
16f88d9
Add dependency to build + fix FVT
alexandra-bucur Dec 20, 2022
b86f4b9
Merge branch 'main' of github.com:odpi/egeria into object-mappers
alexandra-bucur Jan 25, 2023
b9117be
Minor fix from review
alexandra-bucur Jan 25, 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
2 changes: 1 addition & 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 @@ -38,7 +38,7 @@ public void sendEvent(AssetConsumerOutTopicEvent event) throws InvalidParameterE
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -38,7 +38,7 @@ public void sendEvent(AssetManagerOutTopicEvent event) throws InvalidParameterEx
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -38,7 +38,7 @@ public void sendEvent(AssetOwnerOutTopicEvent event) throws InvalidParameterExce
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -38,7 +38,7 @@ public void sendEvent(CommunityProfileOutboundEvent event) throws InvalidParamet
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
3 changes: 2 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 @@ -37,8 +37,9 @@ public void sendEvent(DataEngineEventHeader event) throws InvalidParameterExcept

try
{

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

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -38,7 +38,7 @@ public void sendEvent(DataManagerOutboundEvent event) throws InvalidParameterExc
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -39,7 +39,7 @@ public void sendEvent(DigitalArchitectureOutTopicEvent event) throws InvalidPara
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -38,7 +38,7 @@ public void sendEvent(GovernanceEngineEvent event) throws InvalidParameterExcept
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -37,7 +37,7 @@ public void sendEvent(ITInfrastructureOutTopicEvent event) throws InvalidParamet
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 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 @@ -38,7 +38,7 @@ public void sendEvent(SecurityManagerOutTopicEvent event) throws InvalidParamete
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 1 deletion ...sservices/securityofficer/connectors/outtopic/SecurityOfficerOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void sendEvent(SecurityOfficerEvent event) throws InvalidParameterExcepti
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
2 changes: 1 addition & 1 deletion ...vices/stewardshipaction/connectors/outtopic/StewardshipActionOutTopicServerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void sendEvent(StewardshipActionOutTopicEvent event) throws InvalidParame
try
{
String eventString = OBJECT_WRITER.writeValueAsString(event);
super.sendEvent(eventString);
super.sendEvent(eventString).join();

if (super.auditLog != null)
{
Expand Down
41 changes: 2 additions & 39 deletions ...ava/org/odpi/openmetadata/repositoryservices/connectors/omrstopic/OMRSTopicConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,44 +423,7 @@ private CompletableFuture<Boolean> sendEvent(OMRSEventV1 event,
final String methodName = "sendEvent";
if (event != null)
{
try
{

String eventString = OBJECT_WRITER.writeValueAsString(event);

if ((auditLog != null) && (logEvent))
{
auditLog.logMessage(methodName,
OMRSAuditCode.OUTBOUND_TOPIC_EVENT.getMessageDefinition(event.getEventCategory().getName(),
topicName),
eventString);
}

for (OpenMetadataTopicConnector eventBusConnector : eventBusConnectors)
{
if (eventBusConnector != null)
{
eventBusConnector.sendEvent(eventString);
}
}
}
catch (ConnectorCheckedException exc)
{
log.debug("Unable to send event: " + exc.getMessage());

throw exc;
}
catch (Exception exc)
{
log.debug("Unexpected error sending event: " + exc.getMessage());

throw new ConnectorCheckedException(OMRSErrorCode.OMRS_TOPIC_SEND_EVENT_FAILED.getMessageDefinition(connectionName,
event.toString(),
exc.getMessage()),
this.getClass().getName(),
methodName,
exc);
}
return CompletableFuture.supplyAsync(() -> sendEventTask(event, logEvent));
}
else
{
Expand All @@ -480,7 +443,7 @@ private boolean sendEventTask(OMRSEventV1 event,
{
ObjectMapper objectMapper = new ObjectMapper();
lpalashevski marked this conversation as resolved.
Show resolved Hide resolved

String eventString = objectMapper.writeValueAsString(event);
String eventString = OBJECT_WRITER.writeValueAsString(event);

if ((auditLog != null) && logEvent)
{
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.