svn commit: r1570089 - in /incubator/sirona/trunk: core/src/main/java/org/apache/sirona/tracking/PathTracker.java server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Thu Feb 20 06:47:23 2014
New Revision: 1570089

URL: http://svn.apache.org/r1570089
Log:
cleaning up path tracking api

Modified:
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
    incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java

Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java?rev=1570089&r1=1570088&r2=1570089&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java Thu Feb 20 06:47:23 2014
@@ -135,18 +135,6 @@ public class PathTracker
     }
 
 
-    // Returns the current thread's unique ID, assigning it if necessary
-    public static String get()
-    {
-        return THREAD_LOCAL.get().uuid;
-    }
-
-    public static void set( final String uuid )
-    {
-        THREAD_LOCAL.get().uuid = uuid;
-    }
-
-
     // An other solution could be using Thread.currentThread().getStackTrace() <- very slow
 
     public static PathTracker start( PathTrackingInformation pathTrackingInformation )
@@ -187,7 +175,7 @@ public class PathTracker
         final long start = pathTrackingInformation.getStart();
         final Context context = THREAD_LOCAL.get();
 
-        final String uuid = PathTracker.get();
+        final String uuid = context.uuid;
 
         final PathTrackingInformation current = context.trackingInformation;
         // same invocation so no inc, class can do recursion so don't use classname/methodname

Modified: incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java?rev=1570089&r1=1570088&r2=1570089&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/test/java/org/apache/sirona/cassandra/local/PathTrackingDataStoreTest.java Thu Feb 20 06:47:23 2014
@@ -19,13 +19,12 @@ package org.apache.sirona.cassandra.loca
 import org.apache.sirona.cassandra.framework.CassandraRunner;
 import org.apache.sirona.cassandra.pathtracking.CassandraPathTrackingDataStore;
 import org.apache.sirona.configuration.ioc.IoCs;
-import org.apache.sirona.tracking.PathTracker;
 import org.apache.sirona.tracking.PathTrackingEntry;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.Date;
+import java.util.UUID;
 
 /**
  *
@@ -42,12 +41,12 @@ public class PathTrackingDataStoreTest
         CassandraPathTrackingDataStore store = IoCs.processInstance( new CassandraPathTrackingDataStore() );
 
         PathTrackingEntry entry =
-            new PathTrackingEntry( PathTracker.get(), "nodeId", "org.au.beer.TheBest", "littlecreatures",
+            new PathTrackingEntry(UUID.randomUUID().toString(), "nodeId", "org.au.beer.TheBest", "littlecreatures",
                                    new Date().getTime(), 12, 1 );
 
         store.store( entry );
 
-        //Assert.assertFalse( store.retrieveAll().isEmpty() );
+        // Assert.assertFalse( store.retrieveAll().isEmpty() );
 
     }
 }