Revert "[#1568] rocketmq need enhance stability when commitlog broken ...

Revert "[#1568] rocketmq need enhance stability when commitlog broken  增加非空判断，防止空指针异常,导致循环事务 check,增加test覆盖，修复编码格式"

This reverts commit a4f62104

broker/src/test/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridgeTest.java

@@ -110,18 +110,14 @@ public class TransactionalMessageBridgeTest {
 
     @Test
     public void testGetHalfMessage() {
-        when(messageStore
-                .getMessage(anyString(), anyString(), anyInt(), anyLong(), anyInt(), ArgumentMatchers.nullable(MessageFilter.class)))
-                .thenReturn(createGetMessageResult(GetMessageStatus.NO_MESSAGE_IN_QUEUE));
+        when(messageStore.getMessage(anyString(), anyString(), anyInt(), anyLong(), anyInt(),  ArgumentMatchers.nullable(MessageFilter.class))).thenReturn(createGetMessageResult(GetMessageStatus.NO_MESSAGE_IN_QUEUE));
         PullResult result = transactionBridge.getHalfMessage(0, 0, 1);
         assertThat(result.getPullStatus()).isEqualTo(PullStatus.NO_NEW_MSG);
     }
 
     @Test
     public void testGetOpMessage() {
-        when(messageStore
-                .getMessage(anyString(), anyString(), anyInt(), anyLong(), anyInt(), ArgumentMatchers.nullable(MessageFilter.class)))
-                .thenReturn(createGetMessageResult(GetMessageStatus.NO_MESSAGE_IN_QUEUE));
+        when(messageStore.getMessage(anyString(), anyString(), anyInt(), anyLong(), anyInt(),  ArgumentMatchers.nullable(MessageFilter.class))).thenReturn(createGetMessageResult(GetMessageStatus.NO_MESSAGE_IN_QUEUE));
         PullResult result = transactionBridge.getOpMessage(0, 0, 1);
         assertThat(result.getPullStatus()).isEqualTo(PullStatus.NO_NEW_MSG);
     }
@@ -147,9 +143,9 @@ public class TransactionalMessageBridgeTest {
         MessageExt messageExt = createMessageBrokerInner();
         final String offset = "123456789";
         MessageExtBrokerInner msgInner = transactionBridge.renewImmunityHalfMessageInner(messageExt);
-        MessageAccessor.putProperty(msgInner, MessageConst.PROPERTY_TRANSACTION_PREPARED_QUEUE_OFFSET, offset);
+        MessageAccessor.putProperty(msgInner, MessageConst.PROPERTY_TRANSACTION_PREPARED_QUEUE_OFFSET,offset);
         assertThat(msgInner).isNotNull();
-        Map<String, String> properties = msgInner.getProperties();
+        Map<String,String> properties = msgInner.getProperties();
         assertThat(properties).isNotNull();
         String resOffset = properties.get(MessageConst.PROPERTY_TRANSACTION_PREPARED_QUEUE_OFFSET);
         assertThat(resOffset).isEqualTo(offset);
@@ -161,11 +157,11 @@ public class TransactionalMessageBridgeTest {
         MessageExt messageExt = new MessageExt();
         long bornTimeStamp = messageExt.getBornTimestamp();
         MessageExt messageExtRes = transactionBridge.renewHalfMessageInner(messageExt);
-        assertThat(messageExtRes.getBornTimestamp()).isEqualTo(bornTimeStamp);
+        assertThat( messageExtRes.getBornTimestamp()).isEqualTo(bornTimeStamp);
     }
 
     @Test
-    public void testLookMessageByOffset() {
+    public void testLookMessageByOffset(){
         when(messageStore.lookMessageByOffset(anyLong())).thenReturn(new MessageExt());
         MessageExt messageExt = transactionBridge.lookMessageByOffset(123);
         assertThat(messageExt).isNotNull();
@@ -186,7 +182,7 @@ public class TransactionalMessageBridgeTest {
                 .getMessage(anyString(), anyString(), anyInt(), anyLong(), anyInt(), ArgumentMatchers.nullable(MessageFilter.class)))
                 .thenReturn(null);
         PullResult result = transactionBridge.getHalfMessage(0, 0, 1);
-        assertThat(result).isNull();
+        assertThat(result.getPullStatus()).isNull();
     }
 
     private GetMessageResult createGetMessageResult(GetMessageStatus status) {