Merge pull request #73 from dbl-x/feat_support_schema

move messageBuilder method to ProducerBase

Author: duhenglucky

openmessaging-api/src/main/java/io/openmessaging/api/Producer.java

@@ -41,7 +41,7 @@
  * @version OMS 1.2.0
  * @since OMS 1.2.0
  */
-public interface Producer extends Admin {
+public interface Producer extends ProducerBase, Admin {
 
     /**
      * Sends a message to the specified destination synchronously, the destination should be preset to {@link
@@ -84,12 +84,4 @@ public interface Producer extends Admin {
      * @param callbackExecutor
      */
     void setCallbackExecutor(final ExecutorService callbackExecutor);
-
-    /**
-     * Create message builder, used for build message in a fluent way.
-     *
-     * @param <T>
-     * @return
-     */
-    <T> MessageBuilder<T> messageBuilder();
 }

openmessaging-api/src/main/java/io/openmessaging/api/ProducerBase.java

@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.openmessaging.api;
+
+/**
+ * {@code ProducerBase} is the basic of other {@code Producer} interfaces
+ * and is used to define some common methods.
+ *
+ * @version OMS 2.0.3
+ * @since OMS 2.0.3
+ */
+public interface ProducerBase {
+
+    /**
+     * Create message builder, used for build message in a fluent way.
+     *
+     * @param <T> the class of message's payload
+     * @return MessageBuilder
+     */
+    <T> MessageBuilder<T> messageBuilder();
+}

openmessaging-api/src/main/java/io/openmessaging/api/order/OrderProducer.java

@@ -19,7 +19,7 @@
 
 import io.openmessaging.api.Admin;
 import io.openmessaging.api.Message;
-import io.openmessaging.api.MessageBuilder;
+import io.openmessaging.api.ProducerBase;
 import io.openmessaging.api.SendResult;
 
 /**
@@ -28,7 +28,7 @@
  * @version OMS 1.2.0
  * @since OMS 1.2.0
  */
-public interface OrderProducer extends Admin {
+public interface OrderProducer extends ProducerBase, Admin {
 
     /**
      * Send message in order
@@ -39,13 +39,4 @@ public interface OrderProducer extends Admin {
      * @return {@link SendResult} Message delivery result, including message Id.
      */
     SendResult send(final Message message, final String shardingKey);
-
-
-    /**
-     * Create message builder, used for build message in a fluent way.
-     *
-     * @param <T>
-     * @return
-     */
-    <T> MessageBuilder<T> messageBuilder();
 }

openmessaging-api/src/main/java/io/openmessaging/api/transaction/TransactionProducer.java

@@ -19,7 +19,7 @@
 
 import io.openmessaging.api.Admin;
 import io.openmessaging.api.Message;
-import io.openmessaging.api.MessageBuilder;
+import io.openmessaging.api.ProducerBase;
 import io.openmessaging.api.SendResult;
 import io.openmessaging.api.TransactionalResult;
 
@@ -29,7 +29,7 @@
  * @version OMS 1.2.0
  * @since OMS 1.2.0
  */
-public interface TransactionProducer extends Admin {
+public interface TransactionProducer extends ProducerBase, Admin {
 
     /**
      * This method is used to send a transactional message. A transactional message is sent in three steps:
@@ -46,17 +46,8 @@ public interface TransactionProducer extends Admin {
      * @return Send result
      */
     SendResult send(final Message message,
-        final LocalTransactionExecuter localTransactionExecutor,
-        final Object arg);
-
-
-    /**
-     * Create message builder, used for build message in a fluent way.
-     *
-     * @param <T>
-     * @return
-     */
-    <T> MessageBuilder<T> messageBuilder();
+                    final LocalTransactionExecuter localTransactionExecutor,
+                    final Object arg);
 
     /**
      * Sends a transactional message