From 911b9f70cde1da1acf4f20a8b8fb413d7be98157 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 7 Dec 2016 12:43:48 +0100 Subject: [PATCH] DATAJPA-1021 - Adapt API in test classes to be Spring 5 compatible. --- ...anningPersistenceUnitPostProcessorUnitTests.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java index b5ef95bd2..c4d008a55 100644 --- a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java @@ -18,6 +18,7 @@ package org.springframework.data.jpa.support; import static org.mockito.Mockito.*; import java.io.IOException; +import java.net.URL; import java.util.Arrays; import java.util.Collections; import java.util.Set; @@ -138,15 +139,19 @@ public class ClasspathScanningPersistenceUnitPostProcessorUnitTests { return resources; } + /* + * (non-Javadoc) + * @see org.springframework.core.io.support.PathMatchingResourcePatternResolver#doFindPathMatchingJarResources(org.springframework.core.io.Resource, java.net.URL, java.lang.String) + */ @Override - protected Set doFindPathMatchingJarResources(Resource rootDirResource, String subPattern) - throws IOException { + protected Set doFindPathMatchingJarResources(Resource rootDirResource, URL rootDirURL, + String subPattern) throws IOException { - if (fileInJarUrl.equals(rootDirResource.getURI().toString())) { + if (fileInJarUrl.equals(rootDirURL.toString())) { return Collections.singleton(rootDirResource); } - return super.doFindPathMatchingJarResources(rootDirResource, subPattern); + return super.doFindPathMatchingJarResources(rootDirResource, rootDirURL, subPattern); } };