diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java index db645a6d5..0fa6b2348 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2011-2012 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. @@ -48,8 +48,10 @@ class DefaultPersistentPropertyPath> implements * @param properties must not be {@literal null}. */ public DefaultPersistentPropertyPath(List properties) { + Assert.notNull(properties); Assert.isTrue(!properties.isEmpty()); + this.properties = properties; } @@ -141,7 +143,8 @@ class DefaultPersistentPropertyPath> implements return true; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.springframework.data.mapping.context.PersistentPropertyPath#getExtensionForBaseOf(org.springframework.data.mapping.context.PersistentPropertyPath) */ public PersistentPropertyPath getExtensionForBaseOf(PersistentPropertyPath base) { @@ -153,8 +156,7 @@ class DefaultPersistentPropertyPath> implements List properties = new ArrayList(); Iterator iterator = iterator(); - for (@SuppressWarnings("unused") - T candidate : base) { + for (int i = 0; i < base.getLength(); i++) { iterator.next(); } @@ -222,6 +224,10 @@ class DefaultPersistentPropertyPath> implements return properties.hashCode(); } + /* + * (non-Javadoc) + * @see java.lang.Object#toString() + */ @Override public String toString() { return toDotPath(); diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java index 0276019cf..d3963ceb9 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java @@ -39,7 +39,7 @@ public abstract class AbstractRepositoryPopulatorFactoryBean extends * @param resources the resources to set */ public void setResources(Resource[] resources) { - this.resources = resources; + this.resources = resources.clone(); } /* @@ -72,7 +72,7 @@ public abstract class AbstractRepositoryPopulatorFactoryBean extends */ public void onApplicationEvent(ContextRefreshedEvent event) { - if (event.equals(getBeanFactory())) { + if (event.getApplicationContext().equals(getBeanFactory())) { Repositories repositories = new Repositories(event.getApplicationContext()); populator.populate(repositories); }