use existing arangoDB.getVersion().getLicense()

Author: BCaxelbecker

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

@@ -32,7 +32,6 @@
 import com.arangodb.entity.LogEntity;
 import com.arangodb.entity.LogLevelEntity;
 import com.arangodb.entity.Permissions;
-import com.arangodb.entity.ServerLicense;
 import com.arangodb.entity.ServerRole;
 import com.arangodb.entity.UserEntity;
 import com.arangodb.internal.ArangoContext;
@@ -712,14 +711,6 @@ public synchronized ArangoDB build() {
 	 */
 	ServerRole getRole() throws ArangoDBException;
 
-	/**
-	 * Returns the server license.
-	 *
-	 * @return the server license
-	 * @throws ArangoDBException
-	 */
-	ServerLicense getLicense() throws ArangoDBException;
-
 	/**
 	 * Create a new user. This user will not have access to any database. You need permission to the _system database in
 	 * order to execute this call.

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

@@ -34,7 +34,6 @@
 import com.arangodb.entity.LogEntity;
 import com.arangodb.entity.LogLevelEntity;
 import com.arangodb.entity.Permissions;
-import com.arangodb.entity.ServerLicense;
 import com.arangodb.entity.ServerRole;
 import com.arangodb.entity.UserEntity;
 import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
@@ -196,11 +195,6 @@ public ServerRole getRole() throws ArangoDBException {
 		return executor.execute(getRoleRequest(), getRoleResponseDeserializer());
 	}
 
-	@Override
-	public ServerLicense getLicense() throws ArangoDBException {
-		return executor.execute(getLicenseRequest(), getLicenseResponseDeserializer());
-	}
-
 	@Override
 	public UserEntity createUser(final String user, final String passwd) throws ArangoDBException {
 		return executor.execute(createUserRequest(db().name(), user, passwd, new UserCreateOptions()),

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

@@ -27,7 +27,6 @@
 
 import com.arangodb.entity.LogLevelEntity;
 import com.arangodb.entity.Permissions;
-import com.arangodb.entity.ServerLicense;
 import com.arangodb.entity.ServerRole;
 import com.arangodb.entity.UserEntity;
 import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
@@ -76,20 +75,6 @@ public ServerRole deserialize(final Response response) throws VPackException {
 		};
 	}
 
-	protected Request getLicenseRequest() {
-		return request(ArangoRequestParam.SYSTEM, RequestType.GET, PATH_API_VERSION);
-	}
-	
-	protected ResponseDeserializer<ServerLicense> getLicenseResponseDeserializer() {
-		return new ResponseDeserializer<ServerLicense>() {
-			@Override
-			public ServerLicense deserialize(final Response response) throws VPackException {
-				System.out.println(response.getBody().toString());
-				return util().deserialize(response.getBody().get("license"), ServerLicense.class);
-			}
-		};
-	}
-
 	protected Request createDatabaseRequest(final String name) {
 		final Request request = request(ArangoRequestParam.SYSTEM, RequestType.POST,
 			InternalArangoDatabase.PATH_API_DATABASE);

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

@@ -44,6 +44,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.arangodb.ArangoDB.Builder;
 import com.arangodb.entity.AqlExecutionExplainEntity;
@@ -69,7 +71,6 @@
 import com.arangodb.entity.QueryEntity;
 import com.arangodb.entity.QueryExecutionState;
 import com.arangodb.entity.QueryTrackingPropertiesEntity;
-import com.arangodb.entity.ServerLicense;
 import com.arangodb.entity.ServerRole;
 import com.arangodb.entity.TraversalEntity;
 import com.arangodb.model.AqlFunctionDeleteOptions;
@@ -92,6 +93,8 @@
  */
 @RunWith(Parameterized.class)
 public class ArangoDatabaseTest extends BaseTest {
+	
+	Logger LOG = LoggerFactory.getLogger(ArangoDatabaseTest.class);
 
 	private static final String COLLECTION_NAME = "db_test";
 	private static final String GRAPH_NAME = "graph_test";
@@ -168,21 +171,26 @@ public void createCollectionWithReplicationFactor() {
 
 	@Test
 	public void createSatelliteCollection() {
-		if (arangoDB.getRole() == ServerRole.SINGLE) {
+
+		if (arangoDB.getVersion().getLicense() == ArangoDBVersion.License.COMMUNITY) {
+			LOG.info("Skip Test on COMMUNITY VERSION");
 			return;
 		}
 
-		if (arangoDB.getLicense() == ServerLicense.community) {
+		if (arangoDB.getRole() == ServerRole.SINGLE) {
+			LOG.info("Skip Test on SINGLE SERVER");
 			return;
 		}
 
 		try {
-			final CollectionEntity result = db.createCollection(COLLECTION_NAME,
-				new CollectionCreateOptions().satellite(true));
+			
+			final CollectionEntity result = db.createCollection(COLLECTION_NAME, new CollectionCreateOptions().satellite(true));
+			
 			assertThat(result, is(notNullValue()));
 			assertThat(result.getId(), is(notNullValue()));
 			assertThat(db.collection(COLLECTION_NAME).getProperties().getReplicationFactor(), is(nullValue()));
 			assertThat(db.collection(COLLECTION_NAME).getProperties().getSatellite(), is(true));
+			
 		} finally {
 			db.collection(COLLECTION_NAME).drop();
 		}