X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FRequestManager.java;h=477028dc10d6c07457c8ef35fad55dad95c30f12;hb=ec486cbd31c74a793931db92aca02b964aa83b93;hp=d2b1bdea99d59ad8556c2cbf70a42e0f7ccd72e0;hpb=52f29c032eb637965d5342d3bd45843774d926b5;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/RequestManager.java b/src/net/pterodactylus/jsite/core/RequestManager.java index d2b1bde..477028d 100644 --- a/src/net/pterodactylus/jsite/core/RequestManager.java +++ b/src/net/pterodactylus/jsite/core/RequestManager.java @@ -1,6 +1,6 @@ /* - * jSite2 - RequestManager.java - - * Copyright © 2008 David Roden + * jSite-next - RequestManager.java - + * Copyright © 2009 David Roden * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,186 +20,23 @@ package net.pterodactylus.jsite.core; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.pterodactylus.fcp.highlevel.GetRequestResult; -import net.pterodactylus.fcp.highlevel.HighLevelCallback; -import net.pterodactylus.fcp.highlevel.HighLevelCallbackListener; -import net.pterodactylus.fcp.highlevel.HighLevelClient; -import net.pterodactylus.fcp.highlevel.HighLevelProgress; -import net.pterodactylus.fcp.highlevel.HighLevelProgressListener; -import net.pterodactylus.fcp.highlevel.PutDirRequestResult; -import net.pterodactylus.fcp.highlevel.PutRequestResult; -import net.pterodactylus.fcp.highlevel.RequestListResult; -import net.pterodactylus.fcp.highlevel.RequestResult; -import net.pterodactylus.jsite.core.Request.Type; -import net.pterodactylus.util.logging.Logging; /** - * The request manager keeps track of all the request on all connected nodes. - * The request manager is added to the {@link NodeManager} as a - * {@link NodeListener} so that it can fire request-removed events in case a - * node is disconnected. - * - * @author David ‘Bombe’ Roden <bombe@freenetproject.org> - * @version $Id$ + * Manages requests. + * + * @author David ‘Bombe’ Roden */ -public class RequestManager implements NodeListener, HighLevelProgressListener { - - /** Logger. */ - private static final Logger logger = Logging.getLogger(RequestManager.class.getName()); - - /** Request listeners. */ - private List requestListeners = Collections.synchronizedList(new ArrayList()); - - /** The node manager. */ - private NodeManager nodeManager; - - /** Request lists for all nodes. */ - @SuppressWarnings("unused") - private Map> nodeRequests = Collections.synchronizedMap(new HashMap>()); - - // - // EVENT MANAGEMENT - // - - /** - * Adds a request listener. - * - * @param requestListener - * The request listener to add - */ - public void addRequestListener(RequestListener requestListener) { - requestListeners.add(requestListener); - } - - /** - * Removes a request listener. - * - * @param requestListener - * The request listener to remove - */ - public void removeRequestListener(RequestListener requestListener) { - requestListeners.remove(requestListener); - } - - /** - * Notifies all listeners that a request was added. - * - * @param request - * The request that was added - */ - private void fireRequestAdded(Request request) { - for (RequestListener requestListener: requestListeners) { - requestListener.requestAdded(request); - } - } - - /** - * Notifies all listeners that a request progressed. - * - * @param request - * The request - */ - private void fireRequestProgressed(Request request) { - for (RequestListener requestListener: requestListeners) { - requestListener.requestProgressed(request); - } - } - - /** - * Notifies all listeners that a request was removed. - * - * @param request - * The request that was removed - */ - private void fireRequestRemoved(Request request) { - for (RequestListener requestListener: requestListeners) { - requestListener.requestRemoved(request); - } - } - - // - // ACCESSORS - // - - /** - * Sets the node manager to use. - * - * @param nodeManager - * The node manager - */ - public void setNodeManager(NodeManager nodeManager) { - this.nodeManager = nodeManager; - } +public class RequestManager implements NodeListener { // // ACTIONS // - // - // PRIVATE ACTIONS - // + public void load() throws IOException { - /** - * Requests a list of all running requests from a node. This method will - * block until the request has been sent! - * - * @param node - * The node to get all requests for - * @throws IOException - * if an I/O error occurs while communicating with the node - */ - private void getRequests(final Node node) throws IOException { - HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node); - if (highLevelClient == null) { - logger.log(Level.WARNING, "no client for node: " + node); - return; - } - final Map identifierRequests = Collections.synchronizedMap(new HashMap()); - nodeRequests.put(node, identifierRequests); - HighLevelCallback requestListCallback = highLevelClient.getRequests(); - requestListCallback.addHighLevelCallbackListener(new HighLevelCallbackListener() { + } - @SuppressWarnings("synthetic-access") - public void gotResult(HighLevelCallback highLevelCallback) { - RequestListResult requestListResult; - try { - requestListResult = highLevelCallback.getResult(); - } catch (InterruptedException e) { - logger.log(Level.SEVERE, "getResult() blocked and was interrupted"); - return; - } - for (RequestResult requestResult: requestListResult) { - String identifier = requestResult.getIdentifier(); - logger.log(Level.FINER, "got identifier: " + identifier); - Request request = identifierRequests.get(identifier); - if (request == null) { - request = new Request(node, identifier); - } - if (request.getType() == null) { - if (requestResult instanceof GetRequestResult) { - request.setType(Type.get); - } else if (requestResult instanceof PutRequestResult) { - request.setType(Type.put); - } else if (requestResult instanceof PutDirRequestResult) { - request.setType(Type.putDir); - } - } - if (identifierRequests.containsKey(identifier)) { - continue; - } - identifierRequests.put(requestResult.getIdentifier(), request); - fireRequestAdded(request); - } - } - }); + public void save() throws IOException { } // @@ -210,99 +47,35 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { * {@inheritDoc} */ public void nodeAdded(Node node) { - HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node); - if (highLevelClient == null) { - logger.warning("got nodeAdded but no high-level client: " + node); - return; - } - highLevelClient.addHighLevelProgressListener(this); - } - - /** - * {@inheritDoc} - */ - public void nodeRemoved(Node node) { - HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node); - if (highLevelClient == null) { - logger.warning("got nodeRemoved but no high-level client: " + node); - return; - } - highLevelClient.removeHighLevelProgressListener(this); + /* TODO */ } /** * {@inheritDoc} */ public void nodeConnected(Node node) { - HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node); - if (highLevelClient == null) { - logger.log(Level.WARNING, "got no high-level client for node " + node); - return; - } - try { - highLevelClient.setWatchGlobal(true); - getRequests(node); - } catch (IOException e) { - /* ignore exception, disconnects are handled elsewhere. */ - } + /* TODO */ } /** * {@inheritDoc} */ public void nodeConnectionFailed(Node node, Throwable cause) { - /* we don't care about this. */ + /* TODO */ } /** * {@inheritDoc} */ public void nodeDisconnected(Node node, Throwable throwable) { - Map identifierRequests = nodeRequests.get(node); - if (identifierRequests == null) { - logger.warning("got node without request map: " + node); - return; - } - for (Request request: identifierRequests.values()) { - fireRequestRemoved(request); - } - identifierRequests.clear(); + /* TODO */ } - // - // INTERFACE HighLevelProgressListener - // - /** - * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(HighLevelClient, - * String, HighLevelProgress) + * {@inheritDoc} */ - public void progressReceived(HighLevelClient highLevelClient, String identifier, HighLevelProgress highLevelProgress) { - Node node = nodeManager.getNode(highLevelClient); - if (node == null) { - logger.warning("got high-level client without node: " + highLevelClient); - return; - } - Map identifierRequests = nodeRequests.get(node); - if (identifierRequests == null) { - logger.warning("got node without request map: " + node); - identifierRequests = Collections.synchronizedMap(new HashMap()); - nodeRequests.put(node, identifierRequests); - } - Request request = identifierRequests.get(identifier); - if (request == null) { - logger.warning("got progress for unknown request: " + identifier); - request = new Request(node, identifier); - identifierRequests.put(identifier, request); - fireRequestAdded(request); - } - request.setTotalBlocks(highLevelProgress.getTotalBlocks()); - request.setRequiredBlocks(highLevelProgress.getRequiredBlocks()); - request.setSuccessfulBlocks(highLevelProgress.getSuccessfulBlocks()); - request.setFailedBlocks(highLevelProgress.getFailedBlocks()); - request.setFatallyFailedBlocks(highLevelProgress.getFatallyFailedBlocks()); - request.setTotalFinalized(highLevelProgress.isTotalFinalized()); - fireRequestProgressed(request); + public void nodeRemoved(Node node) { + /* TODO */ } }