[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] #4270

devCod3r · 2023-07-21T09:49:45Z

Fixes #4269

Motivation

Replaced the if-else conditions with switch cases.
ISSUE #4269

Modifications

Describe the modifications you've done.
Replaced the if-else conditions with switch cases.

Documentation

Does this pull request introduce a new feature?
Ans: no
If a feature is not applicable for documentation, explain why?
Ans: Replaced the if-else conditions with switch cases.

…lAdaptor]

mxsm · 2023-07-21T13:12:14Z

...sage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java

+                        }
+                        map.put(MeshMessageProtocolConstant.PROTOCOL_KEY_CONTENT, new String(cloudEvent.getData().toBytes(), StandardCharsets.UTF_8));


StandardCharsets.UTF_8 replace with Constants.DEFAULT_CHARSET

…lAdaptor]

codecov · 2023-07-21T15:06:15Z

Codecov Report

Merging #4270 (5d8ff20) into master (6c94d9d) will increase coverage by 0.00%.
The diff coverage is 0.00%.

❗ Current head 5d8ff20 differs from pull request most recent head 42cc3fe. Consider uploading reports for the commit 42cc3fe to get more accurate results

@@            Coverage Diff            @@
##             master    #4270   +/-   ##
=========================================
  Coverage     16.86%   16.87%           
  Complexity     1426     1426           
=========================================
  Files           593      593           
  Lines         26073    26068    -5     
  Branches       2401     2396    -5     
=========================================
  Hits           4398     4398           
+ Misses        21234    21229    -5     
  Partials        441      441

Impacted Files	Coverage Δ
...otocol/meshmessage/MeshMessageProtocolAdaptor.java	`4.34% <0.00%> (+0.42%)`	⬆️
...he/eventmesh/runtime/boot/EventMeshHTTPServer.java	`0.52% <0.00%> (ø)`
.../protocol/http/processor/CreateTopicProcessor.java	`0.00% <0.00%> (ø)`
.../protocol/http/processor/DeleteTopicProcessor.java	`0.00% <0.00%> (ø)`
...col/http/processor/QuerySubscriptionProcessor.java	`0.00% <0.00%> (ø)`
...nt/tcp/impl/cloudevent/CloudEventTCPPubClient.java	`6.06% <ø> (ø)`
...nt/tcp/impl/cloudevent/CloudEventTCPSubClient.java	`5.88% <ø> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Pil0tXia · 2023-07-21T15:54:17Z

...sage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java

+            case MSG_BATCH_SEND_V2:
+                return SendMessageBatchV2ProtocolResolver.buildEvent(header, body);
+            case MSG_SEND_SYNC:
+                return SendMessageRequestProtocolResolver.buildEvent(header, body);


Line 87 is redundant.

Merged both the Cases.

Pil0tXia · 2023-07-21T15:56:57Z

...sage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java

-                @Override
-                public Map<String, Object> toMap() {
-                    if (cloudEvent.getData() == null) {
+                cloudEvent.getExtension(Constants.PROTOCOL_DESC) == null ? null : cloudEvent.getExtension(Constants.PROTOCOL_DESC).toString();


No change needs to be made in this line.

Reverted back the changes (Removed few white spaces).

Pil0tXia · 2023-07-21T16:01:00Z

...sage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java

+                        map.put(MeshMessageProtocolConstant.PROTOCOL_KEY_CONTENT, new String(cloudEvent.getData().toBytes(),
+                                Constants.DEFAULT_CHARSET));


Consider putting the second argument on the same line.

The second argument is on the same line but when I tried to put all the 3 arguments in the same line, I got the warning as shown below:

Like this:

map.put(MeshMessageProtocolConstant.PROTOCOL_KEY_CONTENT, new String(cloudEvent.getData().toBytes(), Constants.DEFAULT_CHARSET));

Because new String(cloudEvent.getData().toBytes(), Constants.DEFAULT_CHARSET) is the second argument of map.put.

Put method doesn't have three arguments; it's the original line breaks that make it look like it has three arguments .

I have put the whole second argument in the next line as suggested, thank you for the info :)

…lAdaptor]

mxsm · 2023-07-22T01:40:14Z

@devCod3r import code style , https://eventmesh.apache.org/community/contribute/contribute

…lAdaptor]

Pil0tXia

LGTM

…rotocolAdaptor] (apache#4270) * [ISSUE apache#4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] * [ISSUE apache#4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] * [ISSUE apache#4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] * [ISSUE apache#4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor]

* feat: add redis connector. * feat: add redis connector. * feat: add redis connector. * feat: add redis connector. * feat: add redis connector. * [ISSUE #4023]Comparison using reference equality instead of value equality.[Operation] (#4276) * [ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] (#4270) * [ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] * [ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] * [ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] * [ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] * [ISSUE #4099]Refactor re-used constant's usage from dedicated file (#4257) * [ISSUE #4099]: Refactor re-used constant's usage from dedicated file * [ISSUE #4099] Rename some constants for mongodb storage plugin * [ISSUE #4099] Refactor constant imports in mongodb cloud event util * [ISSUE #4099]: Replace contants imports to class import in mongo cloud event util * fix import order. * fix import order. * fix import order. * fix import order. --------- Co-authored-by: Fabian Bao <fabian.bao@agfa.com> Co-authored-by: kyooosukedn <87076947+kyooosukedn@users.noreply.github.com> Co-authored-by: Sam V Jose <124816912+devCod3r@users.noreply.github.com> Co-authored-by: ruhshan <ruhshan.ahmed@gmail.com>

…MessageProtocolAdaptor] (apache#4270)" This reverts commit 2cb5aa9.

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtoco…

8cf76d6

…lAdaptor]

mxsm requested changes Jul 21, 2023

View reviewed changes

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtoco…

3732f92

…lAdaptor]

Pil0tXia requested changes Jul 21, 2023

View reviewed changes

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtoco…

4a277f1

…lAdaptor]

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtoco…

42cc3fe

…lAdaptor]

devCod3r requested review from Pil0tXia and mxsm July 24, 2023 12:28

Pil0tXia approved these changes Jul 24, 2023

View reviewed changes

mxsm approved these changes Jul 25, 2023

View reviewed changes

xwm1992 approved these changes Jul 25, 2023

View reviewed changes

xwm1992 merged commit 2cb5aa9 into apache:master Jul 25, 2023

hhuang1231 added a commit to hhuang1231/eventmesh that referenced this pull request Jul 27, 2023

Revert "[ISSUE apache#4269] Used switch to replace the if-else. [Mesh…

00e3172

…MessageProtocolAdaptor] (apache#4270)" This reverts commit 2cb5aa9.

hhuang1231 mentioned this pull request Jul 28, 2023

[ISSUE #4268] Used switch to replace the if-else [CloudEventsProtocolAdaptor] #4298

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] #4270

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] #4270

devCod3r commented Jul 21, 2023

mxsm Jul 21, 2023

codecov bot commented Jul 21, 2023 •

edited

Loading

Pil0tXia Jul 21, 2023 •

edited

Loading

devCod3r Jul 21, 2023

Pil0tXia Jul 21, 2023

devCod3r Jul 21, 2023

Pil0tXia Jul 21, 2023

devCod3r Jul 21, 2023

Pil0tXia Jul 21, 2023 •

edited

Loading

devCod3r Jul 23, 2023

mxsm commented Jul 22, 2023

Pil0tXia left a comment

		}
		map.put(MeshMessageProtocolConstant.PROTOCOL_KEY_CONTENT, new String(cloudEvent.getData().toBytes(), StandardCharsets.UTF_8));

		map.put(MeshMessageProtocolConstant.PROTOCOL_KEY_CONTENT, new String(cloudEvent.getData().toBytes(),
		Constants.DEFAULT_CHARSET));

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] #4270

[ISSUE #4269] Used switch to replace the if-else. [MeshMessageProtocolAdaptor] #4270

Conversation

devCod3r commented Jul 21, 2023

Motivation

Modifications

Documentation

mxsm Jul 21, 2023

Choose a reason for hiding this comment

codecov bot commented Jul 21, 2023 • edited Loading

Codecov Report

Pil0tXia Jul 21, 2023 • edited Loading

Choose a reason for hiding this comment

devCod3r Jul 21, 2023

Choose a reason for hiding this comment

Pil0tXia Jul 21, 2023

Choose a reason for hiding this comment

devCod3r Jul 21, 2023

Choose a reason for hiding this comment

Pil0tXia Jul 21, 2023

Choose a reason for hiding this comment

devCod3r Jul 21, 2023

Choose a reason for hiding this comment

Pil0tXia Jul 21, 2023 • edited Loading

Choose a reason for hiding this comment

devCod3r Jul 23, 2023

Choose a reason for hiding this comment

mxsm commented Jul 22, 2023

Pil0tXia left a comment

Choose a reason for hiding this comment

codecov bot commented Jul 21, 2023 •

edited

Loading

Pil0tXia Jul 21, 2023 •

edited

Loading

Pil0tXia Jul 21, 2023 •

edited

Loading