diff options
Diffstat (limited to 'eelf-logger')
12 files changed, 100 insertions, 127 deletions
diff --git a/eelf-logger/eelf-logger-api/pom.xml b/eelf-logger/eelf-logger-api/pom.xml index 2817cf1..5157e81 100644 --- a/eelf-logger/eelf-logger-api/pom.xml +++ b/eelf-logger/eelf-logger-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>eelf-logger</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>eelf-logger-api</artifactId> diff --git a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/AppLogInfo.java b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/AppLogInfo.java index bdce8d1..1acf7a7 100644 --- a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/AppLogInfo.java +++ b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/AppLogInfo.java @@ -29,7 +29,7 @@ public interface AppLogInfo extends LogInfo { /** * Required field contains UUID which identifies this service instance inside an inventory management system - * (e.g. A&AI) to reference/manage this service as a unit + * to reference/manage this service as a unit * * @return remote VM Name or service the request is acting upon. */ diff --git a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ErrorLogInfo.java b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ErrorLogInfo.java index 876037c..af70c89 100644 --- a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ErrorLogInfo.java +++ b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ErrorLogInfo.java @@ -30,36 +30,29 @@ public interface ErrorLogInfo extends LogInfo { /** * Required field contains an error code representing the error condition. The codes can be chose by * the logging application but they should adhere to the guidelines embodied in the table below: - * <table summary="Error Codes" cellspacing=0 border=1> - * <tr> - * <td style=min-width:50px>Error type</td> - * <td style=min-width:50px>Notes</td> - * </tr> - * <tr> - * <td style=min-width:50px>100</td> - * <td style=min-width:50px>Permission errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>200</td> - * <td style=min-width:50px>Availability errors/Timeouts</td> - * </tr> - * <tr> - * <td style=min-width:50px>300</td> - * <td style=min-width:50px>Data errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>400</td> - * <td style=min-width:50px>Schema errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>500</td> - * <td style=min-width:50px>Business process errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>900</td> - * <td style=min-width:50px>Unknown Errors</td> - * </tr> - * </table> + * + * <div style="display: flex"> + * <div style="border-left: 2px solid black; border-right: 2px solid black;"> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Error Type</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">100</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">200</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">300</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">400</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">500</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;border-bottom: 2px solid black;"> + * 900</p> + * </div> + * <div style="border-right: 2px solid black;"> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Notes</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Permission errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Availability errors/Timeouts</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Data errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Schema errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Business process errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;border-bottom: 2px solid black;"> + * Unknown Errors</p> + * </div> + * </div> * * @return error Code */ diff --git a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/NagiosAlertLevel.java b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/NagiosAlertLevel.java index 3da5fc3..81e0369 100644 --- a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/NagiosAlertLevel.java +++ b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/NagiosAlertLevel.java @@ -21,14 +21,33 @@ package org.onap.dcae.utils.eelf.logger.api.info; /** * Enum for Nagios monitoring/alerting codes as per table below. - * <p> - * <table cellspacing=0 border=1> - * <tr><th>Return Code</th><th>Service State</th><th>Host State</th></tr> - * <tr><td>0</td><td>OK</td><td>UP</td></tr> - * <tr><td>1</td><td>WARNING</td><td>UP or DOWN/UNREACHABLE*</td></tr> - * <tr><td>2</td><td>CRITICAL</td><td>DOWN/UNREACHABLE</td></tr> - * <tr><td>3</td><td>UNKNOWN</td><td>DOWN/UNREACHABLE</td></tr> - * </table> + * + * + * <div style="display: flex"> + * <div style="border-left: 2px solid black; border-right: 2px solid black;"> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Return Code</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">0</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">1</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">2</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;border-bottom: 2px solid black;">3</p> + * </div> + * <div style="border-right: 2px solid black;"> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Service State</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">OK</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">WARNING</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">CRITICAL</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;border-bottom: 2px solid black;"> + * UNKNOWN</p> + * </div> + * <div style="border-right: 2px solid black;"> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Host State</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">UP</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">UP or DOWN/UNREACHABLE*</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">DOWN/UNREACHABLE</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;border-bottom: 2px solid black;"> + * DOWN/UNREACHABLE</p> + * </div> + * </div> * * @author Rajiv Singla */ diff --git a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ResponseLogInfo.java b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ResponseLogInfo.java index 1929e7f..ad09f3d 100644 --- a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ResponseLogInfo.java +++ b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/info/ResponseLogInfo.java @@ -30,43 +30,32 @@ public interface ResponseLogInfo extends LogInfo { * Required field contains application-specific response codes. While error codes are * application-specific, they * should conform categories mentioned in table below in order to provide consistency - * <p> - * <table cellspacing=0 border=1> - * <tr> - * <th style=min-width:50px><b>Error type</b></th> - * <th style=min-width:50px><b>Notes</b></th> - * </tr> - * <tr> - * <td style=min-width:50px>0</td> - * <td style=min-width:50px>Success</td> - * </tr> - * <tr> - * <td style=min-width:50px>100</td> - * <td style=min-width:50px>Permission errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>200</td> - * <td style=min-width:50px>Availability errors/Timeouts</td> - * </tr> - * <tr> - * <td style=min-width:50px>300</td> - * <td style=min-width:50px>Data errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>400</td> - * <td style=min-width:50px>Schema errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>500</td> - * <td style=min-width:50px>Business process errors</td> - * </tr> - * <tr> - * <td style=min-width:50px>900</td> - * <td style=min-width:50px>Unknown Errors</td> - * </tr> - * </table> + * <div style="display: flex"> + * <div style="border-left: 2px solid black; border-right: 2px solid black;"> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Error Type</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">0</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">100</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">200</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">300</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">400</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">500</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;border-bottom: 2px solid black;"> + * 900</p> + * </div> + * <div style="border-right: 2px solid black;"> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Notes</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Success</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Permission errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Availability errors/Timeouts</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Data errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Schema errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;">Business process errors</p> + * <p style="margin: 0;padding: 0 1px 0;border-top: 2px solid black;border-bottom: 2px solid black;"> + * Unknown Errors</p> + * </div> + * </div> * - * @return application-specific error code + * @return error Code */ Integer getResponseCode(); diff --git a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/AuditLog.java b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/AuditLog.java index 952176e..df33941 100644 --- a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/AuditLog.java +++ b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/AuditLog.java @@ -59,6 +59,7 @@ public interface AuditLog { * * @param message log message * @param auditLogSpec audit log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void info(String message, AuditLogSpec auditLogSpec, OptionalLogSpec optionalLogSpec, String... args); @@ -78,6 +79,7 @@ public interface AuditLog { * * @param message log message * @param auditLogSpec audit log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void warn(String message, AuditLogSpec auditLogSpec, OptionalLogSpec optionalLogSpec, String... args); @@ -96,6 +98,7 @@ public interface AuditLog { * * @param message log message * @param auditLogSpec audit log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void error(String message, AuditLogSpec auditLogSpec, OptionalLogSpec optionalLogSpec, String... args); @@ -114,6 +117,7 @@ public interface AuditLog { * * @param message log message * @param auditLogSpec audit log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void fatal(String message, AuditLogSpec auditLogSpec, OptionalLogSpec optionalLogSpec, String... args); diff --git a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/ErrorLog.java b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/ErrorLog.java index 6b27755..900eebf 100644 --- a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/ErrorLog.java +++ b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/ErrorLog.java @@ -57,6 +57,7 @@ public interface ErrorLog { * * @param message log message * @param errorLogSpec error log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void error(String message, ErrorLogSpec errorLogSpec, OptionalLogSpec optionalLogSpec, String... args); @@ -76,6 +77,7 @@ public interface ErrorLog { * * @param message log message * @param errorLogSpec error log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void warn(String message, ErrorLogSpec errorLogSpec, OptionalLogSpec optionalLogSpec, String... args); diff --git a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/MetricLog.java b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/MetricLog.java index ebc33ca..508f791 100644 --- a/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/MetricLog.java +++ b/eelf-logger/eelf-logger-api/src/main/java/org/onap/dcae/utils/eelf/logger/api/log/MetricLog.java @@ -59,6 +59,7 @@ public interface MetricLog { * * @param message log message * @param metricLogSpec metric log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void info(String message, MetricLogSpec metricLogSpec, OptionalLogSpec optionalLogSpec, String... args); @@ -78,6 +79,7 @@ public interface MetricLog { * * @param message log message * @param metricLogSpec metric log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void warn(String message, MetricLogSpec metricLogSpec, OptionalLogSpec optionalLogSpec, String... args); @@ -96,6 +98,7 @@ public interface MetricLog { * * @param message log message * @param metricLogSpec metric log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void error(String message, MetricLogSpec metricLogSpec, OptionalLogSpec optionalLogSpec, String... args); @@ -114,6 +117,7 @@ public interface MetricLog { * * @param message log message * @param metricLogSpec metric log spec + * @param optionalLogSpec optional log spec * @param args argument values for log message interpolation */ void fatal(String message, MetricLogSpec metricLogSpec, OptionalLogSpec optionalLogSpec, String... args); diff --git a/eelf-logger/eelf-logger-logback-impl/pom.xml b/eelf-logger/eelf-logger-logback-impl/pom.xml index b829b51..429457f 100644 --- a/eelf-logger/eelf-logger-logback-impl/pom.xml +++ b/eelf-logger/eelf-logger-logback-impl/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>eelf-logger</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>eelf-logger-logback-impl</artifactId> diff --git a/eelf-logger/eelf-logger-model/pom.xml b/eelf-logger/eelf-logger-model/pom.xml index 50230b0..e3d941b 100644 --- a/eelf-logger/eelf-logger-model/pom.xml +++ b/eelf-logger/eelf-logger-model/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>eelf-logger</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>eelf-logger-model</artifactId> diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml index 05eb504..bb762ae 100644 --- a/eelf-logger/pom.xml +++ b/eelf-logger/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>tca-gen2-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>eelf-logger</artifactId> @@ -39,10 +39,7 @@ <module>eelf-logger-logback-impl</module> </modules> - - <properties> - <!-- PROJECT SETTINGS--> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -54,38 +51,35 @@ <!-- PROJECT DEPENDENCIES --> <slf4j.version>1.7.5</slf4j.version> <logback.version>1.2.3</logback.version> - <lombok.version>1.16.10</lombok.version> - + <lombok.version>1.18.12</lombok.version> <!--TESTING DEPENDENCIES --> <junit.version>4.12</junit.version> - <mockito.version>2.2.11</mockito.version> + <mockito.version>2.22.0</mockito.version> <assertj-core.version>2.6.0</assertj-core.version> <!-- PLUGINS VERSIONS --> - <compiler.plugin.version>3.3</compiler.plugin.version> + <compiler.plugin.version>3.8.0</compiler.plugin.version> <surefire.plugin.version>2.19.1</surefire.plugin.version> <failsafe.plugin.version>2.19.1</failsafe.plugin.version> - <findbugs.plugin.version>3.0.2</findbugs.plugin.version> - <pmd.plugin.version>3.5</pmd.plugin.version> - <javadoc.plugin.version>2.10.4</javadoc.plugin.version> - <source.plugin.version>2.4</source.plugin.version> + <pmd.plugin.version>3.11.0</pmd.plugin.version> + <javadoc.plugin.version>3.0.0</javadoc.plugin.version> + <source.plugin.version>3.2.1</source.plugin.version> <jar.plugin.version>2.4</jar.plugin.version> <deploy.plugin.version>2.8</deploy.plugin.version> - <lombok.plugin.version>1.16.10.0</lombok.plugin.version> + <lombok.plugin.version>1.18.0.0</lombok.plugin.version> <maven.site.plugin>3.5.1</maven.site.plugin> <!--PLUGIN SETTINGS --> - <compiler.source.version>1.7</compiler.source.version> - <compiler.target.version>1.7</compiler.target.version> + <compiler.source.version>11</compiler.source.version> + <compiler.target.version>11</compiler.target.version> <unit.test.pattern>**/*Test.java</unit.test.pattern> <skip.unit.tests>false</skip.unit.tests> <integration.test.pattern>**/*IT.java</integration.test.pattern> <skip.integration.tests>true</skip.integration.tests> <pmd.violation.buildfail>true</pmd.violation.buildfail> - <findbugs.failOnError>true</findbugs.failOnError> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> </properties> @@ -290,34 +284,6 @@ </executions> </plugin> - - <!-- FIND BUGS (STATIC CODE ANALYSIS) PLUGIN --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugs.plugin.version}</version> - <configuration> - <effort>Max</effort> - <threshold>Low</threshold> - <xmlOutput>true</xmlOutput> - <!-- BUILD FAIL ON FINDBUGS ERRORS --> - <failOnError>${findbugs.failOnError}</failOnError> - <excludeFilterFile>${main.basedir}/findbugs-exclude.xml</excludeFilterFile> - <outputDirectory>${project.reporting.outputDirectory}/findbugs</outputDirectory> - <findbugsXmlOutputDirectory>${project.reporting.outputDirectory}/findbugs - </findbugsXmlOutputDirectory> - </configuration> - <executions> - <execution> - <id>analyze-compile</id> - <phase>compile</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- PMD PLUGIN SETUP --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -452,10 +418,6 @@ <artifactId>maven-pmd-plugin</artifactId> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> </plugins> </build> diff --git a/eelf-logger/version.properties b/eelf-logger/version.properties index 2dd836f..bef49d7 100644 --- a/eelf-logger/version.properties +++ b/eelf-logger/version.properties @@ -16,7 +16,7 @@ # major=1 -minor=1 +minor=2 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} |