@@ -110,7 +110,7 @@ private static void addPropertiesFrom(Class<?> returnedType, Class<?> domainType
110110	}
111111
112112	private  static  void  processEntity (PropertyPath  propertyPath , Collection <PropertyPath > filteredProperties ,
113- 									  Predicate <Class <?>> ding ,
113+ 									  Predicate <Class <?>> simpleTypePredicate ,
114114									  MappingContext <?, ?> mappingContext ) {
115115
116116		PropertyPath  leafProperty  = propertyPath .getLeafProperty ();
@@ -122,11 +122,11 @@ private static void processEntity(PropertyPath propertyPath, Collection<Property
122122		Class <?> propertyEntityType  = persistentProperty .getActualType ();
123123
124124		// Use domain type as root type for the property path 
125- 		addPropertiesFromEntity (filteredProperties , propertyPath , ding , propertyEntityType , mappingContext , new  HashSet <>());
125+ 		addPropertiesFromEntity (filteredProperties , propertyPath , simpleTypePredicate , propertyEntityType , mappingContext , new  HashSet <>());
126126	}
127127
128128	private  static  void  addPropertiesFromEntity (Collection <PropertyPath > filteredProperties , PropertyPath  propertyPath ,
129- 												Predicate <Class <?>> ding ,
129+ 												Predicate <Class <?>> simpleTypePredicate ,
130130												Class <?> propertyType , MappingContext <?, ?> mappingContext ,
131131												Collection <PersistentEntity <?, ?>> processedEntities ) {
132132
@@ -143,7 +143,7 @@ private static void addPropertiesFromEntity(Collection<PropertyPath> filteredPro
143143			processedEntities .add (mappingContext .getPersistentEntity (pathRootType ));
144144		}
145145
146- 		takeAllPropertiesFromEntity (filteredProperties , ding , propertyPath , mappingContext , persistentEntityFromProperty , processedEntities );
146+ 		takeAllPropertiesFromEntity (filteredProperties , simpleTypePredicate , propertyPath , mappingContext , persistentEntityFromProperty , processedEntities );
147147	}
148148
149149	private  static  boolean  hasProcessedEntity (PersistentEntity <?, ?> persistentEntityFromProperty ,
@@ -153,20 +153,20 @@ private static boolean hasProcessedEntity(PersistentEntity<?, ?> persistentEntit
153153	}
154154
155155	private  static  void  takeAllPropertiesFromEntity (Collection <PropertyPath > filteredProperties ,
156- 													Predicate <Class <?>> ding , PropertyPath  propertyPath ,
156+ 													Predicate <Class <?>> simpleTypePredicate , PropertyPath  propertyPath ,
157157													MappingContext <?, ?> mappingContext ,
158158													PersistentEntity <?, ?> persistentEntityFromProperty ,
159159													Collection <PersistentEntity <?, ?>> processedEntities ) {
160160
161161		filteredProperties .add (propertyPath );
162162
163163		persistentEntityFromProperty .doWithAll (persistentProperty  -> {
164- 			addPropertiesFromEntity (filteredProperties , propertyPath .nested (persistentProperty .getName ()), ding , mappingContext , processedEntities );
164+ 			addPropertiesFromEntity (filteredProperties , propertyPath .nested (persistentProperty .getName ()), simpleTypePredicate , mappingContext , processedEntities );
165165		});
166166	}
167167
168168	private  static  void  addPropertiesFromEntity (Collection <PropertyPath > filteredProperties , PropertyPath  propertyPath ,
169- 												Predicate <Class <?>> ding , MappingContext <?, ?> mappingContext ,
169+ 												Predicate <Class <?>> simpleTypePredicate , MappingContext <?, ?> mappingContext ,
170170										  		Collection <PersistentEntity <?, ?>> processedEntities ) {
171171
172172		// break the recursion / cycles 
@@ -175,11 +175,11 @@ private static void addPropertiesFromEntity(Collection<PropertyPath> filteredPro
175175		}
176176		Class <?> propertyType  = propertyPath .getLeafType ();
177177		// simple types can get added directly to the list. 
178- 		if  (ding .test (propertyType )) {
178+ 		if  (simpleTypePredicate .test (propertyType )) {
179179			filteredProperties .add (propertyPath );
180180		// Other types are handled also as entities because there cannot be any nested projection within a real entity. 
181181		} else  if  (mappingContext .hasPersistentEntityFor (propertyType )) {
182- 			addPropertiesFromEntity (filteredProperties , propertyPath , ding , propertyType , mappingContext , processedEntities );
182+ 			addPropertiesFromEntity (filteredProperties , propertyPath , simpleTypePredicate , propertyType , mappingContext , processedEntities );
183183		}
184184	}
185185}
0 commit comments