Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed core module, moved Indexed annotations

Browse Source
This commit is contained in:
Michael Hunger
2011-07-13 10:50:03 +02:00
parent 5ec697ed60
commit bfcddfc7af
24 changed files with 37 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-data-graph-core/.classpath
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

36
spring-data-graph-core/.project
View File

@@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>spring-data-graph-core</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>

9
spring-data-graph-core/.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,9 +0,0 @@
#Mon Oct 11 15:28:26 EDT 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6

7
spring-data-graph-core/.settings/org.eclipse.wst.common.component
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="spring-datastore-graph-core">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>

5
spring-data-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="1.6"/>
<installed facet="jst.utility" version="1.0"/>
</faceted-project>

9
spring-data-graph-core/.settings/org.maven.ide.eclipse.prefs
View File

@@ -1,9 +0,0 @@
#Thu Oct 07 14:11:15 EDT 2010
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
includeModules=false
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1

96
spring-data-graph-core/pom.xml
View File

@@ -1,96 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-graph-parent</artifactId>
<version>1.1.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-data-graph-parent/pom.xml</relativePath>
</parent>
<artifactId>spring-data-graph-core</artifactId>
<packaging>jar</packaging>
<name>Spring Data Graph Support</name>
<dependencies>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<!-- Spring Data -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons-core</artifactId>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>

17
spring-data-graph-core/template.mf
View File

@@ -1,17 +0,0 @@
Bundle-SymbolicName: org.springframework.data.graph
Bundle-Name: Spring Data Graph
Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Package:
sun.reflect;version="0";resolution:=optional
Import-Template:
org.springframework.beans.*;version="[3.0.0, 4.0.0)",
org.springframework.core.*;version="[3.0.0, 4.0.0)",
org.springframework.dao.*;version="[3.0.0, 4.0.0)",
org.springframework.util.*;version="[3.0.0, 4.0.0)",
org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
org.springframework.data.persistence.*;version="[1.0.0, 2.0.0)",
org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
org.w3c.dom.*;version="0"

0
spring-data-graph-core/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java
View File

2
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/annotation/Indexed.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Indexed.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.annotation;
package org.springframework.data.graph.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphQuery.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Query.java
View File

@@ -34,7 +34,7 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD,ElementType.METHOD})
public @interface GraphQuery {
public @interface Query {
/**
* @return Query to be executed %d will be replaced by the node-id of the current entity other placeholders by the given params
*/

2
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java
View File

@@ -21,8 +21,8 @@ import org.apache.commons.logging.LogFactory;
import org.neo4j.graphdb.PropertyContainer;
import org.neo4j.graphdb.index.Index;
import org.neo4j.index.lucene.ValueContext;
import org.springframework.data.graph.annotation.Indexed;
import org.springframework.data.graph.core.GraphBacked;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
import java.lang.reflect.AnnotatedElement;

21
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java
View File

@@ -16,9 +16,8 @@
package org.springframework.data.graph.neo4j.fieldaccess;
import org.springframework.core.GenericCollectionTypeResolver;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.graph.annotation.GraphQuery;
import org.springframework.data.graph.annotation.Query;
import org.springframework.data.graph.core.NodeBacked;
import org.springframework.data.graph.neo4j.support.GenericTypeExtractor;
@@ -30,9 +29,9 @@ import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn;
public class QueryFieldAccessorFactory implements FieldAccessorFactory<NodeBacked> {
@Override
public boolean accept(final Field f) {
final GraphQuery graphQuery = f.getAnnotation(GraphQuery.class);
return graphQuery != null
&& !graphQuery.value().isEmpty();
final Query query = f.getAnnotation(Query.class);
return query != null
&& !query.value().isEmpty();
}
@@ -54,15 +53,15 @@ public class QueryFieldAccessorFactory implements FieldAccessorFactory<NodeBacke
public QueryFieldAccessor(final Field field) {
this.field = field;
final GraphQuery graphQuery = field.getAnnotation(GraphQuery.class);
this.params = graphQuery.params();
this.query = graphQuery.value();
final Query query = field.getAnnotation(Query.class);
this.params = query.params();
this.query = query.value();
this.iterableResult = Iterable.class.isAssignableFrom(field.getType());
this.target = resolveTarget(graphQuery,field);
this.target = resolveTarget(query,field);
}
private Class<?> resolveTarget(GraphQuery graphQuery, Field field) {
if (!graphQuery.elementClass().equals(Object.class)) return graphQuery.elementClass();
private Class<?> resolveTarget(Query query, Field field) {
if (!query.elementClass().equals(Object.class)) return query.elementClass();
return GenericTypeExtractor.resolveFieldType(field);
}

6
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java
View File

@@ -20,7 +20,7 @@ import org.neo4j.helpers.collection.IteratorUtil;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.graph.annotation.GraphQuery;
import org.springframework.data.graph.annotation.Query;
import org.springframework.data.graph.annotation.NodeEntity;
import org.springframework.data.graph.annotation.RelationshipEntity;
import org.springframework.data.graph.core.NodeBacked;
@@ -121,13 +121,13 @@ public class GraphRepositoryFactory extends RepositoryFactorySupport {
static class GraphQueryMethod extends QueryMethod {
private final Method method;
private final GraphQuery queryAnnotation;
private final Query queryAnnotation;
private final String query;
public GraphQueryMethod(Method method, RepositoryMetadata metadata, NamedQueries namedQueries) {
super(method, metadata);
this.method = method;
queryAnnotation = method.getAnnotation(GraphQuery.class);
queryAnnotation = method.getAnnotation(Query.class);
this.query = queryAnnotation != null ? queryAnnotation.value() : getNamedQuery(namedQueries);
if (this.query==null) throw new IllegalArgumentException("Could not extract a query from "+method);
}

2
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java
View File

@@ -25,8 +25,8 @@ import org.neo4j.helpers.collection.ClosableIterable;
import org.neo4j.index.impl.lucene.LuceneIndexImplementation;
import org.neo4j.kernel.AbstractGraphDatabase;
import org.springframework.core.convert.ConversionService;
import org.springframework.data.graph.annotation.Indexed;
import org.springframework.data.graph.core.*;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import javax.transaction.Status;
import javax.transaction.SystemException;

2
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java
View File

@@ -16,8 +16,8 @@
package org.springframework.data.graph.neo4j;
import org.springframework.data.graph.annotation.Indexed;
import org.springframework.data.graph.annotation.NodeEntity;
import org.springframework.data.graph.neo4j.annotation.Indexed;
/**
* @author mh

2
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java
View File

@@ -18,9 +18,9 @@ package org.springframework.data.graph.neo4j;
import org.springframework.data.graph.annotation.EndNode;
import org.springframework.data.graph.annotation.Indexed;
import org.springframework.data.graph.annotation.RelationshipEntity;
import org.springframework.data.graph.annotation.StartNode;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import java.util.Date;

12
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java
View File

@@ -20,19 +20,11 @@ import org.neo4j.graphdb.DynamicRelationshipType;
import org.neo4j.graphdb.traversal.TraversalDescription;
import org.neo4j.kernel.Traversal;
import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl;
import org.springframework.data.graph.*;
import org.springframework.data.graph.annotation.GraphProperty;
import org.springframework.data.graph.annotation.GraphTraversal;
import org.springframework.data.graph.annotation.NodeEntity;
import org.springframework.data.graph.annotation.RelatedTo;
import org.springframework.data.graph.annotation.*;
import org.springframework.data.graph.core.Direction;
import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder;
import org.springframework.data.graph.core.NodeBacked;
import org.springframework.data.graph.neo4j.Person;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import static org.springframework.data.graph.neo4j.Person.persistedPerson;
import static org.springframework.data.graph.neo4j.Person.persistedPerson;
import org.springframework.data.graph.annotation.Indexed;
import java.lang.reflect.Field;
import java.util.Collection;

10
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java
View File

@@ -18,7 +18,7 @@ package org.springframework.data.graph.neo4j;
import org.springframework.data.graph.annotation.*;
import org.springframework.data.graph.core.Direction;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import org.springframework.data.graph.annotation.Indexed;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
@@ -67,16 +67,16 @@ public class Person {
@RelatedToVia(type = "knows", elementClass = Friendship.class)
private Iterable<Friendship> friendships;
@GraphQuery(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss")
@Query(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss")
private Person bossByQuery;
@GraphQuery(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss.%s",params = "name")
@Query(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss.%s",params = "name")
private String bossName;
@GraphQuery(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member",elementClass = Person.class)
@Query(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member",elementClass = Person.class)
private Iterable<Person> otherTeamMembers;
@GraphQuery(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member.name, member.age")
@Query(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member.name, member.age")
private Iterable<Map<String,Object>> otherTeamMemberData;
public String getBossName() {

12
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java
View File

@@ -19,7 +19,7 @@ package org.springframework.data.graph.neo4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.graph.annotation.GraphQuery;
import org.springframework.data.graph.annotation.Query;
import org.springframework.data.graph.neo4j.repository.GraphRepository;
import org.springframework.data.graph.neo4j.repository.NamedIndexRepository;
@@ -31,19 +31,19 @@ import java.util.Map;
*/
public interface PersonRepository extends GraphRepository<Person>, NamedIndexRepository<Person> {
@GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member")
@Query("start team=(%d) match (team)-[:persons]->(member) return member")
Iterable<Person> findAllTeamMembers(Group team);
@GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member.name,member.age")
@Query("start team=(%d) match (team)-[:persons]->(member) return member.name,member.age")
Iterable<Map<String,Object>> findAllTeamMemberData(Group team);
@GraphQuery("start person=(%d) match (boss)-[:boss]->(person) return boss")
@Query("start person=(%d) match (boss)-[:boss]->(person) return boss")
Person findBoss(Person person);
Group findTeam(Person person);
@GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member")
@Query("start team=(%d) match (team)-[:persons]->(member) return member")
Page<Person> findAllTeamMembersPaged(Pageable page, Group team);
@GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member")
@Query("start team=(%d) match (team)-[:persons]->(member) return member")
Iterable<Person> findAllTeamMembersSorted(Group team, Sort sort);
}

2
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java
View File

@@ -17,8 +17,8 @@
package org.springframework.data.graph.neo4j.partial;
import org.springframework.data.graph.annotation.GraphProperty;
import org.springframework.data.graph.annotation.Indexed;
import org.springframework.data.graph.annotation.NodeEntity;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import javax.persistence.*;

9
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java
View File

@@ -16,13 +16,8 @@
package org.springframework.data.graph.neo4j.partial;
import org.neo4j.graphdb.DynamicRelationshipType;
import org.springframework.data.graph.*;
import org.springframework.data.graph.annotation.GraphProperty;
import org.springframework.data.graph.annotation.NodeEntity;
import org.springframework.data.graph.annotation.RelatedTo;
import org.springframework.data.graph.annotation.RelatedToVia;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import org.springframework.data.graph.annotation.*;
import org.springframework.data.graph.annotation.Indexed;
import javax.persistence.*;
import java.util.Set;

2
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java
View File

@@ -24,10 +24,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.graph.annotation.Indexed;
import org.springframework.data.graph.annotation.NodeEntity;
import org.springframework.data.graph.annotation.RelatedTo;
import org.springframework.data.graph.core.Direction;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import org.springframework.data.graph.neo4j.mapping.Neo4JMappingContext;
import org.springframework.data.repository.query.parser.Property;

2
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java
View File

@@ -29,9 +29,9 @@ import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.index.Index;
import org.neo4j.helpers.collection.IteratorUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.graph.annotation.Indexed;
import org.springframework.data.graph.annotation.NodeEntity;
import org.springframework.data.graph.neo4j.*;
import org.springframework.data.graph.neo4j.annotation.Indexed;
import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory;
import org.springframework.data.graph.neo4j.repository.GraphRepository;
import org.springframework.data.graph.neo4j.support.node.Neo4jHelper;