Skip to content

AMBW-47325 [[Regression][Maven] Maven Goal parameters shows extra log… #749

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AMBW-47325 [[Regression][Maven] Maven Goal parameters shows extra log… #749

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
209 changes: 209 additions & 0 deletions ...-plugin/src/main/java/com/tibco/bw/maven/plugin/log/filter/SystemStreamLogWithFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
package com.tibco.bw.maven.plugin.log.filter;

import java.io.PrintWriter;
import java.io.StringWriter;

import org.apache.maven.plugin.logging.Log;

/**
* "standard" apache output and error output stream logger with filter to remove messages from non BW plugins.
*
* @author lshivara
*/
public class SystemStreamLogWithFilter implements Log
{

private String[] exclusions = { "org.apache.maven", "org.eclipse.aether", "org.eclipse.m2e", "org.eclipse.jgit",
"excludes []", "includes []", "-application", "-ws", "win32", "com.tibco.bw.core.design.project.BwDesignApplication", "/eclipse",
"\\eclipse", "\\src\\test\\resources", "\\src\\main\\resources", "/src/test/resources", "/src/main/resources"};

private String previousLogLine = null;

/**
* @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence)
*/
public void debug(CharSequence content)
{
print("debug", content);
}

/**
* @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence, java.lang.Throwable)
*/
public void debug(CharSequence content, Throwable error)
{
print("debug", content, error);
}

/**
* @see org.apache.maven.plugin.logging.Log#debug(java.lang.Throwable)
*/
public void debug(Throwable error)
{
print("debug", error);
}

/**
* @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence)
*/
public void info(CharSequence content)
{
print("info", content);
}

/**
* @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence, java.lang.Throwable)
*/
public void info(CharSequence content, Throwable error)
{
print("info", content, error);
}

/**
* @see org.apache.maven.plugin.logging.Log#info(java.lang.Throwable)
*/
public void info(Throwable error)
{
print("info", error);
}

/**
* @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence)
*/
public void warn(CharSequence content)
{
print("warn", content);
}

/**
* @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence, java.lang.Throwable)
*/
public void warn(CharSequence content, Throwable error)
{
print("warn", content, error);
}

/**
* @see org.apache.maven.plugin.logging.Log#warn(java.lang.Throwable)
*/
public void warn(Throwable error)
{
print("warn", error);
}

/**
* @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence)
*/
public void error(CharSequence content)
{
System.err.println("[error] " + content.toString());
}

/**
* @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence, java.lang.Throwable)
*/
public void error(CharSequence content, Throwable error)
{
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);

error.printStackTrace(pWriter);

System.err.println("[error] " + content.toString() + "\n\n" + sWriter.toString());
}

/**
* @see org.apache.maven.plugin.logging.Log#error(java.lang.Throwable)
*/
public void error(Throwable error)
{
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);

error.printStackTrace(pWriter);

System.err.println("[error] " + sWriter.toString());
}

/**
* @see org.apache.maven.plugin.logging.Log#isDebugEnabled()
*/
public boolean isDebugEnabled()
{
// TODO Not sure how best to set these for this implementation...
return false;
}

/**
* @see org.apache.maven.plugin.logging.Log#isInfoEnabled()
*/
public boolean isInfoEnabled()
{
return true;
}

/**
* @see org.apache.maven.plugin.logging.Log#isWarnEnabled()
*/
public boolean isWarnEnabled()
{
return true;
}

/**
* @see org.apache.maven.plugin.logging.Log#isErrorEnabled()
*/
public boolean isErrorEnabled()
{
return true;
}

private void print(String prefix, CharSequence content)
{
boolean nonBWLog = false;
String contentString = content.toString();
for (String exclude: exclusions) {
nonBWLog = contentString.contains(exclude) ? true : false;
if (nonBWLog) {
break;
}
}
if (!nonBWLog) {
printLog(prefix, contentString);
}
}

private void printLog(String prefix, String content)
{
String logPrintLine = content.toString();
//log formatting - Remove successive blank lines in log
if (previousLogLine == null || previousLogLine.isEmpty()) {
if (!logPrintLine.isEmpty()) {
System.out.println("[" + prefix + "] " + logPrintLine);
}
}else {
System.out.println("[" + prefix + "] " + logPrintLine);
}
previousLogLine = logPrintLine;
}


private void print(String prefix, Throwable error)
{
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);

error.printStackTrace(pWriter);
printLog(prefix, sWriter.toString());
}

private void print(String prefix, CharSequence content, Throwable error)
{
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);

error.printStackTrace(pWriter);
printLog(prefix, content.toString() + "\n" + sWriter.toString());
}

}
48 changes: 28 additions & 20 deletions ...n-plugin/src/main/java/com/tibco/bw/maven/plugin/process/BWDesignUtilityExecutorMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.tibco.bw.maven.plugin.process;

import com.tibco.bw.maven.plugin.utils.BWProjectUtils;
import com.tibco.bw.maven.plugin.utils.Constants;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
Expand All @@ -12,12 +16,9 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import com.tibco.bw.maven.plugin.log.filter.SystemStreamLogWithFilter;
import com.tibco.bw.maven.plugin.utils.BWProjectUtils;
import com.tibco.bw.maven.plugin.utils.Constants;

@Mojo(name = "bwdesignUtility")
public class BWDesignUtilityExecutorMojo extends AbstractMojo{
Expand Down Expand Up @@ -125,7 +126,7 @@ private void executeCommand() throws MojoExecutionException {
logger.info("--------------------- Executing BWDesign Utility Command : "+ commandName +" -----------------------");
logger.debug("Launching bwdesign utility with params: " + params);

printProcessOutput(process);
printProcessOutput(process, params);

} catch (Exception e) {
e.printStackTrace();
Expand Down Expand Up @@ -156,7 +157,7 @@ private void generateProcessDiagram() throws MojoExecutionException {
logger.info("---------------------Generating Process diagram-----------------------");
logger.debug("Launching bwdesign utility with params: " + params);

printProcessOutput(process);
printProcessOutput(process, params);

} catch (Exception e) {
e.printStackTrace();
Expand Down Expand Up @@ -186,7 +187,7 @@ private void generateManifestJSON() throws MojoExecutionException {
logger.info("---------------------Generating Manifest JSON-----------------------");
logger.debug("Launching bwdesign utility with params: " + params);

printProcessOutput(process);
printProcessOutput(process, params);

} catch (Exception e) {
e.printStackTrace();
Expand Down Expand Up @@ -226,8 +227,7 @@ private void validateBWProject() throws MojoExecutionException{
logger.info("---------------------Validating BW Project-----------------------");
logger.debug("Launching bwdesign utility with params: " + params);
final Process process = builder.start();

printProcessOutput(process);
printProcessOutput(process, params);

} catch (IOException e) {
e.printStackTrace();
Expand Down Expand Up @@ -257,7 +257,7 @@ private void importWorkspace() throws MojoExecutionException {
logger.info("-----------------Import Projects to Workspaces-------------------");
logger.debug("Launching bwdesign utility with params: " + params);

printProcessOutput(process);
printProcessOutput(process, params);

} catch (Exception e) {
e.printStackTrace();
Expand All @@ -275,17 +275,25 @@ private String projectList() {
return String.join(",", projectList);
}

private void printProcessOutput(Process process) throws IOException {
BufferedReader reader= null;
private void printProcessOutput(Process process, List<String> params) throws IOException {
BufferedReader reader = null;
String line = null;

reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
while ((line = reader.readLine()) != null) {
//System.err.println(line);
logger.info(line);
if (!params.contains(line)) {
logger.info(line);
}
}

reader.close();
}


@Override
public Log getLog() {
if (logger == null) {
logger = new SystemStreamLogWithFilter();
}
return logger;
}
}