Commit 8418bbf7 authored by chiaming2000's avatar chiaming2000
Browse files

Sync supported protocol source hash for Java API and simulator to 

release 3.0.0:

https://github.com/Seagate/kinetic-protocol/commit/f74698fba2df685cbfa9b6b9de54f1d2398f8615

Minor code clean up - fixed compiler warnings.
parent 95539250

kinetic-client/src/main/java/com/seagate/kinetic/admin/cli/KineticAdminCLI.java

+0 −9
Original line number Diff line number Diff line
@@ -556,13 +556,4 @@ public class KineticAdminCLI { 
        }

    }



    private void validateErase(String erase) throws IllegalArgumentException {

        if (erase == null || erase.isEmpty()) {

            throw new IllegalArgumentException("Erase can not be empty.");

        }



        if (!erase.equalsIgnoreCase(TRUE) && !erase.equalsIgnoreCase(FALSE)) {

            throw new IllegalArgumentException("Erase should be true or false.");

        }

    }

}

kinetic-client/src/main/java/com/seagate/kinetic/admin/impl/DefaultAdminClient.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import com.seagate.kinetic.proto.Kinetic.Command.Setup; 
import com.seagate.kinetic.proto.Kinetic.Command.Status;

import com.seagate.kinetic.proto.Kinetic.Command.Status.StatusCode;

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

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



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

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

kinetic-client/src/main/java/com/seagate/kinetic/client/internal/DefaultKineticClient.java

+0 −46
Original line number Diff line number Diff line
@@ -938,50 +938,4 @@ public class DefaultKineticClient implements AdvancedKineticClient { 
        this.client.requestAsync(message, handler);

    }



    /**

     * Set up kinetic connection.

     * <p>

     * The purpose is to get a connection ID from server. After this is returned, the connection is ready 

     * for concurrent and asynchronous operations. 

     * 

     * This may be extended to set up other connection attributes in the future.

     * @throws KineticException 

     */

    private void connectionSetUp ()  {

        

        KineticMessage response = null;

        

        KineticException ke = null;

        

        try {

            // create get request message

            KineticMessage request = MessageFactory.createNoOpRequestMessage();



            // send request

            response = this.client.request(request); 

        } catch (KineticException e) {

            // assign exception caught so that we can use it in the finally clause 

            ke = e;

            LOG.warning(e.getMessage());

        } finally {   

            if (response != null) {

                /**

                 * if got normal response, check and set connection Id.

                 */

                this.client.setConnectionId(response);

            } else if (ke != null){

                /**

                 * check if response message is set in the exception

                 */

                response = ke.getResponseMessage();

                if (response != null) {

                    /**

                     * set connection Id if necessary.

                     */

                    this.client.setConnectionId(response);

                }

            }

        }

    }



}

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/internal/p2p/P2PConnectionPool.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import kinetic.client.KineticClientFactory; 
import kinetic.client.KineticException;



import com.seagate.kinetic.common.lib.KineticMessage;

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



import com.seagate.kinetic.proto.Kinetic.Command.P2POperation.Peer;



/**

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/internal/p2p/P2POperationHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import kinetic.client.KineticClient; 
import com.google.protobuf.ByteString;

import com.seagate.kinetic.common.lib.KineticMessage;

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

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



import com.seagate.kinetic.proto.Kinetic.Command.MessageType;

import com.seagate.kinetic.proto.Kinetic.Command.P2POperation;

import com.seagate.kinetic.proto.Kinetic.Command.P2POperation.Operation;