Commit e4462ab

committed

fix jwt authentication

1 parent 490b1be commit e4462abCopy full SHA for e4462ab

File tree

+10

-11

lines changed

+10

-11

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,11 @@ public synchronized Connection connection() {`
`80`	`80`
`81`	`81`	`@Override`
`82`	`82`	`public void setJwt(String jwt) {`
`83`		`- this.jwt = jwt;`
`84`		`- for (Connection connection : connections) {`
`85`		`- connection.setJwt(jwt);`
	`83`	`+ if (jwt != null) {`
	`84`	`+ this.jwt = jwt;`
	`85`	`+ for (Connection connection : connections) {`
	`86`	`+ connection.setJwt(jwt);`
	`87`	`+ }`
`86`	`88`	`}`
`87`	`89`	`}`
`88`	`90`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@ public class HostSet {`
`15`	`15`	`private final ArrayList<Host> hosts = new ArrayList<>();`
`16`	`16`	`private volatile String jwt = null;`
`17`	`17`
`18`		`- public HostSet() {`
`19`		`- super();`
`20`		`- }`
`21`		`-`
`22`	`18`	`public HostSet(List<Host> hosts) {`
`23`	`19`	`super();`
`24`	`20`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ void getDocumentsDirtyRead(ArangoCollectionAsync collection) throws ExecutionExc`
`566`	`566`	`values.add(new BaseDocument("1"));`
`567`	`567`	`values.add(new BaseDocument("2"));`
`568`	`568`	`values.add(new BaseDocument("3"));`
`569`		`- collection.insertDocuments(values);`
	`569`	`+ collection.insertDocuments(values).get();`
`570`	`570`	`final MultiDocumentEntity<BaseDocument> documents = collection.getDocuments(Arrays.asList("1", "2", "3"),`
`571`	`571`	`BaseDocument.class, new DocumentReadOptions().allowDirtyRead(true)).get();`
`572`	`572`	`assertThat(documents).isNotNull();`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ void setAllLogLevel(ArangoDBAsync arangoDB) throws ExecutionException, Interrupt`
`532`	`532`	`assertThat(retrievedLevels.getAgency()).isEqualTo(LogLevelEntity.LogLevel.ERROR);`
`533`	`533`	`} finally {`
`534`	`534`	`entity.setAll(LogLevelEntity.LogLevel.INFO);`
`535`		`- arangoDB.setLogLevel(entity);`
	`535`	`+ arangoDB.setLogLevel(entity).get();`
`536`	`536`	`}`
`537`	`537`	`}`
`538`	`538`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import com.arangodb.internal.serde.InternalSerde;`
`28`	`28`	`import org.junit.jupiter.api.Test;`
`29`	`29`
	`30`	`+import java.util.Collections;`
`30`	`31`	`import java.util.List;`
`31`	`32`
`32`	`33`	`import static org.assertj.core.api.Assertions.assertThat;`
`@@ -65,7 +66,7 @@ public void close() {`
`65`	`66`	`@Override`
`66`	`67`	`public HostSet resolve(final boolean initial, final boolean closeConnections) {`
`67`	`68`
`68`		`- HostSet set = new HostSet();`
	`69`	`+ HostSet set = new HostSet(Collections.emptyList());`
`69`	`70`	`set.addHost(HOST_0);`
`70`	`71`	`return set;`
`71`	`72`	`}`
`@@ -83,7 +84,7 @@ public void init(ArangoExecutorSync executor, InternalSerde arangoSerialization)`
`83`	`84`	`@Override`
`84`	`85`	`public HostSet resolve(final boolean initial, final boolean closeConnections) {`
`85`	`86`
`86`		`- HostSet set = new HostSet();`
	`87`	`+ HostSet set = new HostSet(Collections.emptyList());`
`87`	`88`	`set.addHost(HOST_0);`
`88`	`89`	`set.addHost(HOST_1);`
`89`	`90`	`set.addHost(HOST_2);`

Comments

(0)