JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java‎
Lines changed: 1 addition & 3 deletions b/‎src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/main/java/de/rwth/idsg/steve/utils/StringUtils.java‎
Lines changed: 14 additions & 0 deletions b/‎src/main/java/de/rwth/idsg/steve/utils/StringUtils.java‎
Lines changed: 14 additions & 0 deletions
@@ -73,9 +73,7 @@ public CommunicationTask(OcppVersion ocppVersion, S params) {
         }
 
         callbackList.add(defaultCallback());
-
-        // FIXME: dirty, because creating a request only to parse its class name
-        operationName = StringUtils.getOperationName(getRequest());
+        operationName = StringUtils.getOperationName(this);
     }
 
     public void addCallback(OcppCallback<RESPONSE> cb) {
 
@@ -1,5 +1,6 @@
 package de.rwth.idsg.steve.utils;
 
+import de.rwth.idsg.steve.ocpp.CommunicationTask;
 import de.rwth.idsg.steve.ocpp.RequestType;
 
 /**
@@ -29,4 +30,17 @@ public static String getOperationName(RequestType requestType) {
 
         return s;
     }
+
+    public static String getOperationName(CommunicationTask task) {
+        String s = task.getClass().getSimpleName();
+
+        if (s.endsWith("Task")) {
+            s = s.substring(0, s.length() - 4);
+        }
+
+        // http://stackoverflow.com/a/4886141
+        s = s.replaceAll("(\\p{Ll})(\\p{Lu})", "$1 $2");
+
+        return s;
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,7 @@ public CommunicationTask(OcppVersion ocppVersion, S params) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`callbackList.add(defaultCallback());`
`76`		`-`
`77`		`- // FIXME: dirty, because creating a request only to parse its class name`
`78`		`- operationName = StringUtils.getOperationName(getRequest());`
	`76`	`+ operationName = StringUtils.getOperationName(this);`
`79`	`77`	`}`
`80`	`78`
`81`	`79`	`public void addCallback(OcppCallback<RESPONSE> cb) {`