FAB-4566 Minor code cleanup

Change-Id: I744aada6ad4006eea7ffc08c682091df7156ffc4
Signed-off-by: rickr <cr22rc@gmail.com>

src/main/java/org/hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java

@@ -95,7 +95,7 @@ private static SignaturePolicy parsePolicy(IndexedHashMap<String, MSPPrincipal>
                         throw new ChaincodeEndorsementPolicyParseException(format("%s expected to have list but found %s.", key, String.valueOf(vo)));
                     }
 
-                    @SuppressWarnings("unchecked") final List<Map<?, ?>> voList = (List<Map<?, ?>>) vo;
+                    @SuppressWarnings ("unchecked") final List<Map<?, ?>> voList = (List<Map<?, ?>>) vo;
 
                     if (voList.size() < matchNo) {
 

src/main/java/org/hyperledger/fabric/sdk/ChaincodeID.java

@@ -74,15 +74,13 @@ public Builder setVersion(String version) {
             return this;
         }
 
-
         /**
          * Set path of chaincode
          *
          * @param path of chaincode
          * @return Builder
          */
 
-
         public Builder setPath(String path) {
             this.protoBuilder.setPath(path);
             return this;
@@ -94,7 +92,7 @@ public ChaincodeID build() {
     }
 
     /**
-     *  Chaincode builder
+     * Chaincode builder
      *
      * @return ChaincodeID builder.
      */
@@ -103,5 +101,4 @@ public static Builder newBuilder() {
         return new Builder();
     }
 
-
 }

src/main/java/org/hyperledger/fabric/sdk/ChaincodeInputDeserializer.java

@@ -29,7 +29,7 @@ class ChaincodeInputDeserializer {
 
     ChaincodeInputDeserializer(ChaincodeInput chaincodeInput) {
         this.byteString = chaincodeInput.toByteString();
-        this.chaincodeInput =  new WeakReference<>(chaincodeInput);
+        this.chaincodeInput = new WeakReference<>(chaincodeInput);
     }
 
     ChaincodeInput getChaincodeInput() {

src/main/java/org/hyperledger/fabric/sdk/ChaincodeInvocationSpecDeserializer.java

@@ -23,7 +23,6 @@
 import org.hyperledger.fabric.protos.peer.Chaincode.ChaincodeInvocationSpec;
 import org.hyperledger.fabric.sdk.exception.InvalidProtocolBufferRuntimeException;
 
-
 class ChaincodeInvocationSpecDeserializer {
     private final ByteString byteString;
     private WeakReference<ChaincodeInvocationSpec> invocationSpec;
@@ -55,6 +54,7 @@ ChaincodeInvocationSpec getChaincodeInvocationSpec() {
         return ret;
 
     }
+
     ChaincodeInputDeserializer getChaincodeInput() {
         ChaincodeInputDeserializer ret = null;
 

src/main/java/org/hyperledger/fabric/sdk/ChaincodeResponse.java

@@ -44,15 +44,15 @@ public ChaincodeResponse(String transactionID, String chaincodeID, Status status
     public ChaincodeResponse(String transactionID, String chaincodeID, int istatus, String message) {
 
         switch (istatus) {
-        case 200:
-            this.status = Status.SUCCESS;
-            break;
-        case 500:
-            this.status = Status.FAILURE;
-            break;
-        default:
-            this.status = Status.UNDEFINED;
-            break;
+            case 200:
+                this.status = Status.SUCCESS;
+                break;
+            case 500:
+                this.status = Status.FAILURE;
+                break;
+            default:
+                this.status = Status.UNDEFINED;
+                break;
         }
         this.message = message;
         this.transactionID = transactionID;

src/main/java/org/hyperledger/fabric/sdk/Channel.java

@@ -152,7 +152,6 @@ public Collection<EventHub> getEventHubs() {
     private Block genesisBlock;
     private final boolean systemChannel;
 
-
     private Channel(String name, HFClient hfClient, Orderer orderer, ChannelConfiguration channelConfiguration, byte[][] signers) throws InvalidArgumentException, TransactionException {
         this(name, hfClient, false);
 

src/main/java/org/hyperledger/fabric/sdk/EnvelopeDeserializer.java

@@ -92,13 +92,11 @@ int getType() {
         return type;
     }
 
-
     /**
      * @return whether this Transaction is marked as TxValidationCode.VALID
      */
     public boolean isValid() {
 
-
         return validcode == FabricTransaction.TxValidationCode.VALID_VALUE;
     }
 
@@ -110,7 +108,6 @@ public byte validationCode() {
         return validcode;
     }
 
-
     static EnvelopeDeserializer newInstance(ByteString byteString, byte b) throws InvalidProtocolBufferException {
 
         EnvelopeDeserializer ret;

src/main/java/org/hyperledger/fabric/sdk/InstallProposalRequest.java

@@ -58,6 +58,7 @@ public File getChaincodeSourceLocation() {
 
     /**
      * The location of the chaincode.
+     *
      * @param chaincodeSourceLocation
      * @throws InvalidArgumentException
      */

src/main/java/org/hyperledger/fabric/sdk/Orderer.java

@@ -121,7 +121,6 @@ Ab.BroadcastResponse sendTransaction(Common.Envelope transaction) throws Excepti
 
         logger.debug(format("Order.sendTransaction name: %s, url: %s", name, url));
 
-
         OrdererClient localOrdererClient = ordererClient;
 
         if (localOrdererClient == null || !localOrdererClient.isChannelActive()) {

src/main/java/org/hyperledger/fabric/sdk/TransactionInfo.java

@@ -19,7 +19,6 @@
 
 /**
  * TransactionInfo contains the data from a {@link ProcessedTransaction} message
- *
  */
 public class TransactionInfo {
     private final String txID;

src/main/java/org/hyperledger/fabric/sdk/TransactionPayloadDeserializer.java

@@ -20,7 +20,7 @@
 
 import com.google.protobuf.ByteString;
 
-class TransactionPayloadDeserializer extends  PayloadDeserializer {
+class TransactionPayloadDeserializer extends PayloadDeserializer {
 
     private WeakReference<TransactionDeserializer> transactionDeserialize;
 
@@ -31,7 +31,6 @@ class TransactionPayloadDeserializer extends  PayloadDeserializer {
 
     TransactionDeserializer getTransaction() {
 
-
         TransactionDeserializer ret = null;
 
         if (transactionDeserialize != null) {

src/main/java/org/hyperledger/fabric/sdk/TransactionRequest.java

@@ -60,7 +60,6 @@ public class TransactionRequest {
     /**
      * The user context to use on this request.
      *
-     *
      * @return User context that is used for signing
      */
     User getUserContext() {

src/main/java/org/hyperledger/fabric/sdk/exception/ChaincodeEndorsementPolicyParseException.java

@@ -12,10 +12,8 @@
  *  limitations under the License.
  */
 
-
 package org.hyperledger.fabric.sdk.exception;
 
-
 public class ChaincodeEndorsementPolicyParseException extends BaseException {
     public ChaincodeEndorsementPolicyParseException(String message) {
         super(message);

src/main/java/org/hyperledger/fabric/sdk/exception/InvalidArgumentException.java

@@ -23,6 +23,7 @@ public class InvalidArgumentException extends BaseException {
     public InvalidArgumentException(String message, Exception parent) {
         super(message, parent);
     }
+
     public InvalidArgumentException(String message) {
         super(message);
     }

src/main/java/org/hyperledger/fabric/sdk/exception/InvokeException.java

@@ -17,6 +17,7 @@
 public class InvokeException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
+
     public InvokeException(String message, Exception parent) {
         super(message, parent);
     }

src/main/java/org/hyperledger/fabric/sdk/exception/TransactionEventException.java

@@ -17,7 +17,6 @@
 
 /**
  * The exception to be thrown when we receive an event for an invalid Transaction
- *
  */
 public class TransactionEventException extends TransactionException {
 
@@ -27,6 +26,7 @@ public class TransactionEventException extends TransactionException {
 
     /**
      * save the TransactionEvent in the exception so that caller can use for debugging
+     *
      * @param message
      * @param transactionEvent
      */
@@ -37,6 +37,7 @@ public TransactionEventException(String message, TransactionEvent transactionEve
 
     /**
      * save the TransactionEvent in the exception so that caller can use for debugging
+     *
      * @param message
      * @param transactionEvent
      * @param throwable

src/main/java/org/hyperledger/fabric/sdk/exception/TransactionException.java

@@ -25,6 +25,7 @@ public TransactionException(String message, Throwable parent) {
     public TransactionException(String message) {
         super(message);
     }
+
     public TransactionException(Throwable t) {
         super(t);
     }

src/main/java/org/hyperledger/fabric/sdk/helper/Utils.java

@@ -129,7 +129,7 @@ public static String generateDirectoryHash(String rootDir, String chaincodeDir,
      * Compress the contents of given directory using Tar and Gzip to an in-memory byte array.
      *
      * @param sourceDirectory the source directory.
-     * @param pathPrefix a path to be prepended to every file name in the .tar.gz output, or {@code null} if no prefix is required.
+     * @param pathPrefix      a path to be prepended to every file name in the .tar.gz output, or {@code null} if no prefix is required.
      * @return the compressed directory contents.
      * @throws IOException
      */
@@ -322,7 +322,6 @@ public static boolean isNullOrEmpty(String url) {
         return url == null || url.isEmpty();
     }
 
-
     /**
      * Makes logging strings which can be long or with unprintable characters be logged and trimmed.
      *
@@ -344,7 +343,6 @@ public static String logString(final String string) {
 
     private static final int NONONCE_LENGTH = 24;
 
-
     private static final SecureRandom RANDOM = new SecureRandom();
 
     public static byte[] generateNonce() {
@@ -355,8 +353,6 @@ public static byte[] generateNonce() {
         return values;
     }
 
-
-
     public static String toHexString(ByteString byteString) {
         if (byteString == null) {
             return null;
@@ -378,6 +374,7 @@ public static String toHexString(byte[] bytes) {
     /**
      * Private constructor to prevent instantiation.
      */
-    private Utils() { }
+    private Utils() {
+    }
 
 }

src/main/java/org/hyperledger/fabric/sdk/security/CryptoPrimitives.java

@@ -824,9 +824,9 @@ public byte[] certificateToDER(String certricatePEM) {
             return pemObject.getContent();
 
         } catch (IOException e) {
-           // best attempt
+            // best attempt
         }
-        return  null;
+        return null;
 
     }
 

src/main/java/org/hyperledger/fabric/sdk/transaction/CSCCProposalBuilder.java

@@ -20,7 +20,6 @@
 
 import static org.hyperledger.fabric.protos.peer.Chaincode.ChaincodeSpec.Type.GOLANG;
 
-
 public class CSCCProposalBuilder extends ProposalBuilder {
     private static final String CSCC_CHAIN_NAME = "cscc";
     private static final Chaincode.ChaincodeID CHAINCODE_ID_CSCC =

src/main/java/org/hyperledger/fabric/sdk/transaction/JoinPeerProposalBuilder.java

@@ -14,7 +14,6 @@
 
 package org.hyperledger.fabric.sdk.transaction;
 
-
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -28,7 +27,6 @@
 public class JoinPeerProposalBuilder extends CSCCProposalBuilder {
     private static final Log logger = LogFactory.getLog(JoinPeerProposalBuilder.class);
 
-
     public JoinPeerProposalBuilder genesisBlock(Block genesisBlock) throws ProposalException {
 
         if (genesisBlock == null) {
@@ -51,13 +49,12 @@ private JoinPeerProposalBuilder() {
     @Override
     public JoinPeerProposalBuilder context(TransactionContext context) {
         super.context(context);
-        return  this;
+        return this;
     }
 
     public static JoinPeerProposalBuilder newBuilder() {
         return new JoinPeerProposalBuilder();
     }
 
-
 }
 

src/main/java/org/hyperledger/fabric/sdk/transaction/LSCCProposalBuilder.java

@@ -19,7 +19,6 @@
 
 import static org.hyperledger.fabric.protos.peer.Chaincode.ChaincodeSpec.Type.GOLANG;
 
-
 public class LSCCProposalBuilder extends ProposalBuilder {
     private static final String LSCC_CHAIN_NAME = "lscc";
     private static final Chaincode.ChaincodeID CHAINCODE_ID_LSCC =

src/main/java/org/hyperledger/fabric/sdk/transaction/QueryInstantiatedChaincodesBuilder.java

@@ -14,7 +14,6 @@
 
 package org.hyperledger.fabric.sdk.transaction;
 
-
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +22,6 @@
 
 public class QueryInstantiatedChaincodesBuilder extends LSCCProposalBuilder {
 
-
     private QueryInstantiatedChaincodesBuilder() {
 
         List<ByteString> argList = new ArrayList<>();
@@ -42,6 +40,5 @@ public static QueryInstantiatedChaincodesBuilder newBuilder() {
         return new QueryInstantiatedChaincodesBuilder();
     }
 
-
 }
 

src/main/java/org/hyperledger/fabric/sdk/transaction/TransactionContext.java

@@ -38,7 +38,7 @@
  */
 public class TransactionContext {
     private static final Config config = Config.getConfig();
-//    private static final Log logger = LogFactory.getLog(TransactionContext.class);
+    //    private static final Log logger = LogFactory.getLog(TransactionContext.class);
     //TODO right now the server does not care need to figure out
     private final ByteString nonce = ByteString.copyFrom(Utils.generateNonce());
 
@@ -111,6 +111,7 @@ public Channel getChannel() {
 
     /**
      * Get the attribute names associated with this transaction context.
+     *
      * @return the attributes.
      */
     public List<String> getAttrs() {
@@ -119,6 +120,7 @@ public List<String> getAttrs() {
 
     /**
      * Set the attributes for this transaction context.
+     *
      * @param attrs the attributes.
      */
     public void setAttrs(List<String> attrs) {

src/main/java/org/hyperledger/fabric/sdk/transaction/UpgradeProposalBuilder.java

@@ -16,10 +16,8 @@
 
 public class UpgradeProposalBuilder extends InstantiateProposalBuilder {
 
-
 //    private final static Log logger = LogFactory.getLog(UpgradeProposalBuilder.class);
 
-
     private UpgradeProposalBuilder() {
         super();
         action = "upgrade";