FAB-6989 update dependencies

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

Author: cr22rc

pom.xml

@@ -28,9 +28,9 @@
         <tag>fabric-sdk-java-1.0</tag>
     </scm>
     <properties>
-        <grpc.version>1.8.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
+        <grpc.version>1.9.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
         <bouncycastle.version>1.59</bouncycastle.version>
-        <httpclient.version>4.5.4</httpclient.version>
+        <httpclient.version>4.5.5</httpclient.version>
         <skipITs>true</skipITs>
         <alpn-boot-version>8.1.7.v20160121</alpn-boot-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-http2</artifactId>
-            <version>4.1.19.Final</version>
+            <version>4.1.20.Final</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
         <dependency>

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

@@ -146,7 +146,7 @@ public long getBlockNumber() {
      */
 
     public int getEnvelopeCount() {
-        return isFiltered() ? filteredBlock.getFilteredTxCount() : block.getData().getDataCount();
+        return isFiltered() ? filteredBlock.getFilteredTransactionsCount() : block.getData().getDataCount();
     }
 
     public class EnvelopeInfo {
@@ -267,12 +267,12 @@ public EnvelopeInfo getEnvelopeInfo(int envelopeIndex) throws InvalidProtocolBuf
 
             if (isFiltered()) {
 
-                switch (filteredBlock.getFilteredTx(envelopeIndex).getType().getNumber()) {
+                switch (filteredBlock.getFilteredTransactions(envelopeIndex).getType().getNumber()) {
                     case Common.HeaderType.ENDORSER_TRANSACTION_VALUE:
-                        ret = new TransactionEnvelopeInfo(this.filteredBlock.getFilteredTx(envelopeIndex));
+                        ret = new TransactionEnvelopeInfo(this.filteredBlock.getFilteredTransactions(envelopeIndex));
                         break;
                     default: //just assume base properties.
-                        ret = new EnvelopeInfo(this.filteredBlock.getFilteredTx(envelopeIndex));
+                        ret = new EnvelopeInfo(this.filteredBlock.getFilteredTransactions(envelopeIndex));
                         break;
                 }
 
@@ -497,7 +497,7 @@ public TxReadWriteSetInfo getTxReadWriteSet() {
             public ChaincodeEvent getEvent() {
                 if (isFiltered()) {
                     final PeerEvents.FilteredChaincodeAction chaincodeActions = filteredAction;
-                    return new ChaincodeEvent(chaincodeActions.getCcEvent().toByteString());
+                    return new ChaincodeEvent(chaincodeActions.getChaincodeEvent().toByteString());
                 }
 
                 return transactionAction.getPayload().getAction().getProposalResponsePayload()
@@ -554,7 +554,7 @@ class EnvelopeInfoIterator implements Iterator<EnvelopeInfo> {
         final int max;
 
         EnvelopeInfoIterator() {
-            max = isFiltered() ? filteredBlock.getFilteredTxCount() : block.getData().getDataCount();
+            max = isFiltered() ? filteredBlock.getFilteredTransactionsCount() : block.getData().getDataCount();
 
         }
 

src/main/proto/peer/events.proto

@@ -80,7 +80,7 @@ message Unregister {
 message FilteredBlock {
     string channel_id = 1;
     uint64 number = 2; // The position in the blockchain
-    repeated FilteredTransaction filtered_tx = 4;
+    repeated FilteredTransaction filtered_transactions = 4;
 }
 
 //FilteredTransaction is a minimal set of information about a transaction
@@ -103,7 +103,7 @@ message FilteredTransactionActions {
 //FilteredChaincodeAction is a minimal set of information about an action within a
 //transaction.
 message FilteredChaincodeAction {
-    ChaincodeEvent ccEvent = 1;
+    ChaincodeEvent chaincode_event = 1;
 }
 
 // SignedEvent is used for any communication between consumer and producer