Skip to content

Commit b4df97d

Browse files
kavehshahedibhufmann
authored andcommitted
server: Use standard IMarker structure for storing bookmarks
The new changes aim to re-structure the algorithm of storing bookmarks. Previously, we stored each bookmark (of an experiment) under a specific directory inside the .webapp directory of Trace Compass. Right now, we are using Eclipse's markers system to store and fetch the benchmarks. [Changed] Bookmark storing/fetching system is changed to IMarker Signed-off-by: Kaveh Shahedi <kaveh.shahedi@ericsson.com>
1 parent 5aeec11 commit b4df97d

File tree

6 files changed

+439
-335
lines changed

6 files changed

+439
-335
lines changed

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/BookmarkManagerServiceTest.java

Lines changed: 253 additions & 146 deletions
Large diffs are not rendered by default.

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/stubs/BookmarkModelStub.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
package org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.stubs;
1313

1414
import java.io.Serializable;
15-
import java.nio.charset.Charset;
1615
import java.util.Objects;
1716
import java.util.UUID;
1817

@@ -25,7 +24,6 @@
2524
* <code>BookmarkModel</code> schema
2625
*
2726
* @author Kaveh Shahedi
28-
* @since 10.1
2927
*/
3028
@JsonIgnoreProperties(ignoreUnknown = true)
3129
public class BookmarkModelStub implements Serializable {
@@ -71,11 +69,7 @@ public BookmarkModelStub(
7169
* end time
7270
*/
7371
public BookmarkModelStub(String name, long start, long end) {
74-
this(getUUID(name), name, start, end);
75-
}
76-
77-
private static UUID getUUID(String name) {
78-
return UUID.nameUUIDFromBytes(Objects.requireNonNull(name.getBytes(Charset.defaultCharset())));
72+
this(UUID.randomUUID(), name, start, end);
7973
}
8074

8175
/**

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/Bookmark.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
* Contributes to the model used for TSP swagger-core annotations.
2424
*
2525
* @author Kaveh Shahedi
26-
* @since 10.1
2726
*/
2827
public interface Bookmark {
2928

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/BookmarkQueryParameters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* Parameters for bookmark creation and update operations
1919
*
2020
* @author Kaveh Shahedi
21-
* @since 10.1
2221
*/
2322
public interface BookmarkQueryParameters {
2423

@@ -30,6 +29,9 @@ public interface BookmarkQueryParameters {
3029
BookmarkParameters getParameters();
3130

3231

32+
/**
33+
* Bookmark parameters
34+
*/
3335
interface BookmarkParameters {
3436
/**
3537
* @return The bookmark name

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/services/Bookmark.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
* Bookmark model for TSP
2020
*
2121
* @author Kaveh Shahedi
22-
* @since 10.1
2322
*/
2423
public class Bookmark implements Serializable {
2524

0 commit comments

Comments
 (0)