This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch maven-metrics
in repository https://gitbox.apache.org/repos/asf/maven-studies.git
commit 463ff049a3515aa43758e0b5812bdcfe7d8da7f8
Author: Enrico Olivelli <eolive...@apache.org>
AuthorDate: Sun Apr 5 14:27:19 2020 +0200
Clean up checkstyle
---
.../maven/lifecycle/internal/LifecycleStarter.java | 2 +-
.../metrics/internal/DefaultMetricsSystem.java | 20 ++++++-----------
.../main/java/org/apache/maven/cli/MavenCli.java | 25 +++++++++++-----------
3 files changed, 20 insertions(+), 27 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
index 7d04361..e2a53ad 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
@@ -135,7 +135,7 @@ public class LifecycleStarter
}
long startBuild = System.currentTimeMillis();
builder.build( session, reactorContext, projectBuilds,
taskSegments, reactorBuildStatus );
- metricsSystem.getMetricsContext().getSummary( "buildTime"
).add(System.currentTimeMillis() - startBuild);
+ metricsSystem.getMetricsContext().getSummary( "buildTime" ).add(
System.currentTimeMillis() - startBuild );
}
catch ( Exception e )
{
diff --git
a/maven-core/src/main/java/org/apache/maven/metrics/internal/DefaultMetricsSystem.java
b/maven-core/src/main/java/org/apache/maven/metrics/internal/DefaultMetricsSystem.java
index 79dd9a4..e88f953 100644
---
a/maven-core/src/main/java/org/apache/maven/metrics/internal/DefaultMetricsSystem.java
+++
b/maven-core/src/main/java/org/apache/maven/metrics/internal/DefaultMetricsSystem.java
@@ -1,6 +1,5 @@
package org.apache.maven.metrics.internal;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,16 +19,12 @@ package org.apache.maven.metrics.internal;
* under the License.
*/
-
-import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.maven.classrealm.ClassRealmManager;
import org.apache.maven.metrics.MetricsContext;
import org.apache.maven.metrics.MetricsProvider;
import org.apache.maven.metrics.MetricsSystem;
import org.apache.maven.metrics.impl.NullMetricsProvider;
-import org.codehaus.plexus.logging.Logger;
/**
* Default Implementation of Metrics System Runtime.
@@ -38,20 +33,19 @@ import org.codehaus.plexus.logging.Logger;
*/
@Singleton
@Named( MetricsSystem.HINT )
-public class DefaultMetricsSystem implements MetricsSystem {
+public class DefaultMetricsSystem implements MetricsSystem
+{
- @Inject
- public DefaultMetricsSystem() {
- }
-
@Override
- public MetricsContext getMetricsContext() {
+ public MetricsContext getMetricsContext()
+ {
return NullMetricsProvider.INSTANCE.getRootContext();
}
@Override
- public MetricsProvider getMetricsProvider() {
+ public MetricsProvider getMetricsProvider()
+ {
return NullMetricsProvider.INSTANCE;
}
-
+
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 58abe73..ffbd3ed 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -118,7 +118,6 @@ import java.util.regex.Pattern;
import static org.apache.maven.cli.ResolveFile.resolveFile;
import org.apache.maven.metrics.MetricsProviderLifeCycleException;
import org.apache.maven.metrics.MetricsSystem;
-import org.apache.maven.metrics.internal.DefaultMetricsSystem;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
// TODO push all common bits back to plexus cli and prepare for transition to
Guice. We don't need 50 ways to make CLIs
@@ -158,7 +157,7 @@ public class MavenCli
private Logger slf4jLogger;
private EventSpyDispatcher eventSpyDispatcher;
-
+
private MetricsSystem metricsSystem;
private ModelProcessor modelProcessor;
@@ -684,10 +683,8 @@ public class MavenCli
container.getLoggerManager().setThresholds(
cliRequest.request.getLoggingLevel() );
- metricsSystem = container.lookup(MetricsSystem.class);
- System.out.println("metricsSystem: "+metricsSystem);
- System.out.println("LIST: "+container.lookupList(MetricsSystem.class));
-
+ metricsSystem = container.lookup( MetricsSystem.class );
+
eventSpyDispatcher = container.lookup( EventSpyDispatcher.class );
DefaultEventSpyContext eventSpyContext = new DefaultEventSpyContext();
@@ -979,14 +976,16 @@ public class MavenCli
private int execute( CliRequest cliRequest )
throws MavenExecutionRequestPopulationException
{
- slf4jLogger.info("MetricsSystem: " + metricsSystem);
- try {
+ try
+ {
metricsSystem.getMetricsProvider().start();
- } catch (MetricsProviderLifeCycleException error) {
- slf4jLogger.error( "Cannot start MetricsProvider, falling back to
default", error);
- metricsSystem = new DefaultMetricsSystem();
}
-
+ catch ( MetricsProviderLifeCycleException error )
+ {
+ slf4jLogger.error( "Error while starting MetricsProvider "
+ + metricsSystem.getClass() + ", falling back to default",
error );
+ }
+
MavenExecutionRequest request =
executionRequestPopulator.populateDefaults( cliRequest.request );
eventSpyDispatcher.onEvent( request );
@@ -996,7 +995,7 @@ public class MavenCli
eventSpyDispatcher.onEvent( result );
eventSpyDispatcher.close();
-
+
metricsSystem.getMetricsProvider().stop();
if ( result.hasExceptions() )
