Merge branch 'master' into bug-fix/added-server-license-method-for-tests

Author: hkernbach

.gitignore

@@ -4,3 +4,4 @@
 /target
 /.idea
 /*.iml
+/bin

ChangeLog.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+### Fixed
+
+- host handling (issue #241)
+- logging extended hostresolver
+
+### Added
+
 - added smartJoinAttribute and shardingStrategy collection attributes
 
 ## [5.0.4] - 2019-18-01

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

@@ -28,10 +28,6 @@
  */
 public class ArangoDBVersion implements Entity {
 
-	public enum License {
-		ENTERPRISE, COMMUNITY
-	}
-
 	private String server;
 	private String version;
 	private License license;

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

@@ -39,6 +39,9 @@ public class CollectionPropertiesEntity extends CollectionEntity {
 	private Collection<String> shardKeys;
 	private final ReplicationFactor replicationFactor;
 
+	private String shardingStrategy; // cluster option
+	private String smartJoinAttribute; // enterprise option
+
 	public CollectionPropertiesEntity() {
 		super();
 		replicationFactor = new ReplicationFactor();
@@ -126,4 +129,20 @@ public void setSatellite(final Boolean satellite) {
 		this.replicationFactor.setSatellite(satellite);
 	}
 
+	public String getShardingStrategy() {
+		return shardingStrategy;
+	}
+
+	public void setShardingStrategy(String shardingStrategy) {
+		this.shardingStrategy = shardingStrategy;
+	}
+
+	public String getSmartJoinAttribute() {
+		return smartJoinAttribute;
+	}
+
+	public void setSmartJoinAttribute(String smartJoinAttribute) {
+		this.smartJoinAttribute = smartJoinAttribute;
+	}
+
 }

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

@@ -0,0 +1,30 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2019 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 Axel Becker
+ */
+public enum License {
+
+	ENTERPRISE, COMMUNITY
+	
+}

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

@@ -0,0 +1,45 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2019 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 Axel Becker
+ * https://www.arangodb.com/docs/3.4/http/collection-creating.html
+ */
+public enum ShardingStrategy {
+	
+	COMMUNITY_COMPAT("community-compat"), 
+	ENTERPRISE_COMPAT("enterprise-compat"), 
+	ENTERPRISE_SMART_EDGE_COMPAT("enterprise-smart-edge-compat"), 
+	HASH("hash"), 
+	ENTERPRISE_HASH_SMART_EDGE("enterprise-hash-smart-edge");
+	
+	private String internalName;
+	
+	private ShardingStrategy(String internalName) {
+		this.internalName = internalName;
+	}
+	
+	public String getInternalName() {
+		return this.internalName;
+	}
+
+}

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

@@ -53,23 +53,28 @@ public <T> T execute(final Request request, final Type type, final HostHandle ho
 		return execute(request, new ResponseDeserializer<T>() {
 			@Override
 			public T deserialize(final Response response) throws VPackException {
-				return createResult(type, response);
+				T result = createResult(type, response);
+				return result;
 			}
 		}, hostHandle);
 	}
 
-	public <T> T execute(final Request request, final ResponseDeserializer<T> responseDeserializer)
-			throws ArangoDBException {
+	public <T> T execute(final Request request, final ResponseDeserializer<T> responseDeserializer) throws ArangoDBException {
 		return execute(request, responseDeserializer, null);
 	}
 
 	public <T> T execute(
 		final Request request,
 		final ResponseDeserializer<T> responseDeserializer,
 		final HostHandle hostHandle) throws ArangoDBException {
+		
 		try {
+			
 			final Response response = protocol.execute(request, hostHandle);
-			return responseDeserializer.deserialize(response);
+			T deserialize = responseDeserializer.deserialize(response);
+			
+			return deserialize;
+			
 		} catch (final VPackException e) {
 			throw new ArangoDBException(e);
 		}

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

@@ -117,8 +117,13 @@ protected Request getVersionRequest() {
 	}
 
 	protected Request createCollectionRequest(final String name, final CollectionCreateOptions options) {
-		return request(name(), RequestType.POST, InternalArangoCollection.PATH_API_COLLECTION).setBody(
-			util().serialize(OptionsBuilder.build(options != null ? options : new CollectionCreateOptions(), name)));
+		
+		VPackSlice body = util().serialize(OptionsBuilder.build(options != null ? options : new CollectionCreateOptions(), name));
+		
+		return request(
+					name(), 
+					RequestType.POST, 
+					InternalArangoCollection.PATH_API_COLLECTION).setBody(body);
 	}
 
 	protected Request getCollectionsRequest(final CollectionsReadOptions options) {

src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java

@@ -20,28 +20,37 @@
 
 package com.arangodb.internal.net;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.arangodb.internal.util.HostUtils;
 
 /**
  * @author Mark Vollmary
  *
  */
 public class ExtendedHostResolver implements HostResolver {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ExtendedHostResolver.class);
 
 	private static final long MAX_CACHE_TIME = 60 * 60 * 1000;
+	
 	private EndpointResolver resolver;
-	private final List<Host> hosts;
+	private HostSet hosts;
+	
 	private final Integer maxConnections;
 	private final ConnectionFactory connectionFactory;
+	
 	private long lastUpdate;
 
 	public ExtendedHostResolver(final List<Host> hosts, final Integer maxConnections,
 		final ConnectionFactory connectionFactory) {
 		super();
-		this.hosts = hosts;
+		this.hosts = new HostSet(hosts);
 		this.maxConnections = maxConnections;
 		this.connectionFactory = connectionFactory;
 		lastUpdate = 0;
@@ -53,23 +62,40 @@ public void init(final EndpointResolver resolver) {
 	}
 
 	@Override
-	public List<Host> resolve(final boolean initial, final boolean closeConnections) {
+
+	public HostSet resolve(final boolean initial, final boolean closeConnections) {
+		
 		if (!initial && isExpired()) {
+			
 			lastUpdate = System.currentTimeMillis();
+			
 			final Collection<String> endpoints = resolver.resolve(closeConnections);
+			LOGGER.info("Resolve " + endpoints.size() + " Endpoints");
+			LOGGER.debug("Endpoints " + Arrays.deepToString(endpoints.toArray()));
+			
 			if (!endpoints.isEmpty()) {
 				hosts.clear();
 			}
+			
 			for (final String endpoint : endpoints) {
+				LOGGER.debug("Create HOST from " + endpoint);
+				
 				if (endpoint.matches(".*://.+:[0-9]+")) {
+					
 					final String[] s = endpoint.replaceAll(".*://", "").split(":");
 					if (s.length == 2) {
 						final HostDescription description = new HostDescription(s[0], Integer.valueOf(s[1]));
-						hosts.add(HostUtils.createHost(description, maxConnections, connectionFactory));
+						hosts.addHost(HostUtils.createHost(description, maxConnections, connectionFactory));
+					} else {
+						LOGGER.warn("Skip Endpoint (Missung Port)" + endpoint);
 					}
+					
+				} else {
+					LOGGER.warn("Skip Endpoint (Format)" + endpoint);
 				}
 			}
 		}
+		
 		return hosts;
 	}
 

src/main/java/com/arangodb/internal/net/FallbackHostHandler.java

@@ -38,7 +38,7 @@ public class FallbackHostHandler implements HostHandler {
 	public FallbackHostHandler(final HostResolver resolver) {
 		this.resolver = resolver;
 		iterations = 0;
-		current = lastSuccess = resolver.resolve(true, false).get(0);
+		current = lastSuccess = resolver.resolve(true, false).getHostsList().get(0);
 		firstOpened = true;
 	}
 
@@ -54,7 +54,7 @@ public void success() {
 
 	@Override
 	public void fail() {
-		final List<Host> hosts = resolver.resolve(false, false);
+		final List<Host> hosts = resolver.resolve(false, false).getHostsList();
 		final int index = hosts.indexOf(current) + 1;
 		final boolean inBound = index < hosts.size();
 		current = hosts.get(inBound ? index : 0);
@@ -79,10 +79,8 @@ public void confirm() {
 
 	@Override
 	public void close() throws IOException {
-		final List<Host> hosts = resolver.resolve(false, false);
-		for (final Host host : hosts) {
-			host.close();
-		}
+		final HostSet hosts = resolver.resolve(false, false);
+		hosts.close();
 	}
 
 	@Override