This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4685
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4685 by this
push:
new 3207c4e GEODE-4685: Spotless
3207c4e is described below
commit 3207c4ef9911d72c507892e67c5adba72a047f06
Author: Udo <[email protected]>
AuthorDate: Tue Feb 27 15:12:22 2018 -0800
GEODE-4685: Spotless
---
.../geode/cache/query/internal/DefaultQuery.java | 27 ++++++++++++----------
.../internal/streaming/StreamingOperation.java | 6 ++---
.../geode/internal/cache/GemFireCacheImpl.java | 3 ++-
.../apache/geode/pdx/PdxClientServerDUnitTest.java | 3 ++-
4 files changed, 22 insertions(+), 17 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
index e02aacb..27501fc 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
@@ -108,7 +108,7 @@ public class DefaultQuery implements Query {
* This is declared as array so that it can be synchronized between two
threads to validate the
* state.
*/
- private final boolean[] queryCompletedForMonitoring = new boolean[]{false};
+ private final boolean[] queryCompletedForMonitoring = new boolean[] {false};
private ProxyCache proxyCache;
@@ -219,10 +219,11 @@ public class DefaultQuery implements Query {
}
};
- /**
- * Caches the fields not found in any Pdx version. This threadlocal will be
cleaned up after query
- * execution completes in {@linkplain #executeUsingContext(ExecutionContext)}
- */
+ // /**
+ // * Caches the fields not found in any Pdx version. This threadlocal will
be cleaned up after
+ // query
+ // * execution completes in {@linkplain
#executeUsingContext(ExecutionContext)}
+ // */
private static final ThreadLocal<Map<String, Set<String>>>
pdxClassToFieldsMap =
ThreadLocal.withInitial(HashMap::new);
@@ -249,6 +250,7 @@ public class DefaultQuery implements Query {
/**
* Should be constructed from DefaultQueryService
+ *
* @see QueryService#newQuery
*/
public DefaultQuery(String queryString, InternalCache cache, boolean
isForRemote) {
@@ -370,7 +372,7 @@ public class DefaultQuery implements Query {
boolean needsCopyOnReadWrapper =
this.cache.getCopyOnRead() &&
!DefaultQueryService.COPY_ON_READ_AT_ENTRY_LEVEL
|| (((QueryExecutionContext) context).isIndexUsed()
- && DefaultQueryService.COPY_ON_READ_AT_ENTRY_LEVEL);
+ && DefaultQueryService.COPY_ON_READ_AT_ENTRY_LEVEL);
// For local queries returning pdx objects wrap the resultset with
// ResultsCollectionPdxDeserializerWrapper
// which deserializes these pdx objects.
@@ -738,6 +740,7 @@ public class DefaultQuery implements Query {
* region which is associated with the query as a bind parameter will not be
included in the list.
* The Region names returned by the query do not indicate anything about the
state of the region
* or whether the region actually exists in the GemfireCache etc.
+ *
* @param parameters the parameters to be passed in to the query when
executed
* @return Unmodifiable List containing the region names.
*/
@@ -764,7 +767,7 @@ public class DefaultQuery implements Query {
/**
* @return int identifying the limit. A value of -1 indicates that no limit
is imposed or the
- * query is not a select query
+ * query is not a select query
*/
public int getLimit(Object[] bindArguments) throws FunctionDomainException,
TypeMismatchException,
NameResolutionException, QueryInvocationTargetException {
@@ -857,7 +860,7 @@ public class DefaultQuery implements Query {
}
private static String getLogMessage(QueryObserver observer, long startTime,
int resultSize,
- String query) {
+ String query) {
float time = (NanoTimer.getTime() - startTime) / 1.0e6f;
String usedIndexesString = null;
@@ -871,7 +874,7 @@ public class DefaultQuery implements Query {
sb.append(')');
if (usedIndexes.size() > 0) {
sb.append(':');
- for (Iterator itr = usedIndexes.entrySet().iterator(); itr.hasNext();
) {
+ for (Iterator itr = usedIndexes.entrySet().iterator(); itr.hasNext();)
{
Map.Entry entry = (Map.Entry) itr.next();
sb.append(entry.getKey()).append(entry.getValue());
if (itr.hasNext()) {
@@ -894,8 +897,7 @@ public class DefaultQuery implements Query {
}
private static String getLogMessage(IndexTrackingQueryObserver
indexObserver, long startTime,
- String otherObserver, int resultSize,
String query,
- BucketRegion bucket) {
+ String otherObserver, int resultSize, String query, BucketRegion bucket)
{
float time = 0.0f;
if (startTime > 0L) {
@@ -911,7 +913,7 @@ public class DefaultQuery implements Query {
sb.append(')');
if (!usedIndexes.isEmpty()) {
sb.append(':');
- for (Iterator itr = usedIndexes.entrySet().iterator(); itr.hasNext();
) {
+ for (Iterator itr = usedIndexes.entrySet().iterator(); itr.hasNext();)
{
Map.Entry entry = (Map.Entry) itr.next();
sb.append(entry.getKey()).append("(Results:
").append(entry.getValue())
.append(", Bucket: ").append(bucket.getId()).append(")");
@@ -984,6 +986,7 @@ public class DefaultQuery implements Query {
/**
* For queries which are executed from a Function "with a Filter".
+ *
* @return returns if this query is coming from a {@link Function}.
*/
public boolean isQueryWithFunctionContext() {
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
index 817fd37..1c3ba3e 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
@@ -25,9 +25,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
@@ -36,6 +33,8 @@ import org.apache.geode.GemFireRethrowable;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.SystemFailure;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.PRQueryTraceInfo;
import org.apache.geode.cache.query.internal.QueryMonitor;
@@ -61,6 +60,7 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.BlobHelper;
+import org.apache.geode.pdx.internal.TypeRegistry;
/**
* StreamingOperation is an abstraction for sending messages to multiple (or
single) recipient
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 382fce3..f0aa07e 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -5057,7 +5057,8 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
*/
public boolean getPdxReadSerializedByAnyGemFireServices() {
Boolean pdxReadSerializedOverriden =
this.getPdxRegistry().getPdxReadSerializedOverride();
- return (getPdxReadSerialized() || pdxReadSerializedOverriden) &&
PdxInstanceImpl.getPdxReadSerialized();
+ return (getPdxReadSerialized() || pdxReadSerializedOverriden)
+ && PdxInstanceImpl.getPdxReadSerialized();
}
@Override
diff --git
a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index f7bb80f..7ef14a0 100644
---
a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -349,7 +349,8 @@ public class PdxClientServerDUnitTest extends
JUnit4CacheTestCase {
final SerializableCallable checkValue = new SerializableCallable() {
public Object call() throws Exception {
Region r = getRootRegion("testSimplePdx");
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ Boolean previousPdxReadSerializedFlag =
+ cache.getPdxRegistry().getPdxReadSerializedOverride();
cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
Object v = r.get(1);
--
To stop receiving notification emails like this one, please contact
[email protected].
