Skip to content

[fix] Passage Log.info to Log.error to make visible in jenkins job #15

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

Merged
boutss merged 1 commit into from
Aug 29, 2019
Merged

[fix] Passage Log.info to Log.error to make visible in jenkins job #15

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
4 changes: 2 additions & 2 deletions src/main/java/com/efluid/tcbc/TestAPIsDependenceJar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ protected int logBilan() {
super.logBilan();
doLogList(apis, "Apis used of library : " + libraryControl);
if (apis.isEmpty()) {
LOG.info("Aucun appel au jar {}. Verifier son nom et s'il est bien présent dans le classpath : ", libraryControl);
LOG.info(System.getProperty("java.class.path"));
LOG.error("Aucun appel au jar {}. Verifier son nom et s'il est bien présent dans le classpath : ", libraryControl);
LOG.error(System.getProperty("java.class.path"));
} else if (erreur) {
return apis.size();
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/efluid/tcbc/TestControleClasseEnDoublon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ protected void traitementClasseEnCours() {
@Override
protected int logBilan() {
super.logBilan();
LOG.info("|=== Classes en doublon ===|");
LOG.error("|=== Classes en doublon ===|");
classesEnDoublon.forEach((nom, classes) -> {
LOG.info("[{}]", nom);
classes.forEach(classe -> LOG.info("\t{}", classe.getNomJar()));
LOG.error("[{}]", nom);
classes.forEach(classe -> LOG.error("\t{}", classe.getNomJar()));
});
LOG.info("Classes trouvees : {}", classesParcourues.size());
LOG.info("Classes en doublon : {}", classesEnDoublon.size());
LOG.info("Classes en doublon exclues : {}", getExclusions().get(ERREUR).size());
LOG.error("Classes trouvees : {}", classesParcourues.size());
LOG.error("Classes en doublon : {}", classesEnDoublon.size());
LOG.error("Classes en doublon exclues : {}", getExclusions().get(ERREUR).size());
return classesEnDoublon.size();
}
}
8 changes: 4 additions & 4 deletions src/main/java/com/efluid/tcbc/TestDependenceJar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ protected void terminate() {
private void logDependances(String nom, Map<String, AtomicLong> dependances, boolean graphViz) {
TreeMap<String, AtomicLong> mapTrie;
if (!dependances.isEmpty()) {
LOG.info(nom + " :");
LOG.error(nom + " :");
mapTrie = new TreeMap<String, AtomicLong>(new ValueComparator(dependances));
mapTrie.putAll(dependances);
for (String cle : mapTrie.keySet()) {
LOG.info("\treference {} type class of {}", mapTrie.get(cle), cle);
LOG.error("\treference {} type class of {}", mapTrie.get(cle), cle);
if (graphViz) {
addToFichierGraphViz(nom, cle, mapTrie.get(cle).toString());
}
Expand All @@ -101,8 +101,8 @@ private void addToFichierGraphViz(String jar, String dependance, String nombre)
}

private void logJarNonReference() {
LOG.info("");
getJarsTraites().stream().sorted().filter(jar -> !dependances.containsKey(jar.getNom())).forEach(jar -> LOG.info("jar not referenced : {}", jar.getNom()));
LOG.error("");
getJarsTraites().stream().sorted().filter(jar -> !dependances.containsKey(jar.getNom())).forEach(jar -> LOG.error("jar not referenced : {}", jar.getNom()));
}

@Override
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/efluid/tcbc/process/BilanControleByteCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@ public int execute() {

private void loggerSynthese() {
TestControleByteCode.doLogList(controle.getClassesReferenceesNonTrouveesOuChargees().values(), "Classes référencées non trouvées :");
LOG.info("Classes en erreur lors du chargement : {}", controle.getClassesReferenceesNonTrouveesOuChargees().size());
LOG.error("Classes en erreur lors du chargement : {}", controle.getClassesReferenceesNonTrouveesOuChargees().size());
controle.getClassesReferenceesNonTrouveesOuChargees().values().forEach(classe ->
LOG.info("\t{}", classe));
LOG.info("Jars en erreur : {}", controle.getJarsTraites().stream().filter(Jar::isErreur).count());
LOG.info("=== Synthèse classes en erreur ({}) ===", controle.getJarsTraites().stream().mapToLong(jar -> jar.getClassesEnErreur().size()).sum());
LOG.error("\t{}", classe));
LOG.error("Jars en erreur : {}", controle.getJarsTraites().stream().filter(Jar::isErreur).count());
LOG.error("=== Synthèse classes en erreur ({}) ===", controle.getJarsTraites().stream().mapToLong(jar -> jar.getClassesEnErreur().size()).sum());
controle.getJarsTraites().stream().filter(Jar::isErreur).forEach(jar ->
LOG.info("\t{} : {}", jar.getNom(), jar.getClassesEnErreur().size() + lineSeparator()));
LOG.info("Nombre d'erreurs totales : {}", controle.getJarsTraites().stream().flatMap(jar -> jar.getClassesEnErreur().stream()).mapToInt(Classe::getNbErreurs).sum());
LOG.error("\t{} : {}", jar.getNom(), jar.getClassesEnErreur().size() + lineSeparator()));
LOG.error("Nombre d'erreurs totales : {}", controle.getJarsTraites().stream().flatMap(jar -> jar.getClassesEnErreur().stream()).mapToInt(Classe::getNbErreurs).sum());
}

private void loggerJar(Jar jar) {
if (!jar.getClassesEnErreur().isEmpty()) {
LOG.info("|=== {} ===|", jar.getNom());
LOG.info("\t|=== Classes en erreur ===|");
LOG.error("|=== {} ===|", jar.getNom());
LOG.error("\t|=== Classes en erreur ===|");
}
for (Classe classeEnErreur : jar.getClassesEnErreur()) {
LOG.error("\t\t{} : {} erreur(s)", classeEnErreur.getNom(), classeEnErreur.getNbErreurs());
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/efluid/tcbc/process/ScanneClasspath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@ private void chargerConfiguration() {
LOG.error("STACKTRACE", ex);
}
if (scanByJarExclusion()) {
LOG.info("Jars excluded : {}", jarsExcluded);
LOG.error("Jars excluded : {}", jarsExcluded);
} else {
LOG.info("Jars inclus : {}", jarsInclus);
LOG.error("Jars inclus : {}", jarsInclus);
}

LOG.info("Exclusion des classes a ne pas traiter : {}", filtreClassesExclues);
LOG.info("Erreurs a ne pas traiter: {}", filtreErreursExclues);
LOG.error("Exclusion des classes a ne pas traiter : {}", filtreClassesExclues);
LOG.error("Erreurs a ne pas traiter: {}", filtreErreursExclues);
}

/**
Expand Down Expand Up @@ -255,7 +255,7 @@ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attr
* Parcours toutes les classes du jar en cours
*/
private void controlerJar() {
LOG.info("Scans jar : " + jarEnCours);
LOG.error("Scans jar : " + jarEnCours);
try (JarFile jar = new JarFile(jarEnCours.getNom())) {
Enumeration<JarEntry> enumeration = jar.entries();
JarEntry jarEntry;
Expand Down Expand Up @@ -310,8 +310,8 @@ public boolean isExclu(Exclusion typeExclusion, final String str) {
public static void doLogList(Collection<String> col, String msgEntete) {
if (col != null && !col.isEmpty()) {
List<String> liste = (List<String>) ((col instanceof List) ? col : new ArrayList<>(col));
LOG.info("|==== {} ====|", msgEntete);
liste.stream().sorted().forEach(s -> LOG.info("\t{}", s));
LOG.error("|==== {} ====|", msgEntete);
liste.stream().sorted().forEach(s -> LOG.error("\t{}", s));
}
}

Expand Down