Skip to content

TC-110123: Replace JAXB DatatypeConverter with JDK DatatypeFactory #5

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
Shan-SmartBear wants to merge 3 commits into
base: master
Choose a base branch
from
+21 −4
Open

TC-110123: Replace JAXB DatatypeConverter with JDK DatatypeFactory #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58b7173
TC-110123: Replace JAXB DatatypeConverter with JDK DatatypeFactory (J…
Shan-SmartBear Jun 22, 2026
11c8b4a
TC-110123 Added exception message
Shan-SmartBear Jun 22, 2026
e5fc436
TC-110123 single initialization
Shan-SmartBear Jun 22, 2026
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
19 changes: 19 additions & 0 deletions src/main/java/com/smartbear/jenkins/plugins/testcomplete/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import org.jenkinsci.remoting.RoleChecker;

import javax.crypto.Cipher;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import java.lang.ref.WeakReference;
import java.security.Key;
import java.security.KeyFactory;
Expand All @@ -53,6 +55,16 @@ public class Utils {

private static final int ENC_CHUNK_MAX_SIZE = 116;

private static final DatatypeFactory XML_DATATYPE_FACTORY = createXmlDatatypeFactory();

private static DatatypeFactory createXmlDatatypeFactory() {
try {
return DatatypeFactory.newInstance();
} catch (DatatypeConfigurationException e) {
throw new IllegalStateException("Failed to obtain a DatatypeFactory instance for XML date/time conversion", e);
}
}

private Utils() {
}

Expand Down Expand Up @@ -178,6 +190,13 @@ private static long OLEDateToMillis(double dSerialDate)
return (long) ((dSerialDate - 25569) * 24 * 3600 * 1000);
}

public static String printDateTime(Calendar cal) {
GregorianCalendar gc = new GregorianCalendar();
gc.setTimeZone(cal.getTimeZone());
gc.setTimeInMillis(cal.getTimeInMillis());
return XML_DATATYPE_FACTORY.newXMLGregorianCalendar(gc).toXMLFormat();
}

static String encryptPassword(String password) throws Exception {
byte[] keyRawData = Base64.getDecoder().decode(PUBLIC_KEY);
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/smartbear/jenkins/plugins/testcomplete/parser/LogNodeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.w3c.dom.*;
import org.xml.sax.SAXException;

import javax.xml.bind.DatatypeConverter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
Expand Down Expand Up @@ -422,7 +421,7 @@ static public String startTimeToTimestamp(String startTime) {
long startDate = Utils.safeConvertDate(startTime);
Calendar cal = new GregorianCalendar();
cal.setTimeInMillis(startDate);
return DatatypeConverter.printDateTime(cal);
return Utils.printDateTime(cal);
}

}
3 changes: 1 addition & 2 deletions src/main/java/com/smartbear/jenkins/plugins/testcomplete/parser/LogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.commons.lang.StringUtils;
import org.w3c.dom.*;

import javax.xml.bind.DatatypeConverter;
import javax.xml.stream.*;

import java.io.IOException;
Expand Down Expand Up @@ -283,7 +282,7 @@ private void processProject(ZipFile logArchive, Node rootOwnerNode, Node rootOwn
String projectName = LogNodeUtils.getTextProperty(rootOwnerNodeInfoSummary, "test");
Calendar cal = new GregorianCalendar();
cal.setTimeInMillis(startDate);
String timestamp = DatatypeConverter.printDateTime(cal);
String timestamp = Utils.printDateTime(cal);

String rootOwnerNodeFileName = LogNodeUtils.getTextProperty(rootOwnerNode, "filename");
if (rootOwnerNodeFileName == null || rootOwnerNodeFileName.isEmpty()) {
Expand Down