From f4994afd2e1c3adc5a889730288ab5f939b5a5e6 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Mon, 24 Feb 2014 11:39:33 +0100 Subject: [PATCH] DATAGRAPH-430 Deprecate Legacy Index APIs --- .../neo4j/partial/{ => model}/Cuisine.java | 2 +- .../partial/{ => model}/Recommendation.java | 2 +- .../neo4j/partial/{ => model}/Restaurant.java | 2 +- .../data/neo4j/partial/{ => model}/User.java | 2 +- .../data/neo4j/annotation/Indexed.java | 2 +- .../repository/AbstractGraphRepository.java | 6 +++++ .../neo4j/repository/IndexRepository.java | 10 ++++---- .../neo4j/repository/LegacyIndexSearcher.java | 1 + .../repository/NamedIndexRepository.java | 10 ++++---- .../neo4j/support/index/IndexProvider.java | 17 +++++++------- .../data/neo4j/support/index/IndexType.java | 1 + .../data/neo4j/model/SubGroup.java | 23 ------------------- 12 files changed, 32 insertions(+), 46 deletions(-) rename spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/{ => model}/Cuisine.java (93%) rename spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/{ => model}/Recommendation.java (95%) rename spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/{ => model}/Restaurant.java (96%) rename spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/{ => model}/User.java (97%) delete mode 100644 spring-data-neo4j/src/test/java/org/springframework/data/neo4j/model/SubGroup.java diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Cuisine.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Cuisine.java similarity index 93% rename from spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Cuisine.java rename to spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Cuisine.java index e0f985b07..84d1994a3 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Cuisine.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Cuisine.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.partial; +package org.springframework.data.neo4j.partial.model; /** * @author Michael Hunger diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Recommendation.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Recommendation.java similarity index 95% rename from spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Recommendation.java rename to spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Recommendation.java index 3180e806a..db1b7239f 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Recommendation.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Recommendation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.partial; +package org.springframework.data.neo4j.partial.model; import org.springframework.data.neo4j.annotation.EndNode; import org.springframework.data.neo4j.annotation.RelationshipEntity; diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Restaurant.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Restaurant.java similarity index 96% rename from spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Restaurant.java rename to spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Restaurant.java index 50d034f04..5471e9007 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/Restaurant.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/Restaurant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.partial; +package org.springframework.data.neo4j.partial.model; import org.springframework.data.neo4j.annotation.GraphProperty; import org.springframework.data.neo4j.annotation.Indexed; diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/User.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/User.java similarity index 97% rename from spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/User.java rename to spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/User.java index dc5701ac5..d525f4c72 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/User.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/model/User.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.partial; +package org.springframework.data.neo4j.partial.model; import org.springframework.data.neo4j.annotation.*; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java index 6016a8cec..b13a65413 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java @@ -79,5 +79,5 @@ public @interface Indexed { } } - enum Level { GLOBAL, CLASS, INSTANCE} + enum Level { @Deprecated GLOBAL, CLASS, INSTANCE} } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java index 411cd5cdf..069d02e77 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java @@ -170,6 +170,7 @@ public abstract class AbstractGraphRepository im * @return Single Entity with this property and value */ @Override + @Deprecated public T findByPropertyValue(final String indexName, final String property, final Object value) { return legacyIndexSearcher.findByPropertyValue(indexName, property, value); @@ -184,6 +185,7 @@ public abstract class AbstractGraphRepository im * @return Iterable over Entities with this property and value */ @Override + @Deprecated public EndResult findAllByPropertyValue(final String indexName, final String property, final Object value) { return legacyIndexSearcher.findAllByPropertyValue(indexName, property, value); } @@ -206,6 +208,7 @@ public abstract class AbstractGraphRepository im *@param query lucene query object or query-string @return Iterable over Entities with this property and value */ @Override + @Deprecated public EndResult findAllByQuery(final String key, final Object query) { return findAllByQuery(null, key,query); } @@ -217,15 +220,18 @@ public abstract class AbstractGraphRepository im *@param query lucene query object or query-string @return Iterable over Entities with this property and value */ @Override + @Deprecated public EndResult findAllByQuery(final String indexName, final String property, final Object query) { return legacyIndexSearcher.findAllByQuery(indexName, property, query); } @Override + @Deprecated public EndResult findAllByRange(final String property, final Number from, final Number to) { return findAllByRange(null,property,from,to); } @Override + @Deprecated public EndResult findAllByRange(final String indexName, final String property, final Number from, final Number to) { return legacyIndexSearcher.findAllByRange(indexName, property, from, to); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/IndexRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/IndexRepository.java index 2324a05e1..89808e2d4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/IndexRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/IndexRepository.java @@ -24,17 +24,17 @@ import org.springframework.transaction.annotation.Transactional; * @author mh * @since 29.03.11 */ -public interface IndexRepository { - @Transactional +@Deprecated public interface IndexRepository { + @Transactional @Deprecated T findByPropertyValue(String property, Object value); - @Transactional + @Transactional @Deprecated EndResult findAllByPropertyValue(String property, Object value); - @Transactional + @Transactional @Deprecated EndResult findAllByQuery(String key, Object query); - @Transactional + @Transactional @Deprecated EndResult findAllByRange(String property, Number from, Number to); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/LegacyIndexSearcher.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/LegacyIndexSearcher.java index 2a8b8efe4..90eb356af 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/LegacyIndexSearcher.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/LegacyIndexSearcher.java @@ -18,6 +18,7 @@ import org.springframework.data.neo4j.support.index.NullReadableIndex; * @author mh * @since 01.02.14 */ +@Deprecated public class LegacyIndexSearcher { private final Neo4jTemplate template; private final Class clazz; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NamedIndexRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NamedIndexRepository.java index e8ef8f638..53a94bf5f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NamedIndexRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NamedIndexRepository.java @@ -24,17 +24,17 @@ import org.springframework.transaction.annotation.Transactional; * @author mh * @since 29.03.11 */ -public interface NamedIndexRepository { - @Transactional +@Deprecated public interface NamedIndexRepository { + @Transactional @Deprecated T findByPropertyValue(String indexName, String property, Object value); - @Transactional + @Transactional @Deprecated EndResult findAllByPropertyValue(String indexName, String property, Object value); - @Transactional + @Transactional @Deprecated EndResult findAllByQuery(String indexName, String key, Object query); - @Transactional + @Transactional @Deprecated EndResult findAllByRange(String indexName, String property, Number from, Number to); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexProvider.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexProvider.java index 08267d94a..183884e37 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexProvider.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexProvider.java @@ -20,35 +20,36 @@ import org.neo4j.graphdb.index.Index; import org.springframework.data.neo4j.mapping.Neo4jPersistentEntity; import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty; +@Deprecated public interface IndexProvider { - Index getIndex(Neo4jPersistentEntity type); + @Deprecated Index getIndex(Neo4jPersistentEntity type); - Index getIndex(Neo4jPersistentEntity type, String indexName); + @Deprecated Index getIndex(Neo4jPersistentEntity type, String indexName); @SuppressWarnings("unchecked") - Index getIndex(Neo4jPersistentEntity persistentEntity, String indexName, IndexType indexType); + @Deprecated Index getIndex(Neo4jPersistentEntity persistentEntity, String indexName, IndexType indexType); - Index getIndex(String indexName); + @Deprecated Index getIndex(String indexName); boolean isNode(Class type); // TODO handle existing indexes @SuppressWarnings("unchecked") - Index createIndex(Class propertyContainerType, String indexName, + @Deprecated Index createIndex(Class propertyContainerType, String indexName, IndexType fullText); - Index getIndex(Neo4jPersistentProperty property, final Class instanceType); + @Deprecated Index getIndex(Neo4jPersistentProperty property, final Class instanceType); /** * adjust your indexName for the "__types__" indices * * @return prefixed indexName for Type */ - String createIndexValueForType(Object type); + @Deprecated String createIndexValueForType(Object type); /** * possibility to do something with the high level index name */ - String customizeIndexName(String indexName, Class type); + @Deprecated String customizeIndexName(String indexName, Class type); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java index 5e36a0825..8671e2320 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java @@ -23,6 +23,7 @@ import java.util.Map; public enum IndexType { + @Deprecated SIMPLE { public Map getConfig() { return LuceneIndexImplementation.EXACT_CONFIG; } }, LABEL { public Map getConfig() { return null; } public boolean isLabelBased() { return true; }}, FULLTEXT { public Map getConfig() { return LuceneIndexImplementation.FULLTEXT_CONFIG; } }, diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/model/SubGroup.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/model/SubGroup.java deleted file mode 100644 index f7071ea55..000000000 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/model/SubGroup.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright 2011 the original author or authors. - * - * 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. - */ - -package org.springframework.data.neo4j.model; - -import org.springframework.data.neo4j.annotation.NodeEntity; - -@NodeEntity -public class SubGroup extends Group { -} \ No newline at end of file