You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/05/05 12:12:00 UTC
[cxf] 03/05: Fixing up WSDLManager backmerge
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e1ed51a7cb96835bcd3d0a9bacf214bfca8fbb89
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue May 5 11:35:43 2020 +0100
Fixing up WSDLManager backmerge
---
rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java | 6 ------
rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java | 1 -
.../src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 2 +-
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
index e731a75..38326fc 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
@@ -104,10 +104,4 @@ public interface WSDLManager {
*/
void removeDefinition(Definition wsdl);
- /**
- * If the definition is cached, remove it from the cache
- * @param url
- */
- void removeDefinition(String url);
-
}
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index 1a911fc..1b94c48 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -354,7 +354,6 @@ public class WSDLManagerImpl implements WSDLManager {
}
}
- @Override
public void removeDefinition(String url) {
synchronized (definitionsMap) {
Definition wsdl = definitionsMap.get(url);
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
index 66bb335..72340aa 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
@@ -216,7 +216,7 @@ public class WSDLManagerImplTest {
assertNotNull(service);
// Now remove it
- builder.removeDefinition(path2.toString());
+ ((WSDLManagerImpl)builder).removeDefinition(path2.toString());
// This time loading should fail as the original resource is removed
try {