fixed some sonar issues

Author: Achim Brandt

src/main/java/com/arangodb/blueprints/batch/ArangoDBBatchEdge.java

@@ -39,7 +39,19 @@ public class ArangoDBBatchEdge extends ArangoDBBatchElement implements Edge {
 	 */
 	private Vertex inVertex = null;
 
-	static ArangoDBBatchEdge create(ArangoDBBatchGraph graph, Object id, Vertex outVertex, Vertex inVertex, String label) {
+	private ArangoDBBatchEdge(ArangoDBBatchGraph graph, ArangoDBSimpleEdge edge, Vertex outVertex, Vertex inVertex) {
+		this.graph = graph;
+		this.document = edge;
+		this.outVertex = outVertex;
+		this.inVertex = inVertex;
+	}
+
+	static ArangoDBBatchEdge create(
+		ArangoDBBatchGraph graph,
+		Object id,
+		Vertex outVertex,
+		Vertex inVertex,
+		String label) {
 		String key = (id != null) ? id.toString() : null;
 
 		if (key == null) {
@@ -59,10 +71,10 @@ static ArangoDBBatchEdge create(ArangoDBBatchGraph graph, Object id, Vertex outV
 				properties.put(StringFactory.LABEL, label);
 			}
 
-			properties.put(ArangoDBSimpleEdge._FROM, graph.getRawGraph().getVertexCollection() + "/"
-					+ from.getRawVertex().getDocumentKey());
-			properties.put(ArangoDBSimpleEdge._TO, graph.getRawGraph().getVertexCollection() + "/"
-					+ to.getRawVertex().getDocumentKey());
+			properties.put(ArangoDBSimpleEdge._FROM,
+				graph.getRawGraph().getVertexCollection() + "/" + from.getRawVertex().getDocumentKey());
+			properties.put(ArangoDBSimpleEdge._TO,
+				graph.getRawGraph().getVertexCollection() + "/" + to.getRawVertex().getDocumentKey());
 
 			try {
 				ArangoDBSimpleEdge v = new ArangoDBSimpleEdge(properties);
@@ -118,17 +130,12 @@ static ArangoDBBatchEdge build(
 		return newEdge;
 	}
 
-	private ArangoDBBatchEdge(ArangoDBBatchGraph graph, ArangoDBSimpleEdge edge, Vertex outVertex, Vertex inVertex) {
-		this.graph = graph;
-		this.document = edge;
-		this.outVertex = outVertex;
-		this.inVertex = inVertex;
-	}
-
+	@Override
 	public Vertex getVertex(Direction direction) throws IllegalArgumentException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public String getLabel() {
 		Object l = document.getProperty(StringFactory.LABEL);
 		if (l != null) {
@@ -152,13 +159,15 @@ public String toString() {
 		return StringFactory.edgeString(this);
 	}
 
+	@Override
 	public void remove() {
 		throw new UnsupportedOperationException();
 	}
 
 	/**
 	 * not supported in batch mode
 	 */
+	@Override
 	public void save() {
 		throw new UnsupportedOperationException();
 	}

src/main/java/com/arangodb/blueprints/batch/ArangoDBBatchElement.java

@@ -3,6 +3,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
+
 import com.arangodb.blueprints.client.ArangoDBBaseDocument;
 import com.arangodb.blueprints.client.ArangoDBException;
 import com.arangodb.blueprints.utils.ArangoDBUtil;
@@ -19,7 +21,12 @@
  * @author Guido Schwab (http://www.triagens.de)
  */
 
-abstract public class ArangoDBBatchElement implements Element {
+abstract class ArangoDBBatchElement implements Element {
+
+	/**
+	 * the logger
+	 */
+	private static final Logger logger = Logger.getLogger(ArangoDBBatchElement.class);
 
 	/**
 	 * the graph of the document
@@ -46,7 +53,7 @@ abstract public class ArangoDBBatchElement implements Element {
 	 *             if an error occurs
 	 */
 
-	abstract public void save() throws ArangoDBException;
+	public abstract void save() throws ArangoDBException;
 
 	/**
 	 * Return the object value associated with the provided string key. If no
@@ -56,6 +63,7 @@ abstract public class ArangoDBBatchElement implements Element {
 	 *            the key of the key/value property
 	 * @return the object value related to the string key
 	 */
+	@Override
 	public Object getProperty(String key) {
 		return document.getProperty(ArangoDBUtil.normalizeKey(key));
 	}
@@ -70,6 +78,7 @@ public void setDocument(ArangoDBBaseDocument document) {
 		this.document = document;
 	}
 
+	@Override
 	public Set<String> getPropertyKeys() {
 		Set<String> ps = document.getPropertyKeys();
 		HashSet<String> result = new HashSet<String>();
@@ -79,44 +88,57 @@ public Set<String> getPropertyKeys() {
 		return result;
 	}
 
+	@Override
 	public void setProperty(String key, Object value) {
 		if (created) {
 			throw new UnsupportedOperationException();
 		}
 
-		if (key == null || key.equals(StringFactory.EMPTY_STRING))
+		if (isEmptyString(key))
 			throw ExceptionFactory.propertyKeyCanNotBeEmpty();
 		if (key.equals(StringFactory.ID))
 			throw ExceptionFactory.propertyKeyIdIsReserved();
 
 		try {
 			document.setProperty(ArangoDBUtil.normalizeKey(key), value);
 		} catch (ArangoDBException e) {
+			logger.warn("could not set property", e);
 			throw new IllegalArgumentException(e.getMessage());
 		}
 	}
 
+	@Override
 	public Object removeProperty(String key) {
+		checkRemovePropertyKey(key);
+
+		Object o = null;
+		try {
+			o = document.removeProperty(ArangoDBUtil.normalizeKey(key));
+		} catch (ArangoDBException e) {
+			logger.warn("could not remove property", e);
+			throw new IllegalArgumentException(e.getMessage());
+		}
+		return o;
+	}
+
+	private void checkRemovePropertyKey(String key) {
 		if (created) {
 			throw new UnsupportedOperationException();
 		}
 
-		if (key == null || key.equals(StringFactory.EMPTY_STRING))
+		if (isEmptyString(key))
 			throw ExceptionFactory.propertyKeyCanNotBeEmpty();
 		if (key.equals(StringFactory.ID))
 			throw ExceptionFactory.propertyKeyIdIsReserved();
 		if (key.equals(StringFactory.LABEL) && this instanceof Edge)
 			throw ExceptionFactory.propertyKeyLabelIsReservedForEdges();
+	}
 
-		Object o = null;
-		try {
-			o = document.removeProperty(ArangoDBUtil.normalizeKey(key));
-		} catch (ArangoDBException e) {
-			throw new IllegalArgumentException(e.getMessage());
-		}
-		return o;
+	private boolean isEmptyString(String key) {
+		return key == null || key.equals(StringFactory.EMPTY_STRING);
 	}
 
+	@Override
 	public Object getId() {
 		return document.getDocumentKey();
 	}