Simplify URI resolver (see #144)

eclipse · Oct 30, 2018 · 33ecf3a · 33ecf3a
1 parent d237c01
commit 33ecf3a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/uriresolver/URIResolverExtension.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/uriresolver/URIResolverExtension.java
@@ -33,21 +33,8 @@ public interface URIResolverExtension extends XMLEntityResolver {
  public String resolve(String baseLocation, String publicId, String systemId);
 
  @Override
- default XMLInputSource resolveEntity(XMLResourceIdentifier rid) throws XNIException, IOException {
- XMLInputSource is = null;
- String id = rid.getPublicId();
- if (id == null) {
- id = rid.getNamespace();
- }
-
- String location = null;
- if (id != null || rid.getLiteralSystemId() != null) {
- location = this.resolve(rid.getBaseSystemId(), id, rid.getLiteralSystemId());
- }
-
- if (location != null) {
- is = new XMLInputSource(rid.getPublicId(), location, location);
- }
- return is;
+ default XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException {
+ return null;
  }
+
 }
diff --git a/...se.lsp4xml/src/main/java/org/eclipse/lsp4xml/uriresolver/URIResolverExtensionManager.java b/...se.lsp4xml/src/main/java/org/eclipse/lsp4xml/uriresolver/URIResolverExtensionManager.java
@@ -47,6 +47,25 @@ class DefaultURIResolverExtension implements URIResolverExtension {
  public String resolve(String baseLocation, String publicId, String systemId) {
  return systemId;
  }
+
+ @Override
+ public XMLInputSource resolveEntity(XMLResourceIdentifier rid) throws XNIException, IOException {
+ XMLInputSource is = null;
+ String id = rid.getPublicId();
+ if (id == null) {
+ id = rid.getNamespace();
+ }
+
+ String location = null;
+ if (id != null || rid.getLiteralSystemId() != null) {
+ location = this.resolve(rid.getBaseSystemId(), id, rid.getLiteralSystemId());
+ }
+
+ if (location != null) {
+ is = new XMLInputSource(rid.getPublicId(), location, location);
+ }
+ return is;
+ }
  }
 
  /**