Remove DefaultEntityResolver.resolveEntity(String)

See #1

Author: carlosame

junit/io/sf/carte/doc/xml/dtd/DefaultEntityResolverTest.java

@@ -163,9 +163,9 @@ public void resolveEntityStringStringRemote() throws SAXException, IOException {
 	}
 
 	@Test
-	public void resolveEntityString() throws SAXException, IOException {
-		@SuppressWarnings("removal")
-		InputSource isrc = resolver.resolveEntity(DocumentTypeDeclaration.XHTML1_TRA_DTDECL);
+	public void parseAndResolveEntity() throws SAXException, IOException {
+		DocumentTypeDeclaration dtDecl = DocumentTypeDeclaration.parse(DocumentTypeDeclaration.XHTML1_TRA_DTDECL);
+		InputSource isrc = resolver.resolveEntity(dtDecl.getName(), dtDecl.getPublicId(), null, dtDecl.getSystemId());
 		assertNotNull(isrc);
 		assertNotNull(isrc.getPublicId());
 		assertEquals(DocumentTypeDeclaration.XHTML1_TRA_PUBLICID, isrc.getPublicId());
@@ -174,18 +174,6 @@ public void resolveEntityString() throws SAXException, IOException {
 		re.close();
 	}
 
-	@SuppressWarnings("removal")
-	@Test
-	public void resolveNonexistentDeclaration() {
-		try {
-			resolver.resolveEntity("hi");
-			fail("Must throw exception");
-		} catch (SAXException e) {
-		} catch (IOException e) {
-			fail("Should throw SAXException, not IOException");
-		}
-	}
-
 	@Test
 	public void resolveNonexistent() {
 		// No SystemId, so it should resolve to null

junit/io/sf/carte/doc/xml/dtd/DocumentTypeDeclarationTest.java

@@ -13,6 +13,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.xml.sax.SAXException;
@@ -36,6 +37,7 @@ public void parse() throws SAXException {
 		assertEquals("html", dtdecl.getName());
 		assertEquals("-//W3C//DTD XHTML 1.0 Transitional//EN", dtdecl.getPublicId());
 		assertEquals("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", dtdecl.getSystemId());
+
 		dtdecl = DocumentTypeDeclaration.parse(ContentModelTest.DTD_NONEXISTENT);
 		assertEquals("hi", dtdecl.getName());
 		assertEquals("-//HI//Does not exist//EN", dtdecl.getPublicId());
@@ -51,6 +53,15 @@ public void parse2() throws SAXException {
 		assertEquals("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", dtdecl.getSystemId());
 	}
 
+	@Test
+	public void parseBadDtd() throws SAXException {
+		try {
+			DocumentTypeDeclaration.parse("hi");
+			fail("Must throw exception");
+		} catch (SAXException e) {
+		}
+	}
+
 	@Test
 	public void testToString() throws SAXException {
 		DocumentTypeDeclaration dtdecl = DocumentTypeDeclaration.parse(

src/io/sf/carte/doc/xml/dtd/DefaultEntityResolver.java

@@ -515,28 +515,6 @@ public InputSource resolveEntity(DocumentType dtDecl) throws SAXException, IOExc
 		return resolveEntity(dtDecl.getName(), dtDecl.getPublicId(), dtDecl.getBaseURI(), dtDecl.getSystemId());
 	}
 
-	/**
-	 * Resolve the given DTD string.
-	 * 
-	 * @param documentTypeDeclaration the document type declaration.
-	 * @return an InputSource object describing the new input source to be used by
-	 *         the parser.
-	 * @throws SAXException Any SAX exception, possibly wrapping another exception.
-	 * @throws IOException  indicating a failure to create a new InputStream or
-	 *                      Reader, or an illegal URL.
-	 * @deprecated This method uses the {@link DocumentTypeDeclaration} type, which
-	 *             carries a dependency with the {@code jclf-text} module, and is
-	 *             going to be removed to make the class a bit lighter. People
-	 *             needing this functionality can always parse the DTD string on
-	 *             their own with {@link DocumentTypeDeclaration#parse(String)} and
-	 *             then call {@link #resolveEntity(String, String, String, String)}.
-	 */
-	@Deprecated(forRemoval=true)
-	public InputSource resolveEntity(String documentTypeDeclaration) throws SAXException, IOException {
-		DocumentTypeDeclaration dtDecl = DocumentTypeDeclaration.parse(documentTypeDeclaration);
-		return resolveEntity(dtDecl.getName(), dtDecl.getPublicId(), null, dtDecl.getSystemId());
-	}
-
 	public void setClassLoader(ClassLoader loader) {
 		this.loader = loader;
 	}