Remove Key, Param, DBEntity, DBCollectionEntity

Author: mpv1989

src/main/java/com/arangodb/springframework/annotation/Key.java

@@ -27,8 +27,7 @@
  * @author Mark Vollmary
  *
  */
-@SuppressWarnings("deprecation")
-public class DBDocumentEntity extends HashMap<String, Object> implements DBEntity {
+public class DBDocumentEntity extends HashMap<String, Object> {
 
 	private static final long serialVersionUID = -7251842887063588024L;
 
@@ -40,10 +39,4 @@ public DBDocumentEntity(final Map<? extends String, ? extends Object> m) {
 		super(m);
 	}
 
-	@Deprecated
-	@Override
-	public boolean add(final Object value) {
-		throw new UnsupportedOperationException();
-	}
-
 }

src/main/java/com/arangodb/springframework/annotation/Param.java

@@ -1,67 +1,65 @@
-/*
- * DISCLAIMER
- *
- * Copyright 2017 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.springframework.core.mapping;
-
-import java.util.Optional;
-
-import org.springframework.data.mapping.PersistentProperty;
-
-import com.arangodb.springframework.annotation.From;
-import com.arangodb.springframework.annotation.FulltextIndexed;
-import com.arangodb.springframework.annotation.GeoIndexed;
-import com.arangodb.springframework.annotation.HashIndexed;
-import com.arangodb.springframework.annotation.PersistentIndexed;
-import com.arangodb.springframework.annotation.Ref;
-import com.arangodb.springframework.annotation.Relations;
-import com.arangodb.springframework.annotation.SkiplistIndexed;
-import com.arangodb.springframework.annotation.To;
-
-/**
- * @author Mark Vollmary
- *
- */
-public interface ArangoPersistentProperty extends PersistentProperty<ArangoPersistentProperty> {
-
-	String getFieldName();
-
-	boolean isKeyProperty();
-
-	boolean isRevProperty();
-
-	Optional<Ref> getRef();
-
-	Optional<Relations> getRelations();
-
-	Optional<From> getFrom();
-
-	Optional<To> getTo();
-
-	Optional<HashIndexed> getHashIndexed();
-
-	Optional<SkiplistIndexed> getSkiplistIndexed();
-
-	Optional<PersistentIndexed> getPersistentIndexed();
-
-	Optional<GeoIndexed> getGeoIndexed();
-
-	Optional<FulltextIndexed> getFulltextIndexed();
-
-}
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2017 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.springframework.core.mapping;
+
+import java.util.Optional;
+
+import org.springframework.data.mapping.PersistentProperty;
+
+import com.arangodb.springframework.annotation.From;
+import com.arangodb.springframework.annotation.FulltextIndexed;
+import com.arangodb.springframework.annotation.GeoIndexed;
+import com.arangodb.springframework.annotation.HashIndexed;
+import com.arangodb.springframework.annotation.PersistentIndexed;
+import com.arangodb.springframework.annotation.Ref;
+import com.arangodb.springframework.annotation.Relations;
+import com.arangodb.springframework.annotation.SkiplistIndexed;
+import com.arangodb.springframework.annotation.To;
+
+/**
+ * @author Mark Vollmary
+ *
+ */
+public interface ArangoPersistentProperty extends PersistentProperty<ArangoPersistentProperty> {
+
+	String getFieldName();
+
+	boolean isRevProperty();
+
+	Optional<Ref> getRef();
+
+	Optional<Relations> getRelations();
+
+	Optional<From> getFrom();
+
+	Optional<To> getTo();
+
+	Optional<HashIndexed> getHashIndexed();
+
+	Optional<SkiplistIndexed> getSkiplistIndexed();
+
+	Optional<PersistentIndexed> getPersistentIndexed();
+
+	Optional<GeoIndexed> getGeoIndexed();
+
+	Optional<FulltextIndexed> getFulltextIndexed();
+
+}

src/main/java/com/arangodb/springframework/core/convert/DBCollectionEntity.java

@@ -194,17 +194,6 @@ public void addPersistentProperty(final ArangoPersistentProperty property) {
 		property.getFulltextIndexed().ifPresent(i -> fulltextIndexedProperties.add(property));
 	}
 
-	@Override
-	protected ArangoPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNull(
-		final ArangoPersistentProperty property) {
-		final ArangoPersistentProperty idPropertyOrNull = super.returnPropertyIfBetterIdPropertyCandidateOrNull(
-			property);
-		if (idPropertyOrNull == null && property.isKeyProperty()) {
-			return property;
-		}
-		return idPropertyOrNull;
-	}
-
 	@Override
 	public Optional<ArangoPersistentProperty> getRevProperty() {
 		return Optional.ofNullable(revProperty);

src/main/java/com/arangodb/springframework/core/convert/DBDocumentEntity.java

@@ -36,7 +36,6 @@
 import com.arangodb.springframework.annotation.FulltextIndexed;
 import com.arangodb.springframework.annotation.GeoIndexed;
 import com.arangodb.springframework.annotation.HashIndexed;
-import com.arangodb.springframework.annotation.Key;
 import com.arangodb.springframework.annotation.PersistentIndexed;
 import com.arangodb.springframework.annotation.Ref;
 import com.arangodb.springframework.annotation.Relations;
@@ -48,7 +47,6 @@
  * @author Mark Vollmary
  *
  */
-@SuppressWarnings("deprecation")
 public class DefaultArangoPersistentProperty extends AnnotationBasedPersistentProperty<ArangoPersistentProperty>
 		implements ArangoPersistentProperty {
 
@@ -67,11 +65,6 @@ protected Association<ArangoPersistentProperty> createAssociation() {
 		return new Association<>(this, null);
 	}
 
-	@Override
-	public boolean isKeyProperty() {
-		return findAnnotation(Key.class) != null;
-	}
-
 	@Override
 	public boolean isRevProperty() {
 		return findAnnotation(Rev.class) != null;
@@ -100,7 +93,7 @@ public Optional<To> getTo() {
 	@Override
 	public String getFieldName() {
 		final String fieldName;
-		if (isIdProperty() || isKeyProperty()) {
+		if (isIdProperty()) {
 			fieldName = "_key";
 		} else if (isRevProperty()) {
 			fieldName = "_rev";