Update the service API prefix [ECR-3042]:

exonum-java-binding/CHANGELOG.md

@@ -18,7 +18,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 The release is based on Exonum 0.11
 
 ### Added
-- `toOptional()` method to `EntryIndexProxy`. (#790) 
+- `toOptional()` method to `EntryIndexProxy`. (#790)
+
+### Changed
+- Service HTTP APIs provided with `Service#createPublicApiHandlers` are now mounted
+  on `/api/services` instead of `/api` for consistency with Exonum Core.
 
 ## [0.5.0] - 2019-03-13
 

exonum-java-binding/common/src/test/java/com/exonum/binding/common/serialization/json/StoredConfigurationGsonSerializerTest.java

@@ -58,7 +58,7 @@ class StoredConfigurationGsonSerializerTest {
       + "\"majority_count\": null,\n"
       + "\"services\": {\n"
       + "    \"configuration\": null,\n"
-      + "    \"cryptocurrency-demo-service\": null\n"
+      + "    \"cryptocurrency-demo\": null\n"
       + "}\n"
       + "}";
 

exonum-java-binding/core/rust/exonum-java/start_cryptocurrency_node.sh

@@ -41,7 +41,7 @@ echo "ARTIFACT_PATH=${ARTIFACT_PATH}"
 
 # Prepare the services configuration file
 SERVICES_CONFIG_FILE="services.toml"
-SERVICE_NAME="cryptocurrency-demo-service"
+SERVICE_NAME="cryptocurrency-demo"
 echo "[user_services]" > ${SERVICES_CONFIG_FILE}
 echo "${SERVICE_NAME} = '${ARTIFACT_PATH}'" >> ${SERVICES_CONFIG_FILE}
 

exonum-java-binding/core/rust/exonum-java/start_qa_node.sh

@@ -40,7 +40,7 @@ echo "ARTIFACT_PATH=${ARTIFACT_PATH}"
 
 # Prepare the services configuration file
 SERVICES_CONFIG_FILE="services.toml"
-SERVICE_NAME="ejb-qa-service"
+SERVICE_NAME="qa"
 echo "[user_services]" > ${SERVICES_CONFIG_FILE}
 echo "${SERVICE_NAME} = '${ARTIFACT_PATH}'" >> ${SERVICES_CONFIG_FILE}
 

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

@@ -102,13 +102,13 @@ default List<HashCode> getStateHashes(Snapshot snapshot) {
    * equal to the service name.
    *
    * <p>Please note that the path prefix is stripped from the request path when it is forwarded to
-   * the given router. For example, if your service name is «cryptocurrency»,
-   * and you have two endpoints «/send-money» and «/balance», use these names when
-   * defining handlers, and they will be available by paths «/cryptocurrency/send-money»
-   * and «/cryptocurrency/balance»:
+   * the given router. For example, if your service name is «timestamping»,
+   * and you have an endpoint «/timestamp», use this name when defining the handler and it will be
+   * available by path «/api/services/timestamping/timestamp»:
+   *
    * <pre><code>
    * router.get("/balance").handler((rc) -> {
-   *   rc.response().end("$1’000’000");
+   *   rc.response().end("2019-04-01T10:15:30+02:00[Europe/Kiev]");
    * });
    * </code></pre>
    *

exonum-java-binding/core/src/main/java/com/exonum/binding/service/adapters/UserServiceAdapter.java

@@ -47,7 +47,7 @@ public class UserServiceAdapter {
 
   private static final Logger logger = LogManager.getLogger(UserServiceAdapter.class);
 
-  private static final String API_ROOT_PATH = "/api";
+  private static final String API_ROOT_PATH = "/api/services";
 
   private final Service service;
   private final Server server;
@@ -164,7 +164,8 @@ public String initialize(long forkHandle) {
 
   public void mountPublicApiHandler(long nodeNativeHandle) {
     try {
-      checkState(node == null, "There is a node already: are you calling this method twice?");
+      checkState(node == null, "There is a node already (%s): are you calling this method twice?",
+          node);
       node = new NodeProxy(nodeNativeHandle);
       Router router = server.createRouter();
       service.createPublicApiHandlers(node, router);

exonum-java-binding/core/src/test/java/com/exonum/binding/service/adapters/UserServiceAdapterTest.java

@@ -205,7 +205,7 @@ void mountPublicApiHandler() {
         .thenReturn(serviceName);
 
     serviceAdapter.mountPublicApiHandler(0x0A);
-    verify(server).mountSubRouter(eq("/api/service1"), eq(router));
+    verify(server).mountSubRouter(eq("/api/services/service1"), eq(router));
   }
 
   @Test

exonum-java-binding/cryptocurrency-demo/frontend/src/plugins/blockchain.js

@@ -27,7 +27,7 @@ const PER_PAGE = 10
 const MAX_VALUE = 2147483647
 
 function getWallet (publicKey) {
-  return axios.get(`/api/cryptocurrency-demo-service/wallet/${publicKey}`)
+  return axios.get(`/api/services/cryptocurrency-demo/wallet/${publicKey}`)
     .then(response => response.data)
     .then(data => {
       return {
@@ -112,7 +112,7 @@ module.exports = {
       },
 
       getHistory (publicKey) {
-        return axios.get(`/api/cryptocurrency-demo-service/wallet/${publicKey}/history`).then(r => r.data)
+        return axios.get(`/api/services/cryptocurrency-demo/wallet/${publicKey}/history`).then(r => r.data)
       }
     }
   }

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

@@ -23,7 +23,7 @@
 
 public interface CryptocurrencyService extends Service {
   short ID = 42;
-  String NAME = "cryptocurrency-demo-service";
+  String NAME = "cryptocurrency-demo";
 
   Optional<Wallet> getWallet(PublicKey ownerKey);
 

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

@@ -36,7 +36,7 @@
 public interface QaService extends Service {
 
   short ID = 127;
-  String NAME = "ejb-qa-service";
+  String NAME = "qa";
 
   HashCode submitCreateCounter(String counterName);