From 7a60c9cd04aea67ce366dfbf89893c14f0dcb5d5 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Fri, 2 Nov 2018 15:41:46 -0500 Subject: [PATCH] Upgrade integration tests to Boot 2.0. --- build.gradle | 1 + spring-credhub-docs/build.gradle | 2 +- spring-credhub-integration-tests/build.gradle | 9 +++------ .../integration/CertificateIntegrationTests.java | 8 ++++---- .../integration/CredHubIntegrationTests.java | 7 +++---- .../integration/CredentialIntegrationTests.java | 4 ++-- .../InterpolationIntegrationTests.java | 2 +- .../integration/PermissionIntegrationTests.java | 4 ++-- .../PermissionV2IntegrationTests.java | 4 ++-- spring-credhub-starter/build.gradle | 5 +---- .../CredHubOAuth2TemplateAutoConfiguration.java | 16 ++++++++++++++++ 11 files changed, 36 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 63f42db..8dd7118 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ buildscript { ext { springVersion = "5.0.10.RELEASE" + springBootVersion = "2.0.6.RELEASE" springCloudConnectorsVersion = "1.2.5.RELEASE" reactorVersion = "Bismuth-SR13" diff --git a/spring-credhub-docs/build.gradle b/spring-credhub-docs/build.gradle index 3f7d540..92c295b 100644 --- a/spring-credhub-docs/build.gradle +++ b/spring-credhub-docs/build.gradle @@ -20,7 +20,7 @@ plugins { dependencyManagement { imports { - mavenBom "org.springframework.boot:spring-boot-dependencies:2.0.6.RELEASE" + mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}" } } diff --git a/spring-credhub-integration-tests/build.gradle b/spring-credhub-integration-tests/build.gradle index 2e5ffe8..4d30868 100644 --- a/spring-credhub-integration-tests/build.gradle +++ b/spring-credhub-integration-tests/build.gradle @@ -17,10 +17,6 @@ description = 'Spring CredHub Integration Tests' buildscript { - ext { - springBootVersion = "1.5.8.RELEASE" - } - dependencies { classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE' classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE' @@ -47,7 +43,8 @@ dependencies { compile project(":spring-credhub-starter") compile("org.springframework.boot:spring-boot-starter") compile("org.springframework.security.oauth:spring-security-oauth2") - + compile("org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.0.RELEASE") + if (project.hasProperty("useHttpComponents")) { compile("org.apache.httpcomponents:httpclient:4.5.3") } @@ -55,7 +52,7 @@ dependencies { compile("com.squareup.okhttp3:okhttp:3.6.0") } if (project.hasProperty("useNetty")) { - compile("io.netty:netty-all:4.1.8.Final") + compile("io.netty:netty-all:4.1.30.Final") } testCompile("org.springframework.boot:spring-boot-starter-test") diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java index f53aed6..e530677 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java @@ -51,14 +51,14 @@ public class CertificateIntegrationTests extends CredHubIntegrationTests { credentials = operations.credentials(); certificates = operations.certificates(); - deleteCredentialIfExists(credentials, TEST_CERT_NAME); - deleteCredentialIfExists(credentials, ROOT_CERT_NAME); + deleteCredentialIfExists(TEST_CERT_NAME); + deleteCredentialIfExists(ROOT_CERT_NAME); } @After public void tearDown() { - deleteCredentialIfExists(credentials, TEST_CERT_NAME); - deleteCredentialIfExists(credentials, ROOT_CERT_NAME); + deleteCredentialIfExists(TEST_CERT_NAME); + deleteCredentialIfExists(ROOT_CERT_NAME); } @Test diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredHubIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredHubIntegrationTests.java index 9492c05..aabcbf3 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredHubIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredHubIntegrationTests.java @@ -8,8 +8,7 @@ import org.springframework.credhub.autoconfig.CredHubOAuth2TemplateAutoConfigura import org.springframework.credhub.autoconfig.CredHubTemplateAutoConfiguration; import org.springframework.credhub.core.CredHubException; import org.springframework.credhub.core.CredHubOperations; -import org.springframework.credhub.core.credential.CredHubCredentialOperations; -import org.springframework.credhub.support.SimpleCredentialName; +import org.springframework.credhub.support.CredentialName; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @@ -32,9 +31,9 @@ public abstract class CredHubIntegrationTests { return operations.info().version().isVersion2(); } - void deleteCredentialIfExists(CredHubCredentialOperations credentialOperations, SimpleCredentialName credentialName) { + void deleteCredentialIfExists(CredentialName credentialName) { try { - credentialOperations.deleteByName(credentialName); + operations.credentials().deleteByName(credentialName); } catch (CredHubException e) { // ignore failing deletes on cleanup } diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java index f40529b..b98421b 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java @@ -56,12 +56,12 @@ public class CredentialIntegrationTests extends CredHubIntegrationTests { .excludeNumber(false) .includeSpecial(true); - deleteCredentialIfExists(credentials, CREDENTIAL_NAME); + deleteCredentialIfExists(CREDENTIAL_NAME); } @After public void tearDown() { - deleteCredentialIfExists(credentials, CREDENTIAL_NAME); + deleteCredentialIfExists(CREDENTIAL_NAME); List afterDelete = credentials.findByName(CREDENTIAL_NAME); assertThat(afterDelete).hasSize(0); diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/InterpolationIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/InterpolationIntegrationTests.java index 914bb1e..e7dfc37 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/InterpolationIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/InterpolationIntegrationTests.java @@ -51,7 +51,7 @@ public class InterpolationIntegrationTests extends CredHubIntegrationTests { @After public void tearDown() { - deleteCredentialIfExists(credentials, CREDENTIAL_NAME); + deleteCredentialIfExists(CREDENTIAL_NAME); } @Test diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionIntegrationTests.java index 6bb040c..972981f 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionIntegrationTests.java @@ -44,12 +44,12 @@ public class PermissionIntegrationTests extends CredHubIntegrationTests { credentials = operations.credentials(); permissions = operations.permissions(); - deleteCredentialIfExists(credentials, CREDENTIAL_NAME); + deleteCredentialIfExists(CREDENTIAL_NAME); } @After public void tearDown() { - deleteCredentialIfExists(credentials, CREDENTIAL_NAME); + deleteCredentialIfExists(CREDENTIAL_NAME); } @Test diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionV2IntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionV2IntegrationTests.java index 7df0345..7ad3f9c 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionV2IntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/PermissionV2IntegrationTests.java @@ -48,12 +48,12 @@ public class PermissionV2IntegrationTests extends CredHubIntegrationTests { credentials = operations.credentials(); permissions = operations.permissionsV2(); - deleteCredentialIfExists(credentials, CREDENTIAL_NAME); + deleteCredentialIfExists(CREDENTIAL_NAME); } @After public void tearDown() { - deleteCredentialIfExists(credentials, CREDENTIAL_NAME); + deleteCredentialIfExists(CREDENTIAL_NAME); } @Test diff --git a/spring-credhub-starter/build.gradle b/spring-credhub-starter/build.gradle index 79a45bb..031b8fa 100644 --- a/spring-credhub-starter/build.gradle +++ b/spring-credhub-starter/build.gradle @@ -16,7 +16,7 @@ dependencyManagement { imports { - mavenBom "org.springframework.boot:spring-boot-dependencies:2.0.6.RELEASE" + mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}" } } @@ -26,9 +26,6 @@ dependencies { compile project(':spring-credhub-core') compile("org.springframework.boot:spring-boot-autoconfigure") - optional("org.springframework.boot:spring-boot-starter-webflux") - - optional("org.springframework.boot:spring-boot-starter-security") optional("org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.0.RELEASE") optional("org.apache.httpcomponents:httpclient") { diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2TemplateAutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2TemplateAutoConfiguration.java index e94ff47..8bbfee5 100644 --- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2TemplateAutoConfiguration.java +++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2TemplateAutoConfiguration.java @@ -1,3 +1,19 @@ +/* + * Copyright 2016-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.credhub.autoconfig; import org.springframework.boot.autoconfigure.AutoConfigureBefore;