diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-07-20 11:53:46 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-07-23 12:39:51 +0200 |
| commit | a56bacfa9dbf4195dc1a5fc213af2c1f892212b5 (patch) | |
| tree | fb447a7246299aaf68dfa7a7b4eff90e28484db3 /src/main/java/com/c2kernel/events | |
| parent | 302ce8e1784f142e17218aade54d231ad8e9d11c (diff) | |
Add schema details to event
Diffstat (limited to 'src/main/java/com/c2kernel/events')
| -rw-r--r-- | src/main/java/com/c2kernel/events/Event.java | 25 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/events/History.java | 26 |
2 files changed, 47 insertions, 4 deletions
diff --git a/src/main/java/com/c2kernel/events/Event.java b/src/main/java/com/c2kernel/events/Event.java index a1a2e8b..52781bd 100644 --- a/src/main/java/com/c2kernel/events/Event.java +++ b/src/main/java/com/c2kernel/events/Event.java @@ -28,11 +28,12 @@ import com.c2kernel.persistency.ClusterStorage; public class Event implements C2KLocalObject
{
- int mID, mEntitySystemKey, mCurrentState, mTransition;
- String mName, mStepName, mStepPath, mStepType, mViewName, mAgentName, mAgentRole;
+ int mEntitySystemKey, mCurrentState, mTransition;
+ Integer mID, mSchemaVersion;
+ String mName, mStepName, mStepPath, mStepType, mSchemaName, mViewName, mAgentName, mAgentRole;
GTimeStamp mTimeStamp;
- public void setID( int id ) {
+ public void setID( Integer id ) {
mID = id;
mName = String.valueOf(id);
}
@@ -119,7 +120,7 @@ public class Event implements C2KLocalObject /**
* Return the Event's ID
*/
- public int getID()
+ public Integer getID()
{
return mID;
}
@@ -288,4 +289,20 @@ public class Event implements C2KLocalObject mTransition = i;
}
+ public Integer getSchemaVersion() {
+ return mSchemaVersion;
+ }
+
+ public void setSchemaVersion(Integer schemaVersion) {
+ this.mSchemaVersion = schemaVersion;
+ }
+
+ public String getSchemaName() {
+ return mSchemaName;
+ }
+
+ public void setSchemaName(String schemaName) {
+ this.mSchemaName = schemaName;
+ }
+
}
diff --git a/src/main/java/com/c2kernel/events/History.java b/src/main/java/com/c2kernel/events/History.java index c9e4995..2eef8de 100644 --- a/src/main/java/com/c2kernel/events/History.java +++ b/src/main/java/com/c2kernel/events/History.java @@ -23,12 +23,22 @@ public class History extends RemoteMap<Event> { public History(int sysKey, Object locker) {
super(sysKey, ClusterStorage.HISTORY, locker);
}
+ public Event addEvent(String agentName, String agentRole,
+ int stepTransitionId,
+ String stepName,
+ String stepPath,
+ String stepType,
+ int stepCurrentState) {
+ return addEvent(agentName, agentRole, stepTransitionId, stepName, stepPath, stepType, null, null, null, stepCurrentState);
+ }
public Event addEvent(String agentName, String agentRole,
int stepTransitionId,
String stepName,
String stepPath,
String stepType,
+ String schemaName,
+ Integer schemaVersion,
String viewName,
int stepCurrentState) {
Logger.msg(7, "History.addEvent() - creating new event for "+stepTransitionId+" on "+stepName+" in "+mSysKey);
@@ -40,6 +50,8 @@ public class History extends RemoteMap<Event> { newEvent.setStepName(stepName);
newEvent.setStepPath(stepPath);
newEvent.setStepType(stepType);
+ newEvent.setSchemaName(schemaName);
+ newEvent.setSchemaVersion(schemaVersion);
newEvent.setViewName(viewName);
newEvent.setCurrentState(stepCurrentState);
newEvent.setTimeStamp(Event.getGMT());
@@ -47,10 +59,22 @@ public class History extends RemoteMap<Event> { }
public Event addEvent(String agentName, String agentRole,
+ int stepTransitionId,
+ String stepName,
+ String stepPath,
+ String stepType,
+ int stepCurrentState,
+ String timeString) throws InvalidDataException {
+ return addEvent(agentName, agentRole, stepTransitionId, stepName, stepPath, stepType, null, null, null, stepCurrentState, timeString);
+ }
+
+ public Event addEvent(String agentName, String agentRole,
int stepTransitionId,
String stepName,
String stepPath,
String stepType,
+ String schemaName,
+ Integer schemaVersion,
String viewName,
int stepCurrentState,
String timeString) throws InvalidDataException {
@@ -63,6 +87,8 @@ public class History extends RemoteMap<Event> { newEvent.setStepName(stepName);
newEvent.setStepPath(stepPath);
newEvent.setStepType(stepType);
+ newEvent.setSchemaName(schemaName);
+ newEvent.setSchemaVersion(schemaVersion);
newEvent.setViewName(viewName);
newEvent.setCurrentState(stepCurrentState);
newEvent.setTimeString(timeString);
|