Merge remote-tracking branch 'origin/4.1'

Author: Mark

ChangeLog

@@ -1,3 +1,7 @@
+v4.1.0 (2016-10-xx)
+---------------------------
+* changed VelocyStream communication (send protocol header)
+
 v4.0.0 (2016-10-17)
 ---------------------------
 * replaced API

docs/setup.md

@@ -43,4 +43,14 @@ Example for arangodb.properties:
   arangodb.user=root
   arangodb.password=
 
+```
+
+## SSL
+
+To use SSL, you have to set the configuration `useSsl` to `true` and set a `SSLContext`. (see [example code](../src/test/java/com/arangodb/example/ssl/SslExample.java))
+
+``` Java
+  
+  ArangoDB arangoDB = new ArangoDB.Builder().useSsl(true).sslContext(sc).build();
+  
 ```

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.arangodb</groupId>
 	<artifactId>arangodb-java-driver</artifactId>
-	<version>4.0.0</version>
+	<version>4.1.0-SNAPSHOT</version>
 	<inceptionYear>2016</inceptionYear>
 	<packaging>jar</packaging>
 

src/main/java/com/arangodb/ArangoDB.java

@@ -29,6 +29,7 @@
 
 import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.LogEntity;
+import com.arangodb.entity.LogLevelEntity;
 import com.arangodb.entity.UserEntity;
 import com.arangodb.internal.ArangoDBConstants;
 import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
@@ -415,4 +416,25 @@ public LogEntity getLogs(final LogOptions options) throws ArangoDBException {
 		return executor.execute(getLogsRequest(options), LogEntity.class);
 	}
 
+	/**
+	 * Returns the server's current loglevel settings.
+	 * 
+	 * @return the server's current loglevel settings
+	 * @throws ArangoDBException
+	 */
+	public LogLevelEntity getLogLevel() throws ArangoDBException {
+		return executor.execute(getLogLevelRequest(), LogLevelEntity.class);
+	}
+
+	/**
+	 * Modifies and returns the server's current loglevel settings.
+	 * 
+	 * @param entity
+	 *            loglevel settings
+	 * @return the server's current loglevel settings
+	 * @throws ArangoDBException
+	 */
+	public LogLevelEntity setLogLevel(final LogLevelEntity entity) throws ArangoDBException {
+		return executor.execute(setLogLevelRequest(entity), LogLevelEntity.class);
+	}
 }

src/main/java/com/arangodb/entity/LogLevelEntity.java

@@ -0,0 +1,200 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2016 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+package com.arangodb.entity;
+
+/**
+ * @author Mark - mark at arangodb.com
+ *
+ */
+public class LogLevelEntity {
+
+	public enum LogLevel {
+		FATAL, ERROR, WARNING, INFO, DEBUG, DEFAULT;
+	}
+
+	private LogLevel agency;
+	private LogLevel agencycomm;
+	private LogLevel cluster;
+	private LogLevel collector;
+	private LogLevel communication;
+	private LogLevel compactor;
+	private LogLevel config;
+	private LogLevel datafiles;
+	private LogLevel graphs;
+	private LogLevel heartbeat;
+	private LogLevel mmap;
+	private LogLevel performance;
+	private LogLevel queries;
+	private LogLevel replication;
+	private LogLevel requests;
+	private LogLevel startup;
+	private LogLevel threads;
+	private LogLevel v8;
+
+	public LogLevelEntity() {
+		super();
+	}
+
+	public LogLevel getAgency() {
+		return agency;
+	}
+
+	public void setAgency(final LogLevel agency) {
+		this.agency = agency;
+	}
+
+	public LogLevel getAgencycomm() {
+		return agencycomm;
+	}
+
+	public void setAgencycomm(final LogLevel agencycomm) {
+		this.agencycomm = agencycomm;
+	}
+
+	public LogLevel getCluster() {
+		return cluster;
+	}
+
+	public void setCluster(final LogLevel cluster) {
+		this.cluster = cluster;
+	}
+
+	public LogLevel getCollector() {
+		return collector;
+	}
+
+	public void setCollector(final LogLevel collector) {
+		this.collector = collector;
+	}
+
+	public LogLevel getCommunication() {
+		return communication;
+	}
+
+	public void setCommunication(final LogLevel communication) {
+		this.communication = communication;
+	}
+
+	public LogLevel getCompactor() {
+		return compactor;
+	}
+
+	public void setCompactor(final LogLevel compactor) {
+		this.compactor = compactor;
+	}
+
+	public LogLevel getConfig() {
+		return config;
+	}
+
+	public void setConfig(final LogLevel config) {
+		this.config = config;
+	}
+
+	public LogLevel getDatafiles() {
+		return datafiles;
+	}
+
+	public void setDatafiles(final LogLevel datafiles) {
+		this.datafiles = datafiles;
+	}
+
+	public LogLevel getGraphs() {
+		return graphs;
+	}
+
+	public void setGraphs(final LogLevel graphs) {
+		this.graphs = graphs;
+	}
+
+	public LogLevel getHeartbeat() {
+		return heartbeat;
+	}
+
+	public void setHeartbeat(final LogLevel heartbeat) {
+		this.heartbeat = heartbeat;
+	}
+
+	public LogLevel getMmap() {
+		return mmap;
+	}
+
+	public void setMmap(final LogLevel mmap) {
+		this.mmap = mmap;
+	}
+
+	public LogLevel getPerformance() {
+		return performance;
+	}
+
+	public void setPerformance(final LogLevel performance) {
+		this.performance = performance;
+	}
+
+	public LogLevel getQueries() {
+		return queries;
+	}
+
+	public void setQueries(final LogLevel queries) {
+		this.queries = queries;
+	}
+
+	public LogLevel getReplication() {
+		return replication;
+	}
+
+	public void setReplication(final LogLevel replication) {
+		this.replication = replication;
+	}
+
+	public LogLevel getRequests() {
+		return requests;
+	}
+
+	public void setRequests(final LogLevel requests) {
+		this.requests = requests;
+	}
+
+	public LogLevel getStartup() {
+		return startup;
+	}
+
+	public void setStartup(final LogLevel startup) {
+		this.startup = startup;
+	}
+
+	public LogLevel getThreads() {
+		return threads;
+	}
+
+	public void setThreads(final LogLevel threads) {
+		this.threads = threads;
+	}
+
+	public LogLevel getV8() {
+		return v8;
+	}
+
+	public void setV8(final LogLevel v8) {
+		this.v8 = v8;
+	}
+
+}

src/main/java/com/arangodb/internal/ArangoDBConstants.java

@@ -56,6 +56,7 @@ public class ArangoDBConstants {
 	public static final String PATH_API_QUERY_SLOW = "/_api/query/slow";
 	public static final String PATH_API_TRAVERSAL = "/_api/traversal";
 	public static final String PATH_API_ADMIN_LOG = "/_admin/log";
+	public static final String PATH_API_ADMIN_LOG_LEVEL = "/_admin/log/level";
 	public static final String PATH_API_ADMIN_ROUTING_RELOAD = "/_admin/routing/reload";
 
 	public static final String ENCRYPTION_PLAIN = "plain";

src/main/java/com/arangodb/internal/InternalArangoDB.java

@@ -22,6 +22,7 @@
 
 import java.util.Collection;
 
+import com.arangodb.entity.LogLevelEntity;
 import com.arangodb.entity.UserEntity;
 import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
 import com.arangodb.internal.velocystream.Connection;
@@ -150,4 +151,13 @@ protected Request getLogsRequest(final LogOptions options) {
 				.putQueryParam(LogOptions.PROPERTY_SEARCH, params.getSearch())
 				.putQueryParam(LogOptions.PROPERTY_SORT, params.getSort());
 	}
+
+	protected Request getLogLevelRequest() {
+		return new Request(ArangoDBConstants.SYSTEM, RequestType.GET, ArangoDBConstants.PATH_API_ADMIN_LOG_LEVEL);
+	}
+
+	protected Request setLogLevelRequest(final LogLevelEntity entity) {
+		return new Request(ArangoDBConstants.SYSTEM, RequestType.PUT, ArangoDBConstants.PATH_API_ADMIN_LOG_LEVEL)
+				.setBody(executor.serialize(entity));
+	}
 }

src/main/java/com/arangodb/internal/velocystream/Connection.java

@@ -49,6 +49,7 @@
 public abstract class Connection {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(Connection.class);
+	private static final byte[] PROTOCOL_HEADER = "VST/1.0\r\n\r\n".getBytes();
 
 	private final String host;
 	private final Integer port;
@@ -109,6 +110,7 @@ public synchronized void open() throws IOException {
 			}
 			((SSLSocket) socket).startHandshake();
 		}
+		sendProtocolHeader();
 	}
 
 	public synchronized void close() {
@@ -124,6 +126,11 @@ public synchronized void close() {
 		}
 	}
 
+	private void sendProtocolHeader() throws IOException {
+		outputStream.write(PROTOCOL_HEADER);
+		outputStream.flush();
+	}
+
 	protected synchronized void writeIntern(final Message message, final Collection<Chunk> chunks) {
 		for (final Chunk chunk : chunks) {
 			try {

src/test/java/com/arangodb/ArangoDBTest.java

@@ -41,6 +41,7 @@
 import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.LogEntity;
 import com.arangodb.entity.LogLevel;
+import com.arangodb.entity.LogLevelEntity;
 import com.arangodb.entity.UserEntity;
 import com.arangodb.model.LogOptions;
 import com.arangodb.model.LogOptions.SortOrder;
@@ -361,4 +362,26 @@ public void getLogsSortDesc() {
 		}
 	}
 
+	@Test
+	public void getLogLevel() {
+		final ArangoDB arangoDB = new ArangoDB.Builder().build();
+		final LogLevelEntity logLevel = arangoDB.getLogLevel();
+		assertThat(logLevel, is(notNullValue()));
+		assertThat(logLevel.getAgency(), is(LogLevelEntity.LogLevel.INFO));
+	}
+
+	@Test
+	public void setLogLevel() {
+		final ArangoDB arangoDB = new ArangoDB.Builder().build();
+		final LogLevelEntity entity = new LogLevelEntity();
+		try {
+			entity.setAgency(LogLevelEntity.LogLevel.ERROR);
+			final LogLevelEntity logLevel = arangoDB.setLogLevel(entity);
+			assertThat(logLevel, is(notNullValue()));
+			assertThat(logLevel.getAgency(), is(LogLevelEntity.LogLevel.ERROR));
+		} finally {
+			entity.setAgency(LogLevelEntity.LogLevel.INFO);
+			arangoDB.setLogLevel(entity);
+		}
+	}
 }

src/test/java/com/arangodb/ArangoDatabaseTest.java

@@ -513,8 +513,8 @@ public void explainQuery() {
 		assertThat(plan.getCollections().size(), is(1));
 		assertThat(plan.getCollections().iterator().next().getName(), is("_apps"));
 		assertThat(plan.getCollections().iterator().next().getType(), is("read"));
-		assertThat(plan.getEstimatedCost(), is(5));
-		assertThat(plan.getEstimatedNrItems(), is(2));
+		assertThat(plan.getEstimatedCost(), greaterThan(0));
+		assertThat(plan.getEstimatedNrItems(), greaterThan(0));
 		assertThat(plan.getVariables().size(), is(1));
 		assertThat(plan.getVariables().iterator().next().getName(), is("i"));
 		assertThat(plan.getNodes().size(), is(3));