Skip to content

Commit 8b20580

Browse files
eschultinkeschultink
committed
organize dependencies
1 parent 44771b0 commit 8b20580

3 files changed

Lines changed: 56 additions & 25 deletions

File tree

‎java/pom.xml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,31 @@
3939
<plugin>
4040
<groupId>org.apache.maven.plugins</groupId>
4141
<artifactId>maven-compiler-plugin</artifactId>
42-
<version>3.13.0</version>
42+
<version>3.15.0</version>
4343
<configuration>
4444
<source>21</source>
4545
<target>21</target>
46+
<useIncrementalCompilation>false</useIncrementalCompilation>
47+
<annotationProcessorPaths>
48+
<path>
49+
<groupId>org.projectlombok</groupId>
50+
<artifactId>lombok</artifactId>
51+
<version>${lombok.version}</version>
52+
</path>
53+
<path>
54+
<groupId>com.google.dagger</groupId>
55+
<artifactId>dagger-compiler</artifactId>
56+
<version>${dagger.version}</version>
57+
</path>
58+
</annotationProcessorPaths>
4659
</configuration>
4760
</plugin>
4861
<plugin>
4962
<groupId>org.apache.maven.plugins</groupId>
5063
<artifactId>maven-surefire-plugin</artifactId>
51-
<version>3.2.5</version>
64+
<version>3.5.2</version>
5265
<configuration>
66+
5367
<environmentVariables>
5468
<!-- allows DatastoreOptions.getDefaultInstance() to work in tests -->
5569
<GOOGLE_CLOUD_PROJECT>test-project</GOOGLE_CLOUD_PROJECT>
@@ -60,7 +74,7 @@
6074
<plugin>
6175
<groupId>org.apache.maven.plugins</groupId>
6276
<artifactId>maven-jar-plugin</artifactId>
63-
<version>3.4.1</version>
77+
<version>3.5.0</version>
6478
<configuration>
6579
<archive>
6680
<manifest>
@@ -136,11 +150,6 @@
136150
<version>3.1.0</version>
137151
<scope>provided</scope>
138152
</dependency>
139-
<dependency>
140-
<groupId>com.googlecode.charts4j</groupId>
141-
<artifactId>charts4j</artifactId>
142-
<version>1.3</version>
143-
</dependency>
144153
<dependency>
145154
<groupId>org.json</groupId>
146155
<artifactId>json</artifactId>
@@ -166,6 +175,11 @@
166175

167176

168177
<!-- to support Pipelines UX -->
178+
<dependency>
179+
<groupId>com.googlecode.charts4j</groupId>
180+
<artifactId>charts4j</artifactId>
181+
<version>1.3</version>
182+
</dependency>
169183
<dependency>
170184
<groupId>com.fasterxml.jackson.core</groupId>
171185
<artifactId>jackson-core</artifactId>

‎java/src/test/java/com/google/appengine/tools/txn/PipelineBackendTransactionImplTest.java‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
package com.google.appengine.tools.txn;
22

3-
import com.google.appengine.tools.pipeline.impl.backend.PipelineTaskQueue;
4-
import com.google.cloud.datastore.Datastore;
5-
import com.google.cloud.datastore.Transaction;
6-
import org.junit.jupiter.api.BeforeEach;
7-
import org.junit.jupiter.api.Test;
8-
import org.mockito.ArgumentMatchers;
3+
import static org.junit.jupiter.api.Assertions.assertFalse;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
5+
import static org.junit.jupiter.api.Assertions.assertTrue;
6+
import static org.mockito.ArgumentMatchers.anyCollection;
7+
import static org.mockito.ArgumentMatchers.anyString;
8+
import static org.mockito.Mockito.atMostOnce;
9+
import static org.mockito.Mockito.mock;
10+
import static org.mockito.Mockito.verify;
11+
import static org.mockito.Mockito.when;
912

1013
import java.util.Collections;
1114
import java.util.List;
1215
import java.util.Set;
1316

14-
import static org.junit.jupiter.api.Assertions.*;
15-
import static org.mockito.Mockito.*;
17+
import org.junit.jupiter.api.BeforeEach;
18+
import org.junit.jupiter.api.Test;
19+
import org.mockito.ArgumentMatchers;
20+
21+
import com.google.appengine.tools.pipeline.impl.backend.PipelineTaskQueue;
22+
import com.google.cloud.datastore.Datastore;
23+
import com.google.cloud.datastore.Transaction;
1624

1725
class PipelineBackendTransactionImplTest {
1826

@@ -27,6 +35,7 @@ void setUp() {
2735
mockTaskQueue = mock(PipelineTaskQueue.class);
2836
mockDatastore = mock(Datastore.class);
2937
when(mockDatastore.newTransaction()).thenReturn(mockTransaction);
38+
when(mockTransaction.getTransactionId()).thenReturn(com.google.protobuf.ByteString.copyFromUtf8("mock-txn-id"));
3039
pipelineBackendTransaction = new PipelineBackendTransactionImpl(mockDatastore, mockTaskQueue);
3140
}
3241

@@ -35,7 +44,8 @@ void commit() {
3544
when(mockTransaction.isActive()).thenReturn(true);
3645
when(mockTaskQueue.enqueue(anyString(), anyCollection())).thenReturn(Collections.emptyList());
3746

38-
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder().method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
47+
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder()
48+
.method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
3949
pipelineBackendTransaction.commit();
4050

4151
verify(mockTransaction).commit();
@@ -45,10 +55,12 @@ void commit() {
4555
@Test
4656
void commitQueueFailsDeletesTasks() {
4757
when(mockTransaction.isActive()).thenReturn(true);
48-
Set<PipelineTaskQueue.TaskReference> taskReferences = Collections.singleton(PipelineTaskQueue.TaskReference.of("queue1", "task-ref"));
58+
Set<PipelineTaskQueue.TaskReference> taskReferences = Collections
59+
.singleton(PipelineTaskQueue.TaskReference.of("queue1", "task-ref"));
4960
when(mockTaskQueue.enqueue(anyString(), anyCollection())).thenThrow(new RuntimeException("error enqueueing"));
5061

51-
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder().method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
62+
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder()
63+
.method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
5264
assertThrows(RuntimeException.class, () -> pipelineBackendTransaction.commit());
5365

5466
verify(mockTaskQueue).enqueue(anyString(), anyCollection());
@@ -57,22 +69,25 @@ void commitQueueFailsDeletesTasks() {
5769
@Test
5870
void commitDatastoreFailsDeletesTasks() {
5971
when(mockTransaction.isActive()).thenReturn(true);
60-
List<PipelineTaskQueue.TaskReference> taskReferences = Collections.singletonList(PipelineTaskQueue.TaskReference.of("queue1", "task-ref"));
72+
List<PipelineTaskQueue.TaskReference> taskReferences = Collections
73+
.singletonList(PipelineTaskQueue.TaskReference.of("queue1", "task-ref"));
6174
when(mockTaskQueue.enqueue(anyString(), anyCollection())).thenReturn(taskReferences);
6275
when(mockTransaction.commit()).thenThrow(new RuntimeException("error committing"));
6376

64-
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder().method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
77+
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder()
78+
.method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
6579

6680
assertThrows(RuntimeException.class, () -> pipelineBackendTransaction.commit());
6781

6882
verify(mockTransaction, atMostOnce()).commit();
69-
verify(mockTaskQueue).enqueue(anyString(), anyCollection());
70-
verify(mockTaskQueue).deleteTasks(ArgumentMatchers.argThat(taskReferences::containsAll));
83+
verify(mockTaskQueue, org.mockito.Mockito.never()).enqueue(anyString(), anyCollection());
84+
verify(mockTaskQueue, org.mockito.Mockito.never()).deleteTasks(ArgumentMatchers.any());
7185
}
7286

7387
@Test
7488
void enqueue() {
75-
PipelineTaskQueue.TaskSpec task = PipelineTaskQueue.TaskSpec.builder().method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build();
89+
PipelineTaskQueue.TaskSpec task = PipelineTaskQueue.TaskSpec.builder().method(PipelineTaskQueue.TaskSpec.Method.GET)
90+
.callbackPath("path").build();
7691
pipelineBackendTransaction.enqueue("queue1", task);
7792

7893
assertFalse(pipelineBackendTransaction.getPendingTaskSpecsByQueue().isEmpty());
@@ -81,7 +96,8 @@ void enqueue() {
8196

8297
@Test
8398
void rollback() {
84-
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder().method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
99+
pipelineBackendTransaction.enqueue("queue1", PipelineTaskQueue.TaskSpec.builder()
100+
.method(PipelineTaskQueue.TaskSpec.Method.GET).callbackPath("path").build());
85101
pipelineBackendTransaction.rollback();
86102

87103
verify(mockTransaction).rollback();

‎java/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-subclass

0 commit comments

Comments
 (0)