bugfix in DownstreamIdRulesHandler (#27)

* approved rest post respond updated, added copyright headers

* copyright header added to test, and unit test updated

Author: emichaf

src/main/java/com/ericsson/ei/App.java

@@ -1,3 +1,19 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 package com.ericsson.ei;
 
 import org.springframework.boot.SpringApplication;

src/main/java/com/ericsson/ei/EnpointSecurity.java

@@ -1,11 +1,19 @@
-/***********************************************************************
- *                                                                     *
- * Copyright Ericsson AB 2017                                          *
- *                                                                     * 
- * No part of this software may be reproduced in any form without the  *   
- * written permission of the copyright owner.                          *             
- *                                                                     *
- ***********************************************************************/
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 
 package com.ericsson.ei;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/ericsson/ei/config/SpringAsyncConfig.java

@@ -1,3 +1,19 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 package com.ericsson.ei.config;
 
 import java.util.concurrent.Executor;

src/main/java/com/ericsson/ei/config/SwaggerConfig.java

@@ -1,11 +1,19 @@
-/***********************************************************************
- *                                                                     *
- * Copyright Ericsson AB 2017                                          *
- *                                                                     * 
- * No part of this software may be reproduced in any form without the  *   
- * written permission of the copyright owner.                          *             
- *                                                                     *
- ***********************************************************************/
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 
 package com.ericsson.ei.config;
 

src/main/java/com/ericsson/ei/controller/SubscriptionControllerImpl.java

@@ -1,11 +1,19 @@
-/***********************************************************************
- *                                                                     *
- * Copyright Ericsson AB 2017                                          *
- *                                                                     * 
- * No part of this software may be reproduced in any form without the  *   
- * written permission of the copyright owner.                          *             
- *                                                                     *
- ***********************************************************************/
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 package com.ericsson.ei.controller;
 
 import java.util.ArrayList;

src/main/java/com/ericsson/ei/erqueryservice/ERQueryService.java

@@ -1,15 +1,18 @@
 /*
-    Copyright 2017 Ericsson AB.
-    For a full list of individual contributors, please see the commit history.
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 */
 package com.ericsson.ei.erqueryservice;
 

src/main/java/com/ericsson/ei/exception/SubscriptionNotFoundException.java

@@ -1,3 +1,19 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 package com.ericsson.ei.exception;
 
 public class SubscriptionNotFoundException extends Exception {

src/main/java/com/ericsson/ei/handlers/DownstreamExtractionHandler.java

@@ -1,3 +1,19 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 package com.ericsson.ei.handlers;
 
 import org.slf4j.Logger;

src/main/java/com/ericsson/ei/handlers/DownstreamIdRulesHandler.java

@@ -1,3 +1,19 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 package com.ericsson.ei.handlers;
 
 import java.util.ArrayList;
@@ -34,25 +50,27 @@ public void setJmesPathInterface(JmesPathInterface jmesPathInterface) {
     }
 
     public void runIdRules(RulesObject rulesObject, String event) {
-         JsonNode idsJsonObj = getIds(rulesObject, event);
-         ArrayList<String> objects = null;
-         String id;
-         if (idsJsonObj != null && idsJsonObj.isArray()) {
-             for (final JsonNode idJsonObj : idsJsonObj) {
-                 id = idJsonObj.textValue();
-                 objects = matchIdRulesHandler.fetchObjectsById(rulesObject, id);
-                 for (String object:objects) {
-                     downstreamExtractionHandler.runExtraction(rulesObject, id, event, object);
-                 }
-                 if (objects.size() == 0) {
-                     try {
-                         waitListStorageHandler.addEventToWaitList(event, rulesObject);
-                     } catch (Exception e) {
-                         log.info(e.getMessage(),e);
-                     }
-                 }
-             }
-         }
+        if (rulesObject != null && event != null) {
+            JsonNode idsJsonObj = getIds(rulesObject, event);
+            ArrayList<String> objects = null;
+            String id;
+            if (idsJsonObj != null && idsJsonObj.isArray()) {
+                for (final JsonNode idJsonObj : idsJsonObj) {
+                    id = idJsonObj.textValue();
+                    objects = matchIdRulesHandler.fetchObjectsById(rulesObject, id);
+                    for (String object : objects) {
+                        downstreamExtractionHandler.runExtraction(rulesObject, id, event, object);
+                    }
+                    if (objects.size() == 0) {
+                        try {
+                            waitListStorageHandler.addEventToWaitList(event, rulesObject);
+                        } catch (Exception e) {
+                            log.info(e.getMessage(), e);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     public JsonNode getIds(RulesObject rulesObject, String event) {

src/main/java/com/ericsson/ei/handlers/EventHandler.java

@@ -1,3 +1,19 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 package com.ericsson.ei.handlers;
 
 import org.slf4j.Logger;