From 0290ac30c2b204b838f0b0e8c908cea7c5a22e56 Mon Sep 17 00:00:00 2001 From: fmoga Date: Tue, 31 May 2011 10:47:41 +0000 Subject: Code cleanup. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1129611 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/sample/comet/Event.java | 18 ++++ .../tuscany/sca/sample/comet/EventProcessor.java | 116 ++++++++++----------- .../src/main/webapp/WEB-INF/web.composite | 29 ++++-- 3 files changed, 94 insertions(+), 69 deletions(-) (limited to 'sca-java-2.x/contrib/samples/learning-more/binding-comet') diff --git a/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java b/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java index 033a54880e..bcc6bea7af 100644 --- a/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java +++ b/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Event.java @@ -1,3 +1,21 @@ +/* + * 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.tuscany.sca.sample.comet; public class Event { diff --git a/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java b/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java index 3b19398ca1..838d2f317c 100644 --- a/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java +++ b/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/EventProcessor.java @@ -22,9 +22,9 @@ package org.apache.tuscany.sca.sample.comet; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.apache.tuscany.sca.binding.comet.runtime.callback.CometCallback; import org.apache.tuscany.sca.binding.comet.runtime.callback.Status; @@ -42,66 +42,66 @@ import com.google.common.collect.Multimaps; @Scope("COMPOSITE") public class EventProcessor implements EventProcessorConsumerService, EventProcessorProducerService { - @Context - protected ComponentContext componentContext; + @Context + protected ComponentContext componentContext; - private Map clients = new ConcurrentHashMap(); - private Multimap eventListeners = Multimaps.synchronizedMultimap(HashMultimap - . create()); + private ConcurrentMap clients = new ConcurrentHashMap(); + private Multimap eventListeners = Multimaps.synchronizedMultimap(HashMultimap + . create()); - @Override - public void onEvent(String eventName, String eventData) { - // System.out.println("EventProcessor: Received event " + eventName + - // "..."); - List destinations = new ArrayList(); - synchronized (eventListeners) { - destinations.addAll(eventListeners.get(eventName)); - } - Event event = new Event(); - event.setName(eventName); - event.setData(eventData); - for (String registrationId : destinations) { - CometCallback client = clients.get(registrationId); - if (client == null) { - // client has unregistered from this event - synchronized (eventListeners) { - eventListeners.remove(eventName, registrationId); - } - } else { - Status status = client.sendMessage(event); - if (status == Status.CLIENT_DISCONNECTED) { - unregister(registrationId); - } - } - } - } + @Override + public void onEvent(String eventName, String eventData) { + // System.out.println("EventProcessor: Received event " + eventName + + // "..."); + List destinations = new ArrayList(); + synchronized (eventListeners) { + destinations.addAll(eventListeners.get(eventName)); + } + Event event = new Event(); + event.setName(eventName); + event.setData(eventData); + for (String registrationId : destinations) { + CometCallback client = clients.get(registrationId); + if (client == null) { + // client has unregistered from this event + synchronized (eventListeners) { + eventListeners.remove(eventName, registrationId); + } + } else { + Status status = client.sendMessage(event); + if (status == Status.CLIENT_DISCONNECTED) { + unregister(registrationId); + } + } + } + } - @Override - public void register(String eventName) { - String registrationId = UUID.randomUUID().toString(); - CometCallback callback = componentContext.getRequestContext().getCallback(); - clients.put(registrationId, callback); - synchronized (eventListeners) { - eventListeners.put(eventName, registrationId); - } - Event event = new Event(); - event.setId(registrationId); - event.setName(eventName); - event.setData(new Date().toString()); - callback.sendMessage(event); - } + @Override + public void register(String eventName) { + String registrationId = UUID.randomUUID().toString(); + CometCallback callback = componentContext.getRequestContext().getCallback(); + clients.put(registrationId, callback); + synchronized (eventListeners) { + eventListeners.put(eventName, registrationId); + } + Event event = new Event(); + event.setId(registrationId); + event.setName(eventName); + event.setData(new Date().toString()); + callback.sendMessage(event); + } - @Override - public void unregister(String registrationId) { - clients.remove(registrationId); - // unregistration from eventListeners done during onEvent - } + @Override + public void unregister(String registrationId) { + clients.remove(registrationId); + // unregistration from eventListeners done during onEvent + } - @Destroy - public void shutdown() { - clients.clear(); - eventListeners.clear(); - clients = null; - eventListeners = null; - } + @Destroy + public void shutdown() { + clients.clear(); + eventListeners.clear(); + clients = null; + eventListeners = null; + } } diff --git a/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite index 61096a4226..6479e10e99 100644 --- a/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite +++ b/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/WEB-INF/web.composite @@ -1,15 +1,22 @@ - + -- cgit v1.2.3