Skip to content

Commit 4163f82

Browse files
author
Alexander Patrikalakis
authored
Merge pull request #11 from amcp/fixTest
Add DynamoDB Local dependency. Fix imports.
2 parents 00389ae + f515826 commit 4163f82

File tree

4 files changed

+64
-6
lines changed

4 files changed

+64
-6
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
target/
22
AwsCredentials.properties
3+
/.idea
4+
*.iml
5+
*~
6+
.*~

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Add the following to your Maven pom file:
3232
<dependency>
3333
<groupId>com.amazonaws</groupId>
3434
<artifactId>dynamodb-streams-kinesis-adapter</artifactId>
35-
<version>LATEST</version>
35+
<version>1.2.1-SNAPSHOT</version>
3636
</dependency>
3737
```
3838

pom.xml

+56-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>dynamodb-streams-kinesis-adapter</artifactId>
77
<packaging>jar</packaging>
88
<name>DynamoDB Streams Adapter for Java</name>
9-
<version>1.2.0</version>
9+
<version>1.2.1-SNAPSHOT</version>
1010
<description>The DynamoDB Streams Adapter implements the AmazonKinesis interface so that your application can use KCL to consume and process data from a DynamoDB stream.</description>
1111
<url>https://aws.amazon.com/dynamodb</url>
1212

@@ -25,6 +25,10 @@
2525
<properties>
2626
<aws-java-sdk.version>[1.11.115, 2.0.0)</aws-java-sdk.version>
2727
<amazon-kinesis-client.version>[1.7.5, 1.8.0)</amazon-kinesis-client.version>
28+
<powermock.version>1.6.2</powermock.version>
29+
<aws.dynamodblocal.version>1.11.86</aws.dynamodblocal.version>
30+
<maven.dependency.version>3.0.0</maven.dependency.version>
31+
<sqlite4java.version>1.0.392</sqlite4java.version>
2832
<gpg.skip>true</gpg.skip>
2933
</properties>
3034

@@ -75,14 +79,14 @@
7579
<dependency>
7680
<groupId>org.powermock</groupId>
7781
<artifactId>powermock-module-junit4</artifactId>
78-
<version>1.6.2</version>
82+
<version>${powermock.version}</version>
7983
<scope>test</scope>
8084
</dependency>
8185

8286
<dependency>
8387
<groupId>org.powermock</groupId>
8488
<artifactId>powermock-api-mockito</artifactId>
85-
<version>1.6.2</version>
89+
<version>${powermock.version}</version>
8690
<scope>test</scope>
8791
</dependency>
8892

@@ -92,6 +96,13 @@
9296
<version>4.12</version>
9397
<scope>test</scope>
9498
</dependency>
99+
100+
<dependency>
101+
<groupId>com.amazonaws</groupId>
102+
<artifactId>DynamoDBLocal</artifactId>
103+
<version>${aws.dynamodblocal.version}</version>
104+
<scope>test</scope>
105+
</dependency>
95106
</dependencies>
96107

97108
<developers>
@@ -136,6 +147,7 @@
136147
<plugin>
137148
<groupId>org.apache.maven.plugins</groupId>
138149
<artifactId>maven-gpg-plugin</artifactId>
150+
<version>1.6</version>
139151
<executions>
140152
<execution>
141153
<id>sign-artifacts</id>
@@ -158,9 +170,50 @@
158170
<include>**/*Test.java</include>
159171
<include>**/*Tests.java</include>
160172
</includes>
173+
<argLine>-Dsqlite4java.library.path=${basedir}/target/dependencies</argLine>
161174
</configuration>
162175
</plugin>
176+
<plugin>
177+
<groupId>org.apache.maven.plugins</groupId>
178+
<artifactId>maven-dependency-plugin</artifactId>
179+
<version>${maven.dependency.version}</version>
180+
<executions>
181+
<execution>
182+
<id>copy-dependencies</id>
183+
<phase>process-test-resources</phase>
184+
<goals>
185+
<goal>copy-dependencies</goal>
186+
</goals>
187+
<configuration>
188+
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
189+
<overWriteReleases>false</overWriteReleases>
190+
<overWriteSnapshots>false</overWriteSnapshots>
191+
<overWriteIfNewer>true</overWriteIfNewer>
192+
</configuration>
193+
</execution>
194+
</executions>
195+
</plugin>
163196
</plugins>
164197
</build>
165198

199+
<repositories>
200+
<repository>
201+
<id>dynamodblocal</id>
202+
<name>AWS DynamoDB Local Release Repository</name>
203+
<url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</url>
204+
<snapshots>
205+
<enabled>false</enabled>
206+
</snapshots>
207+
</repository>
208+
</repositories>
209+
210+
<dependencyManagement>
211+
<dependencies>
212+
<dependency>
213+
<groupId>com.almworks.sqlite4java</groupId>
214+
<artifactId>sqlite4java</artifactId>
215+
<version>${sqlite4java.version}</version>
216+
</dependency>
217+
</dependencies>
218+
</dependencyManagement>
166219
</project>

src/test/java/com/amazonaws/services/dynamodbv2/streamsadapter/util/ReplicatingRecordProcessor.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
*/
1515
package com.amazonaws.services.dynamodbv2.streamsadapter.util;
1616

17+
import static com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason.TERMINATE;
18+
1719
import java.nio.charset.Charset;
1820

1921
import org.apache.commons.logging.Log;
@@ -24,7 +26,6 @@
2426
import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput;
2527
import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
2628
import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput;
27-
import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownReason;
2829
import com.amazonaws.services.kinesis.model.Record;
2930

3031
public class ReplicatingRecordProcessor implements IRecordProcessor {
@@ -81,7 +82,7 @@ public void processRecords(ProcessRecordsInput processRecordsInput) {
8182

8283
@Override
8384
public void shutdown(ShutdownInput shutdownInput) {
84-
if (ShutdownReason.TERMINATE.equals(shutdownInput.getShutdownReason())) {
85+
if (TERMINATE.equals(shutdownInput.getShutdownReason())) {
8586
try {
8687
shutdownInput.getCheckpointer().checkpoint();
8788
} catch (Exception e) {

0 commit comments

Comments
 (0)