diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java index a7b9a46550183..b109125327ce9 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java @@ -145,7 +145,7 @@ private void verifyNodeCorrectlyIndexedUniquely( long nodeId, Value[] propertyVa } else { - engine.report().uniqueIndexNotUnique( indexRule, Values.asPublic( propertyValues ), indexedNodeId ); + engine.report().uniqueIndexNotUnique( indexRule, Values.asObjects( propertyValues ), indexedNodeId ); } } @@ -157,11 +157,11 @@ private void reportIncorrectIndexCount( Value[] propertyValues, { if ( count == 0 ) { - engine.report().notIndexed( indexRule, Values.asPublic( propertyValues ) ); + engine.report().notIndexed( indexRule, Values.asObjects( propertyValues ) ); } else if ( count != 1 ) { - engine.report().indexedMultipleTimes( indexRule, Values.asPublic( propertyValues ), count ); + engine.report().indexedMultipleTimes( indexRule, Values.asObjects( propertyValues ), count ); } } diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala index e98f301ca1d60..bff8436218048 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala @@ -308,7 +308,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) } def getProperty(id: Long, propertyKeyId: Int): Any = try { - tc.statement.readOperations().nodeGetProperty(id, propertyKeyId).asLegacyObject() + tc.statement.readOperations().nodeGetProperty(id, propertyKeyId).asObject() } catch { case _: org.neo4j.kernel.api.exceptions.EntityNotFoundException => null.asInstanceOf[Int] } @@ -378,7 +378,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) } override def getProperty(id: Long, propertyKeyId: Int): Any = try { - tc.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asLegacyObject() + tc.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asObject() } catch { case _: exceptions.EntityNotFoundException => null } diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala index 0d3bd7e129d4f..c43b38a211185 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala @@ -304,7 +304,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) } override def getProperty(id: Long, propertyKeyId: Int): Any = try { - txContext.statement.readOperations().nodeGetProperty(id, propertyKeyId).asLegacyObject() + txContext.statement.readOperations().nodeGetProperty(id, propertyKeyId).asObject() } catch { case e: org.neo4j.kernel.api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) @@ -379,7 +379,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) } override def getProperty(id: Long, propertyKeyId: Int): Any = try { - txContext.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asLegacyObject() + txContext.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asObject() } catch { case e: org.neo4j.kernel.api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/TransactionBoundQueryContext.scala index dc24011f179c5..f844f7e36835f 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/TransactionBoundQueryContext.scala @@ -311,7 +311,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional } override def getProperty(id: Long, propertyKeyId: Int): Any = try { - transactionalContext.statement.readOperations().nodeGetProperty(id, propertyKeyId).asLegacyObject() + transactionalContext.statement.readOperations().nodeGetProperty(id, propertyKeyId).asObject() } catch { case e: org.neo4j.kernel.api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) @@ -386,7 +386,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional } override def getProperty(id: Long, propertyKeyId: Int): Any = try { - transactionalContext.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asLegacyObject() + transactionalContext.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asObject() } catch { case e: org.neo4j.kernel.api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala index 0f6d2b16c191b..f8a3cb7c8fb9f 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala @@ -311,7 +311,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional } override def getProperty(id: Long, propertyKeyId: Int): Any = try { - transactionalContext.statement.readOperations().nodeGetProperty(id, propertyKeyId).asLegacyObject() + transactionalContext.statement.readOperations().nodeGetProperty(id, propertyKeyId).asObject() } catch { case e: org.neo4j.kernel.api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) @@ -385,7 +385,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional } override def getProperty(id: Long, propertyKeyId: Int): Any = try { - transactionalContext.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asLegacyObject() + transactionalContext.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asObject() } catch { case e: org.neo4j.kernel.api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/IndexQuery.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/IndexQuery.java index 1f62b604d0fb8..4351ae7ee8112 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/IndexQuery.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/IndexQuery.java @@ -30,7 +30,6 @@ import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.TextValue; import org.neo4j.values.Value; -import org.neo4j.values.ValueGroup; import org.neo4j.values.ValueTuple; import org.neo4j.values.Values; @@ -295,12 +294,12 @@ public boolean test( Value value ) public Number from() { - return (Number)from.asPublic(); + return (Number)from.asObject(); } public Number to() { - return (Number)to.asPublic(); + return (Number)to.asObject(); } public boolean fromInclusive() @@ -368,7 +367,7 @@ public boolean test( Value value ) public String from() { - return (String)from.asPublic(); + return (String)from.asObject(); } public boolean fromInclusive() @@ -378,7 +377,7 @@ public boolean fromInclusive() public String to() { - return (String)to.asPublic(); + return (String)to.asObject(); } public boolean toInclusive() @@ -435,7 +434,7 @@ public IndexQueryType type() @Override public boolean test( Value value ) { - return value != null && Values.isTextValue( value ) && ((String)value.asPublic()).contains( contains ); + return value != null && Values.isTextValue( value ) && ((String)value.asObject()).contains( contains ); } public String contains() @@ -463,7 +462,7 @@ public IndexQueryType type() @Override public boolean test( Value value ) { - return value != null && Values.isTextValue( value ) && ((String)value.asPublic()).endsWith( suffix ); + return value != null && Values.isTextValue( value ) && ((String)value.asObject()).endsWith( suffix ); } public String suffix() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/legacyindex/InternalAutoIndexOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/legacyindex/InternalAutoIndexOperations.java index fcfecc1d8039e..be0ef971a7a17 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/legacyindex/InternalAutoIndexOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/legacyindex/InternalAutoIndexOperations.java @@ -160,7 +160,7 @@ public void propertyAdded( DataWriteOperations ops, long entityId, int propertyK if ( propertyKeysToInclude.get().contains( name ) ) { ensureIndexExists( ops ); - type.add( ops, entityId, name, value.asLegacyObject() ); + type.add( ops, entityId, name, value.asObject() ); } } catch ( LegacyIndexNotFoundKernelException | EntityNotFoundException e ) @@ -189,8 +189,8 @@ public void propertyChanged( DataWriteOperations ops, long entityId, int propert if ( propertyKeysToInclude.get().contains( name ) ) { ensureIndexExists( ops ); - type.remove( ops, entityId, name, oldValue.asLegacyObject() ); - type.add( ops, entityId, name, newValue.asLegacyObject() ); + type.remove( ops, entityId, name, oldValue.asObject() ); + type.add( ops, entityId, name, newValue.asObject() ); } } catch ( LegacyIndexNotFoundKernelException | EntityNotFoundException e ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java index d060717e4552d..495068e426845 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java @@ -106,7 +106,7 @@ public Object getProperty( String key ) throw new PropertyNotFoundException( propertyKeyId, EntityType.GRAPH, -1 ); } - return value.asPublic(); + return value.asObjectCopy(); } catch ( PropertyNotFoundException e ) { @@ -128,7 +128,7 @@ public Object getProperty( String key, Object defaultValue ) { int propertyKeyId = statement.readOperations().propertyKeyGetForName( key ); Value value = statement.readOperations().graphGetProperty( propertyKeyId ); - return value == Values.NO_VALUE ? defaultValue : value.asPublic(); + return value == Values.NO_VALUE ? defaultValue : value.asObjectCopy(); } } @@ -165,7 +165,7 @@ public Object removeProperty( String key ) try ( Statement statement = actions.statement() ) { int propertyKeyId = statement.tokenWriteOperations().propertyKeyGetOrCreateForName( key ); - return statement.dataWriteOperations().graphRemoveProperty( propertyKeyId ).asPublic(); + return statement.dataWriteOperations().graphRemoveProperty( propertyKeyId ).asObjectCopy(); } catch ( IllegalTokenNameException e ) { @@ -228,7 +228,7 @@ public Map getAllProperties() { int propertyKeyId = propertyKeys.next(); properties.put( readOperations.propertyKeyGetName( propertyKeyId ), - readOperations.graphGetProperty( propertyKeyId ).asPublic() ); + readOperations.graphGetProperty( propertyKeyId ).asObjectCopy() ); } return properties; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java index 7398ebe1da690..d57183e7021ad 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java @@ -314,7 +314,7 @@ public Object removeProperty( String key ) throws NotFoundException try ( Statement statement = actions.statement() ) { int propertyKeyId = statement.tokenWriteOperations().propertyKeyGetOrCreateForName( key ); - return statement.dataWriteOperations().nodeRemoveProperty( nodeId, propertyKeyId ).asPublic(); + return statement.dataWriteOperations().nodeRemoveProperty( nodeId, propertyKeyId ).asObjectCopy(); } catch ( EntityNotFoundException e ) { @@ -347,7 +347,7 @@ public Object getProperty( String key, Object defaultValue ) { int propertyKeyId = statement.readOperations().propertyKeyGetForName( key ); Value value = statement.readOperations().nodeGetProperty( nodeId, propertyKeyId ); - return value == Values.NO_VALUE ? defaultValue : value.asPublic(); + return value == Values.NO_VALUE ? defaultValue : value.asObjectCopy(); } catch ( EntityNotFoundException e ) { @@ -420,7 +420,7 @@ public Map getAllProperties() { String name = statement.readOperations().propertyKeyGetName( propertyCursor.get().propertyKeyId() ); - properties.put( name, propertyCursor.get().value().asPublic() ); + properties.put( name, propertyCursor.get().value().asObjectCopy() ); } return properties; @@ -462,7 +462,7 @@ public Object getProperty( String key ) throws NotFoundException throw new PropertyNotFoundException( propertyKeyId, EntityType.NODE, nodeId ); } - return value.asPublic(); + return value.asObjectCopy(); } catch ( EntityNotFoundException | PropertyNotFoundException e ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyContainerProxyHelper.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyContainerProxyHelper.java index 94b31ccd7fedd..fe31b5f4708b4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyContainerProxyHelper.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyContainerProxyHelper.java @@ -52,7 +52,7 @@ static Map getProperties( Statement statement, Cursor getAllProperties() { String name = statement.readOperations().propertyKeyGetName( propertyCursor.get().propertyKeyId() ); - properties.put( name, propertyCursor.get().value().asPublic() ); + properties.put( name, propertyCursor.get().value().asObjectCopy() ); } return properties; @@ -344,7 +344,7 @@ public Object getProperty( String key ) throw new PropertyNotFoundException( propertyId, EntityType.RELATIONSHIP, getId() ); } - return value.asPublic(); + return value.asObjectCopy(); } catch ( EntityNotFoundException | PropertyNotFoundException e ) { @@ -366,7 +366,7 @@ public Object getProperty( String key, Object defaultValue ) { int propertyId = statement.readOperations().propertyKeyGetForName( key ); Value value = statement.readOperations().relationshipGetProperty( getId(), propertyId ); - return value == Values.NO_VALUE ? defaultValue : value.asPublic(); + return value == Values.NO_VALUE ? defaultValue : value.asObjectCopy(); } catch ( EntityNotFoundException e ) { @@ -435,7 +435,7 @@ public Object removeProperty( String key ) try ( Statement statement = actions.statement() ) { int propertyId = statement.tokenWriteOperations().propertyKeyGetOrCreateForName( key ); - return statement.dataWriteOperations().relationshipRemoveProperty( getId(), propertyId ).asPublic(); + return statement.dataWriteOperations().relationshipRemoveProperty( getId(), propertyId ).asObjectCopy(); } catch ( EntityNotFoundException e ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java index f208962650aa3..ac6e6f9339951 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java @@ -443,7 +443,7 @@ public String key() @Override public Object previouslyCommitedValue() { - return oldValue.asPublic(); + return oldValue.asObjectCopy(); } @Override @@ -453,7 +453,7 @@ public Object value() { throw new IllegalStateException( "This property has been removed, it has no value anymore." ); } - return newValue.asPublic(); + return newValue.asObjectCopy(); } @Override @@ -498,7 +498,7 @@ public String key() @Override public Object previouslyCommitedValue() { - return oldValue.asPublic(); + return oldValue.asObjectCopy(); } @Override @@ -508,7 +508,7 @@ public Object value() { throw new IllegalStateException( "This property has been removed, it has no value anymore." ); } - return newValue.asPublic(); + return newValue.asObjectCopy(); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ResourceTypes.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ResourceTypes.java index b8df7d7e27e2e..44d14a1d7352d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ResourceTypes.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/ResourceTypes.java @@ -109,9 +109,9 @@ private static long indexEntryResourceId( long labelId, long propertyKeyId, Stri private static String stringOf( Value value ) { - if ( null != Values.NO_VALUE ) + if ( value != null && value != Values.NO_VALUE ) { - return Strings.prettyPrint( value.asLegacyObject() ); + return Strings.prettyPrint( value.asObject() ); } return ""; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyStore.java index 68facf2321ce9..b068884365805 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyStore.java @@ -227,7 +227,7 @@ public static void encodeValue( PropertyBlock block, int keyId, Value value, DynamicRecordAllocator stringAllocator, DynamicRecordAllocator arrayAllocator ) { // TODO: use ValueWriter - Object asObject = value.asLegacyObject(); + Object asObject = value.asObject(); if ( asObject instanceof String ) { // Try short string first, i.e. inlined in the property block String string = (String) asObject; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java index 3c5aea916faa1..a401c9edd90e2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyBlock.java @@ -179,7 +179,7 @@ public String toString() result.append( ",firstDynamic=" ).append( getSingleValueLong() ); break; default: - Object value = type.value( this, null ).asLegacyObject(); + Object value = type.value( this, null ).asObject(); if ( value != null && value.getClass().isArray() ) { int length = Array.getLength( value ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java index ac6ba3bac5509..4bd9dd6efd553 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigrator.java @@ -629,7 +629,7 @@ private BiConsumer< while ( cursor.next() ) { scratch.add( cursor.propertyKeyId() ); // add key as int here as to have the importer use the token id - scratch.add( cursor.value().asLegacyObject() ); + scratch.add( cursor.value().asObject() ); } entity.setProperties( scratch.isEmpty() ? InputEntity.NO_PROPERTIES : scratch.toArray() ); cursor.close(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index 5e9a22fcac9df..0880310ac5243 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -482,7 +482,7 @@ public void add( IndexEntryUpdate update ) { job.update( IndexEntryUpdate.change( nodeToChange, index, previousValue, newValue ) ); } - added.add( Pair.of( update.getEntityId(), update.values()[0].asPublic() ) ); + added.add( Pair.of( update.getEntityId(), update.values()[0].asObjectCopy() ) ); } @Override @@ -497,7 +497,7 @@ public void process( IndexEntryUpdate update ) throws IOException, IndexEntryCon { case ADDED: case CHANGED: - added.add( Pair.of( update.getEntityId(), update.values()[0].asPublic() ) ); + added.add( Pair.of( update.getEntityId(), update.values()[0].asObjectCopy() ) ); break; default: throw new IllegalArgumentException( update.updateMode().name() ); @@ -560,7 +560,7 @@ public void add( IndexEntryUpdate update ) { job.update( IndexEntryUpdate.remove( nodeToDelete, index, valueToDelete ) ); } - added.put( update.getEntityId(), update.values()[0].asPublic() ); + added.put( update.getEntityId(), update.values()[0].asObjectCopy() ); } @Override @@ -575,10 +575,10 @@ public void process( IndexEntryUpdate update ) throws IOException, IndexEntryCon { case ADDED: case CHANGED: - added.put( update.getEntityId(), update.values()[0].asPublic() ); + added.put( update.getEntityId(), update.values()[0].asObjectCopy() ); break; case REMOVED: - removed.put( update.getEntityId(), update.values()[0].asPublic() ); // on remove, value is the before value + removed.put( update.getEntityId(), update.values()[0].asObjectCopy() ); // on remove, value is the before value break; default: throw new IllegalArgumentException( update.updateMode().name() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java index bec41deea9601..0d92d1512d795 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexImplementation.java @@ -84,20 +84,20 @@ private static Object[] encode( Value[] propertyValues ) private static Object encode( Value value ) { - Object asPublic = value.asPublic(); - if ( asPublic instanceof Number ) + Object asObject = value.asObject(); + if ( asObject instanceof Number ) { - asPublic = ((Number) asPublic).doubleValue(); + asObject = ((Number) asObject).doubleValue(); } - else if ( asPublic instanceof Character ) + else if ( asObject instanceof Character ) { - asPublic = asPublic.toString(); + asObject = asObject.toString(); } - else if ( asPublic.getClass().isArray() ) + else if ( asObject.getClass().isArray() ) { - asPublic = new ArrayKey( ArrayEncoder.encode( value ) ); + asObject = new ArrayKey( ArrayEncoder.encode( value ) ); } - return asPublic; + return asObject; } static class ArrayKey diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java index 36743a4987b98..33b84d713d1c5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java @@ -298,7 +298,7 @@ public void shouldUpdateNodePropertyValue() throws Exception // THEN ReadOperations readOperations = readOperationsInNewTransaction(); - assertEquals( 42, readOperations.nodeGetProperty( nodeId, propertyId ).asPublic() ); + assertEquals( 42, readOperations.nodeGetProperty( nodeId, propertyId ).asObject() ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java index 6984de11837be..326d5e801d9b1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java @@ -1688,7 +1688,7 @@ private void withProperties( Collection> nodesWithValues ) Value valueAfter = Values.of( entry.other() ); state.nodeDoAddProperty( nodeId, propertyKeyId, valueAfter ); state.indexDoUpdateEntry( descriptor.schema(), nodeId, null, - ValueTuple.of( valueAfter.asPublic() ) ); + ValueTuple.of( valueAfter ) ); } } }; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java index c2e45622f3c3d..6d3b9cb5e5d34 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java @@ -886,7 +886,7 @@ private static List asPropertyValuesList( StorePropertyCursor cursor ) List values = new ArrayList<>(); while ( cursor.next() ) { - values.add( cursor.value().asPublic() ); + values.add( cursor.value().asObjectCopy() ); } return values; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java index a2fc41c19967a..35bda8f88e16d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java @@ -987,21 +987,21 @@ private void validateNodeRel1( final long node, StorageProperty prop1, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "string1", data.value().asPublic() ); + assertEquals( "string1", data.value().asObject() ); nodeAddProperty( node, prop1.propertyKeyId(), "-string1" ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( 1, data.value().asPublic() ); + assertEquals( 1, data.value().asObject() ); nodeAddProperty( node, prop2.propertyKeyId(), -1 ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( true, data.value().asPublic() ); + assertEquals( true, data.value().asObject() ); nodeAddProperty( node, prop3.propertyKeyId(), false ); } else @@ -1078,21 +1078,21 @@ private void validateNodeRel2( final long node, StorageProperty prop1, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "string2", data.value().asPublic() ); + assertEquals( "string2", data.value().asObject() ); nodeAddProperty( node, prop1.propertyKeyId(), "-string2" ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( 2, data.value().asPublic() ); + assertEquals( 2, data.value().asObject() ); nodeAddProperty( node, prop2.propertyKeyId(), -2 ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( false, data.value().asPublic() ); + assertEquals( false, data.value().asObject() ); nodeAddProperty( node, prop3.propertyKeyId(), true ); } else @@ -1165,21 +1165,21 @@ private void validateRel1( long rel, StorageProperty prop1, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "string1", data.value().asPublic() ); + assertEquals( "string1", data.value().asObject() ); relAddProperty( rel, prop1.propertyKeyId(), "-string1" ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( 1, data.value().asPublic() ); + assertEquals( 1, data.value().asObject() ); relAddProperty( rel, prop2.propertyKeyId(), -1 ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( true, data.value().asPublic() ); + assertEquals( true, data.value().asObject() ); relAddProperty( rel, prop3.propertyKeyId(), false ); } else @@ -1227,21 +1227,21 @@ private void validateRel2( long rel, StorageProperty prop1, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "string2", data.value().asPublic() ); + assertEquals( "string2", data.value().asObject() ); relAddProperty( rel, prop1.propertyKeyId(), "-string2" ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( 2, data.value().asPublic() ); + assertEquals( 2, data.value().asObject() ); relAddProperty( rel, prop2.propertyKeyId(), -2 ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( false, data.value().asPublic() ); + assertEquals( false, data.value().asObject() ); relAddProperty( rel, prop3.propertyKeyId(), true ); } else @@ -1301,19 +1301,19 @@ private void deleteRel1( long rel, StorageProperty prop1, StorageProperty prop2, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "-string1", data.value().asPublic() ); + assertEquals( "-string1", data.value().asObject() ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( -1, data.value().asPublic() ); + assertEquals( -1, data.value().asObject() ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( false, data.value().asPublic() ); + assertEquals( false, data.value().asObject() ); transaction.relationshipDoRemoveProperty( rel, prop3.propertyKeyId(), prop3.value() ); } else @@ -1362,19 +1362,19 @@ private void deleteRel2( long rel, StorageProperty prop1, StorageProperty prop2, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "-string2", data.value().asPublic() ); + assertEquals( "-string2", data.value().asObject() ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( -2, data.value().asPublic() ); + assertEquals( -2, data.value().asObject() ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( true, data.value().asPublic() ); + assertEquals( true, data.value().asObject() ); transaction.relationshipDoRemoveProperty( rel, prop3.propertyKeyId(), prop3.value() ); } else @@ -1428,19 +1428,19 @@ private void deleteNode1( long node, StorageProperty prop1, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "-string1", data.value().asPublic() ); + assertEquals( "-string1", data.value().asObject() ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( -1, data.value().asPublic() ); + assertEquals( -1, data.value().asObject() ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( false, data.value().asPublic() ); + assertEquals( false, data.value().asObject() ); transaction.nodeDoRemoveProperty( node, prop3.propertyKeyId(), prop3.value() ); } else @@ -1474,19 +1474,19 @@ private void deleteNode2( long node, StorageProperty prop1, { assertEquals( "prop1", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( "-string2", data.value().asPublic() ); + assertEquals( "-string2", data.value().asObject() ); } else if ( data.propertyKeyId() == prop2.propertyKeyId() ) { assertEquals( "prop2", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( -2, data.value().asPublic() ); + assertEquals( -2, data.value().asObject() ); } else if ( data.propertyKeyId() == prop3.propertyKeyId() ) { assertEquals( "prop3", MyPropertyKeyToken.getIndexFor( keyId ).name() ); - assertEquals( true, data.value().asPublic() ); + assertEquals( true, data.value().asObject() ); transaction.nodeDoRemoveProperty( node, prop3.propertyKeyId(), prop3.value() ); } else diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java index 826dfc0272527..0172d626be590 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java @@ -85,14 +85,11 @@ import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.UnderlyingStorageException; -import org.neo4j.kernel.impl.store.format.RecordGenerators; -import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.IndexRule; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.RecordLoad; -import org.neo4j.kernel.impl.traversal.AsOneStartBranchTest; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.storageengine.api.schema.LabelScanReader; @@ -1669,7 +1666,7 @@ private Map valueMapToObjectMap( Map asValues ) Map asObjects = new HashMap<>(); for ( Map.Entry entry : asValues.entrySet() ) { - asObjects.put( entry.getKey(), entry.getValue().asPublic() ); + asObjects.put( entry.getKey(), entry.getValue().asObjectCopy() ); } return asObjects; } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ValueEncoding.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ValueEncoding.java index 6fe7518d69752..64cb1a0176f94 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ValueEncoding.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/ValueEncoding.java @@ -158,20 +158,20 @@ boolean canEncode( Value value ) @Override Field encodeField( String name, Value value ) { - return stringField( name, value.asLegacyObject().toString() ); + return stringField( name, value.asObject().toString() ); } @Override void setFieldValue( Value value, Field field ) { - field.setStringValue( value.asLegacyObject().toString() ); + field.setStringValue( value.asObject().toString() ); } @Override Query encodeQuery( Value value, int propertyNumber ) { return new ConstantScoreQuery( - new TermQuery( new Term( key( propertyNumber ), value.asLegacyObject().toString() ) ) ); + new TermQuery( new Term( key( propertyNumber ), value.asObject().toString() ) ) ); } }; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java index f164be3580080..e00c7a7e807b2 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java @@ -404,7 +404,7 @@ else if ( data.size() == 1 ) private static Value duplicateValue( Value propertyValue ) { - return Values.of( propertyValue.asPublic() ); + return Values.of( propertyValue.asObjectCopy() ); } private static int randomIntInRange( int min, int max ) diff --git a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java index 2c9d58644440d..443000881644a 100644 --- a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java +++ b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java @@ -498,7 +498,7 @@ public long next() case ADDED: node.addLabel( Label.label( labelsIdNameMap.get( schema.getLabelId() ) ) ); - node.setProperty( NAME_PROPERTY, indexUpdate.values()[0].asPublic() ); + node.setProperty( NAME_PROPERTY, indexUpdate.values()[0].asObject() ); break; case REMOVED: node.addLabel( diff --git a/community/values/src/main/java/org/neo4j/values/BooleanArray.java b/community/values/src/main/java/org/neo4j/values/BooleanArray.java index d853c60d94560..f57497bbf8b7c 100644 --- a/community/values/src/main/java/org/neo4j/values/BooleanArray.java +++ b/community/values/src/main/java/org/neo4j/values/BooleanArray.java @@ -117,14 +117,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/BooleanValue.java b/community/values/src/main/java/org/neo4j/values/BooleanValue.java index e53d419b534ab..9078894afa1ee 100644 --- a/community/values/src/main/java/org/neo4j/values/BooleanValue.java +++ b/community/values/src/main/java/org/neo4j/values/BooleanValue.java @@ -87,7 +87,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/ByteArray.java b/community/values/src/main/java/org/neo4j/values/ByteArray.java index 484f13746dbe1..54ca16471a1b4 100644 --- a/community/values/src/main/java/org/neo4j/values/ByteArray.java +++ b/community/values/src/main/java/org/neo4j/values/ByteArray.java @@ -100,14 +100,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/ByteValue.java b/community/values/src/main/java/org/neo4j/values/ByteValue.java index 547f1e8fb4fb7..c2682f7b611f6 100644 --- a/community/values/src/main/java/org/neo4j/values/ByteValue.java +++ b/community/values/src/main/java/org/neo4j/values/ByteValue.java @@ -65,7 +65,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/CharArray.java b/community/values/src/main/java/org/neo4j/values/CharArray.java index 8dcd06c0fb7d6..df880ebba3739 100644 --- a/community/values/src/main/java/org/neo4j/values/CharArray.java +++ b/community/values/src/main/java/org/neo4j/values/CharArray.java @@ -83,14 +83,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/CharValue.java b/community/values/src/main/java/org/neo4j/values/CharValue.java index 14b8afba88208..5ca5f9ed1c30c 100644 --- a/community/values/src/main/java/org/neo4j/values/CharValue.java +++ b/community/values/src/main/java/org/neo4j/values/CharValue.java @@ -73,7 +73,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/DoubleArray.java b/community/values/src/main/java/org/neo4j/values/DoubleArray.java index e45b93ae7c2ce..d9751fc112d93 100644 --- a/community/values/src/main/java/org/neo4j/values/DoubleArray.java +++ b/community/values/src/main/java/org/neo4j/values/DoubleArray.java @@ -100,14 +100,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/DoubleValue.java b/community/values/src/main/java/org/neo4j/values/DoubleValue.java index 2e15be4240d36..ba4b0339e7b94 100644 --- a/community/values/src/main/java/org/neo4j/values/DoubleValue.java +++ b/community/values/src/main/java/org/neo4j/values/DoubleValue.java @@ -61,7 +61,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/FloatArray.java b/community/values/src/main/java/org/neo4j/values/FloatArray.java index 11c5fb6ef10a4..ed1a940ac6627 100644 --- a/community/values/src/main/java/org/neo4j/values/FloatArray.java +++ b/community/values/src/main/java/org/neo4j/values/FloatArray.java @@ -100,14 +100,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/FloatValue.java b/community/values/src/main/java/org/neo4j/values/FloatValue.java index 932f9196ece61..a6684c378b22c 100644 --- a/community/values/src/main/java/org/neo4j/values/FloatValue.java +++ b/community/values/src/main/java/org/neo4j/values/FloatValue.java @@ -61,7 +61,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/IntArray.java b/community/values/src/main/java/org/neo4j/values/IntArray.java index 70fe51baddc42..8fe24e31762f4 100644 --- a/community/values/src/main/java/org/neo4j/values/IntArray.java +++ b/community/values/src/main/java/org/neo4j/values/IntArray.java @@ -100,14 +100,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/IntValue.java b/community/values/src/main/java/org/neo4j/values/IntValue.java index a7e103b4aea68..0b9dd0200b10e 100644 --- a/community/values/src/main/java/org/neo4j/values/IntValue.java +++ b/community/values/src/main/java/org/neo4j/values/IntValue.java @@ -43,7 +43,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/LongArray.java b/community/values/src/main/java/org/neo4j/values/LongArray.java index 6a8e37885758b..fd2a866178202 100644 --- a/community/values/src/main/java/org/neo4j/values/LongArray.java +++ b/community/values/src/main/java/org/neo4j/values/LongArray.java @@ -100,7 +100,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @@ -113,7 +113,7 @@ public String prettyPrint() @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/LongValue.java b/community/values/src/main/java/org/neo4j/values/LongValue.java index edf5533ba9c3a..31ac07e2e8251 100644 --- a/community/values/src/main/java/org/neo4j/values/LongValue.java +++ b/community/values/src/main/java/org/neo4j/values/LongValue.java @@ -61,7 +61,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/NoValue.java b/community/values/src/main/java/org/neo4j/values/NoValue.java index 1b99278952531..2774a91f102e0 100644 --- a/community/values/src/main/java/org/neo4j/values/NoValue.java +++ b/community/values/src/main/java/org/neo4j/values/NoValue.java @@ -131,7 +131,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return null; } diff --git a/community/values/src/main/java/org/neo4j/values/ShortArray.java b/community/values/src/main/java/org/neo4j/values/ShortArray.java index 5a04dd3047ff4..389f77dbe9d49 100644 --- a/community/values/src/main/java/org/neo4j/values/ShortArray.java +++ b/community/values/src/main/java/org/neo4j/values/ShortArray.java @@ -100,14 +100,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/ShortValue.java b/community/values/src/main/java/org/neo4j/values/ShortValue.java index 1c30ca9a23cfb..9794fa699a022 100644 --- a/community/values/src/main/java/org/neo4j/values/ShortValue.java +++ b/community/values/src/main/java/org/neo4j/values/ShortValue.java @@ -65,7 +65,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value; } diff --git a/community/values/src/main/java/org/neo4j/values/StringArray.java b/community/values/src/main/java/org/neo4j/values/StringArray.java index 898f65e0b9560..915be6643da71 100644 --- a/community/values/src/main/java/org/neo4j/values/StringArray.java +++ b/community/values/src/main/java/org/neo4j/values/StringArray.java @@ -76,14 +76,14 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value().clone(); } @Override @Deprecated - public Object asLegacyObject() + public Object asObject() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/StringValue.java b/community/values/src/main/java/org/neo4j/values/StringValue.java index 90c9773b61507..386145ee8b75b 100644 --- a/community/values/src/main/java/org/neo4j/values/StringValue.java +++ b/community/values/src/main/java/org/neo4j/values/StringValue.java @@ -62,7 +62,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return value(); } diff --git a/community/values/src/main/java/org/neo4j/values/Value.java b/community/values/src/main/java/org/neo4j/values/Value.java index 0f870f85c0c35..5d6c4661b4940 100644 --- a/community/values/src/main/java/org/neo4j/values/Value.java +++ b/community/values/src/main/java/org/neo4j/values/Value.java @@ -61,7 +61,7 @@ public abstract class Value * * @return the object version of the current value */ - public abstract Object asPublic(); + public abstract Object asObjectCopy(); /** * Return this value as a regular java boxed primitive, String or primitive array. This method does not clone @@ -69,10 +69,9 @@ public abstract class Value * * @return the object version of the current value */ - @Deprecated - public Object asLegacyObject() + public Object asObject() { - return asPublic(); + return asObjectCopy(); } /** diff --git a/community/values/src/main/java/org/neo4j/values/Values.java b/community/values/src/main/java/org/neo4j/values/Values.java index 8ffb557f65286..b43730c0bcc88 100644 --- a/community/values/src/main/java/org/neo4j/values/Values.java +++ b/community/values/src/main/java/org/neo4j/values/Values.java @@ -399,18 +399,18 @@ public static Value[] values( Object[] objects ) } @Deprecated - public static Object asLegacyObject( Value value ) + public static Object asObject( Value value ) { - return value == null ? null : value.asLegacyObject(); + return value == null ? null : value.asObject(); } - public static Object[] asPublic( Value[] propertyValues ) + public static Object[] asObjects( Value[] propertyValues ) { Object[] legacy = new Object[propertyValues.length]; for ( int i = 0; i < propertyValues.length; i++ ) { - legacy[i] = propertyValues[i].asPublic(); + legacy[i] = propertyValues[i].asObjectCopy(); } return legacy; diff --git a/community/values/src/test/java/org/neo4j/values/MyVirtualValue.java b/community/values/src/test/java/org/neo4j/values/MyVirtualValue.java index 7d7de40e967d9..ed2e55d2106a1 100644 --- a/community/values/src/test/java/org/neo4j/values/MyVirtualValue.java +++ b/community/values/src/test/java/org/neo4j/values/MyVirtualValue.java @@ -46,7 +46,7 @@ public void writeTo( ValueWriter writer ) } @Override - public Object asPublic() + public Object asObjectCopy() { return this; } diff --git a/community/values/src/test/java/org/neo4j/values/ValueAsPublicTest.java b/community/values/src/test/java/org/neo4j/values/ValueAsObjectCopyTest.java similarity index 70% rename from community/values/src/test/java/org/neo4j/values/ValueAsPublicTest.java rename to community/values/src/test/java/org/neo4j/values/ValueAsObjectCopyTest.java index c0f3205e31391..910c65929611a 100644 --- a/community/values/src/test/java/org/neo4j/values/ValueAsPublicTest.java +++ b/community/values/src/test/java/org/neo4j/values/ValueAsObjectCopyTest.java @@ -28,9 +28,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class ValueAsPublicTest +public class ValueAsObjectCopyTest { - private Iterable scalars = Arrays.asList( + private Iterable scalars = Arrays.asList( shouldGivePublic( Values.byteValue( (byte)1 ), (byte)1 ), shouldGivePublic( Values.shortValue( (short)2 ), (short)2 ), shouldGivePublic( Values.intValue( 3 ), 3 ), @@ -46,7 +46,7 @@ public class ValueAsPublicTest @Test public void shouldProvideScalarValueAsPublic() { - for ( AsPublicTest test : scalars ) + for ( AsObjectCopyTest test : scalars ) { test.assertGeneratesPublic(); } @@ -59,15 +59,15 @@ public void shouldProvideDirectByteArrayAsPublic() { byte[] inStore = {1}; Value value = Values.byteArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return byte[]", asPublic instanceof byte[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return byte[]", asObject instanceof byte[] ); - byte[] arr = (byte[]) asPublic; + byte[] arr = (byte[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (byte[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (byte[])value.asObjectCopy() ) ); } @Test @@ -75,15 +75,15 @@ public void shouldProvideDirectShortArrayAsPublic() { short[] inStore = {1}; Value value = Values.shortArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return short[]", asPublic instanceof short[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return short[]", asObject instanceof short[] ); - short[] arr = (short[]) asPublic; + short[] arr = (short[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (short[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (short[])value.asObjectCopy() ) ); } @Test @@ -91,15 +91,15 @@ public void shouldProvideDirectIntArrayAsPublic() { int[] inStore = {1}; Value value = Values.intArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return int[]", asPublic instanceof int[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return int[]", asObject instanceof int[] ); - int[] arr = (int[]) asPublic; + int[] arr = (int[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (int[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (int[])value.asObjectCopy() ) ); } @Test @@ -107,15 +107,15 @@ public void shouldProvideDirectLongArrayAsPublic() { long[] inStore = {1}; Value value = Values.longArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return long[]", asPublic instanceof long[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return long[]", asObject instanceof long[] ); - long[] arr = (long[]) asPublic; + long[] arr = (long[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (long[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (long[])value.asObjectCopy() ) ); } @Test @@ -123,15 +123,15 @@ public void shouldProvideDirectFloatArrayAsPublic() { float[] inStore = {1}; Value value = Values.floatArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return float[]", asPublic instanceof float[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return float[]", asObject instanceof float[] ); - float[] arr = (float[]) asPublic; + float[] arr = (float[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (float[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (float[])value.asObjectCopy() ) ); } @Test @@ -139,15 +139,15 @@ public void shouldProvideDirectDoubleArrayAsPublic() { double[] inStore = {1}; Value value = Values.doubleArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return double[]", asPublic instanceof double[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return double[]", asObject instanceof double[] ); - double[] arr = (double[]) asPublic; + double[] arr = (double[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (double[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (double[])value.asObjectCopy() ) ); } @Test @@ -155,15 +155,15 @@ public void shouldProvideDirectCharArrayAsPublic() { char[] inStore = {'a'}; Value value = Values.charArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return char[]", asPublic instanceof char[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return char[]", asObject instanceof char[] ); - char[] arr = (char[]) asPublic; + char[] arr = (char[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = 'b'; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (char[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (char[])value.asObjectCopy() ) ); } @Test @@ -171,15 +171,15 @@ public void shouldProvideDirectStringArrayAsPublic() { String[] inStore = {"a"}; Value value = Values.stringArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return String[]", asPublic instanceof String[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return String[]", asObject instanceof String[] ); - String[] arr = (String[]) asPublic; + String[] arr = (String[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = "b"; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (String[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (String[])value.asObjectCopy() ) ); } @Test @@ -187,15 +187,15 @@ public void shouldProvideDirectBooleanArrayAsPublic() { boolean[] inStore = {true}; Value value = Values.booleanArray( inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return boolean[]", asPublic instanceof boolean[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return boolean[]", asObject instanceof boolean[] ); - boolean[] arr = (boolean[]) asPublic; + boolean[] arr = (boolean[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = false; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (boolean[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (boolean[])value.asObjectCopy() ) ); } // LAZY ARRAYS @@ -205,15 +205,15 @@ public void shouldProvideLazyByteArrayAsPublic() { byte[] inStore = {1}; Value value = Values.lazyByteArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return byte[]", asPublic instanceof byte[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return byte[]", asObject instanceof byte[] ); - byte[] arr = (byte[]) asPublic; + byte[] arr = (byte[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (byte[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (byte[])value.asObjectCopy() ) ); } @Test @@ -221,15 +221,15 @@ public void shouldProvideLazyShortArrayAsPublic() { short[] inStore = {1}; Value value = Values.lazyShortArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return short[]", asPublic instanceof short[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return short[]", asObject instanceof short[] ); - short[] arr = (short[]) asPublic; + short[] arr = (short[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (short[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (short[])value.asObjectCopy() ) ); } @Test @@ -237,15 +237,15 @@ public void shouldProvideLazyIntArrayAsPublic() { int[] inStore = {1}; Value value = Values.lazyIntArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return int[]", asPublic instanceof int[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return int[]", asObject instanceof int[] ); - int[] arr = (int[]) asPublic; + int[] arr = (int[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (int[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (int[])value.asObjectCopy() ) ); } @Test @@ -253,15 +253,15 @@ public void shouldProvideLazyLongArrayAsPublic() { long[] inStore = {1}; Value value = Values.lazyLongArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return long[]", asPublic instanceof long[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return long[]", asObject instanceof long[] ); - long[] arr = (long[]) asPublic; + long[] arr = (long[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (long[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (long[])value.asObjectCopy() ) ); } @Test @@ -269,15 +269,15 @@ public void shouldProvideLazyFloatArrayAsPublic() { float[] inStore = {1}; Value value = Values.lazyFloatArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return float[]", asPublic instanceof float[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return float[]", asObject instanceof float[] ); - float[] arr = (float[]) asPublic; + float[] arr = (float[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (float[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (float[])value.asObjectCopy() ) ); } @Test @@ -285,15 +285,15 @@ public void shouldProvideLazyDoubleArrayAsPublic() { double[] inStore = {1}; Value value = Values.lazyDoubleArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return double[]", asPublic instanceof double[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return double[]", asObject instanceof double[] ); - double[] arr = (double[]) asPublic; + double[] arr = (double[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = -1; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (double[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (double[])value.asObjectCopy() ) ); } @Test @@ -301,15 +301,15 @@ public void shouldProvideLazyCharArrayAsPublic() { char[] inStore = {'a'}; Value value = Values.lazyCharArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return char[]", asPublic instanceof char[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return char[]", asObject instanceof char[] ); - char[] arr = (char[]) asPublic; + char[] arr = (char[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = 'b'; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (char[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (char[])value.asObjectCopy() ) ); } @Test @@ -317,15 +317,15 @@ public void shouldProvideLazyStringArrayAsPublic() { String[] inStore = {"a"}; Value value = Values.lazyStringArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return String[]", asPublic instanceof String[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return String[]", asObject instanceof String[] ); - String[] arr = (String[]) asPublic; + String[] arr = (String[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = "b"; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (String[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (String[])value.asObjectCopy() ) ); } @Test @@ -333,28 +333,28 @@ public void shouldProvideLazyBooleanArrayAsPublic() { boolean[] inStore = {true}; Value value = Values.lazyBooleanArray( () -> inStore ); - Object asPublic = value.asPublic(); - assertTrue( "should return boolean[]", asPublic instanceof boolean[] ); + Object asObject = value.asObjectCopy(); + assertTrue( "should return boolean[]", asObject instanceof boolean[] ); - boolean[] arr = (boolean[]) asPublic; + boolean[] arr = (boolean[]) asObject; assertTrue( "should have same values", Arrays.equals( inStore, arr ) ); arr[0] = false; assertFalse( "should not modify inStore array", Arrays.equals( inStore, arr ) ); - assertTrue( "should still generate inStore array", Arrays.equals( inStore, (boolean[])value.asPublic() ) ); + assertTrue( "should still generate inStore array", Arrays.equals( inStore, (boolean[])value.asObjectCopy() ) ); } - private AsPublicTest shouldGivePublic( Value value, Object asPublic ) + private AsObjectCopyTest shouldGivePublic( Value value, Object asObject ) { - return new AsPublicTest( value, asPublic ); + return new AsObjectCopyTest( value, asObject ); } - private class AsPublicTest + private class AsObjectCopyTest { private final Value value; private final Object expected; - private AsPublicTest( Value value, Object expected ) + private AsObjectCopyTest( Value value, Object expected ) { this.value = value; this.expected = expected; @@ -362,7 +362,7 @@ private AsPublicTest( Value value, Object expected ) void assertGeneratesPublic() { - assertThat( value.asPublic(), equalTo( expected ) ); + assertThat( value.asObjectCopy(), equalTo( expected ) ); } } }