Skip to content

Commit 7d12ce9

Browse files
rmllrrmllr
authored
Merge pull request #2 from softvis-research/development
Merge "development" into "master"
2 parents 7adca78 + 89b0aea commit 7d12ce9

24 files changed

Lines changed: 672 additions & 559 deletions

‎pom.xml‎

Lines changed: 89 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,51 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6+
<parent>
7+
<groupId>org.jqassistant.contrib.common</groupId>
8+
<artifactId>parent</artifactId>
9+
<version>1.6.0</version>
10+
</parent>
11+
612
<groupId>org.jqassistant.contrib.plugin.kieker</groupId>
713
<artifactId>jqa-kieker-plugin</artifactId>
814
<version>1.0.0-SNAPSHOT</version>
915

16+
<name>jQAssistant Kieker Plugin</name>
17+
<description>The jQAssistant plugin to scan and to analyze Kieker trace logs.</description>
18+
<url>http://jqassistant.org/</url>
19+
20+
<developers>
21+
<developer>
22+
<id>matteo-fischer</id>
23+
<name>Matteo Fischer</name>
24+
</developer>
25+
<developer>
26+
<id>richard-mueller</id>
27+
<name>Richard Mueller</name>
28+
<email>[email protected]</email>
29+
</developer>
30+
</developers>
31+
32+
<licenses>
33+
<license>
34+
<name>GNU General Public License, v3</name>
35+
<url>http://www.gnu.org/licenses/gpl-3.0.html</url>
36+
</license>
37+
</licenses>
38+
1039
<properties>
11-
<jqassistant.version>1.4.0</jqassistant.version>
40+
<org.hamcrest.version>2.0.0.0</org.hamcrest.version>
1241
</properties>
1342

1443
<build>
1544
<plugins>
16-
<plugin>
17-
<groupId>com.buschmais.jqassistant</groupId>
18-
<artifactId>jqassistant-maven-plugin</artifactId>
19-
<version>${jqassistant.version}</version>
20-
<dependencies>
21-
<dependency>
22-
<groupId>org.jqassistant.contrib.plugin.kieker</groupId>
23-
<artifactId>jqa-kieker-plugin</artifactId>
24-
<version>1.0.0-SNAPSHOT</version>
25-
</dependency>
26-
</dependencies>
27-
</plugin>
2845
<plugin>
2946
<groupId>org.apache.maven.plugins</groupId>
3047
<artifactId>maven-compiler-plugin</artifactId>
31-
<version>3.7.0</version>
3248
<configuration>
33-
<source>1.7</source>
34-
<target>1.7</target>
49+
<source>1.8</source>
50+
<target>1.8</target>
3551
</configuration>
3652
</plugin>
3753
<plugin>
@@ -56,69 +72,105 @@
5672
</plugins>
5773
</build>
5874

59-
<!-- tag::dependencies[] -->
75+
<dependencyManagement>
76+
<dependencies>
77+
<!-- jQAssistant -->
78+
<!-- unit tests -->
79+
<dependency>
80+
<groupId>junit</groupId>
81+
<artifactId>junit</artifactId>
82+
<version>4.12</version>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.mockito</groupId>
87+
<artifactId>mockito-core</artifactId>
88+
<version>1.10.19</version>
89+
<scope>test</scope>
90+
</dependency>
91+
</dependencies>
92+
</dependencyManagement>
93+
6094
<dependencies>
95+
<dependency>
96+
<groupId>com.buschmais.jqassistant.plugin</groupId>
97+
<artifactId>common</artifactId>
98+
<scope>provided</scope>
99+
</dependency>
100+
<dependency>
101+
<groupId>com.buschmais.jqassistant.core</groupId>
102+
<artifactId>shared</artifactId>
103+
<scope>provided</scope>
104+
</dependency>
61105
<dependency>
62106
<groupId>com.buschmais.jqassistant.core</groupId>
63107
<artifactId>scanner</artifactId>
64-
<version>1.4.0</version>
108+
<scope>provided</scope>
109+
</dependency>
110+
<dependency>
111+
<groupId>com.buschmais.jqassistant.core</groupId>
112+
<artifactId>report</artifactId>
113+
<scope>provided</scope>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.buschmais.jqassistant.core</groupId>
117+
<artifactId>plugin</artifactId>
65118
<scope>provided</scope>
66119
</dependency>
67120
<dependency>
68121
<groupId>com.buschmais.jqassistant.plugin</groupId>
69122
<artifactId>common</artifactId>
70-
<version>1.4</version>
71-
<scope>provided</scope>
123+
<type>test-jar</type>
124+
<scope>test</scope>
72125
</dependency>
73126
<dependency>
74-
<groupId>com.opencsv</groupId>
75-
<artifactId>opencsv</artifactId>
76-
<version>4.1</version>
127+
<groupId>com.buschmais.jqassistant.core</groupId>
128+
<artifactId>store</artifactId>
129+
<type>test-jar</type>
77130
<scope>provided</scope>
78131
</dependency>
79-
<!-- Test dependencies -->
80132
<dependency>
81133
<groupId>com.buschmais.jqassistant.core</groupId>
82-
<artifactId>plugin</artifactId>
83-
<version>1.4.0</version>
134+
<artifactId>analysis</artifactId>
135+
<type>test-jar</type>
136+
<scope>provided</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>com.buschmais.xo</groupId>
140+
<artifactId>xo.neo4j.embedded</artifactId>
84141
<scope>test</scope>
85142
</dependency>
86143
<dependency>
87144
<groupId>com.buschmais.jqassistant.neo4jserver</groupId>
88145
<artifactId>neo4jv3</artifactId>
89-
<version>1.4.0</version>
90146
<scope>test</scope>
91147
</dependency>
92148
<dependency>
93-
<groupId>com.buschmais.jqassistant.plugin</groupId>
94-
<artifactId>common</artifactId>
95-
<type>test-jar</type>
96-
<version>1.4</version>
97-
<scope>test</scope>
149+
<groupId>org.hamcrest</groupId>
150+
<artifactId>java-hamcrest</artifactId>
151+
<version>${org.hamcrest.version}</version>
98152
</dependency>
99153
<dependency>
100154
<groupId>junit</groupId>
101155
<artifactId>junit</artifactId>
102-
<version>4.12</version>
103156
<scope>test</scope>
104157
</dependency>
105158
<dependency>
106159
<groupId>org.slf4j</groupId>
107160
<artifactId>slf4j-simple</artifactId>
108-
<version>1.7.13</version>
109-
<scope>test</scope>
161+
<scope>provided</scope>
110162
</dependency>
111163
<dependency>
112164
<groupId>net.kieker-monitoring</groupId>
113165
<artifactId>kieker</artifactId>
114166
<version>1.14-SNAPSHOT</version>
115167
</dependency>
116168
</dependencies>
117-
<!-- end::dependencies[] -->
169+
118170
<repositories>
119171
<repository>
120172
<id>sonatype.oss.snapshots</id>
121173
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
122174
</repository>
123175
</repositories>
124-
</project>
176+
</project>

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/AfterOperationEventDescriptor.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/BeforeOperationEventDescriptor.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallEventDescriptor.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.jqassistant.contrib.plugin.kieker.api.model;
2+
3+
import com.buschmais.jqassistant.core.store.api.model.Descriptor;
4+
import com.buschmais.xo.neo4j.api.annotation.Label;
5+
import com.buschmais.xo.neo4j.api.annotation.Relation;
6+
7+
/**
8+
* Defines the node for a call event.
9+
*/
10+
@Label("Call")
11+
public interface CallEventDescriptor extends EventDescriptor, Descriptor {
12+
@Relation("CALLER")
13+
MethodDescriptor getCaller();
14+
15+
void setCaller(MethodDescriptor caller);
16+
17+
@Relation("CALLEE")
18+
MethodDescriptor getCallee();
19+
20+
void setCallee(MethodDescriptor callee);
21+
22+
void setTimestamp(long timestamp);
23+
24+
long getTimestamp();
25+
26+
void setOrderIndex(int orderIndex);
27+
28+
int getOrderIndex();
29+
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallsDescriptor.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.jqassistant.contrib.plugin.kieker.api.model;
2+
3+
import com.buschmais.jqassistant.core.store.api.model.Descriptor;
4+
import com.buschmais.xo.neo4j.api.annotation.Relation;
5+
6+
@Relation("CALLS")
7+
public interface CallsDescriptor extends Descriptor {
8+
9+
@Relation.Outgoing
10+
MethodDescriptor getCallee();
11+
12+
@Relation.Incoming
13+
MethodDescriptor getCaller();
14+
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/EventDescriptor.java‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,11 @@
11
package org.jqassistant.contrib.plugin.kieker.api.model;
22

33
import com.buschmais.xo.neo4j.api.annotation.Label;
4-
import com.buschmais.xo.neo4j.api.annotation.Relation;
5-
6-
import java.util.List;
74

85
/**
9-
* Defines the label for an event, that took place in a trace.
10-
* Contains the properties: timestamp, traceId and orderIndex.
11-
* An event can call a method.
6+
* Defines the node for an event.
127
*/
138
@Label("Event")
149
public interface EventDescriptor extends KiekerDescriptor {
15-
16-
@Relation("CALLS")
17-
List<MethodDescriptor> getMethods();
1810

19-
void setLoggingTimestamp(long timestamp);
20-
long getLoggingTimestamp();
21-
22-
void setTimestamp(long timestamp);
23-
long getTimestamp();
24-
25-
void setTraceId(long traceId);
26-
long getTraceId();
27-
28-
void setOrderIndex(int orderIndex);
29-
int getOrderIndex();
30-
}
11+
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/ExecutionEventDescriptor.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package org.jqassistant.contrib.plugin.kieker.api.model;
2+
3+
import com.buschmais.jqassistant.core.store.api.model.Descriptor;
4+
import com.buschmais.xo.neo4j.api.annotation.Label;
5+
import com.buschmais.xo.neo4j.api.annotation.Relation;
6+
7+
/**
8+
* Defines the node for a call event.
9+
*/
10+
@Label("Execution")
11+
public interface ExecutionEventDescriptor extends EventDescriptor, Descriptor {
12+
@Relation("EXECUTION")
13+
MethodDescriptor getExecutedMethod();
14+
15+
void setExecutedMethod(MethodDescriptor executedMethod);
16+
17+
void setBeforeTimestamp(long beforeTimestamp);
18+
19+
long getBeforeTimestamp();
20+
21+
void setAfterTimestamp(long afterTimestamp);
22+
23+
long getAfterTimestamp();
24+
25+
void setBeforeOrderIndex(int beforeOrderIndex);
26+
27+
int getBeforeOrderIndex();
28+
29+
void setAfterOrderIndex(int afterOrderIndex);
30+
31+
int getAfterOrderIndex();
32+
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/KiekerDescriptor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.jqassistant.contrib.plugin.kieker.api.model;
22

3-
import com.buschmais.jqassistant.core.store.api.model.Descriptor;
43
import com.buschmais.xo.neo4j.api.annotation.Label;
54

65
/**
76
* Defines the label which is shared by all nodes representing Kieker structures.
87
*/
98
@Label("Kieker")
10-
public interface KiekerDescriptor extends Descriptor {
9+
public interface KiekerDescriptor {
1110
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/MethodDescriptor.java‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,38 @@
11
package org.jqassistant.contrib.plugin.kieker.api.model;
22

3+
import com.buschmais.jqassistant.plugin.common.api.model.NamedDescriptor;
4+
import com.buschmais.xo.neo4j.api.annotation.Indexed;
35
import com.buschmais.xo.neo4j.api.annotation.Label;
6+
import com.buschmais.xo.neo4j.api.annotation.Property;
7+
import com.buschmais.xo.neo4j.api.annotation.Relation;
48

59
/**
6-
* Defines the label for a Method, that was called by an event.
7-
* A Method is identified by its signature.
10+
* Defines the node for a Method.
811
*/
912
@Label("Method")
10-
public interface MethodDescriptor extends KiekerDescriptor {
13+
public interface MethodDescriptor extends KiekerDescriptor, NamedDescriptor {
1114

15+
@Relation.Outgoing
16+
CallsDescriptor getCallee();
17+
18+
@Relation.Incoming
19+
CallsDescriptor getCaller();
20+
21+
@Property("signature")
22+
@Indexed
1223
void setSignature(String signature);
24+
1325
String getSignature();
1426

27+
void setDuration(long duration);
28+
29+
long getDuration();
30+
31+
void setIncomingCalls(int incomingCalls);
32+
33+
int getIncomingCalls();
34+
35+
void setOutgoingCalls(int outgoingCalls);
36+
37+
int getOutgoingCalls();
1538
}

0 commit comments

Comments
 (0)