Skip to content

Commit 5d1ce6d

Browse files
committed
DATACMNS-864 - Fix Java 8 compiler ambiguities.
Added explicit generics invocations in places that caused an ambiguous invocation on Java 8.
1 parent 8bb6418 commit 5d1ce6d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public AnnotationRevisionMetadata(final Object entity, Class<? extends Annotatio
6060
AnnotationDetectionFieldCallback revisionCallback = new AnnotationDetectionFieldCallback(
6161
revisionTimeStampAnnotation);
6262
ReflectionUtils.doWithFields(entity.getClass(), revisionCallback);
63-
this.revisionDate = new DateTime(revisionCallback.getValue(entity));
63+
this.revisionDate = new DateTime(revisionCallback.<Object> getValue(entity));
6464
} else {
6565
this.revisionDate = null;
6666
}

src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ public boolean hasDeleteMethod() {
154154
* @see org.springframework.data.rest.core.invoke.RepositoryInvoker#invokeDelete(java.io.Serializable)
155155
*/
156156
@Override
157-
@SuppressWarnings("unchecked")
158157
public void invokeDelete(Serializable id) {
159158

160159
Assert.notNull(id, "Identifier must not be null!");
@@ -167,7 +166,7 @@ public void invokeDelete(Serializable id) {
167166
if (idTypes.contains(parameterType)) {
168167
invoke(method, convertId(id));
169168
} else {
170-
invoke(method, invokeFindOne(id));
169+
invoke(method, this.<Object> invokeFindOne(id));
171170
}
172171
}
173172

src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,15 @@ public void supportsSlicesAsReturnWrapper() throws Exception {
221221
* @see DATACMNS-859
222222
*/
223223
@Test
224+
@SuppressWarnings("unchecked")
224225
public void supportsStreamAsReturnWrapper() throws Exception {
225226

226227
Stream<Sample> samples = Arrays.asList(new Sample("Dave", "Matthews")).stream();
227228

228229
Object result = getProcessor("findStreamProjection").processResult(samples);
229230

230231
assertThat(result, is(instanceOf(Stream.class)));
231-
List<?> content = ((Stream<?>) result).collect(Collectors.toList());
232+
List<Object> content = ((Stream<Object>) result).collect(Collectors.toList());
232233

233234
assertThat(content, is(not(empty())));
234235
assertThat(content.get(0), is(instanceOf(SampleProjection.class)));

0 commit comments

Comments
 (0)