Apply smallish fixes (#731)

* Fix grammar
* Fix code style

Author: MakarovS

exonum-java-binding/core/src/main/java/com/exonum/binding/blockchain/CoreSchemaProxy.java

@@ -50,12 +50,12 @@ final class CoreSchemaProxy {
 
   private final NativeHandle nativeHandle;
   private final View dbView;
-  private static final Serializer<Block> blockSerializer = BlockSerializer.INSTANCE;
-  private static final Serializer<TransactionLocation> transactionLocationSerializer =
+  private static final Serializer<Block> BLOCK_SERIALIZER = BlockSerializer.INSTANCE;
+  private static final Serializer<TransactionLocation> TRANSACTION_LOCATION_SERIALIZER =
       TransactionLocationSerializer.INSTANCE;
-  private static final Serializer<TransactionResult> transactionResultSerializer =
+  private static final Serializer<TransactionResult> TRANSACTION_RESULT_SERIALIZER =
       TransactionResultSerializer.INSTANCE;
-  private static final Serializer<TransactionMessage> transactionMessageSerializer =
+  private static final Serializer<TransactionMessage> TRANSACTION_MESSAGE_SERIALIZER =
       StandardSerializers.transactionMessage();
 
   private CoreSchemaProxy(NativeHandle nativeHandle, View dbView) {
@@ -118,7 +118,7 @@ ProofListIndexProxy<HashCode> getBlockTransactions(long blockHeight) {
    */
   MapIndex<HashCode, Block> getBlocks() {
     return MapIndexProxy.newInstance(
-        CoreIndex.BLOCKS, dbView, StandardSerializers.hash(), blockSerializer);
+        CoreIndex.BLOCKS, dbView, StandardSerializers.hash(), BLOCK_SERIALIZER);
   }
 
   /**
@@ -127,23 +127,23 @@ MapIndex<HashCode, Block> getBlocks() {
    * @throws RuntimeException if the "genesis block" was not created
    */
   Block getLastBlock() {
-    return blockSerializer.fromBytes(nativeGetLastBlock(nativeHandle.get()));
+    return BLOCK_SERIALIZER.fromBytes(nativeGetLastBlock(nativeHandle.get()));
   }
 
   /**
    * Returns a map of transaction messages identified by their SHA-256 hashes.
    */
   MapIndex<HashCode, TransactionMessage> getTxMessages() {
     return MapIndexProxy.newInstance(CoreIndex.TRANSACTIONS, dbView, StandardSerializers.hash(),
-        transactionMessageSerializer);
+        TRANSACTION_MESSAGE_SERIALIZER);
   }
 
   /**
    * Returns a map with a key-value pair of a transaction hash and execution result.
    */
   ProofMapIndexProxy<HashCode, TransactionResult> getTxResults() {
     return ProofMapIndexProxy.newInstance(CoreIndex.TRANSACTIONS_RESULTS, dbView,
-        StandardSerializers.hash(), transactionResultSerializer);
+        StandardSerializers.hash(), TRANSACTION_RESULT_SERIALIZER);
   }
 
   /**
@@ -152,7 +152,7 @@ ProofMapIndexProxy<HashCode, TransactionResult> getTxResults() {
    */
   MapIndex<HashCode, TransactionLocation> getTxLocations() {
     return MapIndexProxy.newInstance(CoreIndex.TRANSACTIONS_LOCATIONS, dbView,
-        StandardSerializers.hash(), transactionLocationSerializer);
+        StandardSerializers.hash(), TRANSACTION_LOCATION_SERIALIZER);
   }
 
   /**

exonum-java-binding/core/src/main/java/com/exonum/binding/service/Schema.java

@@ -25,8 +25,8 @@
 public interface Schema {
 
   /**
-   * Returns the root hashes of Merklized tables in this database schema, as of the current
-   * state of the database. If there are no Merklized tables, returns an empty list.
+   * Returns the root hashes of Merkelized tables in this database schema, as of the current
+   * state of the database. If there are no Merkelized tables, returns an empty list.
    *
    * <p>This list of root hashes represents the current service state. Lists of these hashes
    * from each service are aggregated in a single <em>blockchain state hash</em> that reflects

exonum-java-binding/core/src/main/java/com/exonum/binding/service/Service.java

@@ -80,12 +80,12 @@ default Optional<String> initialize(Fork fork) {
   Transaction convertToTransaction(RawTransaction rawTransaction);
 
   /**
-   * Returns a list of root hashes of all Merklized tables defined by this service,
-   * as of the given snapshot of the blockchain state. If the service doesn't have any Merklized
+   * Returns a list of root hashes of all Merkelized tables defined by this service,
+   * as of the given snapshot of the blockchain state. If the service doesn't have any Merkelized
    * tables, returns an empty list.
    *
    * <p>The core uses this list to aggregate hashes of tables defined by all services
-   * into a single Merklized meta-map.  The hash of this meta-map is considered the hash
+   * into a single Merkelized meta-map.  The hash of this meta-map is considered the hash
    * of the entire blockchain state and is recorded as such in blocks and Precommit messages.
    *
    * @param snapshot a snapshot of the blockchain state. Not valid after this method returns

exonum-java-binding/core/src/test/java/com/exonum/binding/blockchain/serialization/TransactionLocationSerializerTest.java

@@ -27,14 +27,14 @@
 
 class TransactionLocationSerializerTest {
 
-  private static final Serializer<TransactionLocation> serializer =
+  private static final Serializer<TransactionLocation> SERIALIZER =
       TransactionLocationSerializer.INSTANCE;
 
   @ParameterizedTest
   @MethodSource("testSource")
   void roundTrip(TransactionLocation expected) {
-    byte[] bytes = serializer.toBytes(expected);
-    TransactionLocation actual = serializer.fromBytes(bytes);
+    byte[] bytes = SERIALIZER.toBytes(expected);
+    TransactionLocation actual = SERIALIZER.fromBytes(bytes);
 
     assertThat(actual, equalTo(expected));
   }

exonum-java-binding/core/src/test/java/com/exonum/binding/blockchain/serialization/TransactionResultSerializerTest.java

@@ -27,14 +27,14 @@
 
 class TransactionResultSerializerTest {
 
-  private static final Serializer<TransactionResult> serializer =
+  private static final Serializer<TransactionResult> SERIALIZER =
       TransactionResultSerializer.INSTANCE;
 
   @ParameterizedTest
   @MethodSource("testSource")
   void roundTrip(TransactionResult expected) {
-    byte[] bytes = serializer.toBytes(expected);
-    TransactionResult actual = serializer.fromBytes(bytes);
+    byte[] bytes = SERIALIZER.toBytes(expected);
+    TransactionResult actual = SERIALIZER.fromBytes(bytes);
 
     assertThat(actual, equalTo(expected));
   }

exonum-java-binding/cryptocurrency-demo/src/main/java/com/exonum/binding/cryptocurrency/CryptocurrencySchema.java

@@ -31,7 +31,7 @@
 /**
  * A schema of the cryptocurrency service.
  *
- * <p>Has one collection: Wallets (names and values) (Merklized)
+ * <p>Has one collection: Wallets (names and values) (Merkelized)
  */
 public final class CryptocurrencySchema implements Schema {
 

exonum-java-binding/pom.xml

@@ -31,23 +31,29 @@
       <url>https://github.com/dmitry-timofeev</url>
     </developer>
 
-    <developer>
-      <id>alexander-irbis</id>
-      <name>Alexander Semichenkov</name>
-      <url>https://github.com/alexander-irbis</url>
-    </developer>
-
     <developer>
       <id>MakarovS</id>
       <name>Sergei Makarov</name>
       <url>https://github.com/MakarovS</url>
     </developer>
 
+    <developer>
+      <id>bullet-tooth</id>
+      <name>Oleg Bondar</name>
+      <url>https://github.com/bullet-tooth</url>
+    </developer>
+
     <developer>
       <id>vitvakatu</id>
       <name>Ilya Bogdanov</name>
       <url>https://github.com/vitvakatu</url>
     </developer>
+
+    <developer>
+      <id>skletsun</id>
+      <name>Sergey Kletsun</name>
+      <url>https://github.com/skletsun</url>
+    </developer>
   </developers>
 
   <modules>

exonum-java-binding/qa-service/src/main/java/com/exonum/binding/qaservice/ApiController.java

@@ -394,10 +394,6 @@ static class QaPaths {
     @VisibleForTesting
     static final String SUBMIT_INCREMENT_COUNTER_TX_PATH = "/submit-increment-counter";
     @VisibleForTesting
-    static final String SUBMIT_INVALID_TX_PATH = "/submit-invalid";
-    @VisibleForTesting
-    static final String SUBMIT_INVALID_THROWING_TX_PATH = "/submit-invalid-throwing";
-    @VisibleForTesting
     static final String SUBMIT_VALID_THROWING_TX_PATH = "/submit-valid-throwing";
     @VisibleForTesting
     static final String SUBMIT_VALID_ERROR_TX_PATH = "/submit-valid-error";

exonum-java-binding/qa-service/src/main/java/com/exonum/binding/qaservice/QaSchema.java

@@ -32,7 +32,7 @@
  * A schema of the QA service.
  *
  * <p>Has two collections:
- * (a) values of the counters (Merklized),
+ * (a) values of the counters (Merkelized),
  * (b) names of the counters.
  */
 public final class QaSchema implements Schema {

exonum-java-binding/qa-service/src/test/java/com/exonum/binding/qaservice/QaServiceImplIntegrationTest.java

@@ -128,8 +128,8 @@ void getStateHashesLogsThem() throws CloseFailuresException {
       Snapshot view = db.createSnapshot(cleaner);
 
       List<HashCode> stateHashes = service.getStateHashes(view);
-      int numMerklizedCollections = 1;
-      assertThat(stateHashes).hasSize(numMerklizedCollections);
+      int numMerkelizedCollections = 1;
+      assertThat(stateHashes).hasSize(numMerkelizedCollections);
 
       List<String> logMessages = logAppender.getMessages();
       int expectedNumMessages = 1;