This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-20098
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 93bae8cf55fb27d7bf698858cc5f49cca4f9ce43
Author: amashenkov <andrey.mashen...@gmail.com>
AuthorDate: Tue Jan 16 14:56:03 2024 +0300
Drop dead code.
Move distribution zone exception from code module.
Minor fixes.
---
.../java/org/apache/ignite/lang/ErrorGroups.java | 12 ----
.../catalog/CatalogParamsValidationUtils.java | 4 --
.../catalog/CatalogValidationException.java | 15 +++--
...utionZoneCantBeDroppedValidationException.java} | 13 +++--
.../DistributionZoneExistsValidationException.java | 2 +
...istributionZoneNotFoundValidationException.java | 2 +
.../catalog/IndexExistsValidationException.java | 2 +
.../catalog/TableExistsValidationException.java | 2 +
.../catalog/TableNotFoundValidationException.java | 2 +
.../internal/catalog/commands/DropZoneCommand.java | 9 +--
.../catalog/commands/RenameZoneCommand.java | 3 +-
.../DistributionZoneAlreadyExistsException.java | 61 ---------------------
.../DistributionZoneBindTableException.java | 64 ----------------------
.../distributionzones/DistributionZoneManager.java | 1 +
.../CausalityDataNodesEngine.java | 2 +-
.../DistributionZoneNotFoundException.java | 12 +---
.../DistributionZoneWasRemovedException.java | 49 -----------------
.../DistributionZoneCausalityDataNodesTest.java | 2 +-
18 files changed, 35 insertions(+), 222 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
b/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
index a9a1e36e4a..9e60780bda 100755
--- a/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
+++ b/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
@@ -419,20 +419,8 @@ public class ErrorGroups {
/** Distribution zones group. */
public static final ErrorGroup DISTRIBUTION_ZONES_ERR_GROUP =
registerGroup("DISTRZONES", (short) 10);
- /** Distribution zone already exists. */
- public static final int ZONE_ALREADY_EXISTS_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 1);
-
/** Distribution zone is not found. */
public static final int ZONE_NOT_FOUND_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 2);
-
- /** Distribution zone rename error. */
- public static final int ZONE_RENAME_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 3);
-
- /** Distribution zone is a default distribution zone or bound to
table. */
- public static final int ZONE_DROP_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 4);
-
- /** Distribution zone definition error. */
- public static final int ZONE_DEFINITION_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 5);
}
/** Network error group. */
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
index ded3b33bf6..4887ea3d5d 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.catalog;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
-import static org.apache.ignite.lang.ErrorGroups.Catalog.VALIDATION_ERR;
import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.JsonPath;
@@ -54,7 +53,6 @@ public class CatalogParamsValidationUtils {
if (value < min || (max != null && value > max)) {
throw new CatalogValidationException(
- VALIDATION_ERR,
"{}: [value={}, min={}" + (max == null ? ']' : ",
max={}]"),
errorPrefix, value, min, max
);
@@ -71,7 +69,6 @@ public class CatalogParamsValidationUtils {
) {
if (autoAdjust != null && (scaleUp != null || scaleDown != null)) {
throw new CatalogValidationException(
- VALIDATION_ERR,
"Not compatible parameters [dataNodesAutoAdjust={},
dataNodesAutoAdjustScaleUp={}, dataNodesAutoAdjustScaleDown={}]",
autoAdjust, scaleUp, scaleDown
);
@@ -92,7 +89,6 @@ public class CatalogParamsValidationUtils {
String error = e.getMessage() == null ? "Unknown JsonPath
compilation error." : e.getMessage();
throw new CatalogValidationException(
- VALIDATION_ERR,
"Invalid filter: [value={}, error={}]",
e,
filter, error
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogValidationException.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogValidationException.java
index 645412b086..8fbf772820 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogValidationException.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogValidationException.java
@@ -17,9 +17,10 @@
package org.apache.ignite.internal.catalog;
+import static org.apache.ignite.lang.ErrorGroups.Catalog.VALIDATION_ERR;
+
import org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.lang.IgniteStringFormatter;
-import org.apache.ignite.lang.ErrorGroups;
/**
* Catalog validation exception.
@@ -33,31 +34,29 @@ public class CatalogValidationException extends
IgniteInternalException {
* @param message Error message.
*/
public CatalogValidationException(String message) {
- super(ErrorGroups.Catalog.VALIDATION_ERR, message);
+ super(VALIDATION_ERR, message);
}
/**
* Constructor.
*
- * @param code Full error code.
* @param messagePattern Error message pattern.
* @param params Error message params.
* @see IgniteStringFormatter#format(String, Object...)
*/
- public CatalogValidationException(int code, String messagePattern,
Object... params) {
- super(code, messagePattern, params);
+ public CatalogValidationException(String messagePattern, Object... params)
{
+ super(VALIDATION_ERR, messagePattern, params);
}
/**
* Constructor.
*
- * @param code Full error code.
* @param messagePattern Error message pattern.
* @param cause Non-null throwable cause.
* @param params Error message params.
* @see IgniteStringFormatter#format(String, Object...)
*/
- CatalogValidationException(int code, String messagePattern, Throwable
cause, Object... params) {
- super(code, messagePattern, cause, params);
+ CatalogValidationException(String messagePattern, Throwable cause,
Object... params) {
+ super(VALIDATION_ERR, messagePattern, cause, params);
}
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneNotFoundValidationException.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneCantBeDroppedValidationException.java
similarity index 63%
copy from
modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneNotFoundValidationException.java
copy to
modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneCantBeDroppedValidationException.java
index 4b24e85db9..3c8f49eca0 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneNotFoundValidationException.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneCantBeDroppedValidationException.java
@@ -18,12 +18,13 @@
package org.apache.ignite.internal.catalog;
/**
- * This exception is thrown when zone not found in the catalog.
- *
- * <p>This exception is used to properly handle IF EXISTS flag in ddl command
handler.
+ * Exception is thrown when the distribution zone cannot be dropped due to
some reason, e.g. because it is the default distribution zone or
+ * there is a table bound to the distribution zone.
*/
-public class DistributionZoneNotFoundValidationException extends
CatalogValidationException {
- public DistributionZoneNotFoundValidationException(String message) {
- super(message);
+public class DistributionZoneCantBeDroppedValidationException extends
CatalogValidationException {
+ private static final long serialVersionUID = -6278120614792218429L;
+
+ public DistributionZoneCantBeDroppedValidationException(String
messagePattern, Object... params) {
+ super(messagePattern, params);
}
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneExistsValidationException.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneExistsValidationException.java
index 9b8828950b..5254c8419e 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneExistsValidationException.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneExistsValidationException.java
@@ -24,6 +24,8 @@ package org.apache.ignite.internal.catalog;
* <p>This exception is used to properly handle IF NOT EXISTS flag in ddl
command handler.
*/
public class DistributionZoneExistsValidationException extends
CatalogValidationException {
+ private static final long serialVersionUID = 3780590802433986943L;
+
public DistributionZoneExistsValidationException(String message) {
super(message);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneNotFoundValidationException.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneNotFoundValidationException.java
index 4b24e85db9..e976c14a56 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneNotFoundValidationException.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/DistributionZoneNotFoundValidationException.java
@@ -23,6 +23,8 @@ package org.apache.ignite.internal.catalog;
* <p>This exception is used to properly handle IF EXISTS flag in ddl command
handler.
*/
public class DistributionZoneNotFoundValidationException extends
CatalogValidationException {
+ private static final long serialVersionUID = -3921048847080737224L;
+
public DistributionZoneNotFoundValidationException(String message) {
super(message);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/IndexExistsValidationException.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/IndexExistsValidationException.java
index a5eb0ff6fb..701a354b24 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/IndexExistsValidationException.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/IndexExistsValidationException.java
@@ -24,6 +24,8 @@ package org.apache.ignite.internal.catalog;
* <p>This exception is used to properly handle IF NOT EXISTS flag in ddl
command handler.
*/
public class IndexExistsValidationException extends CatalogValidationException
{
+ private static final long serialVersionUID = 4680962492129806371L;
+
IndexExistsValidationException(String message) {
super(message);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableExistsValidationException.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableExistsValidationException.java
index 473b388b08..82f0589946 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableExistsValidationException.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableExistsValidationException.java
@@ -24,6 +24,8 @@ package org.apache.ignite.internal.catalog;
* <p>This exception is used to properly handle IF NOT EXISTS flag in ddl
command handler.
*/
public class TableExistsValidationException extends CatalogValidationException
{
+ private static final long serialVersionUID = 8715710884629604003L;
+
TableExistsValidationException(String message) {
super(message);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableNotFoundValidationException.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableNotFoundValidationException.java
index 3027a2da4c..153a00f78d 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableNotFoundValidationException.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/TableNotFoundValidationException.java
@@ -23,6 +23,8 @@ package org.apache.ignite.internal.catalog;
* <p>This exception is used to properly handle IF EXISTS flag in ddl command
handler.
*/
public class TableNotFoundValidationException extends
CatalogValidationException {
+ private static final long serialVersionUID = -5554342698956213470L;
+
public TableNotFoundValidationException(String message) {
super(message);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
index 5f0813ee62..abfe041ea3 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
@@ -25,11 +25,10 @@ import java.util.List;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogCommand;
import org.apache.ignite.internal.catalog.CatalogValidationException;
+import
org.apache.ignite.internal.catalog.DistributionZoneCantBeDroppedValidationException;
import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
import org.apache.ignite.internal.catalog.storage.DropZoneEntry;
import org.apache.ignite.internal.catalog.storage.UpdateEntry;
-import
org.apache.ignite.internal.distributionzones.DistributionZoneBindTableException;
-import org.apache.ignite.lang.ErrorGroups.DistributionZones;
/**
* A command that drops a zone with specified name.
@@ -52,9 +51,10 @@ public class DropZoneCommand extends AbstractZoneCommand {
validate();
}
+ @SuppressWarnings("MethodOverridesInaccessibleMethodOfSuper")
private void validate() {
if (zoneName.equals(DEFAULT_ZONE_NAME)) {
- throw new
CatalogValidationException(DistributionZones.ZONE_RENAME_ERR, "Default
distribution zone can't be dropped");
+ throw new DistributionZoneCantBeDroppedValidationException(
"Default distribution zone can't be dropped");
}
}
@@ -67,7 +67,8 @@ public class DropZoneCommand extends AbstractZoneCommand {
.filter(t -> t.zoneId() == zone.id())
.findAny()
.ifPresent(t -> {
- throw new DistributionZoneBindTableException(zone.name(),
t.name());
+ throw new
DistributionZoneCantBeDroppedValidationException("Distribution zone is assigned
to the table [zoneName={}, "
+ + ", tableName={}]", zone.name(), t.name());
});
return List.of(new DropZoneEntry(zone.id()));
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
index 1792db14de..8856c9989e 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
@@ -30,7 +30,6 @@ import
org.apache.ignite.internal.catalog.DistributionZoneExistsValidationExcept
import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
import org.apache.ignite.internal.catalog.storage.AlterZoneEntry;
import org.apache.ignite.internal.catalog.storage.UpdateEntry;
-import org.apache.ignite.lang.ErrorGroups.DistributionZones;
/**
* A command that renames a zone with specified name.
@@ -85,7 +84,7 @@ public class RenameZoneCommand extends AbstractZoneCommand {
validateIdentifier(newZoneName, "New zone name");
if (zoneName.equals(DEFAULT_ZONE_NAME)) {
- throw new
CatalogValidationException(DistributionZones.ZONE_RENAME_ERR, "Default
distribution zone can't be renamed");
+ throw new CatalogValidationException("Default distribution zone
can't be renamed");
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneAlreadyExistsException.java
b/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneAlreadyExistsException.java
deleted file mode 100644
index 77a1e091f6..0000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneAlreadyExistsException.java
+++ /dev/null
@@ -1,61 +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 org.apache.ignite.internal.distributionzones;
-
-import static
org.apache.ignite.lang.ErrorGroups.DistributionZones.ZONE_ALREADY_EXISTS_ERR;
-
-import java.util.UUID;
-import org.apache.ignite.internal.lang.IgniteInternalException;
-
-// TODO https://issues.apache.org/jira/browse/IGNITE-20098
-/**
- * This exception is thrown when a new distribution zone failed to be created,
- * because a distribution zone with same name already exists.
- */
-public class DistributionZoneAlreadyExistsException extends
IgniteInternalException {
- /**
- * The constructor.
- *
- * @param zoneName Zone name.
- */
- public DistributionZoneAlreadyExistsException(String zoneName) {
- this(zoneName, null);
- }
-
- /**
- * The constructor.
- *
- * @param zoneName Zone name.
- * @param cause Optional nested exception (can be {@code null}).
- */
- public DistributionZoneAlreadyExistsException(String zoneName, Throwable
cause) {
- super(ZONE_ALREADY_EXISTS_ERR, "Distribution zone already exists
[zoneName=" + zoneName + ']', cause);
- }
-
- /**
- * The constructor is used for creating an exception instance that is
thrown from a remote server.
- *
- * @param traceId Trace id.
- * @param code Error code.
- * @param message Error message.
- * @param cause Cause exception.
- */
- public DistributionZoneAlreadyExistsException(UUID traceId, int code,
String message, Throwable cause) {
- super(traceId, code, message, cause);
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneBindTableException.java
b/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneBindTableException.java
deleted file mode 100644
index 967461b756..0000000000
---
a/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneBindTableException.java
+++ /dev/null
@@ -1,64 +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 org.apache.ignite.internal.distributionzones;
-
-import static
org.apache.ignite.lang.ErrorGroups.DistributionZones.ZONE_DROP_ERR;
-
-import java.util.UUID;
-import org.apache.ignite.internal.lang.IgniteInternalException;
-import org.jetbrains.annotations.Nullable;
-
-// TODO https://issues.apache.org/jira/browse/IGNITE-20098
-/**
- * Exception is thrown when the distribution zone cannot be dropped because
there is a table bound to the distribution zone.
- */
-public class DistributionZoneBindTableException extends
IgniteInternalException {
- /**
- * The constructor.
- *
- * @param zoneName Zone name.
- * @param tableName Table name.
- */
- public DistributionZoneBindTableException(String zoneName, String
tableName) {
- this(zoneName, tableName, null);
- }
-
- /**
- * The constructor.
- *
- * @param zoneName Zone name.
- * @param tableName Table name.
- * @param cause Optional nested exception (can be {@code null}).
- */
- public DistributionZoneBindTableException(String zoneName, String
tableName, @Nullable Throwable cause) {
- super(ZONE_DROP_ERR, "Distribution zone is assigned to the table
[zoneName=" + zoneName + ", tableName=" + tableName + ']',
- cause);
- }
-
- /**
- * The constructor is used for creating an exception instance that is
thrown from a remote server.
- *
- * @param traceId Trace id.
- * @param code Error code.
- * @param message Error message.
- * @param cause Cause exception.
- */
- public DistributionZoneBindTableException(UUID traceId, int code, String
message, Throwable cause) {
- super(traceId, code, message, cause);
- }
-}
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
index f308f93f17..1347bb02d2 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
@@ -95,6 +95,7 @@ import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopolog
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot;
import
org.apache.ignite.internal.distributionzones.causalitydatanodes.CausalityDataNodesEngine;
+import
org.apache.ignite.internal.distributionzones.exception.DistributionZoneNotFoundException;
import
org.apache.ignite.internal.distributionzones.rebalance.DistributionZoneRebalanceEngine;
import
org.apache.ignite.internal.distributionzones.utils.CatalogAlterZoneEventListener;
import org.apache.ignite.internal.lang.ByteArray;
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/CausalityDataNodesEngine.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/CausalityDataNodesEngine.java
index 88cddd736e..c77539256e 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/CausalityDataNodesEngine.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/CausalityDataNodesEngine.java
@@ -49,10 +49,10 @@ import org.apache.ignite.internal.causality.VersionedValue;
import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
import
org.apache.ignite.internal.distributionzones.DistributionZoneManager.Augmentation;
import
org.apache.ignite.internal.distributionzones.DistributionZoneManager.ZoneState;
-import
org.apache.ignite.internal.distributionzones.DistributionZoneNotFoundException;
import org.apache.ignite.internal.distributionzones.DistributionZonesUtil;
import org.apache.ignite.internal.distributionzones.Node;
import org.apache.ignite.internal.distributionzones.NodeWithAttributes;
+import
org.apache.ignite.internal.distributionzones.exception.DistributionZoneNotFoundException;
import org.apache.ignite.internal.lang.ByteArray;
import org.apache.ignite.internal.metastorage.Entry;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneNotFoundException.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/exception/DistributionZoneNotFoundException.java
similarity index 88%
rename from
modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneNotFoundException.java
rename to
modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/exception/DistributionZoneNotFoundException.java
index a634ffd72f..59750bd73f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneNotFoundException.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/exception/DistributionZoneNotFoundException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.distributionzones;
+package org.apache.ignite.internal.distributionzones.exception;
import static
org.apache.ignite.lang.ErrorGroups.DistributionZones.ZONE_NOT_FOUND_ERR;
@@ -23,19 +23,11 @@ import java.util.UUID;
import org.apache.ignite.internal.lang.IgniteInternalException;
import org.jetbrains.annotations.Nullable;
-// TODO https://issues.apache.org/jira/browse/IGNITE-20098
/**
* Exception is thrown when appropriate distribution zone can`t be found.
*/
public class DistributionZoneNotFoundException extends IgniteInternalException
{
- /**
- * The constructor.
- *
- * @param zoneName Zone name.
- */
- public DistributionZoneNotFoundException(String zoneName) {
- this(zoneName, null);
- }
+ private static final long serialVersionUID = 4690347752201656106L;
/**
* The constructor.
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/exception/DistributionZoneWasRemovedException.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/exception/DistributionZoneWasRemovedException.java
deleted file mode 100644
index 9ee6a59c23..0000000000
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/exception/DistributionZoneWasRemovedException.java
+++ /dev/null
@@ -1,49 +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 org.apache.ignite.internal.distributionzones.exception;
-
-import static
org.apache.ignite.lang.ErrorGroups.DistributionZones.ZONE_NOT_FOUND_ERR;
-
-import java.util.UUID;
-import org.apache.ignite.internal.lang.IgniteInternalException;
-
-/**
- * Exception is thrown when appropriate distribution zone was removed.
- */
-public class DistributionZoneWasRemovedException extends
IgniteInternalException {
- /**
- * The constructor.
- *
- * @param zoneId Zone id.
- */
- public DistributionZoneWasRemovedException(int zoneId) {
- super(ZONE_NOT_FOUND_ERR, "Distribution zone is not found [zoneId=" +
zoneId + ']');
- }
-
- /**
- * The constructor is used for creating an exception instance that is
thrown from a remote server.
- *
- * @param traceId Trace id.
- * @param code Error code.
- * @param message Error message.
- * @param cause Cause exception.
- */
- public DistributionZoneWasRemovedException(UUID traceId, int code, String
message, Throwable cause) {
- super(traceId, code, message, cause);
- }
-}
diff --git
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/DistributionZoneCausalityDataNodesTest.java
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/DistributionZoneCausalityDataNodesTest.java
index d25928f893..95f8736e10 100644
---
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/DistributionZoneCausalityDataNodesTest.java
+++
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/causalitydatanodes/DistributionZoneCausalityDataNodesTest.java
@@ -67,10 +67,10 @@ import
org.apache.ignite.internal.cluster.management.topology.api.LogicalNode;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot;
import
org.apache.ignite.internal.distributionzones.BaseDistributionZoneManagerTest;
import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
-import
org.apache.ignite.internal.distributionzones.DistributionZoneNotFoundException;
import org.apache.ignite.internal.distributionzones.DistributionZonesUtil;
import org.apache.ignite.internal.distributionzones.Node;
import org.apache.ignite.internal.distributionzones.NodeWithAttributes;
+import
org.apache.ignite.internal.distributionzones.exception.DistributionZoneNotFoundException;
import
org.apache.ignite.internal.distributionzones.utils.CatalogAlterZoneEventListener;
import org.apache.ignite.internal.lang.IgniteBiTuple;
import org.apache.ignite.internal.metastorage.Entry;
