From c25890354b1e7b0973e6f73683573560b908fe04 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 26 Nov 2021 17:36:52 +0000 Subject: [PATCH] Remove Hazelcast 3 smoke test to prepare for Hazelcast 5 upgrade Closes gh-28827 --- .../build.gradle | 24 -------- .../java/smoketest/hazelcast3/Country.java | 53 ---------------- .../hazelcast3/CountryRepository.java | 33 ---------- .../SampleHazelcast3Application.java | 45 -------------- .../src/main/resources/application.properties | 2 - .../src/main/resources/hazelcast.xml | 21 ------- .../SampleHazelcast4ApplicationTests.java | 61 ------------------- 7 files changed, 239 deletions(-) delete mode 100644 spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/build.gradle delete mode 100644 spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/Country.java delete mode 100644 spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/CountryRepository.java delete mode 100644 spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/SampleHazelcast3Application.java delete mode 100644 spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/application.properties delete mode 100644 spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml delete mode 100644 spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/build.gradle deleted file mode 100644 index c64d5334d1..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id "java" - id "org.springframework.boot.conventions" -} - -description = "Spring Boot Hazelcast 3 smoke test" - -configurations.all { - resolutionStrategy { - force "com.hazelcast:hazelcast:3.12.8" - force "com.hazelcast:hazelcast-spring:3.12.8" - } -} - -dependencies { - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-cache")) - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) - implementation("com.hazelcast:hazelcast") - implementation("com.hazelcast:hazelcast-spring") - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux")) -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/Country.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/Country.java deleted file mode 100644 index 8e638a8fcb..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/Country.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2012-2020 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 - * - * https://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 smoketest.hazelcast3; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class Country implements Serializable { - - private final String code; - - public Country(String code) { - this.code = code; - } - - public String getCode() { - return this.code; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - Country country = (Country) o; - - return this.code.equals(country.code); - } - - @Override - public int hashCode() { - return this.code.hashCode(); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/CountryRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/CountryRepository.java deleted file mode 100644 index 7febaaa49b..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/CountryRepository.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012-2020 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 - * - * https://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 smoketest.hazelcast3; - -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Component; - -@Component -@CacheConfig(cacheNames = "countries") -public class CountryRepository { - - @Cacheable - public Country findByCode(String code) { - System.out.println("---> Loading country with code '" + code + "'"); - return new Country(code); - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/SampleHazelcast3Application.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/SampleHazelcast3Application.java deleted file mode 100644 index 5fbac81b38..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/java/smoketest/hazelcast3/SampleHazelcast3Application.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012-2020 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 - * - * https://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 smoketest.hazelcast3; - -import com.hazelcast.spring.cache.HazelcastCacheManager; - -import org.springframework.boot.ApplicationRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.actuate.metrics.cache.CacheMetricsRegistrar; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Bean; - -@SpringBootApplication -@EnableCaching -public class SampleHazelcast3Application { - - public static void main(String[] args) { - SpringApplication.run(SampleHazelcast3Application.class, args); - } - - @Bean - public ApplicationRunner registerCache(CountryRepository repository, HazelcastCacheManager cacheManager, - CacheMetricsRegistrar registrar) { - return (args) -> { - repository.findByCode("BE"); - registrar.bindCacheToRegistry(cacheManager.getCache("countries")); - }; - } - -} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/application.properties deleted file mode 100644 index f896a300ee..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -management.endpoint.health.show-details=always -management.endpoints.web.exposure.include=* diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml deleted file mode 100644 index 4fbcdb0b59..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/main/resources/hazelcast.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 600 - - - - - true - true - - - - - - - - - diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java deleted file mode 100644 index 5512077212..0000000000 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2012-2020 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 - * - * https://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 smoketest.hazelcast3; - -import com.hazelcast.spring.cache.HazelcastCacheManager; -import org.junit.jupiter.api.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.cache.CacheManager; -import org.springframework.test.web.reactive.server.WebTestClient; - -import static org.assertj.core.api.Assertions.assertThat; - -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@AutoConfigureWebTestClient -class SampleHazelcast4ApplicationTests { - - @Autowired - private WebTestClient webClient; - - @Autowired - private CacheManager cacheManager; - - @Autowired - private CountryRepository countryRepository; - - @Test - void cacheManagerIsUsingHazelcast() { - assertThat(this.cacheManager).isInstanceOf(HazelcastCacheManager.class); - } - - @Test - void healthEndpointHasHazelcastContributor() { - this.webClient.get().uri("/actuator/health/hazelcast").exchange().expectStatus().isOk().expectBody() - .jsonPath("status").isEqualTo("UP").jsonPath("details.name").isNotEmpty().jsonPath("details.uuid") - .isNotEmpty(); - } - - @Test - void metricsEndpointHasCacheMetrics() { - this.webClient.get().uri("/actuator/metrics/cache.entries").exchange().expectStatus().isOk(); - } - -}