diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-26 13:47:29 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-08-26 13:47:29 +0200 |
commit | 00c15eb9ac5e832a26e98a125bfb3e8745e10e8a (patch) | |
tree | 2ba213a043c5ef96d2c442b7bd4b4fbdf5a18ca1 /athenz-identity-provider-service | |
parent | dd8d314617119b5163fa661c3659a11592f00eef (diff) |
Fixes after code review
Diffstat (limited to 'athenz-identity-provider-service')
2 files changed, 5 insertions, 10 deletions
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index b77cd457fc9..1b1edcc64b8 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -34,12 +34,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-jersey2</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_core</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -53,10 +47,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -118,7 +114,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java index 92ba8f0edfb..66ab5255b6f 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java @@ -24,10 +24,8 @@ import com.yahoo.vespa.hosted.provision.node.Allocation; import com.yahoo.vespa.hosted.provision.node.Generation; import com.yahoo.vespa.hosted.provision.node.IP; import com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors; -import org.hamcrest.Matchers; import org.junit.Test; -import java.util.HashSet; import java.util.Optional; import java.util.Set; @@ -35,6 +33,7 @@ import static com.yahoo.vespa.hosted.athenz.instanceproviderservice.TestUtils.ge import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import static org.hamcrest.core.IsCollectionContaining.hasItem; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -92,7 +91,7 @@ public class IdentityDocumentGeneratorTest { assertEquals(expectedProviderUniqueId, signedIdentityDocument.providerUniqueId()); // Validate that container ips are present - assertThat(signedIdentityDocument.ipAddresses(), Matchers.containsInAnyOrder("::1")); + assertThat(signedIdentityDocument.ipAddresses(), hasItem("::1")); IdentityDocumentSigner signer = new IdentityDocumentSigner(); |