From 82151872fd3013c72d620648ddea8737ec79c64f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 17 Nov 2016 19:06:26 +1300 Subject: [PATCH] no effective change - format only --- .../ebeanservice/docstore/api/DocStoreQueryUpdate.java | 2 +- .../docstore/api/DocStoreUpdateProcessor.java | 6 +++--- .../docstore/api/mapping/DocMappingBuilder.java | 8 ++++---- .../docstore/api/mapping/DocPropertyMapping.java | 2 +- .../docstore/api/support/DocStoreBeanBaseAdapter.java | 5 ++--- .../docstore/api/support/DocStoreDeleteEvent.java | 2 +- .../support/DocStoreEmbeddedInvalidationProperties.java | 2 +- .../docstore/api/support/DocStoreIndexEvent.java | 2 +- .../ebeanservice/docstore/api/support/DocStructure.java | 6 +++--- .../ebeanservice/docstore/none/NoneDocStoreFactory.java | 2 +- 10 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreQueryUpdate.java b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreQueryUpdate.java index 2a0ff8b41..ba377dd91 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreQueryUpdate.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreQueryUpdate.java @@ -5,7 +5,7 @@ import java.io.IOException; /** * Update the document store using a Ebean ORM query. *

- * Executes a forEach query and updates the document store with the bean object graph returned by the query. + * Executes a forEach query and updates the document store with the bean object graph returned by the query. *

*/ public interface DocStoreQueryUpdate { diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateProcessor.java b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateProcessor.java index abf491bc2..2de6e8a2a 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateProcessor.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateProcessor.java @@ -25,9 +25,9 @@ public interface DocStoreUpdateProcessor { * to a queue for future processing. *

* - * @param docStoreUpdates The 'Bulk' and 'Queue' updates to the indexes for the transaction. - * @param bulkBatchSize The batch size to use for Bulk API calls specified on the transaction. - * If this is 0 then the default batch size is used. + * @param docStoreUpdates The 'Bulk' and 'Queue' updates to the indexes for the transaction. + * @param bulkBatchSize The batch size to use for Bulk API calls specified on the transaction. + * If this is 0 then the default batch size is used. */ void process(DocStoreUpdates docStoreUpdates, int bulkBatchSize); diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java index 434f7cc3f..35883c3f1 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java @@ -20,7 +20,7 @@ public class DocMappingBuilder { private final Stack properties = new Stack<>(); - private final Map map = new LinkedHashMap<>(); + private final Map map = new LinkedHashMap<>(); /** * Create with the document structure paths and docStore deployment annotation. @@ -90,7 +90,7 @@ public class DocMappingBuilder { DocPropertyMapping mapping = map.get(fullName); if (mapping == null) { - throw new IllegalStateException("DocMapping for ["+fullName+"] but property not included in document?"); + throw new IllegalStateException("DocMapping for [" + fullName + "] but property not included in document?"); } mapping.apply(docMapping); } @@ -124,7 +124,7 @@ public class DocMappingBuilder { */ private static class SortableVisitor extends DocPropertyAdapter { - private Map sortableMap = new LinkedHashMap<>(); + private Map sortableMap = new LinkedHashMap<>(); @Override public void visitProperty(DocPropertyMapping property) { @@ -132,7 +132,7 @@ public class DocMappingBuilder { DocPropertyOptions options = property.getOptions(); if (options != null && Boolean.TRUE.equals(options.getSortable())) { String fullPath = pathStack.peekFullPath(property.getName()); - sortableMap.put(fullPath, fullPath+".raw"); + sortableMap.put(fullPath, fullPath + ".raw"); } } diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java index 515aeb601..cfc4c871d 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java @@ -76,7 +76,7 @@ public class DocPropertyMapping { } public String toString() { - return "name:"+name+" type:"+type+" options("+options+")"; + return "name:" + name + " type:" + type + " options(" + options + ")"; } /** diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index bf5ca3249..7fa9f4e83 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -12,7 +12,6 @@ import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.InheritInfoVisitor; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; @@ -224,7 +223,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } } int[] pos = new int[posList.size()]; - for (int i = 0; i implements DocStoreBeanAdapter< protected DocStructure derivePathProperties(PathProperties pathProps) { boolean includeByDefault = (pathProps == null); - if (pathProps == null) { + if (pathProps == null) { pathProps = new PathProperties(); } diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java index 3bb51b6c9..fe7812b14 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java @@ -1,8 +1,8 @@ package com.avaje.ebeanservice.docstore.api.support; import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; import com.avaje.ebeanservice.docstore.api.DocStoreUpdate; +import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java index c133d73a6..01e2e1fe1 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java @@ -5,7 +5,7 @@ import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; /** * Checks if a persist request means an embedded/nested object in another document needs updating. - * + *

* This has specific properties to check (so not all properties invalidate). */ public final class DocStoreEmbeddedInvalidationProperties extends DocStoreEmbeddedInvalidation { diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEvent.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEvent.java index 763fbf8f2..335ee5307 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEvent.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEvent.java @@ -1,8 +1,8 @@ package com.avaje.ebeanservice.docstore.api.support; import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; import com.avaje.ebeanservice.docstore.api.DocStoreUpdate; +import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java index 4903c50a4..34ed95ebf 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java @@ -22,9 +22,9 @@ public class DocStructure { /** * The embedded document structures by path. */ - private final Map embedded = new HashMap<>(); + private final Map embedded = new HashMap<>(); - private final Map manyRoot = new HashMap<>(); + private final Map manyRoot = new HashMap<>(); /** * Create given an initial deployment doc mapping. @@ -72,7 +72,7 @@ public class DocStructure { public void prepareMany(BeanDescriptor desc) { Set strings = embedded.keySet(); for (String prop : strings) { - BeanPropertyAssoc embProp = (BeanPropertyAssoc)desc.findBeanProperty(prop); + BeanPropertyAssoc embProp = (BeanPropertyAssoc) desc.findBeanProperty(prop); if (embProp.isMany()) { prepare(prop, embProp); } diff --git a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java b/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java index 963ef0642..f67527331 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java @@ -3,8 +3,8 @@ package com.avaje.ebeanservice.docstore.none; import com.avaje.ebean.DocumentStore; import com.avaje.ebean.plugin.SpiServer; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; import com.avaje.ebeanservice.docstore.api.DocStoreFactory; import com.avaje.ebeanservice.docstore.api.DocStoreIntegration; import com.avaje.ebeanservice.docstore.api.DocStoreUpdateProcessor;