Clean up after rebase

neo4j · Mar 17, 2017 · 8ddd30b · 8ddd30b
1 parent 4a292f2
commit 8ddd30b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/...nel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java b/...nel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java
@@ -62,7 +62,7 @@ private static String constructUserMessage( OperationContext context, TokenNameL
                         (LabelSchemaDescriptor) constraint.schema() );
 
             case CONSTRAINT_CREATION:
-                return ALREADY_CONSTRAINED_MESSAGE_PREFIX + constraint.userDescription( tokenNameLookup );
+                return ALREADY_CONSTRAINED_MESSAGE_PREFIX + constraint.prettyPrint( tokenNameLookup );
 
             default:
                 return format( NO_CONTEXT_FORMAT, constraint );

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/api/schema/RelationshipPropertyDescriptor.java b/...nity/kernel/src/main/java/org/neo4j/kernel/api/schema/RelationshipPropertyDescriptor.java
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java
@@ -37,8 +37,6 @@
 import org.neo4j.kernel.api.ExecutionStatisticsOperations;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.LegacyIndexHits;
-import org.neo4j.kernel.api.TokenWriteOperations;
-import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException;
 import org.neo4j.kernel.api.ProcedureCallOperations;
 import org.neo4j.kernel.api.QueryRegistryOperations;
 import org.neo4j.kernel.api.ReadOperations;

diff --git a/...rc/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatterTest.java b/...rc/test/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatterTest.java
@@ -72,7 +72,7 @@ public void shouldFormatIndexDescriptors()
     @Test
     public void shouldFormatUniquenessConstraints()
     {
-        assertEquals( "ConstraintDescriptorFactory.uniqueForLabel( 23, 42 ) )", formatArgument(
+        assertEquals( "ConstraintDescriptorFactory.uniqueForLabel( 23, 42 )", formatArgument(
                 ConstraintDescriptorFactory.uniqueForSchema( SchemaDescriptorFactory.forLabel( 23, 42 ) ) ) );
     }