Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 3 deletions checkstyle-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

<suppressions>
<suppress checks="AbbreviationAsWordInName|MemberName|ParameterName|ConstantName"/>
<suppress checks="PackageName" files="com.harman.ignite.domain.remoteInhibit" />
<suppress checks="PackageName" files="org.eclipse.ecsp.domain.remoteInhibit" />
<suppress checks="TypeName" files=".*\.java"/>
<suppress checks="CyclomaticComplexity" files="com.harman.ignite.ro.processor.strategy.impl.AbstractStreamProcessor.java"/>
<suppress checks="MethodLength" files="com.harman.ignite.ro.processor.(strategy.impl.AbstractStreamProcessor|ROStreamProcessorUnitTest).java"/>
</suppressions>
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ecsp</groupId>
<artifactId>utils</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>

<name>Utils</name>
<description>Utility library for ECSP project</description>
Expand Down Expand Up @@ -91,7 +91,7 @@
</checkstyle.suppressions.location>
<sonar.java.checkstyle.reportPaths>${project.build.directory}/checkstyle-result.xml
</sonar.java.checkstyle.reportPaths>
<entities.version>1.0.0</entities.version>
<entities.version>1.1.0</entities.version>
<!-- Sonar plugin properties -->
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<sonar.java.source>17</sonar.java.source>
Expand All @@ -110,8 +110,8 @@
<spring.boot.autoconfigure>3.3.3</spring.boot.autoconfigure>
<snakeyaml.version>2.0</snakeyaml.version>
<sonar.coverage.exclusions>
src/main/java/com/harman/ignite/utils/logger/IgniteCallerDataConverter.java,
src/main/java/com/harman/ignite/utils/logger/IgniteThrowableProxyConverter.java
src/main/java/org/eclipse/ecsp/utils/logger/IgniteCallerDataConverter.java,
src/main/java/org/eclipse/ecsp/utils/logger/IgniteThrowableProxyConverter.java
</sonar.coverage.exclusions>
</properties>

Expand Down Expand Up @@ -375,8 +375,8 @@
report. -->
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
<excludes>
<exclude>com/harman/ignite/utils/logger/IgniteCallerDataConverter.*</exclude>
<exclude>com/harman/ignite/utils/logger/IgniteThrowableProxyConverter.*</exclude>
<exclude>org/eclipse/ecsp/utils/logger/IgniteCallerDataConverter.*</exclude>
<exclude>org/eclipse/ecsp/utils/logger/IgniteThrowableProxyConverter.*</exclude>
</excludes>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.diagnostic;
package org.eclipse.ecsp.diagnostic;

/** Constants for diagnostic module. */
public class DiagnosticConstants {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.diagnostic;
package org.eclipse.ecsp.diagnostic;

import java.util.HashMap;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.diagnostic;
package org.eclipse.ecsp.diagnostic;

/**
* This interface is used to report the diagnostic data.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.diagnostic;
package org.eclipse.ecsp.diagnostic;

/**
* This enum is used to report the diagnostic result.
Expand All @@ -50,9 +50,9 @@
* @since 1.0
* @version 1.0
*
* @see com.harman.ignite.diagnostic.DiagnosticReporter
* @see com.harman.ignite.diagnostic.DiagnosticData
* @see com.harman.ignite.diagnostic.DiagnosticConstants
* @see org.eclipse.ecsp.diagnostic.DiagnosticReporter
* @see org.eclipse.ecsp.diagnostic.DiagnosticData
* @see org.eclipse.ecsp.diagnostic.DiagnosticConstants
*
* @author avadakkootko
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,12 @@
* *******************************************************************************
*/

package com.harman.ignite.diagnostic;
package org.eclipse.ecsp.diagnostic;

import com.harman.ignite.healthcheck.InvalidMetricNamingException;
import com.harman.ignite.healthcheck.InvalidMetricNamingException;
import com.harman.ignite.utils.logger.IgniteLogger;
import com.harman.ignite.utils.logger.IgniteLoggerFactory;
import com.harman.ignite.utils.metrics.IgniteDiagnosticGuage;
import org.eclipse.ecsp.healthcheck.InvalidMetricNamingException;
import org.eclipse.ecsp.utils.logger.IgniteLogger;
import org.eclipse.ecsp.utils.logger.IgniteLoggerFactory;
import org.eclipse.ecsp.utils.metrics.IgniteDiagnosticGuage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
Expand All @@ -65,11 +64,11 @@
* @since 1.0
* @version 1.0
*
* @see com.harman.ignite.diagnostic.DiagnosticReporter
* @see com.harman.ignite.diagnostic.DiagnosticData
* @see com.harman.ignite.diagnostic.DiagnosticResult
* @see com.harman.ignite.utils.metrics.IgniteDiagnosticGuage
* @see com.harman.ignite.healthcheck.InvalidMetricNamingException
* @see org.eclipse.ecsp.diagnostic.DiagnosticReporter
* @see org.eclipse.ecsp.diagnostic.DiagnosticData
* @see org.eclipse.ecsp.diagnostic.DiagnosticResult
* @see org.eclipse.ecsp.utils.metrics.IgniteDiagnosticGuage
* @see org.eclipse.ecsp.healthcheck.InvalidMetricNamingException
* @see org.springframework.beans.factory.annotation.Autowired
* @see org.springframework.beans.factory.annotation.Value
* @see org.springframework.stereotype.Component
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
* *******************************************************************************
*/

package com.harman.ignite.diagnostic;
package org.eclipse.ecsp.diagnostic;

import com.harman.ignite.utils.logger.IgniteLogger;
import com.harman.ignite.utils.logger.IgniteLoggerFactory;
import org.eclipse.ecsp.utils.logger.IgniteLogger;
import org.eclipse.ecsp.utils.logger.IgniteLoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
Expand All @@ -63,9 +63,9 @@
* @since 1.0
* @version 1.0
*
* @see com.harman.ignite.diagnostic.DiagnosticReporter
* @see com.harman.ignite.diagnostic.DiagnosticData
* @see com.harman.ignite.diagnostic.DiagnosticResult
* @see org.eclipse.ecsp.diagnostic.DiagnosticReporter
* @see org.eclipse.ecsp.diagnostic.DiagnosticData
* @see org.eclipse.ecsp.diagnostic.DiagnosticResult
* @see org.springframework.beans.factory.annotation.Autowired
* @see org.springframework.beans.factory.annotation.Value
* @see org.springframework.stereotype.Component
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.healthcheck;
package org.eclipse.ecsp.healthcheck;

/**
* Contract for health monitors that intend to publish health to the HealthService.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
* *******************************************************************************
*/

package com.harman.ignite.healthcheck;
package org.eclipse.ecsp.healthcheck;

import com.harman.ignite.utils.logger.IgniteLogger;
import com.harman.ignite.utils.logger.IgniteLoggerFactory;
import com.harman.ignite.utils.metrics.IgniteHealthGuage;
import jakarta.annotation.PostConstruct;
import org.eclipse.ecsp.utils.logger.IgniteLogger;
import org.eclipse.ecsp.utils.logger.IgniteLoggerFactory;
import org.eclipse.ecsp.utils.metrics.IgniteHealthGuage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
Expand All @@ -60,8 +60,8 @@
* @since 1.0
* @version 1.0
*
* @see com.harman.ignite.healthcheck.HealthMonitor
* @see com.harman.ignite.utils.metrics.IgniteHealthGuage
* @see org.eclipse.ecsp.healthcheck.HealthMonitor
* @see org.eclipse.ecsp.utils.metrics.IgniteHealthGuage
* @see jakarta.annotation.PostConstruct
* @see org.springframework.beans.factory.annotation.Autowired
* @see org.springframework.beans.factory.annotation.Value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.healthcheck;
package org.eclipse.ecsp.healthcheck;

/**
* Enables the application implementing health service to take appropriate action on critical health monitor failure.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.healthcheck;
package org.eclipse.ecsp.healthcheck;

/**
* This class is used to store the health service state.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.harman.ignite.healthcheck;
package org.eclipse.ecsp.healthcheck;

/**
* Custom exception for duplicate metric name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
* *******************************************************************************
*/

package com.harman.ignite.healthcheck;
package org.eclipse.ecsp.healthcheck;

import com.harman.ignite.utils.logger.IgniteLogger;
import com.harman.ignite.utils.logger.IgniteLoggerFactory;
import org.eclipse.ecsp.utils.logger.IgniteLogger;
import org.eclipse.ecsp.utils.logger.IgniteLoggerFactory;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.filter;
package org.eclipse.ecsp.utils.filter;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.turbo.TurboFilter;
import ch.qos.logback.core.spi.FilterReply;
import com.harman.ignite.utils.logger.LoggerUtils;
import org.eclipse.ecsp.utils.logger.LoggerUtils;
import org.slf4j.Marker;

import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -77,7 +77,7 @@ public void start() {
* This method is invoked in deciding if log statement would be logged or not.
* The filter is configured in logback.xml, where we are providing "suppressTimeInMs" like below:
* <br><br>
* &lt;turboFilter class="com.harman.ignite.utils.filter.DuplicateExceptionFilter"&gt;<br>
* &lt;turboFilter class="org.eclipse.ecsp.utils.filter.DuplicateExceptionFilter"&gt;<br>
* &nbsp;&nbsp;&lt;suppressTimeInMs&gt;60000&lt;/suppressTimeInMs&gt;<br>
* &lt;/turboFilter>&gt;
*
Expand Down Expand Up @@ -159,7 +159,7 @@ public long getSuppressTimeInMs() {

/**
* The value of suppressTimeInMs will be taken from logback.xml. Refer below for an example:
* &lt;turboFilter class="com.harman.ignite.utils.filter.DuplicateExceptionFilter"&gt;<br>
* &lt;turboFilter class="org.eclipse.ecsp.utils.filter.DuplicateExceptionFilter"&gt;<br>
* &nbsp;&nbsp;&lt;suppressTimeInMs&gt;60000&lt;/suppressTimeInMs&gt;<br>
* &lt;/turboFilter&gt;
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.logger;
package org.eclipse.ecsp.utils.logger;

import ch.qos.logback.classic.pattern.CallerDataConverter;
import ch.qos.logback.classic.spi.CallerData;
Expand All @@ -52,7 +52,7 @@
* Customizations include:<br>
* 1. removing of "caller" from log message.<br>
* 2. Printing short-form of fully qualified package <br>
* name(eg:com.harman.ignite.utils.logger.IgniteCallerDataConverter
* name(eg:org.eclipse.ecsp.utils.logger.IgniteCallerDataConverter
* will be replaced as c.h.i.u.l.IgniteCallerDataConverter)
*
* @author vishnu.k;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.logger;
package org.eclipse.ecsp.utils.logger;

import com.harman.ignite.entities.IgniteEvent;
import org.eclipse.ecsp.entities.IgniteEvent;

/**
* Interface for IgniteLogger.
Expand All @@ -47,7 +47,7 @@
* @since 1.0
* @version 1.0
*
* @see com.harman.ignite.entities.IgniteEvent
* @see org.eclipse.ecsp.entities.IgniteEvent
*/
public interface IgniteLogger {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.logger;
package org.eclipse.ecsp.utils.logger;

/**
* Factory class which gives a logger instance for the requested type.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.logger;
package org.eclipse.ecsp.utils.logger;

import ch.qos.logback.classic.PatternLayout;
import com.harman.ignite.entities.IgniteEvent;
import org.eclipse.ecsp.entities.IgniteEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -55,7 +55,7 @@
* @since 1.0
* @version 1.0
*
* @see com.harman.ignite.entities.IgniteEvent
* @see org.eclipse.ecsp.entities.IgniteEvent
* @see org.slf4j.Logger
* @see org.slf4j.LoggerFactory
*/
Expand All @@ -72,13 +72,15 @@ public class IgniteLoggerImpl implements IgniteLogger {
*/
private IgniteLoggerImpl(Class<?> clazz) {
PatternLayout.defaultConverterMap
.put("caller", com.harman.ignite.utils.logger.IgniteCallerDataConverter.class.getName());
.put("caller", org.eclipse.ecsp.utils.logger.IgniteCallerDataConverter.class.getName());
PatternLayout.defaultConverterMap
.put("ex", com.harman.ignite.utils.logger.IgniteThrowableProxyConverter.class.getName());
.put("ex", org.eclipse.ecsp.utils.logger.IgniteThrowableProxyConverter.class.getName());
PatternLayout.defaultConverterMap
.put("exception", com.harman.ignite.utils.logger.IgniteThrowableProxyConverter.class.getName());
.put("exception",
org.eclipse.ecsp.utils.logger.IgniteThrowableProxyConverter.class.getName());
PatternLayout.defaultConverterMap
.put("throwable", com.harman.ignite.utils.logger.IgniteThrowableProxyConverter.class.getName());
.put("throwable",
org.eclipse.ecsp.utils.logger.IgniteThrowableProxyConverter.class.getName());
logger = LoggerFactory.getLogger(clazz);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.logger;
package org.eclipse.ecsp.utils.logger;

import ch.qos.logback.classic.pattern.ThrowableHandlingConverter;
import ch.qos.logback.classic.spi.ILoggingEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.logger;
package org.eclipse.ecsp.utils.logger;

import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@
* *******************************************************************************
*/

package com.harman.ignite.utils.metrics;
package org.eclipse.ecsp.utils.metrics;

import com.harman.ignite.utils.logger.IgniteLogger;
import com.harman.ignite.utils.logger.IgniteLoggerFactory;
import io.prometheus.client.Counter;
import org.eclipse.ecsp.utils.logger.IgniteLogger;
import org.eclipse.ecsp.utils.logger.IgniteLoggerFactory;


/**
* Abstract class for creating Prometheus counter metric.
Expand Down
Loading