Fix ArangoCollection#rename(String)

mpv1989 · mpv1989 · commit 7558e13f4c16 · 2018-07-09T10:01:45.000+02:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+### Fixed
+
+- fixed `ArangoCollection#rename(String)`
+
+  Change field `name` in `ArangoCollection` after rename so that future requests through the instance will be made with the new collection name.
+
 ## [4.6.0] - 2018-07-02
 
 ### Added
diff --git a/src/main/java/com/arangodb/internal/ArangoCollectionImpl.java b/src/main/java/com/arangodb/internal/ArangoCollectionImpl.java
@@ -382,8 +382,10 @@ public CollectionPropertiesEntity changeProperties(final CollectionPropertiesOpt
 	}
 
 	@Override
-	public CollectionEntity rename(final String newName) throws ArangoDBException {
-		return executor.execute(renameRequest(newName), CollectionEntity.class);
+	public synchronized CollectionEntity rename(final String newName) throws ArangoDBException {
+		final CollectionEntity result = executor.execute(renameRequest(newName), CollectionEntity.class);
+		name = result.getName();
+		return result;
 	}
 
 	@Override
diff --git a/src/main/java/com/arangodb/internal/InternalArangoCollection.java b/src/main/java/com/arangodb/internal/InternalArangoCollection.java
@@ -87,7 +87,7 @@ public abstract class InternalArangoCollection<A extends InternalArangoDB<E>, D
 	private static final String SILENT = "silent";
 
 	private final D db;
-	private final String name;
+	protected volatile String name;
 
 	protected InternalArangoCollection(final D db, final String name) {
 		super(db.executor, db.util, db.context);
diff --git a/src/test/java/com/arangodb/ArangoCollectionTest.java b/src/test/java/com/arangodb/ArangoCollectionTest.java
@@ -2004,6 +2004,20 @@ public void rename() {
 		}
 	}
 
+	@Test
+	public void renameDontBreaksCollectionHandler() {
+		if (arangoDB.getRole() != ServerRole.SINGLE) {
+			return;
+		}
+		try {
+			final ArangoCollection collection = db.collection(COLLECTION_NAME);
+			collection.rename(COLLECTION_NAME + "1");
+			assertThat(collection.getInfo(), is(notNullValue()));
+		} finally {
+			db.collection(COLLECTION_NAME + "1").rename(COLLECTION_NAME);
+		}
+	}
+
 	@Test
 	public void getRevision() {
 		final CollectionRevisionEntity result = db.collection(COLLECTION_NAME).getRevision();

Original file line number	Diff line number	Diff line change
`@@ -382,8 +382,10 @@ public CollectionPropertiesEntity changeProperties(final CollectionPropertiesOpt`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`@Override`
`385`		`- public CollectionEntity rename(final String newName) throws ArangoDBException {`
`386`		`- return executor.execute(renameRequest(newName), CollectionEntity.class);`
	`385`	`+ public synchronized CollectionEntity rename(final String newName) throws ArangoDBException {`
	`386`	`+ final CollectionEntity result = executor.execute(renameRequest(newName), CollectionEntity.class);`
	`387`	`+ name = result.getName();`
	`388`	`+ return result;`
`387`	`389`	`}`
`388`	`390`
`389`	`391`	`@Override`