Encapsulate routing setup

client/src/main/java/io/spine/client/CommandFactory.java

@@ -170,11 +170,11 @@ private CommandContext createContext(int targetVersion) {
     private static CommandContext withCurrentTime(CommandContext value) {
         ActorContext withCurrentTime =
                 value.getActorContext()
-                     .toVBuilder()
+                     .toBuilder()
                      .setTimestamp(currentTime())
                      .build();
         CommandContext result =
-                value.toVBuilder()
+                value.toBuilder()
                      .setActorContext(withCurrentTime)
                      .build();
         return result;

client/src/main/java/io/spine/client/Queries.java

@@ -53,7 +53,7 @@ private Queries() {
 
     public static QueryId generateId() {
         String formattedId = format(QUERY_ID_FORMAT, Identifier.newUuid());
-        return QueryId.vBuilder()
+        return QueryId.newBuilder()
                       .setValue(formattedId)
                       .build();
     }

client/src/main/java/io/spine/client/QueryBuilder.java

@@ -139,7 +139,7 @@ private Optional<Pagination> pagination() {
         if (limit == 0) {
             return Optional.empty();
         }
-        Pagination result = Pagination.vBuilder()
+        Pagination result = Pagination.newBuilder()
                                       .setPageSize(limit)
                                       .build();
         return Optional.of(result);
@@ -149,7 +149,7 @@ private Optional<OrderBy> orderBy() {
         if (orderingColumn == null) {
             return Optional.empty();
         }
-        OrderBy result = OrderBy.vBuilder()
+        OrderBy result = OrderBy.newBuilder()
                                 .setColumn(orderingColumn)
                                 .setDirection(direction)
                                 .build();

client/src/main/java/io/spine/client/Targets.java

@@ -95,6 +95,7 @@ public static Target allOf(Class<? extends Message> targetClass) {
      *         a set of predicates which target entity state or event message must match
      * @return a {@code Target} instance formed according to the provided parameters
      */
+    @SuppressWarnings("CheckReturnValue")
     public static Target composeTarget(Class<? extends Message> targetClass,
                                        @Nullable Iterable<?> ids,
                                        @Nullable Iterable<CompositeFilter> filters) {
@@ -103,7 +104,7 @@ public static Target composeTarget(Class<? extends Message> targetClass,
         boolean includeAll = (ids == null && filters == null);
 
         TypeUrl typeUrl = TypeUrl.of(targetClass);
-        TargetVBuilder builder = Target.vBuilder()
+        Target.Builder builder = Target.newBuilder()
                                        .setType(typeUrl.value());
         if (includeAll) {
             builder.setIncludeAll(true);
@@ -132,7 +133,7 @@ private static IdFilter composeIdFilter(Collection<?> items) {
 
     private static IdFilter idFilter(List<Any> ids) {
         return IdFilter
-                .vBuilder()
+                .newBuilder()
                 .addAllIds(ids)
                 .build();
     }
@@ -154,7 +155,7 @@ private static <I> I checkId(I item) {
     }
 
     private static TargetFilters targetFilters(List<CompositeFilter> filters, IdFilter idFilter) {
-        return TargetFilters.vBuilder()
+        return TargetFilters.newBuilder()
                             .setIdFilter(idFilter)
                             .addAllFilter(filters)
                             .build();

core/src/main/java/io/spine/core/EventMixin.java

@@ -95,16 +95,16 @@ default boolean isRejection() {
     default Event clearEnrichments() {
         EventContext context = context();
         EventContext.OriginCase originCase = context.getOriginCase();
-        EventContextVBuilder resultContext = context.toVBuilder()
+        EventContext.Builder resultContext = context.toBuilder()
                                                     .clearEnrichment();
         if (originCase == EVENT_CONTEXT) {
             resultContext.setEventContext(context.getEventContext()
-                                                 .toVBuilder()
+                                                 .toBuilder()
                                                  .clearEnrichment()
                                                  .build());
         }
         Event thisEvent = (Event) this;
-        Event result = thisEvent.toVBuilder()
+        Event result = thisEvent.toBuilder()
                                 .setContext(resultContext.build())
                                 .build();
         return result;

license-report.md

@@ -431,7 +431,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:26 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:03 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -821,7 +821,7 @@ This report was generated on **Mon May 13 10:24:26 EEST 2019** using [Gradle-Lic
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:27 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:03 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -1359,7 +1359,7 @@ This report was generated on **Mon May 13 10:24:27 EEST 2019** using [Gradle-Lic
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:27 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:04 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -2059,7 +2059,7 @@ This report was generated on **Mon May 13 10:24:27 EEST 2019** using [Gradle-Lic
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:28 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:04 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -2603,7 +2603,7 @@ This report was generated on **Mon May 13 10:24:28 EEST 2019** using [Gradle-Lic
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:29 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:05 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -3108,7 +3108,7 @@ This report was generated on **Mon May 13 10:24:29 EEST 2019** using [Gradle-Lic
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:29 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:05 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -3621,7 +3621,7 @@ This report was generated on **Mon May 13 10:24:29 EEST 2019** using [Gradle-Lic
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:30 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:05 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -4234,4 +4234,4 @@ This report was generated on **Mon May 13 10:24:30 EEST 2019** using [Gradle-Lic
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon May 13 10:24:30 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri May 17 11:12:06 EEST 2019** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).

server/src/main/java/io/spine/server/BoundedContext.java

@@ -165,10 +165,12 @@ private static CommandBus buildCommandBus(BoundedContextBuilder builder, EventBu
     /**
      * Creates a new instance of {@link IntegrationBus} with the given parameters.
      *
-     * @param builder    the {@link BoundedContextBuilder} to obtain
-     *                   the {@link IntegrationBus.Builder} from
-     * @param eventBus   the initialized {@link EventBus}
-     * @param name       the name of the constructed Bounded Context
+     * @param builder
+     *         the {@link BoundedContextBuilder} to obtain the {@link IntegrationBus.Builder} from
+     * @param eventBus
+     *         the initialized {@link EventBus}
+     * @param name
+     *         the name of the constructed Bounded Context
      * @return new instance of {@link IntegrationBus}
      */
     private static IntegrationBus buildIntegrationBus(BoundedContextBuilder builder,
@@ -216,7 +218,7 @@ public static BoundedContextBuilder newBuilder() {
      */
     public <I, E extends Entity<I, ?>> void register(Repository<I, E> repository) {
         checkNotNull(repository);
-        repository.setBoundedContext(this);
+        repository.setContext(this);
         guard.register(repository);
         repository.onRegistered();
         registerEventDispatcher(stand());
@@ -270,10 +272,13 @@ private void registerWithIntegrationBus(ExternalDispatcherFactory<?> dispatcher)
     }
 
     /**
-     * Registers the passed event dispatcher with the {@code EventBus} of
-     * this {@code BoundedContext}, if it dispatches domestic events.
+     * Registers the passed event dispatcher with the buses of this {@code BoundedContext}.
+     *
+     * <p>If the passed instance dispatches domestic events, registers it with the {@code EventBus}.
      * If the passed instance dispatches external events, registers it with
      * the {@code IntegrationBus}.
+     *
+     * @see #registerEventDispatcher(EventDispatcherDelegate)
      */
     public void registerEventDispatcher(EventDispatcher<?> dispatcher) {
         checkNotNull(dispatcher);
@@ -288,10 +293,10 @@ public void registerEventDispatcher(EventDispatcher<?> dispatcher) {
     }
 
     /**
-     * Registers the passed event dispatcher with the {@code EventBus} of
-     * this {@code BoundedContext}, if it dispatchers domestic events.
-     * If the passed instance dispatches external events, registers it with
-     * the {@code IntegrationBus}.
+     * Registers the passed delegate of an {@link EventDispatcher} with the buses of this
+     * {@code BoundedContext}.
+     *
+     * @see #registerEventDispatcher(EventDispatcher)
      */
     public void registerEventDispatcher(EventDispatcherDelegate<?> dispatcher) {
         checkNotNull(dispatcher);
@@ -305,7 +310,8 @@ public void registerEventDispatcher(EventDispatcherDelegate<?> dispatcher) {
      */
     private static
     Supplier<IllegalStateException> notExternalDispatcherFrom(Object dispatcher) {
-        return () -> newIllegalStateException("No external dispatcher provided by %s", dispatcher);
+        return () -> newIllegalStateException(
+                "No external dispatcher provided by `%s`.", dispatcher);
     }
 
     /**
@@ -518,4 +524,12 @@ private void shutDownRepositories() {
             tenantIndex.close();
         }
     }
+
+    /**
+     * Returns the name of this Bounded Context.
+     */
+    @Override
+    public String toString() {
+        return name.getValue();
+    }
 }

server/src/main/java/io/spine/server/aggregate/AggregatePartRepository.java

@@ -20,7 +20,9 @@
 
 package io.spine.server.aggregate;
 
+import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper;
 import io.spine.annotation.Internal;
+import io.spine.server.BoundedContext;
 import io.spine.server.aggregate.model.AggregatePartClass;
 
 import static io.spine.server.aggregate.model.AggregatePartClass.asAggregatePartClass;
@@ -47,11 +49,19 @@ protected AggregatePartRepository() {
         super();
     }
 
+    /**
+     * Registers itself with the {@link io.spine.server.BoundedContext#aggregateRootDirectory()
+     * AggregateRootDirectory} of the parent {@code BoundedContext}.
+     *
+     * @param context
+     *         the Bounded Context of this repository
+     */
     @Override
-    public void onRegistered() {
-        super.onRegistered();
-        boundedContext().aggregateRootDirectory()
-                        .register(this);
+    @OverridingMethodsMustInvokeSuper
+    protected void init(BoundedContext context) {
+        super.init(context);
+        context.aggregateRootDirectory()
+               .register(this);
     }
 
     @Override
@@ -71,9 +81,8 @@ AggregatePartClass<A> aggregatePartClass() {
         return (AggregatePartClass<A>) entityModelClass();
     }
 
-    //TODO:2017-06-06:alexander.yevsyukov: Cache aggregate roots shared among part repositories
     private AggregateRoot<I> createAggregateRoot(I id) {
-        AggregateRoot<I> result = aggregatePartClass().createRoot(boundedContext(), id);
+        AggregateRoot<I> result = aggregatePartClass().createRoot(context(), id);
         return result;
     }