From 3b27387c768ed72933b1db528628e14126d6aaa5 Mon Sep 17 00:00:00 2001 From: oowekyala Date: Sun, 6 Aug 2017 22:22:17 +0200 Subject: [PATCH 1/2] Updated changelog --- .../net/sourceforge/pmd/lang/{ => metrics}/MetricKeyUtil.java | 2 +- .../pmd/lang/java/metrics/ParameterizedMetricKeyTest.java | 2 +- .../sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java | 2 +- src/site/markdown/overview/changelog.md | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) rename pmd-core/src/main/java/net/sourceforge/pmd/lang/{ => metrics}/MetricKeyUtil.java (97%) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/MetricKeyUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java similarity index 97% rename from pmd-core/src/main/java/net/sourceforge/pmd/lang/MetricKeyUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java index 79a2ed8971..b724014d23 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/MetricKeyUtil.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.lang; +package net.sourceforge.pmd.lang.metrics; import java.util.Objects; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java index e433861d14..5ab34f3039 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import net.sourceforge.pmd.lang.MetricKeyUtil; +import net.sourceforge.pmd.lang.metrics.MetricKeyUtil; import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration; import net.sourceforge.pmd.lang.java.metrics.api.JavaClassMetricKey; import net.sourceforge.pmd.lang.java.metrics.api.JavaOperationMetricKey; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java index f5ea7c30eb..dd7bba80eb 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java @@ -14,7 +14,7 @@ import java.util.Random; import org.junit.Test; -import net.sourceforge.pmd.lang.MetricKeyUtil; +import net.sourceforge.pmd.lang.metrics.MetricKeyUtil; import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration; diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md index 2c02b85ceb..26d98f53d7 100644 --- a/src/site/markdown/overview/changelog.md +++ b/src/site/markdown/overview/changelog.md @@ -132,4 +132,5 @@ and include them to such reports. * [#530](https://github.com/pmd/pmd/pull/530): \[java] Fix issue #527: Lombok getter annotation on enum is not recognized correctly - [Clément Fournier](https://github.com/oowekyala) * [#535](https://github.com/pmd/pmd/pull/535): \[apex] Fix broken Apex visitor adapter - [Clément Fournier](https://github.com/oowekyala) * [#529](https://github.com/pmd/pmd/pull/529): \[java] Abstracted the Java metrics framework - [Clément Fournier](https://github.com/oowekyala) +* [#542](https://github.com/pmd/pmd/pull/542): \[java] Metrics abstraction - [Clément Fournier](https://github.com/oowekyala) From f982acca32cfa52e9f6753523a3439647cb9b55b Mon Sep 17 00:00:00 2001 From: oowekyala Date: Sun, 6 Aug 2017 23:29:43 +0200 Subject: [PATCH 2/2] Checkstyle --- .../java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java | 2 -- .../pmd/lang/java/metrics/ParameterizedMetricKeyTest.java | 2 +- .../sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java index b724014d23..6ede93208a 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/metrics/MetricKeyUtil.java @@ -7,8 +7,6 @@ package net.sourceforge.pmd.lang.metrics; import java.util.Objects; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.metrics.Metric; -import net.sourceforge.pmd.lang.metrics.MetricKey; /** * Holds the key creation method until we move it to the MetricKey interface. diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java index 5ab34f3039..23a8ab7f03 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ParameterizedMetricKeyTest.java @@ -12,11 +12,11 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import net.sourceforge.pmd.lang.metrics.MetricKeyUtil; import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration; import net.sourceforge.pmd.lang.java.metrics.api.JavaClassMetricKey; import net.sourceforge.pmd.lang.java.metrics.api.JavaOperationMetricKey; import net.sourceforge.pmd.lang.metrics.MetricKey; +import net.sourceforge.pmd.lang.metrics.MetricKeyUtil; import net.sourceforge.pmd.lang.metrics.MetricVersion; import net.sourceforge.pmd.lang.metrics.ParameterizedMetricKey; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java index dd7bba80eb..35e8f320ba 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/ProjectMemoizerTest.java @@ -14,7 +14,6 @@ import java.util.Random; import org.junit.Test; -import net.sourceforge.pmd.lang.metrics.MetricKeyUtil; import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration; @@ -24,6 +23,7 @@ import net.sourceforge.pmd.lang.java.metrics.impl.AbstractJavaOperationMetric; import net.sourceforge.pmd.lang.java.metrics.testdata.MetricsVisitorTestData; import net.sourceforge.pmd.lang.metrics.Metric.Version; import net.sourceforge.pmd.lang.metrics.MetricKey; +import net.sourceforge.pmd.lang.metrics.MetricKeyUtil; import net.sourceforge.pmd.lang.metrics.MetricMemoizer; import net.sourceforge.pmd.lang.metrics.MetricVersion;