actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-18 00:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

rafactor: using xmlbuilder2 instead of regex

Browse source
This commit is contained in:
augustomelo 2024-03-04 08:21:00 +00:00
parent 6abf828e83
commit bc6665734d
3 changed files with 35118 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

35106
dist/cleanup/index.js vendored
View file

File diff suppressed because it is too large Load diff

27
dist/setup/index.js vendored
View file

@ -105361,6 +105361,7 @@ const cache = __importStar(__nccwpck_require__(7799));
const core = __importStar(__nccwpck_require__(2186));
const tc = __importStar(__nccwpck_require__(7784));
const constants_1 = __nccwpck_require__(9042);
const xmlbuilder2_1 = __nccwpck_require__(151);
function getTempDir() {
let tempDirectory = process.env['RUNNER_TEMP'] || os_1.default.tmpdir();
return tempDirectory;
@ -105489,37 +105490,37 @@ function parseJavaVersionFile(content) {
}
return fileContent;
}
function parsePomXmlFile(xmlFile) {
function parsePomXmlFile(xmlFileAsString) {
const versionDefinitionTypes = [getByMavenCompilerSpecification, getBySpringBootSpecification];
for (var definitionType of versionDefinitionTypes) {
var version = definitionType(xmlFile);
var version = definitionType(xmlbuilder2_1.create(xmlFileAsString));
if (version !== null) {
return version;
}
}
return null;
}
function getByMavenCompilerSpecification(xmlFile) {
function getByMavenCompilerSpecification(xmlDoc) {
const possibleTagsRegex = [
'<maven\.compiler\.source>(.*?)<\/maven\.compiler\.source>',
'<maven.compiler.release>(.*?)<\/maven.compiler.release>',
'maven.compiler.source',
'maven.compiler.release',
];
for (var tag of possibleTagsRegex) {
const version = getVersionByTagName(xmlFile, tag);
const version = getVersionByTagName(xmlDoc, tag);
if (version !== null) {
return version;
}
}
return null;
}
function getBySpringBootSpecification(xmlFile) {
return getVersionByTagName(xmlFile, '<java.version>(.*?)<\/java.version>');
function getBySpringBootSpecification(xmlDoc) {
return getVersionByTagName(xmlDoc, 'java.version');
}
function getVersionByTagName(xmlFile, regex) {
const match = xmlFile.match(new RegExp(regex));
if (match) {
core.debug(`Found java version: '${match[1]}' using regex: '${regex}'`);
return match[1];
function getVersionByTagName(xmlDoc, tag) {
const match = xmlDoc.find(n => n.node.nodeName === tag);
if (match !== undefined) {
core.debug(`Found java version: '${match.first().toString()}' using tag: '${tag}'`);
return match.first().toString();
}
else {
return null;

28
src/util.ts
View file

@ -7,6 +7,8 @@ import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
import { INPUT_JOB_STATUS, DISTRIBUTIONS_ONLY_MAJOR_VERSION } from './constants';
import { create } from 'xmlbuilder2';
import { XMLBuilder } from 'xmlbuilder2/lib/interfaces';
export function getTempDir() {
let tempDirectory = process.env['RUNNER_TEMP'] || os.tmpdir();
@ -155,11 +157,11 @@ function parseJavaVersionFile(content: string): string | null {
return fileContent;
}
function parsePomXmlFile(xmlFile: string): string | null {
function parsePomXmlFile(xmlFileAsString: string): string | null {
const versionDefinitionTypes = [getByMavenCompilerSpecification, getBySpringBootSpecification];
for (var definitionType of versionDefinitionTypes) {
var version = definitionType(xmlFile);
var version = definitionType(create(xmlFileAsString));
if (version !== null) {
return version;
@ -169,14 +171,14 @@ function parsePomXmlFile(xmlFile: string): string | null {
return null;
}
function getByMavenCompilerSpecification(xmlFile: string): string | null {
function getByMavenCompilerSpecification(xmlDoc: XMLBuilder): string | null {
const possibleTagsRegex = [
'<maven\.compiler\.source>(.*?)<\/maven\.compiler\.source>',
'<maven.compiler.release>(.*?)<\/maven.compiler.release>',
'maven.compiler.source',
'maven.compiler.release',
];
for (var tag of possibleTagsRegex) {
const version = getVersionByTagName(xmlFile, tag);
const version = getVersionByTagName(xmlDoc, tag);
if (version !== null) {
return version;
@ -186,16 +188,16 @@ function getByMavenCompilerSpecification(xmlFile: string): string | null {
return null;
}
function getBySpringBootSpecification(xmlFile: string): string | null {
return getVersionByTagName(xmlFile, '<java.version>(.*?)<\/java.version>');
function getBySpringBootSpecification(xmlDoc: XMLBuilder): string | null {
return getVersionByTagName(xmlDoc, 'java.version');
}
function getVersionByTagName(xmlFile: string, regex: string): string | null {
const match = xmlFile.match(new RegExp(regex));
function getVersionByTagName(xmlDoc: XMLBuilder, tag: string): string | null {
const match = xmlDoc.find(n => n.node.nodeName === tag);
if (match) {
core.debug(`Found java version: '${match[1]}' using regex: '${regex}'`);
return match[1];
if (match !== undefined) {
core.debug(`Found java version: '${match.first().toString()}' using tag: '${tag}'`);
return match.first().toString();
} else {
return null;
}