Merge pull request #28 from Orange-OpenSource/long-support

cep: long and boolean support

Author: marcc-orange

cepheus-cep/src/main/java/com/orange/cepheus/cep/EventMapper.java

@@ -222,6 +222,8 @@ private Class classForType(String attributeType) {
                 return String.class;
             case "int":
                 return int.class;
+            case "long":
+                return long.class;
             case "float":
                 return float.class;
             case "double":
@@ -273,9 +275,11 @@ private Object valueForString(String value, String type, String name) throws Eve
                 case "string":
                     return value;
                 case "boolean":
-                    return value;
+                    return Boolean.valueOf(value);
                 case "int":
                     return Integer.valueOf(value);
+                case "long":
+                    return Long.valueOf(value);
                 case "float":
                     return Float.valueOf(value);
                 case "double":

cepheus-cep/src/test/java/com/orange/cepheus/cep/EventMapperTest.java

@@ -50,6 +50,7 @@ public void testEsperTypes() {
         e.addAttribute(new Attribute("4", "float"));
         e.addAttribute(new Attribute("5", "boolean"));
         e.addAttribute(new Attribute("6", "XXXX"));
+        e.addAttribute(new Attribute("7", "long"));
 
         Map<String, Object> map = eventMapper.esperTypeFromEventType(e);
 
@@ -59,6 +60,7 @@ public void testEsperTypes() {
         assertEquals(int.class, map.get("3"));
         assertEquals(float.class, map.get("4"));
         assertEquals(boolean.class, map.get("5"));
+        assertEquals(long.class, map.get("7"));
     }
 
     /**
@@ -92,6 +94,9 @@ public void testContextElementConversion() throws Exception {
         attributes.add(new ContextAttribute("2", "float", 1.4f));
         attributes.add(new ContextAttribute("3", "double", 3.1d));
         attributes.add(new ContextAttribute("4", "int", 3));
+        attributes.add(new ContextAttribute("5", "long", 3l));
+        attributes.add(new ContextAttribute("6", "boolean", true));
+        attributes.add(new ContextAttribute("7", "boolean", false));
         ce.setContextAttributeList(attributes);
 
         Map<String, Object> values = eventMapper.eventFromContextElement(ce).getValues();
@@ -101,6 +106,9 @@ public void testContextElementConversion() throws Exception {
         assertEquals(1.4f, values.get("2"));
         assertEquals(3.1d, values.get("3"));
         assertEquals(3, values.get("4"));
+        assertEquals(3l, values.get("5"));
+        assertEquals(true, values.get("6"));
+        assertEquals(false, values.get("7"));
     }
 
     /**
@@ -117,6 +125,9 @@ public void testContextElementConversionString() throws Exception {
         attributes.add(new ContextAttribute("2", "float", "1.4"));
         attributes.add(new ContextAttribute("3", "double", "3.1"));
         attributes.add(new ContextAttribute("4", "int", "3"));
+        attributes.add(new ContextAttribute("5", "long", "3"));
+        attributes.add(new ContextAttribute("6", "boolean", "true"));
+        attributes.add(new ContextAttribute("7", "boolean", "false"));
         ce.setContextAttributeList(attributes);
 
         Map<String, Object> values = eventMapper.eventFromContextElement(ce).getValues();
@@ -125,6 +136,9 @@ public void testContextElementConversionString() throws Exception {
         assertEquals(1.4f, values.get("2"));
         assertEquals(3.1d, values.get("3"));
         assertEquals(3, values.get("4"));
+        assertEquals(3l, values.get("5"));
+        assertEquals(true, values.get("6"));
+        assertEquals(false, values.get("7"));
     }
 
     /**
@@ -143,13 +157,19 @@ public void testContextElementConversionMetadata() throws Exception {
         metadatas.add(new ContextMetadata("2", "float", 1.4f));
         metadatas.add(new ContextMetadata("3", "double", 3.1d));
         metadatas.add(new ContextMetadata("4", "int", 3));
+        metadatas.add(new ContextMetadata("5", "long", 3l));
+        metadatas.add(new ContextMetadata("6", "boolean", true));
+        metadatas.add(new ContextMetadata("7", "boolean", false));
         ca.setMetadata(metadatas);
 
         Map<String, Object> values = eventMapper.eventFromContextElement(ce).getValues();
         assertEquals("hello", values.get("ATTR1_1"));
         assertEquals(1.4f, values.get("ATTR1_2"));
         assertEquals(3.1d, values.get("ATTR1_3"));
         assertEquals(3, values.get("ATTR1_4"));
+        assertEquals(3l, values.get("ATTR1_5"));
+        assertEquals(true, values.get("ATTR1_6"));
+        assertEquals(false, values.get("ATTR1_7"));
     }
 
     /**
@@ -168,13 +188,21 @@ public void testContextElementConversionMetadataString() throws Exception {
         metadatas.add(new ContextMetadata("2", "float", "1.4"));
         metadatas.add(new ContextMetadata("3", "double", "3.1"));
         metadatas.add(new ContextMetadata("4", "int", "3"));
+        metadatas.add(new ContextMetadata("5", "long", "3"));
+        metadatas.add(new ContextMetadata("6", "boolean", "true"));
+        metadatas.add(new ContextMetadata("7", "boolean", "false"));
+
+
         ca.setMetadata(metadatas);
 
         Map<String, Object> values = eventMapper.eventFromContextElement(ce).getValues();
         assertEquals("hello", values.get("ATTR1_1"));
         assertEquals(1.4f, values.get("ATTR1_2"));
         assertEquals(3.1d, values.get("ATTR1_3"));
         assertEquals(3, values.get("ATTR1_4"));
+        assertEquals(3l, values.get("ATTR1_5"));
+        assertEquals(true, values.get("ATTR1_6"));
+        assertEquals(false, values.get("ATTR1_7"));
     }
 
     /**

doc/cep/mapping.md

@@ -29,7 +29,7 @@ Therefore no Context Attribute is allowed to be named `id`.
 
 ### Simple attribute types
 
-The current version of the CEP engine only handle simple attribute types (like string, int, float, ...)
+The current version of the CEP engine only handle simple attribute types (like string, int, long, float, double and boolean)
 and cannot execute statements for complex types like objects or arrays because of the strongly typed nature of the CEP engine.
 
 ### Accessing attributes metadata