1 files changed, 11 insertions, 11 deletions
diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java
index 5a0d11d4c..368305efa 100644
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java
@@ -102,7 +102,7 @@ public class ApexEvent extends HashMap<String, Object> implements Serializable {
     public static final String SOURCE_REGEXP = "^$|[A-Za-z0-9\\.\\-_:]+";
 
     /** The target of an Apex event must match this regular expression. */
-    public static final String TARGET_REGEXP = "^$|[A-Za-z0-9\\.\\-_:]+";
+    public static final String TARGET_REGEXP = SOURCE_REGEXP;
 
     // The fields of the event
     // @formatter:off
@@ -121,16 +121,6 @@ public class ApexEvent extends HashMap<String, Object> implements Serializable {
     private String exceptionMessage;
 
     /**
-     * Private utility to get the next candidate value for a Execution ID. This value will always be
-     * unique in a single JVM
-     * 
-     * @return the next candidate value for a Execution ID
-     */
-    private static synchronized long getNextExecutionId() {
-        return nextExecutionID.getAndIncrement();
-    }
-
-    /**
      * Instantiates a new apex event.
      *
      * @param name the name of the event
@@ -152,6 +142,16 @@ public class ApexEvent extends HashMap<String, Object> implements Serializable {
     }
 
     /**
+     * Private utility to get the next candidate value for a Execution ID. This value will always be
+     * unique in a single JVM
+     * 
+     * @return the next candidate value for a Execution ID
+     */
+    private static synchronized long getNextExecutionId() {
+        return nextExecutionID.getAndIncrement();
+    }
+
+    /**
      * Check that a field of the event is valid.
      *
      * @param fieldName the name of the field to check