GEODE-1346: Typo "Emtpy" affects Exception name and some help strings
Fixed the typos and removed many now-unused StringIds from LocalizedStrings and ParentLocalizedStrings. The number of StringIds is now small enough that I removed ParentLocalizedStrings. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f24b9fb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f24b9fb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f24b9fb0 Branch: refs/heads/develop Commit: f24b9fb07e0f79b8c11e9cbe94c0885ff20fb909 Parents: dc024d0 Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Mon May 9 08:23:47 2016 -0700 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Mon May 9 08:26:28 2016 -0700 ---------------------------------------------------------------------- .../execute/EmptyRegionFunctionException.java | 63 + .../execute/EmtpyRegionFunctionException.java | 63 - .../internal/cache/PartitionedRegion.java | 6 +- .../gemfire/internal/i18n/LocalizedStrings.java | 2456 +++++++++++++++--- .../internal/i18n/BasicI18nJUnitTest.java | 4 +- .../codeAnalysis/sanctionedSerializables.txt | 2 +- 6 files changed, 2113 insertions(+), 481 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f24b9fb0/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java new file mode 100755 index 0000000..a077779 --- /dev/null +++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * http://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 com.gemstone.gemfire.cache.execute; + +import com.gemstone.gemfire.distributed.DistributedMember; + +/** + * Exception to indicate that Region is empty for data aware functions. + * + * @since 6.5 + * + */ +public class EmptyRegionFunctionException extends FunctionException { + + private static final long serialVersionUID = 1L; + + /** + * Construct an instance of EmtpyRegionFunctionException + * + * @param cause + * a Throwable cause of this exception + */ + public EmptyRegionFunctionException(Throwable cause) { + super(cause); + } + + /** + * Construct an instance of EmtpyRegionFunctionException + * + * @param msg + * Exception message + */ + public EmptyRegionFunctionException(String msg) { + super(msg); + } + + /** + * Construct an instance of EmtpyRegionFunctionException + * + * @param msg + * the error message + * @param cause + * a Throwable cause of this exception + */ + public EmptyRegionFunctionException(String msg, Throwable cause) { + super(msg, cause); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f24b9fb0/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java deleted file mode 100644 index 6aff9eb..0000000 --- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 - * - * http://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 com.gemstone.gemfire.cache.execute; - -import com.gemstone.gemfire.distributed.DistributedMember; - -/** - * Exception to indicate that Region is empty for data aware functions. - * - * @since 6.5 - * - */ -public class EmtpyRegionFunctionException extends FunctionException { - - private static final long serialVersionUID = 1L; - - /** - * Construct an instance of EmtpyRegionFunctionException - * - * @param cause - * a Throwable cause of this exception - */ - public EmtpyRegionFunctionException(Throwable cause) { - super(cause); - } - - /** - * Construct an instance of EmtpyRegionFunctionException - * - * @param msg - * Exception message - */ - public EmtpyRegionFunctionException(String msg) { - super(msg); - } - - /** - * Construct an instance of EmtpyRegionFunctionException - * - * @param msg - * the error message - * @param cause - * a Throwable cause of this exception - */ - public EmtpyRegionFunctionException(String msg, Throwable cause) { - super(msg, cause); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f24b9fb0/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java index 328c196..4460a8a 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java @@ -92,7 +92,7 @@ import com.gemstone.gemfire.cache.TransactionDataNotColocatedException; import com.gemstone.gemfire.cache.TransactionDataRebalancedException; import com.gemstone.gemfire.cache.TransactionException; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; -import com.gemstone.gemfire.cache.execute.EmtpyRegionFunctionException; +import com.gemstone.gemfire.cache.execute.EmptyRegionFunctionException; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionContext; import com.gemstone.gemfire.cache.execute.FunctionException; @@ -3879,7 +3879,7 @@ public class PartitionedRegion extends LocalRegion implements logger.debug("Executing on bucketset : {} executeOnBucketSet Member to buckets map is : {} bucketSet is empty", bucketSet, memberToBuckets); } - throw new EmtpyRegionFunctionException( + throw new EmptyRegionFunctionException( LocalizedStrings.PartitionedRegion_FUNCTION_NOT_EXECUTED_AS_REGION_IS_EMPTY .toLocalizedString()); } @@ -4023,7 +4023,7 @@ public class PartitionedRegion extends LocalRegion implements .groupByMemberToBuckets(this, bucketSet, function.optimizeForWrite()); if (memberToBuckets.isEmpty()) { - throw new EmtpyRegionFunctionException(LocalizedStrings.PartitionedRegion_FUNCTION_NOT_EXECUTED_AS_REGION_IS_EMPTY.toLocalizedString() + throw new EmptyRegionFunctionException(LocalizedStrings.PartitionedRegion_FUNCTION_NOT_EXECUTED_AS_REGION_IS_EMPTY.toLocalizedString() ); }
