From 33300bf248c87c5de9ccb3b2e961e11956d5d457 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Mon, 16 Feb 2015 15:14:40 +0100
Subject: [PATCH] Fixed some issues for the quality tools
---
.../stages/LegacyTraceReconstructor.java | 20 +++++++++-----
.../stages/OperationCallAggregator.java | 16 ++++++++++++
.../kieker/diagnosis/common/util/Mapper.java | 26 +++++++++++++++----
.../java/kieker/diagnosis/subview/Filter.java | 2 +-
.../util/AverageDurationSortListener.java | 2 +-
.../util/CallsSortListener.java | 2 +-
.../util/ComponentSortListener.java | 2 +-
.../util/ContainerSortListener.java | 2 +-
.../util/MaximalDurationSortListener.java | 2 +-
.../util/MedianDurationSortListener.java | 2 +-
.../util/MinimalDurationSortListener.java | 2 +-
.../util/OperationSortListener.java | 2 +-
.../util/TotalDurationSortListener.java | 2 +-
.../calls/util/ComponentSortListener.java | 2 +-
.../calls/util/ContainerSortListener.java | 2 +-
.../calls/util/DurationSortListener.java | 2 +-
.../calls/util/OperationSortListener.java | 2 +-
.../calls/util/TraceIDSortListener.java | 2 +-
18 files changed, 65 insertions(+), 27 deletions(-)
diff --git a/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java b/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java
index 4f6846b7..db9d5bbb 100644
--- a/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java
+++ b/src/main/java/kieker/diagnosis/common/model/importer/stages/LegacyTraceReconstructor.java
@@ -16,6 +16,7 @@
package kieker.diagnosis.common.model.importer.stages;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -74,13 +75,7 @@ final class LegacyTraceReconstructor extends AbstractStage<OperationExecutionRec
}
public Trace reconstructTrace() {
- Collections.sort(this.records, new Comparator<OperationExecutionRecord>() {
-
- @Override
- public int compare(final OperationExecutionRecord o1, final OperationExecutionRecord o2) {
- return Long.compare(o1.getEoi(), o2.getEoi());
- }
- });
+ Collections.sort(this.records, new EOIComparator());
OperationCall root = null;
OperationCall header = null;
@@ -114,6 +109,17 @@ final class LegacyTraceReconstructor extends AbstractStage<OperationExecutionRec
return this.traceComplete;
}
+ private static final class EOIComparator implements Comparator<OperationExecutionRecord>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public int compare(final OperationExecutionRecord o1, final OperationExecutionRecord o2) {
+ return Long.compare(o1.getEoi(), o2.getEoi());
+ }
+
+ }
+
}
}
diff --git a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.java b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.java
index 108fcaf0..ab7b96e2 100644
--- a/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.java
+++ b/src/main/java/kieker/diagnosis/common/model/importer/stages/OperationCallAggregator.java
@@ -1,3 +1,19 @@
+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
package kieker.diagnosis.common.model.importer.stages;
import java.util.ArrayList;
diff --git a/src/main/java/kieker/diagnosis/common/util/Mapper.java b/src/main/java/kieker/diagnosis/common/util/Mapper.java
index d8cd6cc5..588189f5 100644
--- a/src/main/java/kieker/diagnosis/common/util/Mapper.java
+++ b/src/main/java/kieker/diagnosis/common/util/Mapper.java
@@ -1,3 +1,19 @@
+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
package kieker.diagnosis.common.util;
import java.util.HashMap;
@@ -5,18 +21,18 @@ import java.util.Map;
public final class Mapper<I, O> {
- private final Map<I, O> map = new HashMap<>();
+ private final Map<I, O> internalMap = new HashMap<>();
public To map(final I key) {
return new To(key);
}
public O resolve(final I key) {
- return this.map.get(key);
+ return this.internalMap.get(key);
}
public I invertedResolve(final O value) {
- for (final Map.Entry<I, O> entry : this.map.entrySet()) {
+ for (final Map.Entry<I, O> entry : this.internalMap.entrySet()) {
if (value.equals(entry.getValue())) {
return entry.getKey();
}
@@ -28,12 +44,12 @@ public final class Mapper<I, O> {
private final I key;
- private To(final I key) {
+ To(final I key) {
this.key = key;
}
public void to(final O value) {
- Mapper.this.map.put(this.key, value);
+ Mapper.this.internalMap.put(this.key, value);
}
}
diff --git a/src/main/java/kieker/diagnosis/subview/Filter.java b/src/main/java/kieker/diagnosis/subview/Filter.java
index 0393eeb0..cb39935e 100644
--- a/src/main/java/kieker/diagnosis/subview/Filter.java
+++ b/src/main/java/kieker/diagnosis/subview/Filter.java
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/AverageDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/AverageDurationSortListener.java
index e3d77ded..c3cda239 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/AverageDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/AverageDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class AverageDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class AverageDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java
index 0c9caad1..dc76cc5b 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/CallsSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class CallsSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class CallsSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java
index 7f42cb76..82063f58 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ComponentSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class ComponentSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class ComponentSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java
index bf726401..36be5420 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/ContainerSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class ContainerSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class ContainerSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java
index 25b676a7..38162799 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MaximalDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class MaximalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class MaximalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java
index 2f9c79d9..25bb2ba2 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MedianDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class MedianDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class MedianDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java
index 70640093..3ac0ea40 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/MinimalDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class MinimalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class MinimalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
index 1987d551..33fb88e4 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/OperationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class OperationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class OperationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java
index 0ac0a160..8974d3c2 100644
--- a/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/aggregatedcalls/util/TotalDurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.aggregatedcalls.util;
import kieker.diagnosis.common.domain.AggregatedOperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class TotalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
+public final class TotalDurationSortListener extends AbstractCallTableColumnSortListener<AggregatedOperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java
index 13c86707..a7e2ee27 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/ComponentSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
import kieker.diagnosis.common.domain.OperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class ComponentSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class ComponentSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java
index 28204a84..33be95cb 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/ContainerSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
import kieker.diagnosis.common.domain.OperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class ContainerSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class ContainerSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java
index 3d8ea8ed..c3f731c9 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/DurationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
import kieker.diagnosis.common.domain.OperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class DurationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class DurationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
index d9e1c037..9582950c 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/OperationSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
import kieker.diagnosis.common.domain.OperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class OperationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class OperationSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java b/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java
index aff55b23..227dbfac 100644
--- a/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java
+++ b/src/main/java/kieker/diagnosis/subview/calls/util/TraceIDSortListener.java
@@ -19,7 +19,7 @@ package kieker.diagnosis.subview.calls.util;
import kieker.diagnosis.common.domain.OperationCall;
import kieker.diagnosis.subview.util.AbstractCallTableColumnSortListener;
-public class TraceIDSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
+public final class TraceIDSortListener extends AbstractCallTableColumnSortListener<OperationCall> {
private static final long serialVersionUID = 1L;
--
GitLab