From 567b231954baf40acb6b40224ca0c7f86494d5b3 Mon Sep 17 00:00:00 2001 From: John Blum Date: Sun, 9 Jun 2019 18:07:40 -0700 Subject: [PATCH] Optimize imports. Format source code. --- .../autoconfigure/CacheNameAutoConfiguration.java | 2 +- .../autoconfigure/ClientCacheAutoConfiguration.java | 2 +- .../ClientSecurityAutoConfiguration.java | 6 ++++-- .../GemFirePropertiesAutoConfiguration.java | 2 +- .../configuration/GemFireProperties.java | 13 ++++++++++++- .../geode/core/env/VcapPropertySource.java | 1 - 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java index 5c6e1a5e..f132fda4 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure; import java.util.Optional; @@ -21,6 +20,7 @@ import java.util.Optional; import org.apache.geode.cache.Cache; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; + import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java index 86b17fb1..760c2871 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java @@ -13,12 +13,12 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.distributed.Locator; + import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java index d3f44e89..6f453e1f 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java @@ -20,8 +20,7 @@ import java.util.Properties; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -45,6 +44,9 @@ import org.springframework.geode.core.env.VcapPropertySource; import org.springframework.geode.core.env.support.CloudCacheService; import org.springframework.lang.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Security functionality, * and specifically Authentication between a client and server using Spring Data Geode Security annotations. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java index af913acc..624aed9e 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java @@ -13,10 +13,10 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure; import org.apache.geode.cache.GemFireCache; + import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java index 4c038f2d..28fc8bba 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration; import java.util.Properties; @@ -44,6 +43,18 @@ import org.springframework.geode.boot.autoconfigure.configuration.support.Servic * @see java.util.Properties * @see org.springframework.boot.context.properties.ConfigurationProperties * @see org.springframework.boot.context.properties.NestedConfigurationProperty + * @see org.springframework.geode.boot.autoconfigure.configuration.support.CacheProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.ClusterProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.DiskStoreProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.EntityProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.LocatorProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.LoggingProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.ManagementProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.ManagerProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.PdxProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.PoolProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.SecurityProperties + * @see org.springframework.geode.boot.autoconfigure.configuration.support.ServiceProperties * @since 1.0.0 */ @SuppressWarnings("unused") diff --git a/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java b/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java index 236f33c1..a342b8ea 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.core.env; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException;