Merge pull request #155 from SpineEventEngine/upgrade-deps

yuri-sergiichuk · web-flow · commit 3292791e4830 · 2020-11-20T18:11:40.000+02:00
Bring `gcloud-java` up-to-date
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
@@ -67,41 +67,41 @@ object Repos {
 }
 
 object Versions {
-    val checkerFramework = "3.3.0"
-    val errorProne       = "2.3.4"
+    val checkerFramework = "3.7.1"
+    val errorProne       = "2.4.0"
     val errorProneJavac  = "9+181-r4173-1" // taken from here: https://github.com/tbroyer/gradle-errorprone-plugin/blob/v0.8/build.gradle.kts
-    val errorPronePlugin = "1.2.1"
+    val errorPronePlugin = "1.3.0"
     val pmd              = "6.24.0"
     val checkstyle       = "8.29"
-    val protobufPlugin   = "0.8.12"
-    val appengineApi     = "1.9.79"
+    val protobufPlugin   = "0.8.13"
+    val appengineApi     = "1.9.82"
     val appenginePlugin  = "2.2.0"
     val findBugs         = "3.0.2"
-    val guava            = "29.0-jre"
-    val protobuf         = "3.11.4"
+    val guava            = "30.0-jre"
+    val protobuf         = "3.13.0"
     val grpc             = "1.28.1"
     val flogger          = "0.5.1"
-    val junit4           = "4.12"
-    val junit5           = "5.6.2"
-    val junitPlatform    = "1.6.2"
-    val junitPioneer     = "0.4.2"
-    val truth            = "1.0.1"
+    val junit4           = "4.13.1"
+    val junit5           = "5.7.0"
+    val junitPlatform    = "1.7.0"
+    val junitPioneer     = "1.0.0"
+    val truth            = "1.1"
     val httpClient       = "1.34.2"
     val apacheHttpClient = "2.1.2"
     val firebaseAdmin    = "6.12.2"
     val roaster          = "2.21.2.Final"
     val licensePlugin    = "1.13"
-    val javaPoet         = "1.12.1"
-    val autoService      = "1.0-rc6"
+    val javaPoet         = "1.13.0"
+    val autoService      = "1.0-rc7"
     val autoCommon       = "0.10"
     val jackson          = "2.9.10.5"
-    val animalSniffer    = "1.18"
+    val animalSniffer    = "1.19"
     val apiguardian      = "1.1.0"
     val javaxAnnotation  = "1.3.2"
     val klaxon           = "5.4"
-    val ouathJwt         = "3.10.3"
+    val ouathJwt         = "3.11.0"
     val bouncyCastlePkcs = "1.66"
-    val assertK          = "0.22"
+    val assertK          = "0.23"
 
     /**
      * Version of the SLF4J library.
@@ -113,7 +113,7 @@ object Versions {
      * this version and force it via [forceConfiguration(..)][DependencyResolution.forceConfiguration].
      */
     @Deprecated("Use Flogger over SLF4J.", replaceWith = ReplaceWith("flogger"))
-    val slf4j            = "1.7.29"
+    val slf4j            = "1.7.30"
 }
 
 object GradlePlugins {
@@ -312,6 +312,9 @@ object DependencyResolution {
                         Deps.test.junit4,
 
                         // Transitive dependencies of 3rd party components that we don't use directly.
+                        "org.junit.platform:junit-platform-commons:${Versions.junitPlatform}",
+                        "com.google.auto.value:auto-value-annotations:1.7.4",
+                        "com.google.auto.service:auto-service-annotations:1.0-rc7",
                         "com.google.code.gson:gson:2.8.6",
                         "com.google.j2objc:j2objc-annotations:1.3",
                         "org.codehaus.plexus:plexus-utils:3.3.0",
diff --git a/config b/config
@@ -1 +1 @@
-Subproject commit 087c8fb2276f8c5323ef6e986cce642a8667926b
+Subproject commit 8ed8f64021dcd5bdfb27f6ee0d00bddad7f92275
diff --git a/datastore/build.gradle.kts b/datastore/build.gradle.kts
@@ -28,7 +28,7 @@ val spineCoreVersion: String by extra
 
 dependencies {
     // Google Cloud Datastore
-    api("com.google.cloud:google-cloud-datastore:1.105.0") {
+    api("com.google.cloud:google-cloud-datastore:1.105.1") {
         exclude(group = "com.google.protobuf")
         exclude(group = "com.google.guava")
     }
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/DsRecordStorage.java b/datastore/src/main/java/io/spine/server/storage/datastore/DsRecordStorage.java
@@ -43,7 +43,6 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -88,16 +87,19 @@ public static <I> Builder<I> newBuilder() {
      * Creates new instance by the passed builder.
      */
     protected DsRecordStorage(
-            RecordStorageBuilder<I, ? extends RecordStorage, ? extends RecordStorageBuilder> b) {
+            RecordStorageBuilder<I,
+                                 ? extends RecordStorage<I>,
+                                 ? extends RecordStorageBuilder<I, ? extends RecordStorage<I>, ?>> b
+    ) {
         super(b.getEntityClass(), b.isMultitenant());
         this.typeUrl = TypeUrl.from(b.getDescriptor());
         this.idClass = checkNotNull(b.getIdClass());
         this.datastore = b.getDatastore();
         this.columnMapping = checkNotNull(b.getColumnMapping());
         this.columnFilterAdapter = FilterAdapter.of(this.columnMapping);
         this.idLookup = new DsLookupByIds<>(this.datastore, this.typeUrl);
-        this.queryLookup = new DsLookupByQueries(this.datastore, this.typeUrl,
-                                                 this.columnFilterAdapter);
+        this.queryLookup =
+                new DsLookupByQueries(this.datastore, this.typeUrl, this.columnFilterAdapter);
     }
 
     private Key keyOf(I id) {
@@ -288,7 +290,7 @@ protected void writeRecords(Map<I, EntityRecordWithColumns> records) {
         checkNotNull(records);
 
         Collection<Entity> entitiesToWrite = new ArrayList<>(records.size());
-        for (Entry<I, EntityRecordWithColumns> record : records.entrySet()) {
+        for (Map.Entry<I, EntityRecordWithColumns> record : records.entrySet()) {
             Entity entity = entityRecordToEntity(record.getKey(), record.getValue());
             entitiesToWrite.add(entity);
         }
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/DsSessionStorage.java b/datastore/src/main/java/io/spine/server/storage/datastore/DsSessionStorage.java
@@ -80,8 +80,6 @@ Optional<ShardSessionRecord> read(ShardIndex index) {
      * {@inheritDoc}
      *
      * <p>Executes the write operation in a new transaction.
-     *
-     * @param message
      */
     @Override
     public void write(ShardSessionRecord message) {
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTest.java
@@ -238,8 +238,8 @@ class DynamicSnapshotTrigger {
 
         @BeforeEach
         void setUp() {
-            ServerEnvironment.instance()
-                             .use(datastoreFactory, Tests.class);
+            ServerEnvironment.when(Tests.class)
+                             .use(datastoreFactory);
             repository = new ProjectAggregateRepository();
             BoundedContext.singleTenant(DsAggregateStorageTest.class.getName())
                           .add(repository)
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTruncationTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTruncationTest.java
@@ -29,12 +29,12 @@
 import org.junit.jupiter.api.DisplayName;
 
 @DisplayName("`DsAggregateStorage` after truncation should")
-public class DsAggregateStorageTruncationTest extends AggregateStorageTruncationTest {
+class DsAggregateStorageTruncationTest extends AggregateStorageTruncationTest {
 
     @BeforeAll
     static void prepareStorageFactory() {
-        ServerEnvironment.instance()
-                         .use(TestDatastoreStorageFactory.local(), Tests.class);
+        ServerEnvironment.when(Tests.class)
+                         .use(TestDatastoreStorageFactory.local());
     }
 
     @AfterAll
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsCatchUpSmokeTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsCatchUpSmokeTest.java
@@ -36,23 +36,21 @@
  *
  * <p>The tests are extremely slow, so several long tests from {@link CatchUpTest} are disabled.
  */
-@DisplayName("Datastore-backed `CatchUp` should ")
 @SlowTest
+@DisplayName("Datastore-backed `CatchUp` should ")
 class DsCatchUpSmokeTest extends CatchUpTest {
 
     private TestDatastoreStorageFactory factory;
 
-    @Override
     @BeforeEach
-    public void setUp() {
+    void prepareStorageFactory() {
         factory = TestDatastoreStorageFactory.local();
-        ServerEnvironment.instance()
-                         .use(factory, Tests.class);
+        ServerEnvironment.when(Tests.class)
+                         .use(factory);
     }
 
-    @Override
     @AfterEach
-    public void tearDown() {
+    void tearDownStorageFactory() {
         if (factory != null) {
             factory.tearDown();
         }
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsDeliverySmokeTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsDeliverySmokeTest.java
@@ -48,8 +48,8 @@ public class DsDeliverySmokeTest extends DeliveryTest {
     public void setUp() {
         super.setUp();
         factory = TestDatastoreStorageFactory.local();
-        ServerEnvironment.instance()
-                         .use(factory, Tests.class);
+        ServerEnvironment.when(Tests.class)
+                         .use(factory);
     }
 
     @AfterEach
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsRecordStorageTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsRecordStorageTest.java
@@ -91,7 +91,6 @@
 import static io.spine.protobuf.AnyPacker.unpack;
 import static io.spine.server.ContextSpec.singleTenant;
 import static io.spine.server.entity.FieldMasks.applyMask;
-import static io.spine.server.entity.storage.EntityRecordWithColumns.create;
 import static io.spine.server.storage.datastore.given.CollegeEntity.CollegeColumn.ADMISSION_DEADLINE;
 import static io.spine.server.storage.datastore.given.CollegeEntity.CollegeColumn.CREATED;
 import static io.spine.server.storage.datastore.given.CollegeEntity.CollegeColumn.NAME;
@@ -161,7 +160,8 @@ protected EntityState newState(ProjectId projectId) {
     private EntityRecordWithColumns newRecordWithColumns(RecordStorage<ProjectId> storage) {
         EntityRecord record = newStorageRecord();
         Entity<ProjectId, Project> entity = new TestCounterEntity(newId());
-        EntityRecordWithColumns recordWithColumns = create(record, entity, storage);
+        EntityRecordWithColumns recordWithColumns =
+                EntityRecordWithColumns.create(record, entity, storage);
         return recordWithColumns;
     }
 
@@ -225,7 +225,8 @@ void testPersistColumns() {
                 .setVersion(versionValue)
                 .vBuild();
         DsRecordStorage<ProjectId> storage = newStorage(TestCounterEntity.class);
-        EntityRecordWithColumns recordWithColumns = create(record, entity, storage);
+        EntityRecordWithColumns recordWithColumns =
+                EntityRecordWithColumns.create(record, entity, storage);
         ImmutableSet<String> columns = recordWithColumns.columnNames()
                                                         .stream()
                                                         .map(ColumnName::value)
@@ -324,7 +325,8 @@ void testLifecycleFlags() {
                 .vBuild();
         TestCounterEntity entity = new TestCounterEntity(id);
         RecordStorage<ProjectId> storage = newStorage(TestCounterEntity.class);
-        EntityRecordWithColumns recordWithColumns = create(record, entity, storage);
+        EntityRecordWithColumns recordWithColumns =
+                EntityRecordWithColumns.create(record, entity, storage);
         storage.write(id, recordWithColumns);
 
         RecordReadRequest<ProjectId> request = new RecordReadRequest<>(id);
@@ -609,7 +611,10 @@ void testQueryEntityWithoutLifecycleById() {
             ProjectId id = newId();
             EntityRecord record = newEntityRecord(id, newState(id));
             EntityWithoutLifecycle entity = new EntityWithoutLifecycle(id);
-            storage.writeRecord(entity.id(), create(record, entity, storage));
+            storage.writeRecord(
+                    entity.id(),
+                    EntityRecordWithColumns.create(record, entity, storage)
+            );
 
             // Create ID filter.
             List<Any> targetIds = singletonList(pack(entity.id()));
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/given/DsInboxStorageTestEnv.java b/datastore/src/test/java/io/spine/server/storage/datastore/given/DsInboxStorageTestEnv.java
@@ -76,7 +76,7 @@ public static InboxMessage generate(int shardIndex, int totalShards, Timestamp w
     }
 
     /**
-     * Generates {@code totalMessage} in a selected shard.
+     * Generates {@code totalMessages} in a selected shard.
      *
      * <p>Each message is generated as received {@code now} and in
      * {@link InboxMessageStatus#TO_DELIVER TO_DELIVER} status.
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/given/DsRecordStorageTestEnv.java b/datastore/src/test/java/io/spine/server/storage/datastore/given/DsRecordStorageTestEnv.java
@@ -56,7 +56,6 @@
 import static io.spine.client.OrderBy.Direction.DESCENDING;
 import static io.spine.protobuf.AnyPacker.pack;
 import static io.spine.protobuf.AnyPacker.unpack;
-import static io.spine.server.entity.storage.EntityRecordWithColumns.create;
 import static java.util.Collections.shuffle;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Comparator.comparing;
@@ -245,18 +244,19 @@ private static CollegeEntity createAndStoreEntity(RecordStorage<CollegeId> stora
         return entity;
     }
 
-    private static CollegeEntity createAndStoreEntity(RecordStorage<CollegeId> storage,
-                                                      String name) {
+    private static CollegeEntity
+    createAndStoreEntity(RecordStorage<CollegeId> storage, String name) {
         CollegeId id = newCollegeId();
         College state = newCollege(id, name);
         CollegeEntity entity = CollegeEntity.create(id, state);
         storeEntity(storage, entity);
         return entity;
     }
 
-    public static void storeEntity(RecordStorage<CollegeId> storage, CollegeEntity entity) {
+    private static void storeEntity(RecordStorage<CollegeId> storage, CollegeEntity entity) {
         EntityRecord record = newEntityRecord(entity.id(), entity.state());
-        EntityRecordWithColumns withColumns = create(record, entity, storage);
+        EntityRecordWithColumns withColumns =
+                EntityRecordWithColumns.create(record, entity, storage);
         storage.write(entity.id(), withColumns);
     }
 
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/tenant/NamespaceIndexTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/tenant/NamespaceIndexTest.java
@@ -164,8 +164,8 @@ void findPrefixedNamespaces() {
                 .newBuilder()
                 .setDatastore(datastore)
                 .build();
-        ServerEnvironment.instance()
-                         .use(storageFactory, Tests.class);
+        ServerEnvironment.when(Tests.class)
+                         .use(storageFactory);
         storageFactory.configureTenantIndex(contextBuilder);
         BoundedContext context = contextBuilder.build();
         RecordStorage<String> storage = storageFactory
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/license-report.md b/license-report.md
diff --git a/pom.xml b/pom.xml
diff --git a/pubsub/build.gradle.kts b/pubsub/build.gradle.kts
diff --git a/stackdriver-trace/build.gradle.kts b/stackdriver-trace/build.gradle.kts
diff --git a/version.gradle.kts b/version.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ val spineCoreVersion: String by extra`
`28`	`28`
`29`	`29`	`dependencies {`
`30`	`30`	`// Google Cloud Datastore`
`31`		`- api("com.google.cloud:google-cloud-datastore:1.105.0") {`
	`31`	`+ api("com.google.cloud:google-cloud-datastore:1.105.1") {`
`32`	`32`	`exclude(group = "com.google.protobuf")`
`33`	`33`	`exclude(group = "com.google.guava")`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,6 @@ Optional<ShardSessionRecord> read(ShardIndex index) {`
`80`	`80`	`* {@inheritDoc}`
`81`	`81`	`*`
`82`	`82`	`* <p>Executes the write operation in a new transaction.`
`83`		`- *`
`84`		`- * @param message`
`85`	`83`	`*/`
`86`	`84`	`@Override`
`87`	`85`	`public void write(ShardSessionRecord message) {`