From d9768f3ffadac4f22871b8ed03dcdf612693109f Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Fri, 20 Dec 2024 18:10:34 +0800 Subject: [PATCH 1/5] clean codecheck Signed-off-by: wangzeyu --- .../adapter/LocalizationAdapter.java | 4 +-- .../hapsigntool/api/SignToolServiceImpl.java | 26 +++++++++---------- .../ohos/hapsigntool/cert/CertBuilder.java | 20 +++++++------- .../ohos/hapsigntool/signer/LocalSigner.java | 4 +-- .../hapsigntool/utils/KeyStoreHelper.java | 22 ++++++++-------- .../ohos/hapsigntool/utils/LogFormatter.java | 4 +-- .../com/ohos/hapsigntool/utils/LogUtils.java | 21 ++++++++------- 7 files changed, 50 insertions(+), 51 deletions(-) diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/adapter/LocalizationAdapter.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/adapter/LocalizationAdapter.java index 3528578d..55ce428f 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/adapter/LocalizationAdapter.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/adapter/LocalizationAdapter.java @@ -53,7 +53,7 @@ public class LocalizationAdapter { /** * Logger */ - private static final LogUtils logger = new LogUtils(LocalizationAdapter.class); + private static final LogUtils LOGGER = new LogUtils(LocalizationAdapter.class); /** * Params @@ -270,7 +270,7 @@ public class LocalizationAdapter { try { certificates = CertUtils.generateCertificates(FileUtils.readFile(certFile)); } catch (IOException | CertificateException | VerifyCertificateChainException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.ACCESS_ERROR, exception.getMessage() + "\nSolutions:" + "\n> The certificate format is incorrect, please check your appCertFile parameter."); diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/SignToolServiceImpl.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/SignToolServiceImpl.java index bb4d1895..27fef50f 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/SignToolServiceImpl.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/SignToolServiceImpl.java @@ -68,7 +68,7 @@ public class SignToolServiceImpl implements ServiceApi { /** * Logger. */ - private static final LogUtils logger = new LogUtils(ServiceApi.class); + private static final LogUtils LOGGER = new LogUtils(ServiceApi.class); static { Security.addProvider(new BouncyCastleProvider()); @@ -256,8 +256,8 @@ public class SignToolServiceImpl implements ServiceApi { FileUtils.write(p7b, new File(adapter.getOutFile())); isSuccess = true; } catch (IOException exception) { - logger.debug(exception.getMessage(), exception); - logger.error(exception.getMessage()); + LOGGER.debug(exception.getMessage(), exception); + LOGGER.error(exception.getMessage()); isSuccess = false; } return isSuccess; @@ -279,12 +279,12 @@ public class SignToolServiceImpl implements ServiceApi { VerificationResult verificationResult = verifyHelper.verify(p7b); isSign = verificationResult.isVerifiedPassed(); if (!isSign) { - logger.error(verificationResult.getMessage()); + LOGGER.error(verificationResult.getMessage()); } outputString(FileUtils.GSON_PRETTY_PRINT.toJson(verificationResult), adapter.getOutFile()); } catch (IOException exception) { - logger.debug(exception.getMessage(), exception); - logger.error(exception.getMessage()); + LOGGER.debug(exception.getMessage(), exception); + LOGGER.error(exception.getMessage()); isSign = false; } catch (VerifyException e) { CustomException.throwException(ERROR.VERIFY_ERROR, "Verify Profile Failed! " + e.getMessage()); @@ -309,7 +309,7 @@ public class SignToolServiceImpl implements ServiceApi { } else if ("remoteSign".equalsIgnoreCase(mode)) { signProvider = new RemoteSignProvider(); } else { - logger.info("Resign mode. But not implement yet"); + LOGGER.info("Resign mode. But not implement yet"); return false; } @@ -343,12 +343,12 @@ public class SignToolServiceImpl implements ServiceApi { */ public void outputString(String content, String file) { if (StringUtils.isEmpty(file)) { - logger.info(content); + LOGGER.info(content); } else { try { FileUtils.write(content.getBytes(StandardCharsets.UTF_8), new File(file)); } catch (IOException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.WRITE_FILE_ERROR, exception.getMessage()); } } @@ -364,14 +364,14 @@ public class SignToolServiceImpl implements ServiceApi { public boolean outputCert(X509Certificate certificate, String file) { try { if (StringUtils.isEmpty(file)) { - logger.info(CertUtils.generateCertificateInCer(certificate)); + LOGGER.info(CertUtils.generateCertificateInCer(certificate)); } else { FileUtils.write(CertUtils.generateCertificateInCer(certificate).getBytes(StandardCharsets.UTF_8), new File(file)); } return true; } catch (CertificateException | IOException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.WRITE_FILE_ERROR, exception.getMessage()); return false; } @@ -391,13 +391,13 @@ public class SignToolServiceImpl implements ServiceApi { stringBuilder.append(CertUtils.generateCertificateInCer(cert)); } if (StringUtils.isEmpty(file)) { - logger.info(stringBuilder.toString()); + LOGGER.info(stringBuilder.toString()); } else { FileUtils.write(stringBuilder.toString().getBytes(StandardCharsets.UTF_8), new File(file)); } return true; } catch (CertificateException | IOException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.WRITE_FILE_ERROR, exception.getMessage()); return false; } diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/cert/CertBuilder.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/cert/CertBuilder.java index 6ce87c49..97939ffd 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/cert/CertBuilder.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/cert/CertBuilder.java @@ -58,7 +58,7 @@ public class CertBuilder { /** * Logger. */ - private static final LogUtils logger = new LogUtils(ServiceApi.class); + private static final LogUtils LOGGER = new LogUtils(ServiceApi.class); /** * issuer keyPair. @@ -87,7 +87,7 @@ public class CertBuilder { try { request = new PKCS10CertificationRequest(csr); } catch (IOException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.IO_CSR_ERROR, exception.getMessage()); } x509v3CertificateBuilder = new X509v3CertificateBuilder( @@ -99,10 +99,10 @@ public class CertBuilder { x509v3CertificateBuilder.addExtension(Extension.subjectKeyIdentifier, false, extUtils.createSubjectKeyIdentifier(request.getSubjectPublicKeyInfo())); } catch (NoSuchAlgorithmException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.NOT_SUPPORT_ERROR, exception.getMessage()); } catch (CertIOException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.IO_CERT_ERROR, exception.getMessage()); } } @@ -122,10 +122,10 @@ public class CertBuilder { .getInstance(keyPair.getPublic().getEncoded()))); } } catch (NoSuchAlgorithmException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.NOT_SUPPORT_ERROR, exception.getMessage()); } catch (CertIOException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.IO_CERT_ERROR, exception.getMessage()); } return this; @@ -216,16 +216,16 @@ public class CertBuilder { .getCertificate(x509v3CertificateBuilder.build(contentSigner)); cert.verify(keyPair.getPublic()); } catch (InvalidKeyException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.KEY_ERROR, exception.getMessage()); } catch (SignatureException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.SIGN_ERROR, exception.getMessage()); } catch (CertificateException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.CERTIFICATE_ERROR, exception.getMessage()); } catch (NoSuchAlgorithmException | NoSuchProviderException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.NOT_SUPPORT_ERROR, exception.getMessage()); } return cert; diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/signer/LocalSigner.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/signer/LocalSigner.java index d6f5ed93..cccb9381 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/signer/LocalSigner.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/signer/LocalSigner.java @@ -40,7 +40,7 @@ public class LocalSigner implements ISigner { /** * logger of LocalSigner */ - private static final LogUtils logger = new LogUtils(LocalSigner.class); + private static final LogUtils LOGGER = new LogUtils(LocalSigner.class); /** * PrivateKey. @@ -84,7 +84,7 @@ public class LocalSigner implements ISigner { signData = signature.sign(); } catch (NoSuchAlgorithmException | InvalidKeyException | InvalidAlgorithmParameterException | SignatureException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.SIGN_ERROR, exception.getMessage()); } return signData; diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/KeyStoreHelper.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/KeyStoreHelper.java index ed09baa8..16e6b3d3 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/KeyStoreHelper.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/KeyStoreHelper.java @@ -80,7 +80,7 @@ public class KeyStoreHelper { /** * Use LogManager to show log instead of use "System.out.print" to show log. */ - private static final LogUtils logger = new LogUtils(KeyStoreHelper.class); + private static final LogUtils LOGGER = new LogUtils(KeyStoreHelper.class); /** * Field keyStorePath. @@ -116,14 +116,14 @@ public class KeyStoreHelper { FileInputStream fis = null; try { if (FileUtils.isFileExist(keyStorePath)) { - logger.info("{} is exist. Try to load it with given passwd", keyStorePath); + LOGGER.info("{} is exist. Try to load it with given passwd", keyStorePath); fis = new FileInputStream(keyStorePath); keyStore.load(fis, pwd); } else { keyStore.load(null, null); } } catch (IOException | NoSuchAlgorithmException | CertificateException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.ACCESS_ERROR, "Init keystore failed: " + exception.getMessage() + "\nSolutions:" + "\n> The key store file does not exist, please check the key store file path." @@ -168,7 +168,7 @@ public class KeyStoreHelper { try { return keyStore.containsAlias(alias); } catch (KeyStoreException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.ACCESS_ERROR, exception.getMessage()); return false; } @@ -205,10 +205,10 @@ public class KeyStoreHelper { return (PrivateKey) key; } } catch (KeyStoreException | NoSuchAlgorithmException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.ACCESS_ERROR, exception.getMessage()); } catch (UnrecoverableKeyException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.ACCESS_ERROR, "Password error of '" + alias + "'"); } return null; @@ -228,7 +228,7 @@ public class KeyStoreHelper { try { cert.checkValidity(); } catch (CertificateExpiredException | CertificateNotYetValidException exception) { - logger.info("p12's certificates is not valid"); + LOGGER.info("p12's certificates is not valid"); } certificates.add(cert); } @@ -257,7 +257,7 @@ public class KeyStoreHelper { } } } catch (KeyStoreException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.KEYSTORE_OPERATION_ERROR, exception.getMessage()); } @@ -292,7 +292,7 @@ public class KeyStoreHelper { keyStore.store(fos, keyStorePwd); fos.flush(); } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.WRITE_FILE_ERROR, exception.getMessage()); return false; } @@ -319,7 +319,7 @@ public class KeyStoreHelper { return new JcaX509CertificateConverter().setProvider("BC") .getCertificate(certificateBuilder.build(contentSigner)); } catch (CertificateException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.IO_CERT_ERROR, exception.getMessage()); return null; } @@ -343,7 +343,7 @@ public class KeyStoreHelper { typeKeyStore = KeyStore.getInstance(KeyStore.getDefaultType()); } } catch (KeyStoreException exception) { - logger.debug(exception.getMessage(), exception); + LOGGER.debug(exception.getMessage(), exception); CustomException.throwException(ERROR.KEYSTORE_OPERATION_ERROR, exception.getMessage()); } return typeKeyStore; diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogFormatter.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogFormatter.java index 344a730d..ac031136 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogFormatter.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogFormatter.java @@ -15,7 +15,6 @@ package com.ohos.hapsigntool.utils; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,8 +27,7 @@ import java.util.logging.LogRecord; * @since 2024/12/08 */ public class LogFormatter extends Formatter { - private final static DateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS"); - + private static final DateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS"); /** * format log. diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java index 9a061099..9ac1ff08 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java @@ -39,7 +39,6 @@ import java.util.regex.Pattern; * @since 2024/12/08 */ public class LogUtils { - private static Logger logger; private static Level level; private static final Map LEVEL_MAP = new HashMap<>(); private static final String DEFAULT_LEVEL = "info"; @@ -59,6 +58,8 @@ public class LogUtils { } } + private final Logger logger; + /** * format log utils constructor. * @@ -110,7 +111,7 @@ public class LogUtils { * @param log log string */ public void warn(String log) { - logger.warning(" WARN - " + log); + logger.warning(" WARN - " + log); } /** @@ -120,7 +121,7 @@ public class LogUtils { * @param arg arg */ public void warn(String log, Object arg) { - logger.warning(" WARN - " + replaceArgs(log, arg)); + logger.warning(" WARN - " + replaceArgs(log, arg)); } /** @@ -142,7 +143,7 @@ public class LogUtils { * @param arg2 arg */ public void warn(String log, Object arg1, Object arg2) { - logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); + logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); } /** @@ -161,7 +162,7 @@ public class LogUtils { * @param log log string */ public void debug(String log) { - logger.config(" DEBUG - " + log); + logger.config(" DEBUG - " + log); } /** @@ -172,7 +173,7 @@ public class LogUtils { * @param arg2 arg */ public void debug(String log, Object arg1, Object arg2) { - logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); + logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); } /** @@ -192,7 +193,7 @@ public class LogUtils { * @param arg arg */ public void debug(String log, Object arg) { - logger.config(" DEBUG - " + replaceArgs(log, arg)); + logger.config(" DEBUG - " + replaceArgs(log, arg)); } /** @@ -201,7 +202,7 @@ public class LogUtils { * @param log log string */ public void error(String log) { - logger.severe(" ERROR - " + log); + logger.severe(" ERROR - " + log); } /** @@ -232,7 +233,7 @@ public class LogUtils { * @param arg arg */ public void error(String log, Object arg) { - logger.severe(" ERROR - " + replaceArgs(log, arg)); + logger.severe(" ERROR - " + replaceArgs(log, arg)); } /** @@ -255,7 +256,7 @@ public class LogUtils { * @param arg3 arg */ public void error(String log, Object arg1, Object arg2, Object arg3) { - logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2, arg3)); + logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2, arg3)); } private static String replaceArgs(String line, Object... args) { -- Gitee From d1c3a4fca189ca51e997f92cd8b978bf11922046 Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Fri, 20 Dec 2024 21:38:47 +0800 Subject: [PATCH 2/5] clean codecheck Signed-off-by: wangzeyu --- .../com/ohos/hapsigntool/utils/LogUtils.java | 37 +++++++++++++++++-- tools/auto_test.py | 32 ++++++++-------- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java index 9ac1ff08..b2a0113a 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java @@ -16,6 +16,7 @@ package com.ohos.hapsigntool.utils; import com.ohos.hapsigntool.error.LogConfigException; +import org.apache.logging.log4j.LogManager; import java.io.File; import java.io.FileInputStream; @@ -28,8 +29,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.logging.ConsoleHandler; +import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.logging.StreamHandler; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -39,11 +42,15 @@ import java.util.regex.Pattern; * @since 2024/12/08 */ public class LogUtils { + private static final org.apache.logging.log4j.Logger log = LogManager.getLogger(LogUtils.class); private static Level level; private static final Map LEVEL_MAP = new HashMap<>(); private static final String DEFAULT_LEVEL = "info"; private static final Pattern PATTERN = Pattern.compile("\\{}"); + private static final Handler outHandler; + private static final Handler errHandler; + static { LEVEL_MAP.put(DEFAULT_LEVEL, Level.INFO); LEVEL_MAP.put("debug", Level.CONFIG); @@ -56,6 +63,12 @@ public class LogUtils { } catch (LogConfigException e) { level = LEVEL_MAP.get(getDefaultLogLevel(configFileName)); } + + LogFormatter logFormatter = new LogFormatter(); + outHandler = new StreamHandler(System.out, logFormatter); + outHandler.setFilter(record -> record.getLevel() != Level.SEVERE && record.getLevel() != Level.WARNING); + errHandler = new StreamHandler(System.err, logFormatter); + errHandler.setFilter(record -> record.getLevel() == Level.SEVERE || record.getLevel() == Level.WARNING); } private final Logger logger; @@ -68,10 +81,8 @@ public class LogUtils { public LogUtils(Class clazz) { logger = Logger.getLogger(clazz.getName()); logger.setUseParentHandlers(false); - ConsoleHandler consoleHandler = new ConsoleHandler(); - LogFormatter logFormatter = new LogFormatter(); - consoleHandler.setFormatter(logFormatter); - logger.addHandler(consoleHandler); + logger.addHandler(outHandler); + logger.addHandler(errHandler); logger.setLevel(level); } @@ -82,6 +93,7 @@ public class LogUtils { */ public void info(String log) { logger.info(" INFO - " + log); + outHandler.flush(); } /** @@ -92,6 +104,7 @@ public class LogUtils { */ public void info(String log, Object arg) { logger.info(" INFO - " + replaceArgs(log, arg)); + outHandler.flush(); } /** @@ -103,6 +116,7 @@ public class LogUtils { */ public void info(String log, Object arg1, Object arg2) { logger.info(" INFO - " + replaceArgs(log, arg1, arg2)); + outHandler.flush(); } /** @@ -112,6 +126,7 @@ public class LogUtils { */ public void warn(String log) { logger.warning(" WARN - " + log); + errHandler.flush(); } /** @@ -122,6 +137,7 @@ public class LogUtils { */ public void warn(String log, Object arg) { logger.warning(" WARN - " + replaceArgs(log, arg)); + errHandler.flush(); } /** @@ -133,6 +149,7 @@ public class LogUtils { */ public void warn(String log, Object arg, Throwable e) { logger.log(Level.WARNING, e, () -> " DEBUG - " + replaceArgs(log, arg)); + errHandler.flush(); } /** @@ -144,6 +161,7 @@ public class LogUtils { */ public void warn(String log, Object arg1, Object arg2) { logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); + errHandler.flush(); } /** @@ -154,6 +172,7 @@ public class LogUtils { */ public void warn(String log, Throwable e) { logger.log(Level.WARNING, e, () -> " DEBUG - " + log); + errHandler.flush(); } /** @@ -163,6 +182,7 @@ public class LogUtils { */ public void debug(String log) { logger.config(" DEBUG - " + log); + outHandler.flush(); } /** @@ -174,6 +194,7 @@ public class LogUtils { */ public void debug(String log, Object arg1, Object arg2) { logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); + outHandler.flush(); } /** @@ -184,6 +205,7 @@ public class LogUtils { */ public void debug(String log, Throwable e) { logger.log(Level.CONFIG, e, () -> " DEBUG - " + log); + outHandler.flush(); } /** @@ -194,6 +216,7 @@ public class LogUtils { */ public void debug(String log, Object arg) { logger.config(" DEBUG - " + replaceArgs(log, arg)); + outHandler.flush(); } /** @@ -203,6 +226,7 @@ public class LogUtils { */ public void error(String log) { logger.severe(" ERROR - " + log); + errHandler.flush(); } /** @@ -213,6 +237,7 @@ public class LogUtils { */ public void error(String log, Throwable e) { logger.log(Level.SEVERE, e, () -> " ERROR - " + log); + errHandler.flush(); } /** @@ -224,6 +249,7 @@ public class LogUtils { */ public void error(String log, Object arg, Throwable e) { logger.log(Level.SEVERE, e, () -> " ERROR - " + replaceArgs(log, arg)); + errHandler.flush(); } /** @@ -234,6 +260,7 @@ public class LogUtils { */ public void error(String log, Object arg) { logger.severe(" ERROR - " + replaceArgs(log, arg)); + errHandler.flush(); } /** @@ -245,6 +272,7 @@ public class LogUtils { */ public void error(String log, Object arg1, Object arg2) { logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2)); + errHandler.flush(); } /** @@ -257,6 +285,7 @@ public class LogUtils { */ public void error(String log, Object arg1, Object arg2, Object arg3) { logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2, arg3)); + errHandler.flush(); } private static String replaceArgs(String line, Object... args) { diff --git a/tools/auto_test.py b/tools/auto_test.py index d20f8175..693b2ff5 100644 --- a/tools/auto_test.py +++ b/tools/auto_test.py @@ -21,8 +21,8 @@ import sys import time import ast import re +import tempfile from subprocess import Popen -from subprocess import PIPE def print_help(): @@ -274,29 +274,29 @@ def run_target(case, cmd): case_result['times'] = case_result['times'] + 1 start = time.time() - command = Popen(cmd, stdout=PIPE, stderr=PIPE, stdin=PIPE, shell=False) + out_temp = tempfile.TemporaryFile(mode='w+') + command = Popen(cmd, stdout=out_temp, stderr=out_temp, stdin=out_temp, shell=False) + success = True + code = command.wait() + if code != 0: + success = False - out = command.stdout.readlines() - with open("log.txt", mode='a+', encoding='utf-8') as f: + log_name = "log.txt" + if not success: + log_name = "error.txt" + + out_temp.seek(0) + out = out_temp.readlines() + with open(log_name, mode='a+', encoding='utf-8') as f: if len(out) > 0: f.writelines(' '.join(cmd) + "\r\n") for line in out: f.writelines(str(line.strip()) + "\r\n") + out_temp.close() - success = True - error = command.stderr.readlines() - with open("error.txt", mode='a+', encoding='utf-8') as f: - if len(error) > 0: - f.writelines(' '.join(cmd) + "\r\n") - for line in error: - f.writelines(str(line.strip()) + "\r\n") - - code = command.wait() - if code != 0: - success = False end = time.time() case_result['total_cost'] = case_result['total_cost'] + (end - start) - + out_temp.close() if success: case_result['success'] = case_result['success'] + 1 else: -- Gitee From fd29aeba93b7f90d2d9074ab3029097dd1850a83 Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Fri, 20 Dec 2024 21:44:24 +0800 Subject: [PATCH 3/5] clean codecheck Signed-off-by: wangzeyu --- .../src/main/java/com/ohos/hapsigntool/utils/LogUtils.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java index b2a0113a..2eede8c7 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java @@ -16,7 +16,6 @@ package com.ohos.hapsigntool.utils; import com.ohos.hapsigntool.error.LogConfigException; -import org.apache.logging.log4j.LogManager; import java.io.File; import java.io.FileInputStream; @@ -28,7 +27,6 @@ import java.security.ProtectionDomain; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import java.util.logging.ConsoleHandler; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; @@ -42,7 +40,6 @@ import java.util.regex.Pattern; * @since 2024/12/08 */ public class LogUtils { - private static final org.apache.logging.log4j.Logger log = LogManager.getLogger(LogUtils.class); private static Level level; private static final Map LEVEL_MAP = new HashMap<>(); private static final String DEFAULT_LEVEL = "info"; -- Gitee From 1043c3e4740224dfb51d9d0106245025e986b798 Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Fri, 20 Dec 2024 21:46:46 +0800 Subject: [PATCH 4/5] clean codecheck Signed-off-by: wangzeyu --- .../com/ohos/hapsigntool/utils/LogUtils.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java index 2eede8c7..e4d04196 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java @@ -45,8 +45,8 @@ public class LogUtils { private static final String DEFAULT_LEVEL = "info"; private static final Pattern PATTERN = Pattern.compile("\\{}"); - private static final Handler outHandler; - private static final Handler errHandler; + private static final Handler OUT_HANDLER; + private static final Handler ERR_HANDLER; static { LEVEL_MAP.put(DEFAULT_LEVEL, Level.INFO); @@ -62,10 +62,10 @@ public class LogUtils { } LogFormatter logFormatter = new LogFormatter(); - outHandler = new StreamHandler(System.out, logFormatter); - outHandler.setFilter(record -> record.getLevel() != Level.SEVERE && record.getLevel() != Level.WARNING); - errHandler = new StreamHandler(System.err, logFormatter); - errHandler.setFilter(record -> record.getLevel() == Level.SEVERE || record.getLevel() == Level.WARNING); + OUT_HANDLER = new StreamHandler(System.out, logFormatter); + OUT_HANDLER.setFilter(record -> record.getLevel() != Level.SEVERE && record.getLevel() != Level.WARNING); + ERR_HANDLER = new StreamHandler(System.err, logFormatter); + ERR_HANDLER.setFilter(record -> record.getLevel() == Level.SEVERE || record.getLevel() == Level.WARNING); } private final Logger logger; @@ -78,8 +78,8 @@ public class LogUtils { public LogUtils(Class clazz) { logger = Logger.getLogger(clazz.getName()); logger.setUseParentHandlers(false); - logger.addHandler(outHandler); - logger.addHandler(errHandler); + logger.addHandler(OUT_HANDLER); + logger.addHandler(ERR_HANDLER); logger.setLevel(level); } @@ -90,7 +90,7 @@ public class LogUtils { */ public void info(String log) { logger.info(" INFO - " + log); - outHandler.flush(); + OUT_HANDLER.flush(); } /** @@ -101,7 +101,7 @@ public class LogUtils { */ public void info(String log, Object arg) { logger.info(" INFO - " + replaceArgs(log, arg)); - outHandler.flush(); + OUT_HANDLER.flush(); } /** @@ -113,7 +113,7 @@ public class LogUtils { */ public void info(String log, Object arg1, Object arg2) { logger.info(" INFO - " + replaceArgs(log, arg1, arg2)); - outHandler.flush(); + OUT_HANDLER.flush(); } /** @@ -123,7 +123,7 @@ public class LogUtils { */ public void warn(String log) { logger.warning(" WARN - " + log); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -134,7 +134,7 @@ public class LogUtils { */ public void warn(String log, Object arg) { logger.warning(" WARN - " + replaceArgs(log, arg)); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -146,7 +146,7 @@ public class LogUtils { */ public void warn(String log, Object arg, Throwable e) { logger.log(Level.WARNING, e, () -> " DEBUG - " + replaceArgs(log, arg)); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -158,7 +158,7 @@ public class LogUtils { */ public void warn(String log, Object arg1, Object arg2) { logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -169,7 +169,7 @@ public class LogUtils { */ public void warn(String log, Throwable e) { logger.log(Level.WARNING, e, () -> " DEBUG - " + log); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -179,7 +179,7 @@ public class LogUtils { */ public void debug(String log) { logger.config(" DEBUG - " + log); - outHandler.flush(); + OUT_HANDLER.flush(); } /** @@ -191,7 +191,7 @@ public class LogUtils { */ public void debug(String log, Object arg1, Object arg2) { logger.warning(" WARN - " + replaceArgs(log, arg1, arg2)); - outHandler.flush(); + OUT_HANDLER.flush(); } /** @@ -202,7 +202,7 @@ public class LogUtils { */ public void debug(String log, Throwable e) { logger.log(Level.CONFIG, e, () -> " DEBUG - " + log); - outHandler.flush(); + OUT_HANDLER.flush(); } /** @@ -213,7 +213,7 @@ public class LogUtils { */ public void debug(String log, Object arg) { logger.config(" DEBUG - " + replaceArgs(log, arg)); - outHandler.flush(); + OUT_HANDLER.flush(); } /** @@ -223,7 +223,7 @@ public class LogUtils { */ public void error(String log) { logger.severe(" ERROR - " + log); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -234,7 +234,7 @@ public class LogUtils { */ public void error(String log, Throwable e) { logger.log(Level.SEVERE, e, () -> " ERROR - " + log); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -246,7 +246,7 @@ public class LogUtils { */ public void error(String log, Object arg, Throwable e) { logger.log(Level.SEVERE, e, () -> " ERROR - " + replaceArgs(log, arg)); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -257,7 +257,7 @@ public class LogUtils { */ public void error(String log, Object arg) { logger.severe(" ERROR - " + replaceArgs(log, arg)); - errHandler.flush(); + ERR_HANDLER.flush(); } /** @@ -268,8 +268,8 @@ public class LogUtils { * @param arg2 arg */ public void error(String log, Object arg1, Object arg2) { - logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2)); - errHandler.flush(); + logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2)); + ERR_HANDLER.flush(); } /** @@ -282,7 +282,7 @@ public class LogUtils { */ public void error(String log, Object arg1, Object arg2, Object arg3) { logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2, arg3)); - errHandler.flush(); + ERR_HANDLER.flush(); } private static String replaceArgs(String line, Object... args) { -- Gitee From 76c4b084a43739e935c07c443fa3eb6f655be29e Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Sat, 21 Dec 2024 09:43:50 +0800 Subject: [PATCH 5/5] clean codecheck Signed-off-by: wangzeyu --- .../src/main/java/com/ohos/hapsigntool/utils/LogUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java index e4d04196..825038ad 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java @@ -53,7 +53,7 @@ public class LogUtils { LEVEL_MAP.put("debug", Level.CONFIG); LEVEL_MAP.put("warn", Level.WARNING); LEVEL_MAP.put("error", Level.SEVERE); - String configFileName = "log.config"; + String configFileName = "log.properties"; try { level = LEVEL_MAP.get(getJarConfig(configFileName)); @@ -64,8 +64,9 @@ public class LogUtils { LogFormatter logFormatter = new LogFormatter(); OUT_HANDLER = new StreamHandler(System.out, logFormatter); OUT_HANDLER.setFilter(record -> record.getLevel() != Level.SEVERE && record.getLevel() != Level.WARNING); + OUT_HANDLER.setLevel(level); ERR_HANDLER = new StreamHandler(System.err, logFormatter); - ERR_HANDLER.setFilter(record -> record.getLevel() == Level.SEVERE || record.getLevel() == Level.WARNING); + ERR_HANDLER.setLevel(Level.WARNING); } private final Logger logger; -- Gitee