Fix some Sonar findings in TmfEvent

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
index c710ee881c522eb6ddb02eab8d04640444eb69c2..9c408e52990acb3ae14c775fce25b33131e81f2e 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
@@ -79,7 +79,7 @@ public class TmfEventFieldTest extends TestCase {
     public void testTerminalStructConstructor() {
         assertSame("getName", fFieldName1, fStructTerminalField1.getName());
         assertNull("getValue", fStructTerminalField1.getValue());
-        assertNull("getFields", fStructTerminalField1.getFields());
+        assertEquals("getFields", 0, fStructTerminalField1.getFields().length);
         assertNull("getField(name)", fStructTerminalField1.getField(fFieldName1));
         assertNull("getField(index)", fStructTerminalField1.getField(0));
         assertEquals("getFieldNames", 0, fStructTerminalField1.getFieldNames().length);
@@ -109,7 +109,7 @@ public class TmfEventFieldTest extends TestCase {
     public void testTerminalConstructor() {
         assertSame("getName", fFieldName1, fField1.getName());
         assertSame("getValue", fValue1, fField1.getValue());
-        assertNull("getFields", fField1.getFields());
+        assertEquals("getFields", 0, fField1.getFields().length);
         assertNull("getField(name)", fField1.getField(fFieldName1));
         assertNull("getField(index)", fField1.getField(0));
         assertEquals("getFieldNames", 0, fField1.getFieldNames().length);
@@ -117,7 +117,7 @@ public class TmfEventFieldTest extends TestCase {
 
         assertSame("getName", fFieldName2, fField2.getName());
         assertSame("getValue", fValue2, fField2.getValue());
-        assertNull("getFields", fField2.getFields());
+        assertEquals("getFields", 0, fField2.getFields().length);
         assertNull("getField(name)", fField2.getField(fFieldName2));
         assertNull("getField(index)", fField2.getField(0));
         assertEquals("getFieldNames", 0, fField2.getFieldNames().length);
@@ -155,7 +155,7 @@ public class TmfEventFieldTest extends TestCase {
         final TmfEventField copy = new TmfEventField(fField1);
         assertSame("getName", fFieldName1, copy.getName());
         assertSame("getValue", fValue1, copy.getValue());
-        assertNull("getFields", copy.getFields());
+        assertEquals("getFields", 0, copy.getFields().length);
         assertNull("getField(name)", copy.getField(fFieldName1));
         assertNull("getField(index)", copy.getField(0));
         assertEquals("getFieldNames", 0, copy.getFieldNames().length);

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java
index 4ef3ba445ad39e8f2549334ead8eed37932f11a8..5463178f9200f296c542e6e7b5c95693b63a39cf 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java
@@ -151,7 +151,7 @@ public class TmfEventTypeManagerTest extends TestCase {
     public void testClear() {
         fInstance.clear();
         assertEquals("clear", 0, fInstance.getContexts().length);
-        assertNull("clear", fInstance.getTypes(null));
+        assertEquals("clear", 0, fInstance.getTypes(null).length);
         assertNull("clear", fInstance.getType(null, null));
         assertEquals("clear", "TmfEventTypeManager [fEventTypes={}]", fInstance.toString());
     }
@@ -170,7 +170,7 @@ public class TmfEventTypeManagerTest extends TestCase {
         assertEquals("clear context", fContext2, contexts[0]);
 
         ITmfEventType[] types = fInstance.getTypes(fContext1);
-        assertNull("clear context", types);
+        assertEquals("clear context", 0, types.length);
 
         ITmfEventType type = fInstance.getType(fContext1, fType0.getName());
         assertNull("clear context", type);

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
index ddd7889ffc3d5e5f3bedb14434625503bbc7fa73..8d09a36235c78c07888c12ce87797b4d3298c57a 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
@@ -77,7 +77,7 @@ public class TmfEventTypeTest extends TestCase {
         assertEquals("getContext", TmfEventType.DEFAULT_CONTEXT_ID, type.getContext());
         assertEquals("getName", TmfEventType.DEFAULT_TYPE_ID, type.getName());
         assertNull("getRootField", type.getRootField());
-        assertNull("getFieldNames", type.getFieldNames());
+        assertEquals("getFieldNames", 0, type.getFieldNames().length);
         assertNull("getFieldName", type.getFieldName(0));
     }
 

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
index 100e5ae4782f4d7d0a309fba97be789f1c40a074..7613941abfbb649c7ea536990b25f3ac5c2fb8f1 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
@@ -151,7 +151,7 @@ public class TmfEventField implements ITmfEventField, Cloneable {
      */
     @Override
     public ITmfEventField[] getFields() {
-        return (fFields != null) ? Arrays.copyOf(fFields, fFields.length) : null;
+        return (fFields != null) ? Arrays.copyOf(fFields, fFields.length) : new ITmfEventField[0];
     }
 
     /* (non-Javadoc)

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
index 14cff763c60c8b51415f9f3cc47cd9b9fab8964c..a0cc90cd9f1ef4fcaefa1e53b0667c37b24b536d 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
@@ -109,7 +109,7 @@ public class TmfEventType implements ITmfEventType, Cloneable {
      */
     @Override
     public String[] getFieldNames() {
-        return (fRootField != null) ? fRootField.getFieldNames() : null;
+        return (fRootField != null) ? fRootField.getFieldNames() : new String[0];
     }
 
     /* (non-Javadoc)

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java
index 5f170c7f9ae9886886a407f0638e36157910fac5..9e672e5f1d4a319f0ff8a3c38652614bd5aedc98 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java
@@ -96,7 +96,7 @@ public final class TmfEventTypeManager {
         if (types != null) {
             return types.values().toArray(new ITmfEventType[types.size()]);
         }
-        return null;
+        return new ITmfEventType[0];
     }
 
     /**