Merge branch 'master' of https://github.com/SpineEventEngine/core-java into automate-checks-for-null-tolerance

Author: illia-shepilov

.idea/dictionaries/common.xml

@@ -33,7 +33,7 @@ buildscript {
         guavaVersion = '20.0'
         protobufGradlePluginVerison = '0.8.0'
 
-        spineVersion = '0.7.21-SNAPSHOT'
+        spineVersion = '0.7.24-SNAPSHOT'
         //TODO:2016-12-12:alexander.yevsyukov: Advance the plug-in version together with all the components and change
         // the version of the dependency below to `spineVersion` defined above.
         spineProtobufPluginVersion = '0.6.6-SNAPSHOT'
@@ -151,6 +151,26 @@ subprojects {
         }
     }
 
+    /* Uncomment this block if you need to display console output during the Gradle build.
+    test {
+        testLogging {
+            // Make sure output from standard out or error is shown in Gradle output.
+            showStandardStreams = true
+
+            // Or we use events method:
+            // events 'standard_out', 'standard_error'
+
+            // Or set property events:
+            // events = ['standard_out', 'standard_error']
+
+            // Instead of string values we can
+            // use enum values:
+            // events org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_OUT,
+            //        org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR,
+        }
+    }
+    */
+    
     protobuf {
         // The below suppressions `GroovyAssignabilityCheck` is a workaround for the IDEA bug.
         // See: https://youtrack.jetbrains.com/issue/IDEA-141744

build.gradle

@@ -20,6 +20,8 @@
 package org.spine3.server;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.protobuf.Message;
@@ -49,6 +51,7 @@
 import org.spine3.server.stand.StandStorage;
 import org.spine3.server.stand.StandUpdateDelivery;
 import org.spine3.server.storage.StorageFactory;
+import org.spine3.server.storage.StorageFactorySwitch;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nullable;
@@ -81,7 +84,7 @@ public final class BoundedContext extends IntegrationEventSubscriberGrpc.Integra
 
     /** If `true` the bounded context serves many organizations. */
     private final boolean multitenant;
-    private final StorageFactory storageFactory;
+
     private final CommandBus commandBus;
     private final EventBus eventBus;
     private final Stand stand;
@@ -96,11 +99,16 @@ public final class BoundedContext extends IntegrationEventSubscriberGrpc.Integra
      */
     private final Map<Class<? extends Message>, AggregateRepository<?, ?>> aggregateRepositories = Maps.newHashMap();
 
+    /**
+     * Memoized version of the {@code StorageFactory} supplier passed to the constructor.
+     */
+    private final Supplier<StorageFactory> storageFactory;
+
     private BoundedContext(Builder builder) {
         super();
         this.name = builder.name;
         this.multitenant = builder.multitenant;
-        this.storageFactory = builder.storageFactory;
+        this.storageFactory = Suppliers.memoize(builder.storageFactorySupplier);
         this.commandBus = builder.commandBus;
         this.eventBus = builder.eventBus;
         this.stand = builder.stand;
@@ -139,7 +147,7 @@ public static Builder newBuilder() {
      */
     @Override
     public void close() throws Exception {
-        storageFactory.close();
+        storageFactory.get().close();
         commandBus.close();
         eventBus.close();
         stand.close();
@@ -209,7 +217,7 @@ public boolean isMultitenant() {
 
     private void checkStorageAssigned(Repository repository) {
         if (!repository.storageAssigned()) {
-            repository.initStorage(this.storageFactory);
+            repository.initStorage(storageFactory.get());
         }
     }
 
@@ -283,6 +291,7 @@ public Stand getStand() {
         final AggregateRepository<?, ?> result = aggregateRepositories.get(aggregateStateClass);
         return Optional.fromNullable(result);
     }
+
     /**
      * A builder for producing {@code BoundedContext} instances.
      *
@@ -292,7 +301,7 @@ public Stand getStand() {
     public static class Builder {
 
         private String name = DEFAULT_NAME;
-        private StorageFactory storageFactory;
+        private Supplier<StorageFactory> storageFactorySupplier;
         private CommandStore commandStore;
         private CommandBus commandBus;
         private EventBus eventBus;
@@ -333,34 +342,38 @@ public boolean isMultitenant() {
             return this.multitenant;
         }
 
-        public Builder setStorageFactory(StorageFactory storageFactory) {
-            this.storageFactory = checkNotNull(storageFactory);
+        /**
+         * Sets the supplier for {@code StorageFactory}.
+         *
+         * <p>If the supplier was not set or {@code null} was passed,
+         * {@link StorageFactorySwitch} will be used during the construction of
+         * a {@code BoundedContext} instance.
+         */
+        public Builder setStorageFactorySupplier(@Nullable Supplier<StorageFactory> supplier) {
+            this.storageFactorySupplier = supplier;
             return this;
         }
 
-        @Nullable
-        public StorageFactory getStorageFactory() {
-            return storageFactory;
+        public Optional<Supplier<StorageFactory>> storageFactorySupplier() {
+            return Optional.fromNullable(storageFactorySupplier);
         }
 
         public Builder setCommandStore(CommandStore commandStore) {
             this.commandStore = checkNotNull(commandStore);
             return this;
         }
 
-        @Nullable
-        public CommandStore getCommandStore() {
-            return this.commandStore;
+        public Optional<CommandStore> commandStore() {
+            return Optional.fromNullable(commandStore);
         }
 
         public Builder setCommandBus(CommandBus commandBus) {
             this.commandBus = checkNotNull(commandBus);
             return this;
         }
 
-        @Nullable
-        public CommandBus getCommandBus() {
-            return commandBus;
+        public Optional<CommandBus> commandBus() {
+            return Optional.fromNullable(commandBus);
         }
 
 
@@ -369,24 +382,21 @@ public Builder setEventBus(EventBus eventBus) {
             return this;
         }
 
-        @Nullable
-        public EventBus getEventBus() {
-            return eventBus;
+        public Optional<EventBus> eventBus() {
+            return Optional.fromNullable(eventBus);
         }
 
         public Builder setStand(Stand stand) {
             this.stand = checkNotNull(stand);
             return this;
         }
 
-        @Nullable
-        public Stand getStand() {
-            return stand;
+        public Optional<Stand> stand() {
+            return Optional.fromNullable(stand);
         }
 
-        @Nullable
-        public StandUpdateDelivery getStandUpdateDelivery() {
-            return standUpdateDelivery;
+        public Optional<StandUpdateDelivery> standUpdateDelivery() {
+            return Optional.fromNullable(standUpdateDelivery);
         }
 
         public Builder setStandUpdateDelivery(StandUpdateDelivery standUpdateDelivery) {
@@ -395,17 +405,26 @@ public Builder setStandUpdateDelivery(StandUpdateDelivery standUpdateDelivery) {
         }
 
         public BoundedContext build() {
-            checkNotNull(storageFactory, "storageFactory must be set");
+            if (storageFactorySupplier == null) {
+                storageFactorySupplier = StorageFactorySwitch.getInstance();
+            }
+
+            final StorageFactory storageFactory = storageFactorySupplier.get();
+
+            if (storageFactory == null) {
+                throw new IllegalStateException("Supplier of StorageFactory (" + storageFactorySupplier +
+                                                        ") returned null instance");
+            }
 
             /* If some of the properties were not set, create them using set StorageFactory. */
             if (commandStore == null) {
-                commandStore = createCommandStore();
+                commandStore = createCommandStore(storageFactory);
             }
             if (commandBus == null) {
-                commandBus = createCommandBus();
+                commandBus = createCommandBus(storageFactory);
             }
             if (eventBus == null) {
-                eventBus = createEventBus();
+                eventBus = createEventBus(storageFactory);
             }
 
             if (stand == null) {
@@ -423,36 +442,30 @@ public BoundedContext build() {
         }
 
         private StandFunnel createStandFunnel(@Nullable StandUpdateDelivery standUpdateDelivery) {
-            StandFunnel standFunnel;
-            if (standUpdateDelivery == null) {
-                standFunnel = StandFunnel.newBuilder()
-                                         .setStand(stand)
-                                         .build();
-            } else {
-                standFunnel = StandFunnel.newBuilder()
-                                         .setDelivery(standUpdateDelivery)
-                                         .setStand(stand)
-                                         .build();
+            final StandFunnel.Builder builder = StandFunnel.newBuilder()
+                                                           .setStand(stand);
+            if (standUpdateDelivery != null) {
+                builder.setDelivery(standUpdateDelivery);
             }
-            return standFunnel;
+            return builder.build();
         }
 
-        private CommandStore createCommandStore() {
+        private static CommandStore createCommandStore(StorageFactory storageFactory) {
             final CommandStore result = new CommandStore(storageFactory.createCommandStorage());
             return result;
         }
 
-        private CommandBus createCommandBus() {
+        private CommandBus createCommandBus(StorageFactory storageFactory) {
             if (commandStore == null) {
-                this.commandStore = createCommandStore();
+                this.commandStore = createCommandStore(storageFactory);
             }
             final CommandBus commandBus = CommandBus.newBuilder()
                                                     .setCommandStore(commandStore)
                                                     .build();
             return commandBus;
         }
 
-        private EventBus createEventBus() {
+        private static EventBus createEventBus(StorageFactory storageFactory) {
             final EventBus result = EventBus.newBuilder()
                                             .setStorageFactory(storageFactory)
                                             .build();

server/src/main/java/org/spine3/server/BoundedContext.java

@@ -82,7 +82,7 @@ protected BoundedContext getBoundedContext() {
      * @param <S> the type of the part state
      * @return the state of the part or a default state if the state was not found
      */
-    protected <S extends Message, A extends AggregatePart<I, S, ?>> S getPart(Class<S> partStateClass) {
+    protected <S extends Message, A extends AggregatePart<I, S, ?>> S getPartState(Class<S> partStateClass) {
         final AggregatePartRepository<I, A> repo = getRepository(partStateClass);
         final AggregatePart<I, S, ?> aggregatePart = repo.loadOrCreate(getId());
         final S partState = aggregatePart.getState();
@@ -92,8 +92,9 @@ protected BoundedContext getBoundedContext() {
     /**
      * Obtains a repository for the passed state class.
      *
-     * @throws IllegalStateException if a repository was not found
-     *                               or the repository does not match expectations of this {@code AggregateRoot}
+     * @throws IllegalStateException
+     *              if a repository was not found,
+     *              or the repository does not match expectations of this {@code AggregateRoot}
      */
     private <S extends Message, A extends AggregatePart<I, S, ?>>
             AggregatePartRepository<I, A> getRepository(Class<S> stateClass) {