From 435130b67b39b394fb5efa8bda5cc21aa17ef4f4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 21 Mar 2018 16:38:12 -0700 Subject: [PATCH] SGF-727 - Remove all git merge conflict tags in SDG source code Javadoc. --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++----- .../data/gemfire/GemfireTemplate.java | 3 +-- .../data/gemfire/RegionFactoryBean.java | 13 ------------- .../data/gemfire/client/ClientCacheFactoryBean.java | 8 -------- .../gemfire/mapping/GemfirePersistentEntity.java | 1 + .../gemfire/mapping/GemfirePersistentProperty.java | 2 +- .../support/GemfireRepositoryFactory.java | 1 - 7 files changed, 8 insertions(+), 30 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6e1e1b4a..1957f70d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,8 +6,8 @@ Make sure that: --> - [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc). -- [ ] There is a ticket in the bug tracker for the project in our [JIRA](https://jira.spring.io/browse/SGF). -- [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes. -- [ ] You submit test cases (unit or integration tests) that back your changes. -- [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only). - +- [ ] You created a [JIRA](https://jira.spring.io/browse/DATAGEODE) ticket in the bug tracker for the project. +- [ ] You formatted the code according to the source code style provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have specifically applied them to your changes. Do not submit any formatting related changes. +- [ ] You submitted test cases (Unit or Integration Tests) backing your changes. +- [ ] You added yourself as the author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only). +- [ ] If applicable, you have complied with and taken steps necessary to report any security vulnerabilities at [Pivotal Security Reporting](https://pivotal.io/security#reporting). diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java index c01ce9f8..befa7fe1 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java @@ -70,8 +70,7 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation private Region regionProxy; - public GemfireTemplate() { - } + public GemfireTemplate() { } public GemfireTemplate(Region region) { setRegion(region); diff --git a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java index 24c67812..15407576 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java @@ -63,24 +63,15 @@ import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; /** -<<<<<<< HEAD - * Abstract base class and Spring {@link FactoryBean} for constructing and initializing a GemFire {@link Region}. -======= * Abstract Spring {@link FactoryBean} base class extended by other SDG {@link FactoryBean FactoryBeans} used to * construct, configure and initialize peer {@link Region Regions}. * * This {@link FactoryBean} allows for very easy and flexible creation of peer {@link Region}. * For client {@link Region Regions}, however, see the {@link ClientRegionFactoryBean}. ->>>>>>> c22ebe6... DATAGEODE-12 - Introduce Spring Configurers to flexibly alter Spring Data GemFire configuration when using Annotation config. * * @author Costin Leau * @author David Turanski * @author John Blum -<<<<<<< HEAD - * @see org.springframework.beans.factory.DisposableBean - * @see org.springframework.context.SmartLifecycle - * @see org.springframework.data.gemfire.RegionLookupFactoryBean -======= * @see org.apache.geode.cache.Cache * @see org.apache.geode.cache.CacheListener * @see org.apache.geode.cache.CacheLoader @@ -100,7 +91,6 @@ import org.springframework.util.StringUtils; * @see org.springframework.data.gemfire.RegionLookupFactoryBean * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean * @see org.springframework.data.gemfire.config.annotation.RegionConfigurer ->>>>>>> c22ebe6... DATAGEODE-12 - Introduce Spring Configurers to flexibly alter Spring Data GemFire configuration when using Annotation config. */ @SuppressWarnings("unused") public abstract class RegionFactoryBean extends RegionLookupFactoryBean @@ -968,8 +958,6 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean>>>>>> fffb2b0... SGF-547 - Configure Eviction with annotations. */ @Override public void stop() { diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java index 8578bad6..031be220 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java @@ -424,15 +424,11 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat } /** -<<<<<<< HEAD - * @inheritDoc -======= * Null-safe internal method used to close the {@link ClientCache} and preserve durability. * * @param cache {@link GemFireCache} to close. * @see org.apache.geode.cache.client.ClientCache#close(boolean) * @see #isKeepAlive() ->>>>>>> c22ebe6... DATAGEODE-12 - Introduce Spring Configurers to flexibly alter Spring Data GemFire configuration when using Annotation config. */ @Override protected void close(GemFireCache cache) { @@ -440,14 +436,10 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat } /** -<<<<<<< HEAD - * @inheritDoc -======= * Returns the {@link Class} type of the {@link GemFireCache} produced by this {@link ClientCacheFactoryBean}. * * @return the {@link Class} type of the {@link GemFireCache} produced by this {@link ClientCacheFactoryBean}. * @see org.springframework.beans.factory.FactoryBean#getObjectType() ->>>>>>> c22ebe6... DATAGEODE-12 - Introduce Spring Configurers to flexibly alter Spring Data GemFire configuration when using Annotation config. */ @Override @SuppressWarnings("unchecked") diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java index 1fea5565..b3e7ea30 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntity.java @@ -76,6 +76,7 @@ public class GemfirePersistentEntity extends BasicPersistentEntity SUPPORTED_IDENTIFIER_NAMES = asSet("id"); - /** * Constructs an instance of {@link GemfirePersistentProperty} initialized with entity persistent property * information (meta-data). @@ -57,6 +56,7 @@ public class GemfirePersistentProperty extends AnnotationBasedPersistentProperty */ public GemfirePersistentProperty(Property property, PersistentEntity owner, SimpleTypeHolder simpleTypeHolder) { + super(property, owner, simpleTypeHolder); } diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java index 70dcdabc..6acce206 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.util.Optional; import org.apache.geode.cache.Region; -import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.gemfire.mapping.GemfirePersistentProperty;