Skip to content

Commit 6cf2634

Browse files
committed
Fixed dependency cycle.
Closes #2514
1 parent ecec2e5 commit 6cf2634

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Diff for: src/main/java/org/springframework/data/mapping/context/EntityProjection.java renamed to src/main/java/org/springframework/data/projection/EntityProjection.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.mapping.context;
16+
package org.springframework.data.projection;
1717

1818
import java.util.ArrayList;
1919
import java.util.Collection;
@@ -24,7 +24,6 @@
2424
import java.util.function.Consumer;
2525

2626
import org.springframework.data.mapping.PropertyPath;
27-
import org.springframework.data.projection.ProjectionInformation;
2827
import org.springframework.data.util.ClassTypeInformation;
2928
import org.springframework.data.util.Streamable;
3029
import org.springframework.data.util.TypeInformation;

Diff for: src/main/java/org/springframework/data/mapping/context/EntityProjectionIntrospector.java renamed to src/main/java/org/springframework/data/projection/EntityProjectionIntrospector.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.mapping.context;
16+
package org.springframework.data.projection;
1717

1818
import java.beans.PropertyDescriptor;
1919
import java.util.ArrayList;
@@ -25,9 +25,8 @@
2525
import org.springframework.data.mapping.PersistentEntity;
2626
import org.springframework.data.mapping.PersistentProperty;
2727
import org.springframework.data.mapping.PropertyPath;
28-
import org.springframework.data.mapping.context.EntityProjection.ProjectionType;
29-
import org.springframework.data.projection.ProjectionFactory;
30-
import org.springframework.data.projection.ProjectionInformation;
28+
import org.springframework.data.projection.EntityProjection.ProjectionType;
29+
import org.springframework.data.mapping.context.MappingContext;
3130
import org.springframework.data.util.ClassTypeInformation;
3231
import org.springframework.data.util.TypeInformation;
3332
import org.springframework.lang.Nullable;
@@ -88,7 +87,7 @@ public static EntityProjectionIntrospector create(ProjectionFactory projectionFa
8887
* @param mappedType must not be {@literal null}.
8988
* @param domainType must not be {@literal null}.
9089
* @return the introspection result.
91-
* @see org.springframework.data.mapping.context.EntityProjection.ContainerPropertyProjection
90+
* @see EntityProjection.ContainerPropertyProjection
9291
*/
9392
public <M, D> EntityProjection<M, D> introspect(Class<M> mappedType, Class<D> domainType) {
9493

Diff for: src/test/java/org/springframework/data/mapping/context/EntityProjectionIntrospectorUnitTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
import org.springframework.data.mapping.PropertyPath;
3030
import org.springframework.data.mapping.model.SimpleTypeHolder;
31+
import org.springframework.data.projection.EntityProjection;
32+
import org.springframework.data.projection.EntityProjectionIntrospector;
3133
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
3234

3335
/**

0 commit comments

Comments
 (0)