Skip to content

Commit

Permalink
Refined TransactionData based on review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
craigtaverner committed Oct 19, 2016
1 parent 5b81e17 commit da504ab
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
Expand Up @@ -167,16 +167,16 @@ public interface TransactionData
/** /**
* Get the username under which authorization state this transaction is running. * Get the username under which authorization state this transaction is running.
* *
* @return name of subject * @return the username of the user who initiated the transaction.
*/ */
String getUsername(); String username();


/** /**
* Applications that start transactions may attach additional application specific meta-data to each transaction. * Applications that start transactions may attach additional application specific meta-data to each transaction.
* *
* @return The application specific meta-data map associated with this transaction * @return The application specific meta-data map associated with this transaction.
*/ */
Map<String,Object> getMetaData(); Map<String,Object> metaData();


/** /**
* Return transaction id that assigned during transaction commit process. * Return transaction id that assigned during transaction commit process.
Expand Down
Expand Up @@ -158,13 +158,13 @@ public Iterable<PropertyEntry<Relationship>> removedRelationshipProperties()
} }


@Override @Override
public String getUsername() public String username()
{ {
return transaction.mode().username(); return transaction.mode().username();
} }


@Override @Override
public Map<String,Object> getMetaData() public Map<String,Object> metaData()
{ {
if ( transaction instanceof KernelTransactionImplementation ) if ( transaction instanceof KernelTransactionImplementation )
{ {
Expand Down
Expand Up @@ -286,15 +286,15 @@ public boolean isDeleted( Relationship relationship )
} }


@Override @Override
public String getUsername() public String username()
{ {
return ""; return "";
} }


@Override @Override
public Map<String,Object> getMetaData() public Map<String,Object> metaData()
{ {
return Collections.EMPTY_MAP; return Collections.emptyMap();
} }


@Override @Override
Expand Down
Expand Up @@ -310,7 +310,7 @@ public void shouldNotAccessUsernameFromStaticAccessMode()
when( transaction.mode() ).thenReturn( accessMode ); when( transaction.mode() ).thenReturn( accessMode );


TxStateTransactionDataSnapshot transactionDataSnapshot = snapshot(); TxStateTransactionDataSnapshot transactionDataSnapshot = snapshot();
assertEquals( "", transactionDataSnapshot.getUsername() ); assertEquals( "", transactionDataSnapshot.username() );
} }


@Test @Test
Expand All @@ -321,14 +321,14 @@ public void shouldAccessUsernameFromAuthSubject()
when( transaction.mode() ).thenReturn( authSubject ); when( transaction.mode() ).thenReturn( authSubject );


TxStateTransactionDataSnapshot transactionDataSnapshot = snapshot(); TxStateTransactionDataSnapshot transactionDataSnapshot = snapshot();
assertEquals( "Christof", transactionDataSnapshot.getUsername() ); assertEquals( "Christof", transactionDataSnapshot.username() );
} }


@Test @Test
public void shouldAccessEmptyMetaData() public void shouldAccessEmptyMetaData()
{ {
TxStateTransactionDataSnapshot transactionDataSnapshot = snapshot(); TxStateTransactionDataSnapshot transactionDataSnapshot = snapshot();
assertEquals( 0, transactionDataSnapshot.getMetaData().size() ); assertEquals( 0, transactionDataSnapshot.metaData().size() );
} }


@Test @Test
Expand All @@ -340,8 +340,8 @@ public void shouldAccessExampleMetaData()
when( transaction.getMetaData() ).thenReturn( genericMap( "username", "Igor" ) ); when( transaction.getMetaData() ).thenReturn( genericMap( "username", "Igor" ) );
TxStateTransactionDataSnapshot transactionDataSnapshot = TxStateTransactionDataSnapshot transactionDataSnapshot =
new TxStateTransactionDataSnapshot( state, nodeActions, relActions, ops, storeStatement, transaction ); new TxStateTransactionDataSnapshot( state, nodeActions, relActions, ops, storeStatement, transaction );
assertEquals( 1, transactionDataSnapshot.getMetaData().size() ); assertEquals( 1, transactionDataSnapshot.metaData().size() );
assertThat( "Expected metadata map to contain defined username", transactionDataSnapshot.getMetaData(), assertThat( "Expected metadata map to contain defined username", transactionDataSnapshot.metaData(),
equalTo( genericMap( "username", "Igor" ) ) ); equalTo( genericMap( "username", "Igor" ) ) );
} }


Expand Down
Expand Up @@ -159,8 +159,8 @@ public void commitTimeNotAccessibleBeforeCommit()
public void shouldGetEmptyUsernameOnAuthDisabled() public void shouldGetEmptyUsernameOnAuthDisabled()
{ {
db.registerTransactionEventHandler( getBeforeCommitHandler( txData -> { db.registerTransactionEventHandler( getBeforeCommitHandler( txData -> {
assertThat( "Should have no username", txData.getUsername(), equalTo( "" ) ); assertThat( "Should have no username", txData.username(), equalTo( "" ) );
assertThat( "Should have no metadata", txData.getMetaData(), equalTo( Collections.emptyMap() ) ); assertThat( "Should have no metadata", txData.metaData(), equalTo( Collections.emptyMap() ) );
}) ); }) );
runTransaction(); runTransaction();
} }
Expand All @@ -171,8 +171,8 @@ public void shouldGetSpecifiedUsernameAndMetaDataInTXData()
final AtomicReference<String> usernameRef = new AtomicReference<>(); final AtomicReference<String> usernameRef = new AtomicReference<>();
final AtomicReference<Map<String,Object>> metaDataRef = new AtomicReference<>(); final AtomicReference<Map<String,Object>> metaDataRef = new AtomicReference<>();
db.registerTransactionEventHandler( getBeforeCommitHandler( txData -> { db.registerTransactionEventHandler( getBeforeCommitHandler( txData -> {
usernameRef.set( txData.getUsername() ); usernameRef.set( txData.username() );
metaDataRef.set( txData.getMetaData() ); metaDataRef.set( txData.metaData() );
} ) ); } ) );
AuthSubject subject = mock( AuthSubject.class ); AuthSubject subject = mock( AuthSubject.class );
when( subject.allowsWrites() ).thenReturn( true ); when( subject.allowsWrites() ).thenReturn( true );
Expand Down

0 comments on commit da504ab

Please sign in to comment.