import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferReader;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.SafeByteBufferFactory;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
import org.junit.Test;
/**
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.tracecompass.datastore.core;singleton:=true
Bundle-Activator: org.eclipse.tracecompass.internal.datastore.core.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.tracecompass.common.core
Export-Package: org.eclipse.tracecompass.datastore.core.interval,
+ org.eclipse.tracecompass.datastore.core.serialization,
org.eclipse.tracecompass.internal.datastore.core;x-internal:=true,
org.eclipse.tracecompass.internal.datastore.core.condition;x-internal:=true,
org.eclipse.tracecompass.internal.datastore.core.historytree;x-internal:=true,
org.eclipse.tracecompass.internal.provisional.datastore.core.exceptions,
org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;x-friends:="org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests",
org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;x-friends:="org.eclipse.tracecompass.statesystem.core,org.eclipse.tracecompass.statesystem.core.tests",
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-friends:="org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests",
- org.eclipse.tracecompass.internal.provisional.datastore.core.serialization;
- x-friends:="org.eclipse.tracecompass.statesystem.core,
- org.eclipse.tracecompass.statesystem.core.tests,
- org.eclipse.tracecompass.segmentstore.core,
- org.eclipse.tracecompass.segmentstore.core.tests"
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-friends:="org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests"
Import-Package: com.google.common.annotations,
com.google.common.base,
com.google.common.cache,
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
/**
* Basic implementation of {@link IHTInterval}.
*
* @author Geneviève Bastien
+ * @since 1.1
*/
public class HTInterval implements IHTInterval {
*
* @author Alexandre Montplaisir
* @author Geneviève Bastien
+ * @since 1.1
*/
public interface IHTInterval extends ISerializableObject {
package org.eclipse.tracecompass.datastore.core.interval;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferReader;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
/**
* A factory that reads object from a byte buffer and create a new object
* @author Geneviève Bastien
* @param <E>
* The type of objects that will be read
+ * @since 1.1
*/
@FunctionalInterface
public interface IHTIntervalReader<E extends IHTInterval> {
package org.eclipse.tracecompass.datastore.core.interval;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
/**
* An object that can be serialized
*
* @author Geneviève Bastien
+ * @since 1.1
*/
public interface ISerializableObject {
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2016 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.datastore.core.serialization;
+
+/**
+ * Interface for a safe ByteBuffer for reading purposes. This interface allows
+ * only to read data from a buffer, no other operation is allowed on it. The
+ * implementations must make sure that only the allowed data can be read.
+ *
+ * @author Geneviève Bastien
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @since 1.1
+ */
+public interface ISafeByteBufferReader {
+
+ /**
+ * Reads a byte at the buffer's current position
+ *
+ * @return The byte read
+ */
+ byte get();
+
+ /**
+ * Transfers bytes from this buffer's current position into the destination
+ * array
+ *
+ * @param dst
+ * The destination array
+ */
+ void get(byte[] dst);
+
+ /**
+ * Reads the char at the buffer's current position
+ *
+ * @return The char read
+ */
+ char getChar();
+
+ /**
+ * Reads the double at the buffer's current position
+ *
+ * @return The double read
+ */
+ double getDouble();
+
+ /**
+ * Reads the float at the buffer's current position
+ *
+ * @return The float read
+ */
+ float getFloat();
+
+ /**
+ * Reads the int at the buffer's current position
+ *
+ * @return The int read
+ */
+ int getInt();
+
+ /**
+ * Reads the long at the buffer's current position
+ *
+ * @return The long read
+ */
+ long getLong();
+
+ /**
+ * Reads the short at the buffer's current position
+ *
+ * @return The short read
+ */
+ short getShort();
+
+ /**
+ * Gets a string from the byte buffer.
+ *
+ * @return The string value read
+ */
+ String getString();
+
+}
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2016 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.datastore.core.serialization;
+
+/**
+ * Interface for a safe ByteBuffer for writing purposes. This interface allows
+ * only to write data from a buffer, no other operation is allowed on it. The
+ * implementation needs to make sure that the buffer does not write over the
+ * limits of the buffer.
+ *
+ * @author Geneviève Bastien
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @since 1.1
+ */
+public interface ISafeByteBufferWriter {
+
+ /**
+ * Writes a byte at the buffer's current position
+ *
+ * @param value
+ * The byte to write
+ */
+ void put(byte value);
+
+ /**
+ * Transfers the bytes from the src array in the buffer at the current
+ * position
+ *
+ * @param src
+ * the byte array to write
+ */
+ void put(byte[] src);
+
+ /**
+ * Writes a char at the buffer's current position
+ *
+ * @param value
+ * The char to write
+ */
+ void putChar(char value);
+
+ /**
+ * Writes a double at the buffer's current position
+ *
+ * @param value
+ * The double to write
+ */
+ void putDouble(double value);
+
+ /**
+ * Writes a float at the buffer's current position
+ *
+ * @param value
+ * The float to write
+ */
+ void putFloat(float value);
+
+ /**
+ * Writes an int at the buffer's current position
+ *
+ * @param value
+ * The int to write
+ */
+ void putInt(int value);
+
+ /**
+ * Writes a long at the buffer's current position
+ *
+ * @param value
+ * The long to write
+ */
+ void putLong(long value);
+
+ /**
+ * Writes a short at the buffer's current position
+ *
+ * @param value
+ * The short to write
+ */
+ void putShort(short value);
+
+ /**
+ * Writes a string value in the byte buffer. The implementation can decide
+ * what format it will use. They can also have a maximum size, in which case
+ * string should be truncated if they are larger than that.
+ *
+ * @param value
+ * The String value to write to the buffer
+ */
+ void putString(String value);
+
+}
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2016 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.datastore.core.serialization;
+
+import java.nio.ByteBuffer;
+
+import org.eclipse.tracecompass.internal.datastore.core.serialization.SafeByteBufferWrapper;
+
+/**
+ * Class that creates instances of safe byte buffers wrappers from a part of a
+ * ByteBuffer instance
+ *
+ * @author Geneviève Bastien
+ * @since 1.1
+ */
+public final class SafeByteBufferFactory {
+
+ private SafeByteBufferFactory() {
+
+ }
+
+ /**
+ * Creates a new safe byte buffer reader from the ByteBuffer's current
+ * position with a size limited to 'size'.
+ *
+ * @param buffer
+ * The big ByteBuffer to safely wrap for reading
+ * @param size
+ * The size of the new sub-buffer
+ * @return The safe byte buffer reader instance
+ */
+ public static ISafeByteBufferReader wrapReader(ByteBuffer buffer, int size) {
+ int pos = buffer.position();
+ // Slice the main buffer, so that position 0 is the current position
+ // set it as read-only also
+ ByteBuffer readOnlyBuffer = buffer.slice().asReadOnlyBuffer();
+ readOnlyBuffer.order(buffer.order());
+ // Set its limit to the request limit
+ readOnlyBuffer.limit(size);
+ // Operations on fBuffer will not affect the main buffer's position, so
+ // we set its position to after the limit
+ buffer.position(pos + size);
+ return new SafeByteBufferWrapper(readOnlyBuffer);
+ }
+
+ /**
+ * Creates a new safe byte buffer writer from the ByteBuffer's current
+ * position with a size limited to 'size'.
+ *
+ * @param buffer
+ * The big ByteBuffer to safely wrap for reading
+ * @param size
+ * The size of the new sub-buffer
+ * @return The safe byte buffer writer instance
+ */
+ public static ISafeByteBufferWriter wrapWriter(ByteBuffer buffer, int size) {
+ int pos = buffer.position();
+ // Slice the main buffer, so that position 0 is the current position
+ ByteBuffer readWriteBuffer = buffer.slice();
+ readWriteBuffer.order(buffer.order());
+ // Set its limit to the request limit
+ readWriteBuffer.limit(size);
+ // Operations on fBuffer will not affect the main buffer's position, so
+ // we set its position to after the limit
+ buffer.position(pos + size);
+ return new SafeByteBufferWrapper(readWriteBuffer);
+ }
+
+ /**
+ * Get the serialized of a string object if it uses the
+ * {@link ISafeByteBufferWriter#putString(String)} method
+ *
+ * @param string
+ * The string to write to the buffer
+ * @return The size of the string serialized by the
+ * {@link ISafeByteBufferWriter#putString(String)} method, or -1 if
+ * the string cannot be serialized
+ */
+ public static int getStringSizeInBuffer(String string) {
+ return SafeByteBufferWrapper.getStringSizeInBuffer(string);
+ }
+
+}
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2016 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.tracecompass.datastore.core.serialization;
import java.nio.ByteBuffer;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferReader;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
/**
* This class is a wrapper around a ByteBuffer. The size to read/write to the
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
+import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
import org.eclipse.tracecompass.internal.provisional.datastore.core.exceptions.RangeException;
import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferReader;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.SafeByteBufferFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
+++ /dev/null
-/*******************************************************************************
- * Copyright (c) 2016 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.tracecompass.internal.provisional.datastore.core.serialization;
-
-/**
- * Interface for a safe ByteBuffer for reading purposes. This interface allows
- * only to read data from a buffer, no other operation is allowed on it. The
- * implementations must make sure that only the allowed data can be read.
- *
- * @author Geneviève Bastien
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface ISafeByteBufferReader {
-
- /**
- * Reads a byte at the buffer's current position
- *
- * @return The byte read
- */
- byte get();
-
- /**
- * Transfers bytes from this buffer's current position into the destination
- * array
- *
- * @param dst
- * The destination array
- */
- void get(byte[] dst);
-
- /**
- * Reads the char at the buffer's current position
- *
- * @return The char read
- */
- char getChar();
-
- /**
- * Reads the double at the buffer's current position
- *
- * @return The double read
- */
- double getDouble();
-
- /**
- * Reads the float at the buffer's current position
- *
- * @return The float read
- */
- float getFloat();
-
- /**
- * Reads the int at the buffer's current position
- *
- * @return The int read
- */
- int getInt();
-
- /**
- * Reads the long at the buffer's current position
- *
- * @return The long read
- */
- long getLong();
-
- /**
- * Reads the short at the buffer's current position
- *
- * @return The short read
- */
- short getShort();
-
- /**
- * Gets a string from the byte buffer.
- *
- * @return The string value read
- */
- String getString();
-
-}
+++ /dev/null
-/*******************************************************************************
- * Copyright (c) 2016 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.tracecompass.internal.provisional.datastore.core.serialization;
-
-/**
- * Interface for a safe ByteBuffer for writing purposes. This interface allows
- * only to write data from a buffer, no other operation is allowed on it. The
- * implementation needs to make sure that the buffer does not write over the
- * limits of the buffer.
- *
- * @author Geneviève Bastien
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface ISafeByteBufferWriter {
-
- /**
- * Writes a byte at the buffer's current position
- *
- * @param value
- * The byte to write
- */
- void put(byte value);
-
- /**
- * Transfers the bytes from the src array in the buffer at the current
- * position
- *
- * @param src
- * the byte array to write
- */
- void put(byte[] src);
-
- /**
- * Writes a char at the buffer's current position
- *
- * @param value
- * The char to write
- */
- void putChar(char value);
-
- /**
- * Writes a double at the buffer's current position
- *
- * @param value
- * The double to write
- */
- void putDouble(double value);
-
- /**
- * Writes a float at the buffer's current position
- *
- * @param value
- * The float to write
- */
- void putFloat(float value);
-
- /**
- * Writes an int at the buffer's current position
- *
- * @param value
- * The int to write
- */
- void putInt(int value);
-
- /**
- * Writes a long at the buffer's current position
- *
- * @param value
- * The long to write
- */
- void putLong(long value);
-
- /**
- * Writes a short at the buffer's current position
- *
- * @param value
- * The short to write
- */
- void putShort(short value);
-
- /**
- * Writes a string value in the byte buffer. The implementation can decide
- * what format it will use. They can also have a maximum size, in which case
- * string should be truncated if they are larger than that.
- *
- * @param value
- * The String value to write to the buffer
- */
- void putString(String value);
-
-}
+++ /dev/null
-/*******************************************************************************
- * Copyright (c) 2016 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.tracecompass.internal.provisional.datastore.core.serialization;
-
-import java.nio.ByteBuffer;
-
-import org.eclipse.tracecompass.internal.datastore.core.serialization.SafeByteBufferWrapper;
-
-/**
- * Class that creates instances of safe byte buffers wrappers from a part of a
- * ByteBuffer instance
- *
- * @author Geneviève Bastien
- */
-public final class SafeByteBufferFactory {
-
- private SafeByteBufferFactory() {
-
- }
-
- /**
- * Creates a new safe byte buffer reader from the ByteBuffer's current
- * position with a size limited to 'size'.
- *
- * @param buffer
- * The big ByteBuffer to safely wrap for reading
- * @param size
- * The size of the new sub-buffer
- * @return The safe byte buffer reader instance
- */
- public static ISafeByteBufferReader wrapReader(ByteBuffer buffer, int size) {
- int pos = buffer.position();
- // Slice the main buffer, so that position 0 is the current position
- // set it as read-only also
- ByteBuffer readOnlyBuffer = buffer.slice().asReadOnlyBuffer();
- readOnlyBuffer.order(buffer.order());
- // Set its limit to the request limit
- readOnlyBuffer.limit(size);
- // Operations on fBuffer will not affect the main buffer's position, so
- // we set its position to after the limit
- buffer.position(pos + size);
- return new SafeByteBufferWrapper(readOnlyBuffer);
- }
-
- /**
- * Creates a new safe byte buffer writer from the ByteBuffer's current
- * position with a size limited to 'size'.
- *
- * @param buffer
- * The big ByteBuffer to safely wrap for reading
- * @param size
- * The size of the new sub-buffer
- * @return The safe byte buffer writer instance
- */
- public static ISafeByteBufferWriter wrapWriter(ByteBuffer buffer, int size) {
- int pos = buffer.position();
- // Slice the main buffer, so that position 0 is the current position
- ByteBuffer readWriteBuffer = buffer.slice();
- readWriteBuffer.order(buffer.order());
- // Set its limit to the request limit
- readWriteBuffer.limit(size);
- // Operations on fBuffer will not affect the main buffer's position, so
- // we set its position to after the limit
- buffer.position(pos + size);
- return new SafeByteBufferWrapper(readWriteBuffer);
- }
-
- /**
- * Get the serialized of a string object if it uses the
- * {@link ISafeByteBufferWriter#putString(String)} method
- *
- * @param string
- * The string to write to the buffer
- * @return The size of the string serialized by the
- * {@link ISafeByteBufferWriter#putString(String)} method, or -1 if
- * the string cannot be serialized
- */
- public static int getStringSizeInBuffer(String string) {
- return SafeByteBufferWrapper.getStringSizeInBuffer(string);
- }
-
-}
+++ /dev/null
-/*******************************************************************************
- * Copyright (c) 2016 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-@org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.internal.provisional.datastore.core.serialization;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.SafeByteBufferFactory;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
import org.eclipse.tracecompass.internal.provisional.segmentstore.core.ISegment2;
import org.eclipse.tracecompass.segmentstore.core.BasicSegment;
import org.eclipse.tracecompass.segmentstore.core.ISegment;
import java.nio.ByteBuffer;
import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferReader;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.SafeByteBufferFactory;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
import org.eclipse.tracecompass.internal.provisional.statesystem.core.statevalue.CustomStateValue;
import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue;
import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue.Type;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.SafeByteBufferFactory;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
import org.eclipse.tracecompass.internal.provisional.statesystem.core.statevalue.CustomStateValue;
import org.eclipse.tracecompass.statesystem.core.exceptions.StateValueTypeException;
import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue;
import java.nio.BufferOverflowException;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferReader;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
import org.eclipse.tracecompass.internal.statesystem.core.Activator;
import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
import java.util.Objects;
import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferReader;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.ISafeByteBufferWriter;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.serialization.SafeByteBufferFactory;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
+import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
+import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
import org.eclipse.tracecompass.internal.provisional.statesystem.core.statevalue.CustomStateValue;
import org.eclipse.tracecompass.statesystem.core.exceptions.TimeRangeException;
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;