Skip to content

code cleanup, use standard dataverse.util methods #12567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pdurbin wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

code cleanup, use standard dataverse.util methods #12567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/api/ldn/COARNotifyRelationshipAnnouncement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ private void parseDataCiteXml(String dataciteXmlUrl, CloseableHttpClient client,
String xmlContent = EntityUtils.toString(xmlResponse.getEntity(), "UTF-8");
logger.fine("Retrieved DataCite XML");

javax.xml.parsers.DocumentBuilderFactory factory = javax.xml.parsers.DocumentBuilderFactory.newInstance();
javax.xml.parsers.DocumentBuilderFactory factory = edu.harvard.iq.dataverse.util.xml.XmlUtil.getSecureDocumentBuilderFactory();
factory.setNamespaceAware(true);
javax.xml.parsers.DocumentBuilder builder = factory.newDocumentBuilder();
org.w3c.dom.Document doc = builder.parse(
Expand Down
2 changes: 1 addition & 1 deletion ...du/harvard/iq/dataverse/authorization/AuthenticationProvidersRegistrationServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ private String lookupShibbolethEntityId() {
XMLStreamReader xmlr = null;

try {
XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
XMLInputFactory xmlFactory = edu.harvard.iq.dataverse.util.xml.XmlUtil.getSecureXMLInputFactory();
xmlr = xmlFactory.createXMLStreamReader(new InputStreamReader((InputStream) metadataRequest.getInputStream()));

while ( xmlr.next() == XMLStreamConstants.COMMENT);
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ protected Optional<AuthenticatedUserDisplayInfo> getOrganizationalData(OAuth2Acc
}

protected AuthenticatedUserDisplayInfo parseActivitiesResponse( String responseBody ) {
DocumentBuilderFactory dbFact = DocumentBuilderFactory.newInstance();
DocumentBuilderFactory dbFact = edu.harvard.iq.dataverse.util.xml.XmlUtil.getSecureDocumentBuilderFactory();

try ( StringReader reader = new StringReader(responseBody)) {
DocumentBuilder db = dbFact.newDocumentBuilder();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/authorization/providers/shib/ShibServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public String getAffiliationViaMDQ(String shibIdp) {
XMLStreamReader xmlr = null;

try {
XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
XMLInputFactory xmlFactory = edu.harvard.iq.dataverse.util.xml.XmlUtil.getSecureXMLInputFactory();
xmlr = xmlFactory.createXMLStreamReader(new InputStreamReader((InputStream) mdqApiRequest.getInputStream()));

while ( xmlr.next() == XMLStreamConstants.COMMENT );
Expand Down
Loading