Commit 3e7949f4 authored by chiaming2000's avatar chiaming2000
Browse files

Get the default protocol version number defined in kinetic.proto when 

applications use the API
(kinetic.client.ClientConfiguration/kinetic.simulator.SimulatorConfiguration)
to obtain the protocol version number.
parent d5bd0ff3

bin/syncProtoFromRepo.sh

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ BASE_DIR=`cd "$BASE_DIR"; pwd` 
PROTO_REPO_URL=https://github.com/Seagate/Kinetic-Protocol.git

PROTO_FILE=$BASE_DIR/kinetic-common/src/main/java/com/seagate/kinetic/proto/kinetic.proto

CLONE_DIR=$BASE_DIR/bin/Kinetic-Protocol

PROTO_RELEASE_VERSION=2.0.6

PROTO_RELEASE_VERSION=3.0.0



function syncFromProtoRepo(){

    if [ -d "$CLONE_DIR" ]; then

kinetic-client/src/main/java/kinetic/client/ClientConfiguration.java

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ package kinetic.client; 
import java.util.Properties;

import java.util.logging.Logger;



import com.seagate.kinetic.proto.Kinetic;



/**

 * Kinetic Client configuration.

 * <p>
@@ -47,12 +49,12 @@ public class ClientConfiguration extends Properties { 
	 /**

     * current supported kinetic protocol version on kinetic-protocol repo.

     */

    public static final String PROTOCOL_VERSION = "2.0.6";

    public static final String PROTOCOL_VERSION = Kinetic.Local.getDefaultInstance().getProtocolVersion();

    

    /**

     * current supported protocol source commit hash on kinetic-protocol repo.

     */

    public static final String PROTOCOL_SOURCE_HASH = "c3b5e37bb236785b12ec2cdae03b682185e7279f";

    public static final String PROTOCOL_SOURCE_HASH = "f74698fba2df685cbfa9b6b9de54f1d2398f8615";



	// kinetic server host

	private String host = "localhost";

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/internal/SimulatorEngine.java

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ public class SimulatorEngine implements MessageService { 
            // init network io service

            this.initIoService();

            

            logger.info("simulator protocol version = " + SimulatorConfiguration.getProtocolVersion());



        } catch (Exception e) {

            e.printStackTrace();

            close();

kinetic-simulator/src/main/java/kinetic/simulator/SimulatorConfiguration.java

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ package kinetic.simulator; 


import java.util.Properties;



import com.seagate.kinetic.proto.Kinetic;

import com.seagate.kinetic.proto.Kinetic.Message;

import com.seagate.kinetic.simulator.heartbeat.HeartbeatProvider;

import com.seagate.kinetic.simulator.heartbeat.provider.MulticastHeartbeatProvider;
@@ -208,7 +210,7 @@ public class SimulatorConfiguration extends Properties { 
    /**

     * current supported protocol version defined at kinetic-protocol repository.

     */

    public static final String PROTOCOL_VERSION = "2.0.6";

    public static final String PROTOCOL_VERSION = Kinetic.Local.getDefaultInstance().getProtocolVersion();

    

    /**

     * current supported protocol source commit hash value obtained from kinetic-protocol repository.