Author: nextgens Date: 2007-04-12 01:54:41 +0000 (Thu, 12 Apr 2007) New Revision: 12591
Removed: trunk/freenet/src/freenet/node/fcp/TestDDADeleteTestFileMessage.java trunk/freenet/src/freenet/node/fcp/TestDDAMessage.java trunk/freenet/src/freenet/node/fcp/TestDDAResult.java trunk/freenet/src/freenet/node/fcp/TestDDAResultMessage.java Log: More dead code removal; In fact I didn't use any of the code :$ Deleted: trunk/freenet/src/freenet/node/fcp/TestDDADeleteTestFileMessage.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/TestDDADeleteTestFileMessage.java 2007-04-12 01:54:00 UTC (rev 12590) +++ trunk/freenet/src/freenet/node/fcp/TestDDADeleteTestFileMessage.java 2007-04-12 01:54:41 UTC (rev 12591) @@ -1,66 +0,0 @@ -/* This code is part of Freenet. It is distributed under the GNU General - * Public License, version 2 (or at your option any later version). See - * http://www.gnu.org/ for further details of the GPL. */ -package freenet.node.fcp; - -import java.io.File; - -import freenet.node.Node; -import freenet.node.TestDDAManager; -import freenet.support.SimpleFieldSet; - -/** - * DeleteDDATestFile - * Identifier=indent123unique [mandatory] - * ClientToken=clientid [mandatory] test owner - * - */ -public class TestDDADeleteTestFileMessage extends FCPMessage { - - static final String name = "DeleteDDATestFile"; - - private static final String FN_IDENTIFIER = "Identifier"; - - private final String _ident; // unique id - - /** - * @throws MessageInvalidException - */ - public TestDDADeleteTestFileMessage(SimpleFieldSet fs) throws MessageInvalidException { - _ident = fs.get(FN_IDENTIFIER); - if(_ident == null) - throw new MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "No Identifier", null, false); - } - - public SimpleFieldSet getFieldSet() { - SimpleFieldSet fs = new SimpleFieldSet(true); - fs.putSingle("Identifier", _ident); - return fs; - } - - public String getName() { - return name; - } - - public void run(FCPConnectionHandler handler, Node node) - throws MessageInvalidException { - handler.getClientName(); - TestDDAManager tm = null;// FIXME node.clientCore.testDDAManager; - TestDDAResult tr = tm.getTestResult(_ident); - if (tr == null) { - throw new MessageInvalidException(ProtocolErrorMessage.NO_SUCH_IDENTIFIER, "No such test identifier", _ident, false); - } - if (!tr.isConfirmed) { - throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "You need to confirm the test first", _ident, false); - } - File tf = tm.getTestWriteFile(_ident); - - FCPMessage msg; - - if (tf == null) { - msg = new ProtocolErrorMessage(ProtocolErrorMessage.INTERNAL_ERROR, false, "Not a write test", _ident, false); - } - - handler.outputHandler.queue(this); - } -} Deleted: trunk/freenet/src/freenet/node/fcp/TestDDAMessage.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/TestDDAMessage.java 2007-04-12 01:54:00 UTC (rev 12590) +++ trunk/freenet/src/freenet/node/fcp/TestDDAMessage.java 2007-04-12 01:54:41 UTC (rev 12591) @@ -1,249 +0,0 @@ -/* This code is part of Freenet. It is distributed under the GNU General - * Public License, version 2 (or at your option any later version). See - * http://www.gnu.org/ for further details of the GPL. */ -package freenet.node.fcp; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; - -import java.io.FilenameFilter; -import java.util.Arrays; -import java.util.Random; - -import freenet.node.Node; -import freenet.node.NodeClientCore; -import freenet.support.HexUtil; -import freenet.support.SimpleFieldSet; - -/** - * TestDDA - * Identifier=indent123unique [mandatory] - * DirToTest=/path/to/dir [mandatory] the dir to test - * TestList=true [default: false] can we list the dir? - * TestRead=fileindir.ext the filename for read test - * readtest skipped if missing - * TestWrite=true the node will generate an unique filename - * writetest skipped if missing or not true - * - */ -public class TestDDAMessage extends FCPMessage { - - private short status = -1; - - static final String name = "TestDDA"; - - private static final String FN_IDENTIFIER = "Identifier"; - private static final String FN_TEST2DIR = "DirToTest"; - private static final String FN_TESTLIST = "TestList"; - private static final String FN_TESTREAD = "TestRead"; - private static final String FN_TESTWRITE = "TestWrite"; - - private boolean resultList = false; - private boolean resultWrite = false; - - private String readResult = null; - private String writeResult = null; - private final boolean _testlist; - private final boolean _testwrite; - private final String identifier; // unique id - private final String dir2test; // the dir to test - private final String _readfilename; - - private String writefilename; - - /** - * @throws MessageInvalidException - */ - public TestDDAMessage(SimpleFieldSet fs) throws MessageInvalidException { - identifier = fs.get(FN_IDENTIFIER); - if(identifier == null) - throw new MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "No Identifier", null, false); - - dir2test = fs.get(FN_TEST2DIR); - if(dir2test == null) - throw new MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "No Dir to test given", identifier, false); - if(dir2test.trim().length() == 0) - throw new MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "DirToTest can't be empty!", identifier, false); - - String rfn = fs.get(FN_TESTREAD); - if(rfn != null) - if (rfn.trim().length() > 0) - _readfilename = rfn; - else - throw new MessageInvalidException(ProtocolErrorMessage.INVALID_FIELD, "Read test filename can't be empty!", identifier, false); - else _readfilename = null; - - _testwrite = fs.getBoolean(FN_TESTWRITE, false); - - String wfn = fs.get("WriteFilename"); - - if (wfn == null) - writefilename = null; - else - writefilename = wfn; - - _testlist = fs.getBoolean(FN_TESTLIST, false); - } - - public SimpleFieldSet getFieldSet() { - SimpleFieldSet fs = new SimpleFieldSet(true); - fs.putSingle("Identifier", identifier); - fs.putSingle("TestedDir", dir2test); - fs.putSingle("Status", getStatus()); - if (status == 0) { - if (_testlist) - fs.putSingle("ListTest", getResultName(resultList)); - else - fs.putSingle("ListTest", "Skipped"); - - if (_readfilename != null) { - if (readResult == null) { - fs.putSingle("ReadTest", getResultName(false)); - } else { - fs.putSingle("ReadTest", getResultName(true)); - fs.putSingle("ReadResult", readResult); - } - } else - fs.putSingle("ReadTest", "Skipped"); - - if (writefilename != null) { -// if (writeTestFilename != null) { -// fs.putSingle("WriteFileName", writeTestFilename); -// } else { - fs.putSingle("WriteFileName", writefilename); -// } - fs.putSingle("WriteData", writeResult); - fs.putSingle("WriteTest", getResultName(resultWrite)); - } else - fs.putSingle("WriteTest", "Skipped"); - } else if (status == -1) { - fs.putSingle("Description", "Test not started"); - } else if (status == 1) { - fs.putSingle("Description", "Dir doesn't exist or isn't acccessible"); - } else - fs.putSingle("Description", "Unknown status? please report"); - return fs; - } - - public String getName() { - return name; - } - - public void run(FCPConnectionHandler handler, Node node) - throws MessageInvalidException { - handler.getClientName(); - NodeClientCore core = node.clientCore; - realTest(); - handler.outputHandler.queue(this); - } - - private void realTest() throws MessageInvalidException { - - // first test dir itself - File dir = new File(dir2test); - - if (!dir.isDirectory()) { - status = 1; - return; - } - - - // can list dir? - FilenameFilter dirLimiter = new FilenameFilter() { - private int limit = 10; - - public boolean accept(File dir, String name) { - if (limit <1) return false; - limit--; - return true; - } - }; - - String[] t_dirList = dir.list(dirLimiter); - resultList = (t_dirList != null); - - // read - if (_readfilename != null) { - - File t_read = new File(dir, _readfilename); - - if (!t_read.isFile()) - throw new MessageInvalidException(ProtocolErrorMessage.FILE_NOT_FOUND, "Read test filename must be an existing regular file!", identifier, false); - - if (t_read.length() == 0) - throw new MessageInvalidException(ProtocolErrorMessage.NOT_SUPPORTED, "Read test file must have content! File size is null!", identifier, false); - - // read first max 8 bytes - try { - FileInputStream fis = new FileInputStream(t_read); - byte[] b = new byte[8]; - int l; - try { - l = fis.read(b, 0, 8); - readResult = HexUtil.bytesToHex(b, 0 ,l); - } catch (IOException e) { - } - fis.close(); - } catch (FileNotFoundException e) { - } catch (IOException e) { - } - } - - // write - if (writefilename != null) { - - Random r = new Random(); - byte[] b = new byte[8]; - - r.nextBytes(b); - - File f; - try { - if (writefilename.trim().length() == 0) { - //generate one - f = File.createTempFile("NodeDDAtest", ".dat", dir); - // writeTestFilename = f.getName(); - } else { - f = new File(dir, writefilename); - if (f.exists()) { - throw new MessageInvalidException(ProtocolErrorMessage.DISK_TARGET_EXISTS, "Write test target file can't exist!", identifier, false); - } - } - - f.deleteOnExit(); - - FileOutputStream fos = new FileOutputStream(f); - fos.write(b); - fos.close(); - - FileInputStream fis = new FileInputStream(f); - - byte[] bb = new byte[8]; - - fis.read(bb); - fis.close(); - - writeResult= HexUtil.bytesToHex(bb, 0 ,8); - resultWrite = Arrays.equals(b, bb); - - } catch (IOException ioe) { - } - } - status = 0; - } - - private String getStatus() { - if (status == 0) return "Done"; - if (status > 0) return "Failed"; - return "Unknown"; - } - - private String getResultName(boolean rn) { - if (rn) return "OK"; - return "Failed"; - } - -} Deleted: trunk/freenet/src/freenet/node/fcp/TestDDAResult.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/TestDDAResult.java 2007-04-12 01:54:00 UTC (rev 12590) +++ trunk/freenet/src/freenet/node/fcp/TestDDAResult.java 2007-04-12 01:54:41 UTC (rev 12591) @@ -1,14 +0,0 @@ -/* This code is part of Freenet. It is distributed under the GNU General - * Public License, version 2 (or at your option any later version). See - * http://www.gnu.org/ for further details of the GPL. */ -package freenet.node.fcp; - - -/** - * - */ -public class TestDDAResult { - - boolean isConfirmed; - -} Deleted: trunk/freenet/src/freenet/node/fcp/TestDDAResultMessage.java =================================================================== --- trunk/freenet/src/freenet/node/fcp/TestDDAResultMessage.java 2007-04-12 01:54:00 UTC (rev 12590) +++ trunk/freenet/src/freenet/node/fcp/TestDDAResultMessage.java 2007-04-12 01:54:41 UTC (rev 12591) @@ -1,59 +0,0 @@ -/* This code is part of Freenet. It is distributed under the GNU General - * Public License, version 2 (or at your option any later version). See - * http://www.gnu.org/ for further details of the GPL. */ -package freenet.node.fcp; - -import freenet.node.Node; -import freenet.support.SimpleFieldSet; - -/** - * TestDDA - * Identifier=indent123unique [mandatory] - * DirToTest=/path/to/dir [mandatory] the dir to test - * TestList=true [default: false] can we list the dir? - * TestRead=fileindir.ext the filename for read test - * readtest skipped if missing - * TestWrite=true the node will generate an unique filename - * writetest skipped if missing or not true - * - */ -public class TestDDAResultMessage extends FCPMessage { - - static final String name = "TestDDAResult"; - - private static final String FN_IDENTIFIER = "Identifier"; - - private final String _ident; // unique id - private final String _msg; - - /** - * @throws MessageInvalidException - */ -// public TestDDAResultMessage(SimpleFieldSet fs) throws MessageInvalidException { -// _ident = fs.get(FN_IDENTIFIER); -// if(_ident == null) -// throw new MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "No Identifier", null, false); -// -// } - - private TestDDAResultMessage(String ident, String msg) { - _ident = ident; - _msg = msg; - } - - public SimpleFieldSet getFieldSet() { - SimpleFieldSet fs = new SimpleFieldSet(true); - fs.putSingle("Identifier", _ident); - return fs; - } - - public String getName() { - return name; - } - - public void run(FCPConnectionHandler handler, Node node) - throws MessageInvalidException { - throw new MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "SimpleProgress goes from server to client not the other way around", _ident, false); - } - -}
