Skip to content

Upgrading to the latest Dropwizard version #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manuelbernhardt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrading to the latest Dropwizard version #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Add the Maven dependency:
<dependency>
<groupId>org.ajbrown.dropwizard</groupId>
<artifactId>dropwizard-ssm</artifactId>
<version>1.0</version>
<version>2.0</version>
</dependency>
```

Expand Down
15 changes: 12 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<groupId>org.ajbrown.dropwizard</groupId>
<artifactId>dropwizard-ssm</artifactId>
<packaging>jar</packaging>
<version>1.1</version>
<version>2.0</version>

<name>Dropwizard SSM</name>
<description>Dropwizard configuration variable substitution using Amazon Simple Systems Manager parameters</description>
Expand Down Expand Up @@ -52,16 +52,17 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>8</maven.compiler.release>

<!-- Dependency Versions -->
<aws-sdk.version>1.11.313</aws-sdk.version>
<dropwizard.version>1.3.1</dropwizard.version>
<dropwizard.version>2.0.21</dropwizard.version>
<junit4.version>4.12</junit4.version>
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>1.10.19</mockito.version>

<!-- Plugin Versions -->
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<license-maven-plugin.version>3.0</license-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
Expand Down Expand Up @@ -134,6 +135,14 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/ajbrown/dropwizard/ssm/config/SsmLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@
import com.amazonaws.services.simplesystemsmanagement.model.ParameterNotFoundException;
import com.google.common.base.Strings;
import io.dropwizard.configuration.UndefinedEnvironmentVariableException;
import org.apache.commons.text.StrLookup;
import org.apache.commons.text.lookup.StringLookup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* StrLookup implementation which loads values from Amazon Simple Systems Management parameters.
*/
public class SsmLookup
extends StrLookup<Object>
public class SsmLookup implements StringLookup
{
private static final Logger log = LoggerFactory.getLogger(SsmLookup.class);

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/ajbrown/dropwizard/ssm/config/SsmSubstitutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement;
import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder;
import io.dropwizard.configuration.UndefinedEnvironmentVariableException;
import org.apache.commons.text.StrSubstitutor;
import org.apache.commons.text.StringSubstitutor;

/**
* Uses Amazon Simple Systems manager parameter stores to substitute configuration values.
*/
public class SsmSubstitutor
extends StrSubstitutor
extends StringSubstitutor
{
public SsmSubstitutor(final boolean strict) {
this(AWSSimpleSystemsManagementClientBuilder.defaultClient(), strict, false, null);
Expand Down Expand Up @@ -56,8 +56,8 @@ public SsmSubstitutor(@Nonnull final AWSSimpleSystemsManagement ssm, boolean str
* </p>
*
* <p>This is mostly useful for re-using a variable name across multiple environments</p>
* @see io.dropwizard.configuration.EnvironmentVariableLookup#EnvironmentVariableLookup(boolean)
* @see org.apache.commons.lang3.text.StrSubstitutor#setEnableSubstitutionInVariables(boolean)
* @see io.dropwizard.configuration.EnvironmentVariableLookup
* @see org.apache.commons.text.StringSubstitutor#setEnableSubstitutionInVariables(boolean)
*/
public SsmSubstitutor(@Nonnull final AWSSimpleSystemsManagement ssm, boolean strict,
boolean substitutionInVariables, final String namespacePrefix)
Expand Down