From 5c5723f04a16e511c90bbc0522ea60832855d3c3 Mon Sep 17 00:00:00 2001 From: Lasse Westh-Nielsen Date: Tue, 31 Jul 2012 15:08:00 +0100 Subject: [PATCH] re-adding javadoc generation --- pom.xml | 1151 +++++++++-------- .../aspects/core/RelationshipBacked.java | 2 +- .../CrossStoreNodeEntityInstantiator.java | 2 - .../data/neo4j/annotation/NodeEntity.java | 2 +- .../data/neo4j/annotation/RelatedToVia.java | 2 +- .../neo4j/annotation/RelationshipEntity.java | 3 +- .../neo4j/config/EnableNeo4jRepositories.java | 12 +- .../data/neo4j/core/EntityState.java | 12 +- .../data/neo4j/core/GraphDatabase.java | 1 - .../core/TypeRepresentationStrategy.java | 7 +- .../neo4j/fieldaccess/DynamicProperties.java | 3 +- .../FieldAccessorListenerFactory.java | 6 +- .../mapping/Neo4jPersistentProperty.java | 5 +- .../neo4j/repository/SpatialRepository.java | 5 +- .../data/neo4j/support/DoReturn.java | 6 - .../data/neo4j/support/Neo4jTemplate.java | 3 - .../neo4j/support/index/IndexProvider.java | 6 - 17 files changed, 602 insertions(+), 626 deletions(-) diff --git a/pom.xml b/pom.xml index c59ccb713..b3dd86b25 100644 --- a/pom.xml +++ b/pom.xml @@ -1,275 +1,280 @@ - - 4.0.0 - org.springframework.data - spring-data-neo4j-dist - Spring Data Neo4j Distribution - + 4.0.0 + org.springframework.data + spring-data-neo4j-dist + Spring Data Neo4j Distribution + - 2.1.0.BUILD-SNAPSHOT - pom - - spring-data-neo4j-parent - spring-data-neo4j - spring-data-neo4j-rest - spring-data-neo4j-tx - spring-data-neo4j-aspects - spring-data-neo4j-cross-store - - http://www.springsource.org/spring-data/neo4j - - SpringSource - http://www.springsource.com - - - http://github.com/SpringSource/spring-data-neo4j - scm:git:git://github.com/SpringSource/spring-data-neo4j.git - scm:git:git://github.com/SpringSource/spring-data-neo4j.git - - - JIRA - https://jira.springsource.org/browse/DATAGRAPH - - - - Spring Data Forums - http://forum.springsource.org/forumdisplay.php?f=80 - http://forum.springsource.org/forumdisplay.php?f=80 - - - - Bamboo - https://build.springsource.org/browse/SPRINGDATA-DATAGRAPH - + 2.1.0.BUILD-SNAPSHOT + pom + + spring-data-neo4j-parent + spring-data-neo4j + spring-data-neo4j-rest + spring-data-neo4j-tx + spring-data-neo4j-aspects + spring-data-neo4j-cross-store + + http://www.springsource.org/spring-data/neo4j + + SpringSource + http://www.springsource.com + + + http://github.com/SpringSource/spring-data-neo4j + scm:git:git://github.com/SpringSource/spring-data-neo4j.git + scm:git:git://github.com/SpringSource/spring-data-neo4j.git + + + JIRA + https://jira.springsource.org/browse/DATAGRAPH + + + + Spring Data Forums + http://forum.springsource.org/forumdisplay.php?f=80 + http://forum.springsource.org/forumdisplay.php?f=80 + + + + Bamboo + https://build.springsource.org/browse/SPRINGDATA-DATAGRAPH + - - - trisberg - Thomas Risberg - trisberg at vmware.com - SpringSource - http://www.SpringSource.com - - Project Admin - - -5 - - - mpollack - Mark Pollack - mpollack at vmware.com - SpringSource - http://www.SpringSource.com - - Project Admin - - -5 - - - mhunger - Michael Hunger - michael.hunger at neotechnology.com - Neo Technology - http://www.neotechnology.com - - Project Admin - Developer - - +1 - - - dmontag - David Montag - david.montag at neotechnology.com - Neo Technology - http://www.neotechnology.com - - Developer - - -7 - - - systay - Andres Taylor - andres at neotechnology.com - Neo Technology - http://www.neotechnology.com - - Developer - - +1 - - + + + trisberg + Thomas Risberg + trisberg at vmware.com + SpringSource + http://www.SpringSource.com + + Project Admin + + -5 + + + mpollack + Mark Pollack + mpollack at vmware.com + SpringSource + http://www.SpringSource.com + + Project Admin + + -5 + + + mhunger + Michael Hunger + michael.hunger at neotechnology.com + Neo Technology + http://www.neotechnology.com + + Project Admin + Developer + + +1 + + + dmontag + David Montag + david.montag at neotechnology.com + Neo Technology + http://www.neotechnology.com + + Developer + + -7 + + + systay + Andres Taylor + andres at neotechnology.com + Neo Technology + http://www.neotechnology.com + + Developer + + +1 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2010 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. - - - + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + Copyright 2010 the original author or authors. - - UTF-8 - - spring-data-neo4j - Spring Data Neo4j - SDNEO4J - ${project.version} - snapshot - ${dist.id}-${dist.version} - ${dist.finalName}.zip - target/${dist.fileName} - dist.springframework.org - - ${basedir}/src/docbkx - ${basedir}/spring-data-neo4j/target/docbkx - ${basedir}/target/classes - - - - fast - - true - - - - examples - - spring-data-neo4j-examples/hello-worlds - spring-data-neo4j-examples/imdb - spring-data-neo4j-examples/cineasts - spring-data-neo4j-examples/cineasts-aspects - spring-data-neo4j-examples/cineasts-rest - spring-data-neo4j-examples/myrestaurants-social - spring-data-neo4j-examples/todos - spring-data-neo4j-examples/backwardscompatibility - - - - staging - - - spring-site-staging - file:///${java.io.tmpdir}/spring-data/data-neo4j/docs/${project.version} - - - spring-milestone-staging - file:///${java.io.tmpdir}/spring-data/data-neo4j/milestone - - - spring-snapshot-staging - file:///${java.io.tmpdir}/spring-data/data-neo4j/snapshot - - - - - snapshot - - http://www.springsource.com/spring-data - - static.springframework.org - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/snapshot-site/ - - - spring-release - Spring Release Repository - s3://maven.springframework.org/release - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - - milestone - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - - - central - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - - http://www.springsource.com/spring-data - - static.springframework.org - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/snapshot-site/ - + 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. + + + + + + UTF-8 + + spring-data-neo4j + Spring Data Neo4j + SDNEO4J + ${project.version} + snapshot + ${dist.id}-${dist.version} + ${dist.finalName}.zip + target/${dist.fileName} + dist.springframework.org + + ${basedir}/src/docbkx + ${basedir}/spring-data-neo4j/target/docbkx + ${basedir}/target/classes + + + + fast + + true + + + + examples + + spring-data-neo4j-examples/hello-worlds + spring-data-neo4j-examples/imdb + spring-data-neo4j-examples/cineasts + spring-data-neo4j-examples/cineasts-aspects + spring-data-neo4j-examples/cineasts-rest + spring-data-neo4j-examples/myrestaurants-social + spring-data-neo4j-examples/todos + spring-data-neo4j-examples/backwardscompatibility + + + + staging + + + spring-site-staging + file:///${java.io.tmpdir}/spring-data/data-neo4j/docs/${project.version} + - spring-release - Spring Release Repository - s3://maven.springframework.org/release + spring-milestone-staging + file:///${java.io.tmpdir}/spring-data/data-neo4j/milestone - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.1.0.RELEASE - - + + spring-snapshot-staging + file:///${java.io.tmpdir}/spring-data/data-neo4j/snapshot + + + + + snapshot + + http://www.springsource.com/spring-data + + static.springframework.org + + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/snapshot-site/ + + + + spring-release + Spring Release Repository + s3://maven.springframework.org/release + + + spring-snapshot + Spring Snapshot Repository + s3://maven.springframework.org/snapshot + + + + + milestone + + + spring-milestone + Spring Milestone Repository + s3://maven.springframework.org/milestone + + + + + central + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + http://www.springsource.com/spring-data + + static.springframework.org + + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/snapshot-site/ + + + + spring-release + Spring Release Repository + s3://maven.springframework.org/release + + + spring-snapshot + Spring Snapshot Repository + s3://maven.springframework.org/snapshot + + + + + + + org.springframework.build.aws + org.springframework.build.aws.maven + 3.1.0.RELEASE + + ${docbook.srcDir} @@ -297,314 +302,318 @@ - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.8 - - - single-page - - generate-html - - - ${docbook.generatedDir} - true - ${docbook.generatedDir}/resources/xsl/html.xsl - 1 - 1 - - - + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.8 + + + single-page + + generate-html + + + ${docbook.generatedDir} + true + ${docbook.generatedDir}/resources/xsl/html.xsl + 1 + 1 + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - pre-site - - - - single-pdf - - generate-pdf - - - ${docbook.generatedDir} - ${docbook.generatedDir}/ - ${docbook.generatedDir}/resources/images/ - ${docbook.generatedDir}/resources/xsl/fopdf.xsl - index.xml - 1 - 1 - - - - - - pre-site - - - tutorial-pdf - - generate-pdf - - - ${docbook.generatedDir} - ${docbook.generatedDir}/ - ${docbook.generatedDir}/resources/images/ - ${docbook.generatedDir}/resources/xsl/fopdf.xsl - 1 - 1 - tutorial.xml - - - - - - pre-site - - - multi-page - - generate-html - - - ${docbook.generatedDir} - true - true - ${docbook.generatedDir}/resources/xsl/html_chunk.xsl - 1 - 1 - - ${basedir}/target/docbkx/multi/ - - - - - - - - - - - - - - - - - - - - - - - - - pre-site - - - - - org.docbook - docbook-xml - 4.4 - runtime - - - org.apache.xmlgraphics - fop - 0.93 - - - - index.xml - false - - css/html.css - ${docbook.generatedDir}/ - - true - - - version - ${project.version} - - - - - - maven-javadoc-plugin - 2.7 - - true -
Spring Data Neo4j
- 1.6 - true - ${project.basedir}/src/main/javadoc - ${project.basedir}/src/main/javadoc/overview.html - ${project.basedir}/src/main/javadoc/spring-javadoc.css - - true - - http://static.springframework.org/spring/docs/3.0.x/javadoc-api - http://java.sun.com/javase/6/docs/api - - - - - javadoc - - jar - - package - - - - + + single-pdf + + generate-pdf + + + ${docbook.generatedDir} + ${docbook.generatedDir}/ + ${docbook.generatedDir}/resources/images/ + ${docbook.generatedDir}/resources/xsl/fopdf.xsl + index.xml + 1 + 1 + + + + + + pre-site + + + tutorial-pdf + + generate-pdf + + + ${docbook.generatedDir} + ${docbook.generatedDir}/ + ${docbook.generatedDir}/resources/images/ + ${docbook.generatedDir}/resources/xsl/fopdf.xsl + 1 + 1 + tutorial.xml + + + + + + pre-site + + + multi-page + + generate-html + + + ${docbook.generatedDir} + true + true + ${docbook.generatedDir}/resources/xsl/html_chunk.xsl + 1 + 1 + + ${basedir}/target/docbkx/multi/ + + + + + + + + + + + + + + + + + + + + + + + + + pre-site + + + + + org.docbook + docbook-xml + 4.4 + runtime + + + org.apache.xmlgraphics + fop + 0.93 + + + + index.xml + false + + css/html.css + ${docbook.generatedDir}/ + + true + + + version + ${project.version} + + + + + + maven-javadoc-plugin + 2.7 + + true +
Spring Data Neo4j
+ 1.6 + true + ${project.basedir}/src/main/javadoc + ${project.basedir}/src/main/javadoc/overview.html + ${project.basedir}/src/main/javadoc/spring-javadoc.css + + true + + http://static.springframework.org/spring/docs/3.0.x/javadoc-api + http://java.sun.com/javase/6/docs/api + + + + + javadoc + + aggregate + + package + + + + - maven-assembly-plugin - 2.2-beta-5 - false - - - ${project.basedir}/src/assembly/distribution.xml - - false - - - - distribution - - single - - package - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.4 - - - upload-dist - deploy - - - - - - - - - run - - - - - - org.springframework.build - org.springframework.build.aws.ant - 3.0.5.RELEASE - - - net.java.dev.jets3t - jets3t - 0.7.2 - - - - - - ${dist.finalName} - - - - repository.springsource.maven.bundles.release - SpringSource Maven Release Repository - http://repository.springsource.com/maven/bundles/release - - - repository.springframework.maven.release - Spring Framework Maven Release Repository - http://maven.springframework.org/release - - - jboss-legacy-repository - Old JBoss Public Repository - http://repository.jboss.org/maven2/ - - - - - central - http://uk.maven.org/maven2 - - - jboss-legacy-repository - Old JBoss Public Repository - http://repository.jboss.org/maven2/ - - - repository.springframework.maven.release - Spring Framework Maven Release Repository - http://maven.springframework.org/release - - - repository.springframework.maven.milestone - Spring Framework Maven Milestone Repository - http://maven.springframework.org/milestone - - - - repository.source.maven.release - SpringSource Maven Release Repository - http://repository.springsource.com/maven/bundles/release - - - jboss-repository - JBoss Public Repository - http://repository.jboss.org/nexus/content/groups/public-jboss - - + maven-assembly-plugin + 2.2-beta-5 + false + + + ${project.basedir}/src/assembly/distribution.xml + + false + + + + distribution + + single + + package + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.4 + + + upload-dist + deploy + + + + + + + + + run + + + + + + org.springframework.build + org.springframework.build.aws.ant + 3.0.5.RELEASE + + + net.java.dev.jets3t + jets3t + 0.7.2 + + + + + + ${dist.finalName} + + + + repository.springsource.maven.bundles.release + SpringSource Maven Release Repository + http://repository.springsource.com/maven/bundles/release + + + repository.springframework.maven.release + Spring Framework Maven Release Repository + http://maven.springframework.org/release + + + jboss-legacy-repository + Old JBoss Public Repository + http://repository.jboss.org/maven2/ + + + + + central + http://uk.maven.org/maven2 + + + jboss-legacy-repository + Old JBoss Public Repository + http://repository.jboss.org/maven2/ + + + repository.springframework.maven.release + Spring Framework Maven Release Repository + http://maven.springframework.org/release + + + repository.springframework.maven.milestone + Spring Framework Maven Milestone Repository + http://maven.springframework.org/milestone + + + + repository.source.maven.release + SpringSource Maven Release Repository + http://repository.springsource.com/maven/bundles/release + + + jboss-repository + JBoss Public Repository + http://repository.jboss.org/nexus/content/groups/public-jboss + + diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/RelationshipBacked.java b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/RelationshipBacked.java index 67d8f4a33..bdcc918ef 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/RelationshipBacked.java +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/RelationshipBacked.java @@ -19,7 +19,7 @@ package org.springframework.data.neo4j.aspects.core; import org.neo4j.graphdb.Relationship; /** - * concrete interface introduced onto Relationship entities by the {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking} + * concrete interface introduced onto Relationship entities by the Neo4jRelationshipBacking * aspect, encapsulates a neo4j relationship as backing state */ public interface RelationshipBacked extends GraphBacked{ diff --git a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/cross_store/support/node/CrossStoreNodeEntityInstantiator.java b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/cross_store/support/node/CrossStoreNodeEntityInstantiator.java index 83d2ea0a3..5dbf3f243 100644 --- a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/cross_store/support/node/CrossStoreNodeEntityInstantiator.java +++ b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/cross_store/support/node/CrossStoreNodeEntityInstantiator.java @@ -49,9 +49,7 @@ public class CrossStoreNodeEntityInstantiator implements EntityInstantiator generic type of the entity - * @return */ public T createEntityFromState(Node n, Class entityClass, final MappingPolicy mappingPolicy) { if (n.hasProperty(CrossStoreNodeEntityState.FOREIGN_ID)) { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java index becd3969e..449e0fdd5 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java @@ -46,7 +46,7 @@ public @interface NodeEntity { * Currently, only JPA storage is supported for partial node entities. *

* - * @return true if the entity is only partially managed by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect. + * @return true if the entity is only partially managed by the Neo4jNodeBacking aspect. */ boolean partial() default false; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java index d898d4381..8d193dfe6 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java @@ -28,7 +28,7 @@ import org.springframework.data.annotation.Reference; /** * Annotation for {@link org.springframework.data.neo4j.annotation.NodeEntity} fields that relate to other entities via * relationships. The fields represent read only iterators that provide the relationship-entities - * {@link org.springframework.persistence.RelatedEntity} of the relationships. The iterator reflects the underlying relationships. + * {@link RelationshipEntity} of the relationships. The iterator reflects the underlying relationships. * * 
  * @RelatedToVia([type="roles"], elementClass=Role.class)
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java
index 8869c7e19..7ff553f05 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java
@@ -22,8 +22,7 @@ import java.lang.annotation.*;
 
 /**
  * Annotation to declare a Pojo-Entity as graph backed relationship entity.
- * It is used by the {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking} aspect to add
- * field advices as well as the {@link org.springframework.data.neo4j.core.RelationshipBacked} interface.
+ * It is used by the Neo4jRelationshipBacking aspect to add field advices as well as the RelationshipBacked interface.
  *
  * Relationship entities cannot be instantiated directly. The will be provided by relationship fields and the
  * methods relatedTo and getRelationshipTo introduced to the node entities.
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java
index 2ab852792..14b5891e8 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java
@@ -75,40 +75,30 @@ public @interface EnableNeo4jRepositories {
 	 * Returns the postfix to be used when looking up custom repository implementations. Defaults to {@literal Impl}. So
 	 * for a repository named {@code PersonRepository} the corresponding implementation class will be looked up scanning
 	 * for {@code PersonRepositoryImpl}.
-	 * 
-	 * @return
 	 */
 	String repositoryImplementationPostfix() default "Impl";
 
 	/**
 	 * Configures the location of where to find the Spring Data named queries properties file. Will default to
 	 * {@code META-INFO/neo4j-named-queries.properties}.
-	 * 
-	 * @return
 	 */
 	String namedQueriesLocation() default "";
 
 	/**
 	 * Returns the key of the {@link QueryLookupStrategy} to be used for lookup queries for query methods. Defaults to
 	 * {@link Key#CREATE_IF_NOT_FOUND}.
-	 * 
-	 * @return
 	 */
 	Key queryLookupStrategy() default Key.CREATE_IF_NOT_FOUND;
 
 	/**
 	 * Returns the {@link FactoryBean} class to be used for each repository instance. Defaults to
 	 * {@link GraphRepositoryFactoryBean}.
-	 * 
-	 * @return
 	 */
 	Class repositoryFactoryBeanClass() default GraphRepositoryFactoryBean.class;
 
 	/**
 	 * Returns the name of the {@link Neo4jTemplate} bean to be used with the repository factory. Defaults to
-	 * {@value Neo4jRepositoryConfigurationExtension#DEFAULT_NEO4J_TEMPLATE_REF}.
-	 * 
-	 * @return
+	 * {@link Neo4jRepositoryConfigurationExtension#DEFAULT_NEO4J_TEMPLATE_REF}.
 	 */
 	String neo4jTemplateRef() default Neo4jRepositoryConfigurationExtension.DEFAULT_NEO4J_TEMPLATE_REF;
 }
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java
index 0d70a67cc..f9b4f1650 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java
@@ -35,35 +35,29 @@ public interface EntityState {
     void setPersistentState(STATE state);
 
     /**
-     *
-     * @param property@return a default value for the given field by its {@link FieldAccessor} or {@code null} if none is provided.
+     * @return a default value for the given field by its {@link FieldAccessor} or {@code null} if none is provided.
      */
     Object getDefaultValue(Neo4jPersistentProperty property);
     
     /**
      *
-     * @param field
-     * @param mappingPolicy
      * @return value of the field either from the state and/or the entity
      */
     Object getValue(Field field, MappingPolicy mappingPolicy);
+
     /**
      * @return value of the property either from the state and/or the entity
      */
     Object getValue(Neo4jPersistentProperty property, MappingPolicy mappingPolicy);
 
     /**
-     *
-     * @param property@return true if the field can be written
+     * @return true if the field can be written
      */
     boolean isWritable(Neo4jPersistentProperty property);
 
     /**
      *
      *
-     * @param field
-     * @param newVal
-     * @param mappingPolicy
      * @return sets the value in the entity and/or the state
      */
     Object setValue(Field field, Object newVal, MappingPolicy mappingPolicy);
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java
index 185d8261a..abc82f603 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java
@@ -92,7 +92,6 @@ public interface GraphDatabase {
     /**
      * creates a index
      * @param type type of index requested - either Node.class or Relationship.class
-     * @param indexName, not null
      * @param indexType SIMPLE, FULLTEXT or POINT declaring the requested index-type
      * @return node index {@link Index}
      */
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java
index bd26a1923..4f64a77a5 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java
@@ -45,19 +45,20 @@ public interface TypeRepresentationStrategy {
     /**
      *
      *
-     * @param type@return lazy Iterable over all instances of the given type
+     * @param type
+     * @return lazy Iterable over all instances of the given type
      */
      ClosableIterable findAll(final StoredEntityType type);
 
     /**
      *
-     * @param type@return number of instances of this class contained in the graph
+     * @param type
+     * @return number of instances of this class contained in the graph
      */
     long count(final StoredEntityType type);
 
     /**
      *
-     * @param state
      * @return java type that of the node entity of this node
      */
 	Object readAliasFrom(S state);
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DynamicProperties.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DynamicProperties.java
index 19e36337f..de15a59f2 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DynamicProperties.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DynamicProperties.java
@@ -27,7 +27,7 @@ import org.springframework.data.neo4j.fieldaccess.DynamicPropertiesFieldAccessor
  * This dynamic property only is available inside a transaction, i.e. when the entity has been saved.
  * 

  * The key/value pairs of the {@link DynamicProperties} property are stored on the node with the keys
- * prefixed with the property name that is returned by {@link DelegatingFieldAccessorFactory#getNeo4jPropertyName(Field)}. 
+ * prefixed with the property name that is returned by {@link org.springframework.data.neo4j.mapping.Neo4jPersistentProperty#getNeo4jPropertyName()}.
  * 
  * @NodeEntity
  * class Person {
@@ -87,7 +87,6 @@ public interface DynamicProperties {
     /**
      * Removes the property with the given key
      * 
-     * @param key
      * @return the property that has been removed or null if no such property exists and {@link #hasProperty} returns
      *         false
      */
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorListenerFactory.java
index a683ff448..4bf5584b2 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorListenerFactory.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorListenerFactory.java
@@ -28,13 +28,15 @@ import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty;
 public interface FieldAccessorListenerFactory {
     /**
      *
-     * @param property@return true if this factory is able to create a listener for the field
+     * @param property
+     * @return true if this factory is able to create a listener for the field
      */
     boolean accept(Neo4jPersistentProperty property);
 
     /**
      *
-     * @param property@return newly created field listener
+     * @param property
+     * @return newly created field listener
      */
     FieldAccessListener forField(Neo4jPersistentProperty property);
 }
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java
index b354293f9..6631664fb 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java
@@ -33,8 +33,6 @@ public interface Neo4jPersistentProperty extends PersistentPropertyWell Known Text Spatial Format
+ *
  * Right now requires a field: @Indexed(type = POINT, indexName = "...") String wkt;
  * inside the entity.
+ *
+ * @see Well Known Text Spatial Format
  */
 public interface SpatialRepository {
     EndResult findWithinBoundingBox(String indexName, double lowerLeftLat,
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DoReturn.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DoReturn.java
index 3cdc8e210..5d4655388 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DoReturn.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DoReturn.java
@@ -29,12 +29,6 @@ public class DoReturn {
         this.value = value;
     }
 
-    /**
-     * static factory method
-     * @param value
-     * @param 
-     * @return
-     */
     public static  DoReturn doReturn(T value) {
         return new DoReturn(value);
     }
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java
index 1d7745f8f..caab9ff08 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java
@@ -198,9 +198,6 @@ public class Neo4jTemplate implements Neo4jOperations {
 
     /**
      * just sets the persistent state (i.e. Node or id) to the entity, doesn't copy any values/properties.
-     * @param entity
-     * @param 
-     * @return
      */
     @Override
     public  S getPersistentState(Object entity) {
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 f69623a54..6b4930a05 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
@@ -44,18 +44,12 @@ public interface IndexProvider {
     /**
      * adjust your indexName for the "__types__" indices
      * 
-     *
-     * @param type
      * @return prefixed indexName for Type
      */
     String createIndexValueForType(Object type);
     
     /**
      * possibility to do something with the high level index name 
-     * 
-     * @param indexName
-     * @param type
-     * @return
      */
     String customizeIndexName(String indexName, Class type);