Skip to content

Commit

Permalink
Merge pull request #59 from coveooss/fix/jedis
Browse files Browse the repository at this point in the history
  • Loading branch information
@jebeaudet
jebeaudet authored Oct 31, 2024
2 parents 7b72700 + 7ef4aa3 commit ab0ab43
Show file tree
Hide file tree
Showing 17 changed files with 370 additions and 348 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/main-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Java CI with Maven

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Maven build&tests
run: mvn -ntp clean verify --file pom.xml
10 changes: 0 additions & 10 deletions .travis.yml
View file

This file was deleted.

142 changes: 107 additions & 35 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

<groupId>com.coveo</groupId>
<artifactId>spillway</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>3.0.0</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>

<description>Simple, flexible, distributable rate limiting for your application</description>
<url>http://github.com/coveo/spillway</url>
<url>https://github.com/coveooss/spillway</url>

<licenses>
<license>
Expand All @@ -24,25 +24,25 @@
<developer>
<name>Guillaume Simard</name>
<organization>Coveo</organization>
<organizationUrl>http://github.com/coveo</organizationUrl>
<organizationUrl>https://github.com/coveo</organizationUrl>
</developer>
<developer>
<name>Emile Fugulin</name>
<organization>Coveo</organization>
<organizationUrl>http://github.com/coveo</organizationUrl>
<organizationUrl>https://github.com/coveo</organizationUrl>
</developer>
<developer>
<name>Pierre-Alexandre St-Jean</name>
<url>http://github.com/pastjean</url>
<organization>Coveo</organization>
<organizationUrl>http://github.com/coveo</organizationUrl>
<organizationUrl>https://github.com/coveo</organizationUrl>
</developer>
</developers>

<scm>
<connection>scm:git:git@github.com:coveo/spillway.git</connection>
<developerConnection>scm:git:git@github.com:coveo/spillway.git</developerConnection>
<url>http://github.com/coveo/spillway</url>
<connection>scm:git:git@github.com:coveooss/spillway.git</connection>
<developerConnection>scm:git:git@github.com:coveooss/spillway.git</developerConnection>
<url>https://github.com/coveooss/spillway</url>
</scm>

<distributionManagement>
Expand All @@ -59,49 +59,96 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>

<commons-lang3.version>3.17.0</commons-lang3.version>

<jedis.version>5.0.2</jedis.version>

<mockito.version>5.14.2</mockito.version>

<junit.version>5.11.3</junit.version>

<slf4j.version>2.0.12</slf4j.version>

<truth.version>1.4.4</truth.version>

<embedded-redis.version>1.4.3</embedded-redis.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
<version>${mockito.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.10</version>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>4.2.1</version>
<version>${jedis.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.28</version>
<version>${truth.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.kstyrc</groupId>
<groupId>com.github.codemonstur</groupId>
<artifactId>embedded-redis</artifactId>
<version>0.6</version>
<version>${embedded-redis.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -110,26 +157,32 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.0</version>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<proc>full</proc>
<parameters>true</parameters>
<debuglevel>lines,vars,source</debuglevel>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<configuration>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
Expand Down Expand Up @@ -183,6 +236,19 @@
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.10.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand All @@ -197,14 +263,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.7</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/coveo/spillway/storage/RedisStorage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public Map<LimitKey, Integer> addAndGet(Collection<AddAndGetRequest> requests) {

pipeline.sync();
} catch (Throwable e) {
logger.error("An exception occured while publishing limits to Redis.", e);
logger.error("An exception occurred while publishing limits to Redis.", e);
}
}

Expand Down
Loading

0 comments on commit ab0ab43

Please sign in to comment.