refactoring

Author: Mark

src/main/java/com/arangodb/ArangoConfigure.java

@@ -95,7 +95,7 @@ public class ArangoConfigure {
 
 	private boolean enableCURLLogger = false;
 
-	private boolean staleConnectionCheck = false;
+	private int validateAfterInactivity = -1;
 
 	private boolean useSsl = false;
 
@@ -257,9 +257,9 @@ private void loadProperties(InputStream in) throws IOException {
 			setEnableCURLLogger(Boolean.parseBoolean(enableCURLLoggerProperty));
 		}
 
-		String staleConnectionCheckProperty = prop.getProperty("staleConnectionCheck");
-		if (staleConnectionCheckProperty != null) {
-			setStaleConnectionCheck(Boolean.parseBoolean(staleConnectionCheckProperty));
+		String validateAfterInactivityProperty = prop.getProperty("validateAfterInactivity");
+		if (validateAfterInactivityProperty != null) {
+			setValidateAfterInactivity(Integer.parseInt(validateAfterInactivityProperty));
 		}
 
 		String batchSizeProperty = prop.getProperty("batchSize");
@@ -562,12 +562,12 @@ public void setEnableCURLLogger(boolean enableCURLLogger) {
 		this.enableCURLLogger = enableCURLLogger;
 	}
 
-	public boolean isStaleConnectionCheck() {
-		return staleConnectionCheck;
+	public int getValidateAfterInactivity() {
+		return validateAfterInactivity;
 	}
 
-	public void setStaleConnectionCheck(boolean staleConnectionCheck) {
-		this.staleConnectionCheck = staleConnectionCheck;
+	public void setValidateAfterInactivity(int validateAfterInactivity) {
+		this.validateAfterInactivity = validateAfterInactivity;
 	}
 
 	public int getConnectRetryCount() {

src/main/java/com/arangodb/http/HttpManager.java

@@ -139,7 +139,8 @@ public void init() {
 			custom.setConnectionRequestTimeout(configure.getTimeout());
 			custom.setSocketTimeout(configure.getTimeout());
 		}
-		custom.setStaleConnectionCheckEnabled(configure.isStaleConnectionCheck());
+
+		cm.setValidateAfterInactivity(configure.getValidateAfterInactivity());
 
 		final RequestConfig requestConfig = custom.build();
 

src/main/java/com/arangodb/impl/InternalDocumentDriverImpl.java

@@ -17,10 +17,7 @@
 package com.arangodb.impl;
 
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import com.arangodb.ArangoConfigure;
 import com.arangodb.ArangoException;
@@ -42,12 +39,6 @@ public class InternalDocumentDriverImpl extends BaseArangoDriverImpl implements
 
 	private static final String WAIT_FOR_SYNC = "waitForSync";
 
-	private static final String POLICY = "policy";
-
-	private static final String API_DOCUMENT_PREFIX = "/_api/document/";
-
-	private static final Pattern pattern = Pattern.compile("^/_db/.*/_api/document/(.*)$");
-
 	InternalDocumentDriverImpl(final ArangoConfigure configure, final HttpManager httpManager) {
 		super(configure, httpManager);
 	}
@@ -200,21 +191,6 @@ public List<String> getDocuments(final String database, final String collectionN
 		return tmp.getResults();
 	}
 
-	private void updateDocumentHandles(final List<String> documents) {
-		final ListIterator<String> lit = documents.listIterator();
-		while (lit.hasNext()) {
-			final String d = lit.next();
-			if (d.startsWith(API_DOCUMENT_PREFIX)) {
-				lit.set(d.substring(API_DOCUMENT_PREFIX.length()));
-			} else {
-				final Matcher matcher = pattern.matcher(d);
-				if (matcher.find()) {
-					lit.set(matcher.group(1));
-				}
-			}
-		}
-	}
-
 	@Override
 	public long checkDocument(final String database, final String documentHandle) throws ArangoException {
 		validateDocumentHandle(documentHandle);

src/main/java/com/arangodb/impl/InternalIndexDriverImpl.java

@@ -35,7 +35,6 @@
 public class InternalIndexDriverImpl extends BaseArangoDriverWithCursorImpl
 		implements com.arangodb.InternalIndexDriver {
 
-	private static final String SIZE = "size";
 	private static final String FIELDS = "fields";
 	private static final String SPARSE = "sparse";
 	private static final String UNIQUE = "unique";

src/test/java/com/arangodb/ArangoDriverDocumentTest.java

@@ -52,8 +52,6 @@ public class ArangoDriverDocumentTest extends BaseTest {
 	private final String collectionName2 = "unit_test_arango_002";
 	private final String collectionName404 = "unit_test_arango_404"; // 存在しないコレクション名
 
-	private CollectionEntity col1;
-	private CollectionEntity col2;
 	private TestInterfaceInstanceCreator testInstanceCreator;
 
 	@Before
@@ -70,8 +68,8 @@ public void before() throws ArangoException {
 		}
 
 		// 1と2は作る
-		col1 = driver.createCollection(collectionName);
-		col2 = driver.createCollection(collectionName2);
+		driver.createCollection(collectionName);
+		driver.createCollection(collectionName2);
 
 		// configure Gson to use our instance creator whenever documents of
 		// TestInterface are requested