From ea6d8e848782fdbdcb1750faba8ea5ef03e91016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Finn=C3=A9?= Date: Tue, 7 Aug 2018 12:01:57 +0200 Subject: [PATCH] Moved MalformedSchemaRuleException to neo4j-kernel-api --- .../java/org/neo4j/consistency/checking/SchemaRecordCheck.java | 2 +- .../org/neo4j/consistency/checking/SchemaRecordCheckTest.java | 2 +- .../api/exceptions/schema/MalformedSchemaRuleException.java | 3 +-- .../java/org/neo4j/storageengine/api/schema/SchemaRule.java | 2 +- .../java/org/neo4j/kernel/impl/store/SchemaRuleAccess.java | 2 +- .../main/java/org/neo4j/kernel/impl/store/SchemaStorage.java | 2 +- .../src/main/java/org/neo4j/kernel/impl/store/SchemaStore.java | 2 +- .../impl/store/record/SchemaRuleDeserializer2_0to3_1.java | 2 +- .../kernel/impl/store/record/SchemaRuleSerialization.java | 2 +- .../transaction/command/PhysicalLogCommandReaderV2_2_10.java | 2 +- .../transaction/command/PhysicalLogCommandReaderV2_2_4.java | 2 +- .../impl/transaction/command/PhysicalLogCommandReaderV3_0.java | 2 +- .../transaction/command/PhysicalLogCommandReaderV3_0_2.java | 2 +- .../kernel/impl/store/record/SchemaRuleSerializationTest.java | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) rename community/{kernel/src/main/java/org/neo4j => kernel-api/src/main/java/org/neo4j/internal}/kernel/api/exceptions/schema/MalformedSchemaRuleException.java (92%) diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java index c346dbf37435b..4b5b96db208cc 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java @@ -25,11 +25,11 @@ import org.neo4j.consistency.checking.index.IndexAccessors; import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.store.RecordAccess; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaProcessor; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.impl.store.SchemaRuleAccess; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java index 8ffcf5f3f413a..b89992b556a9d 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java @@ -24,8 +24,8 @@ import org.neo4j.consistency.checking.index.IndexAccessors; import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.store.RecordAccessStub; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/MalformedSchemaRuleException.java similarity index 92% rename from community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/MalformedSchemaRuleException.java index 7abf324441d9c..ca4a0dfeb8642 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/MalformedSchemaRuleException.java @@ -17,9 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.exceptions.schema; +package org.neo4j.internal.kernel.api.exceptions.schema; -import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.exceptions.Status; /** diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java index 917fad1f415a1..09ce9d34bf477 100644 --- a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java +++ b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java @@ -19,13 +19,13 @@ */ package org.neo4j.storageengine.api.schema; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaComputer; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptorSupplier; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; /** * Represents a stored schema rule. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaRuleAccess.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaRuleAccess.java index d2a22bb4cc93d..42613b59780c0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaRuleAccess.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaRuleAccess.java @@ -19,7 +19,7 @@ */ package org.neo4j.kernel.impl.store; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.storageengine.api.schema.SchemaRule; public interface SchemaRuleAccess diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java index 0798ab3b40231..d65db1bce908f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java @@ -25,11 +25,11 @@ import org.neo4j.function.Predicates; import org.neo4j.helpers.collection.PrefetchingIterator; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStore.java index 5ec44d6caf103..59f23b234298f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStore.java @@ -27,8 +27,8 @@ import java.util.Iterator; import java.util.List; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.allocator.ReusableRecordsCompositeAllocator; import org.neo4j.kernel.impl.store.format.RecordFormats; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java index 3705fa3fddebb..83c7784154f70 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java @@ -22,8 +22,8 @@ import java.nio.ByteBuffer; import java.util.Optional; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java index 2811f8bbc3379..b133593a04b20 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import java.util.Optional; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; @@ -29,7 +30,6 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaProcessor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constraints.NodeKeyConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_10.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_10.java index 9d7456cf63f9c..f2263094eda04 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_10.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_10.java @@ -29,7 +29,7 @@ import java.util.Map; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.impl.index.IndexCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddRelationshipCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_4.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_4.java index 3d75e20636410..a57e96b13c6d0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_4.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV2_2_4.java @@ -29,7 +29,7 @@ import java.util.Map; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.impl.index.IndexCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddRelationshipCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java index 66bf6613fe6b6..d874bdcee778f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0.java @@ -29,7 +29,7 @@ import java.util.Map; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.impl.index.IndexCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddRelationshipCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java index 12821c86b5b54..c89e123c7c501 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/PhysicalLogCommandReaderV3_0_2.java @@ -29,7 +29,7 @@ import java.util.Map; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.impl.index.IndexCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand; import org.neo4j.kernel.impl.index.IndexCommand.AddRelationshipCommand; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java index 47de215a2d0f0..d8d12a5ece4cf 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java @@ -26,9 +26,9 @@ import java.util.Base64; import java.util.stream.IntStream; +import org.neo4j.internal.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constraints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constraints.UniquenessConstraintDescriptor;