Updated Branches: refs/heads/master 1aded3057 -> 4a2d616ff
fixing run time exception in the InstanceNotifierEventMessageDelegator Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bf9d67c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bf9d67c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bf9d67c8 Branch: refs/heads/master Commit: bf9d67c8a42b4a5eb9d4709c63037c7415970c50 Parents: b8d7d0c Author: reka <[email protected]> Authored: Mon Jan 13 13:51:43 2014 +0530 Committer: reka <[email protected]> Committed: Mon Jan 13 13:51:43 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 2 +- ...eCleanupClusterNotifierMessageProcessor.java | 55 ++++++++++++++++++++ ...ceCleanupMemberNotifierMessageProcessor.java | 55 ++++++++++++++++++++ ...InstanceCleanupNotifierMessageProcessor.java | 55 -------------------- .../InstanceNotifierMessageProcessorChain.java | 14 +++-- 5 files changed, 120 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bf9d67c8/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index c4fe290..a7d649a 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -136,7 +136,7 @@ public class CartridgeAgent implements Runnable { } private void onArtifactUpdateEvent(ArtifactUpdatedEvent event) { - ArtifactUpdatedEvent artifactUpdatedEvent = (ArtifactUpdatedEvent) event; + ArtifactUpdatedEvent artifactUpdatedEvent = event; if(log.isInfoEnabled()) { log.info(String.format("Artifact update event received: %s", artifactUpdatedEvent.toString())); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bf9d67c8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java new file mode 100644 index 0000000..f513663 --- /dev/null +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.stratos.messaging.message.processor.instance.notifier; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent; +import org.apache.stratos.messaging.message.processor.MessageProcessor; +import org.apache.stratos.messaging.util.Util; + +public class InstanceCleanupClusterNotifierMessageProcessor extends MessageProcessor { + private static final Log log = LogFactory.getLog(InstanceCleanupClusterNotifierMessageProcessor.class); + + private MessageProcessor nextProcessor; + @Override + public void setNext(MessageProcessor nextProcessor) { + this.nextProcessor = nextProcessor; + } + + @Override + public boolean process(String type, String message, Object object) { + if (InstanceCleanupClusterEvent.class.getName().equals(type)) { + // Parse complete message and build event + InstanceCleanupClusterEvent event = (InstanceCleanupClusterEvent) Util.jsonToObject(message, InstanceCleanupClusterEvent.class); + + // Notify event listeners + notifyEventListeners(event); + return true; + } + else { + if(nextProcessor != null) { + return nextProcessor.process(type, message, object); + } + else { + throw new RuntimeException(String.format("Failed to process instance clean up using available message processors: [type] %s [body] %s", type, message)); + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bf9d67c8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupMemberNotifierMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupMemberNotifierMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupMemberNotifierMessageProcessor.java new file mode 100644 index 0000000..7f5b0e7 --- /dev/null +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupMemberNotifierMessageProcessor.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.stratos.messaging.message.processor.instance.notifier; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMemberEvent; +import org.apache.stratos.messaging.message.processor.MessageProcessor; +import org.apache.stratos.messaging.util.Util; + +public class InstanceCleanupMemberNotifierMessageProcessor extends MessageProcessor { + private static final Log log = LogFactory.getLog(InstanceCleanupMemberNotifierMessageProcessor.class); + + private MessageProcessor nextProcessor; + @Override + public void setNext(MessageProcessor nextProcessor) { + this.nextProcessor = nextProcessor; + } + + @Override + public boolean process(String type, String message, Object object) { + if (InstanceCleanupMemberEvent.class.getName().equals(type)) { + // Parse complete message and build event + InstanceCleanupMemberEvent event = (InstanceCleanupMemberEvent) Util.jsonToObject(message, InstanceCleanupMemberEvent.class); + + // Notify event listeners + notifyEventListeners(event); + return true; + } + else { + if(nextProcessor != null) { + return nextProcessor.process(type, message, object); + } + else { + throw new RuntimeException(String.format("Failed to process instance clean up using available message processors: [type] %s [body] %s", type, message)); + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bf9d67c8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupNotifierMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupNotifierMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupNotifierMessageProcessor.java deleted file mode 100644 index cc9f174..0000000 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupNotifierMessageProcessor.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 org.apache.stratos.messaging.message.processor.instance.notifier; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMemberEvent; -import org.apache.stratos.messaging.message.processor.MessageProcessor; -import org.apache.stratos.messaging.util.Util; - -public class InstanceCleanupNotifierMessageProcessor extends MessageProcessor { - private static final Log log = LogFactory.getLog(InstanceCleanupNotifierMessageProcessor.class); - - private MessageProcessor nextProcessor; - @Override - public void setNext(MessageProcessor nextProcessor) { - this.nextProcessor = nextProcessor; - } - - @Override - public boolean process(String type, String message, Object object) { - if (InstanceCleanupMemberEvent.class.getName().equals(type)) { - // Parse complete message and build event - InstanceCleanupMemberEvent event = (InstanceCleanupMemberEvent) Util.jsonToObject(message, InstanceCleanupMemberEvent.class); - - // Notify event listeners - notifyEventListeners(event); - return true; - } - else { - if(nextProcessor != null) { - return nextProcessor.process(type, message, object); - } - else { - throw new RuntimeException(String.format("Failed to process instance clean up using available message processors: [type] %s [body] %s", type, message)); - } - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bf9d67c8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java index e0b8d73..520cf0f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java @@ -34,14 +34,18 @@ public class InstanceNotifierMessageProcessorChain extends MessageProcessorChain private static final Log log = LogFactory.getLog(InstanceNotifierMessageProcessorChain.class); private ArtifactUpdateMessageProcessor artifactUpdateMessageProcessor; - private InstanceCleanupNotifierMessageProcessor instanceCleanupNotifierMessageProcessor; + private InstanceCleanupMemberNotifierMessageProcessor instanceCleanupMemberNotifierMessageProcessor; + private InstanceCleanupClusterNotifierMessageProcessor instanceCleanupClusterNotifierMessageProcessor; public void initialize() { // Add instance notifier event processors artifactUpdateMessageProcessor = new ArtifactUpdateMessageProcessor(); add(artifactUpdateMessageProcessor); - instanceCleanupNotifierMessageProcessor = new InstanceCleanupNotifierMessageProcessor(); - add(instanceCleanupNotifierMessageProcessor); + instanceCleanupMemberNotifierMessageProcessor = new InstanceCleanupMemberNotifierMessageProcessor(); + add(instanceCleanupMemberNotifierMessageProcessor); + instanceCleanupClusterNotifierMessageProcessor = new InstanceCleanupClusterNotifierMessageProcessor(); + add(instanceCleanupClusterNotifierMessageProcessor); + if (log.isDebugEnabled()) { log.debug("Instance notifier message processor chain initialized"); @@ -52,9 +56,9 @@ public class InstanceNotifierMessageProcessorChain extends MessageProcessorChain if (eventListener instanceof ArtifactUpdateEventListener) { artifactUpdateMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof InstanceCleanupMemberEventListener) { - artifactUpdateMessageProcessor.addEventListener(eventListener); + instanceCleanupMemberNotifierMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof InstanceCleanupClusterEventListener) { - artifactUpdateMessageProcessor.addEventListener(eventListener); + instanceCleanupClusterNotifierMessageProcessor.addEventListener(eventListener); } else { throw new RuntimeException("Unknown event listener"); }
