From b1f998901b89b651d988432916df9a235d927620 Mon Sep 17 00:00:00 2001 From: Keith James Date: Wed, 18 Mar 2015 10:49:07 +0000 Subject: [PATCH] Removed default size limit on JSONCodec. Removed some incorrect 'use' statements in the tests. Updated copyright statements to WTSI format. --- lib/WTSI/DNAP/Utilities.pm | 2 +- lib/WTSI/DNAP/Utilities/Cacheable.pm | 2 +- lib/WTSI/DNAP/Utilities/Executable.pm | 2 +- lib/WTSI/DNAP/Utilities/IO.pm | 3 ++- lib/WTSI/DNAP/Utilities/JSONCodec.pm | 11 ++++++----- lib/WTSI/DNAP/Utilities/Loggable.pm | 2 +- lib/WTSI/DNAP/Utilities/Runnable.pm | 2 +- lib/WTSI/DNAP/Utilities/Startable.pm | 2 +- t/lib/WTSI/DNAP/Utilities/JSONCodecTest.pm | 2 -- t/lib/WTSI/DNAP/Utilities/StartableTest.pm | 2 -- 10 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/WTSI/DNAP/Utilities.pm b/lib/WTSI/DNAP/Utilities.pm index f2cc0fe..e3668b2 100644 --- a/lib/WTSI/DNAP/Utilities.pm +++ b/lib/WTSI/DNAP/Utilities.pm @@ -24,7 +24,7 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2013-2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2013, 2014 Genome Research Limited. All Rights Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/lib/WTSI/DNAP/Utilities/Cacheable.pm b/lib/WTSI/DNAP/Utilities/Cacheable.pm index 10c743f..3630115 100644 --- a/lib/WTSI/DNAP/Utilities/Cacheable.pm +++ b/lib/WTSI/DNAP/Utilities/Cacheable.pm @@ -131,7 +131,7 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2013-2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2013, 2014 Genome Research Limited. All Rights Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/lib/WTSI/DNAP/Utilities/Executable.pm b/lib/WTSI/DNAP/Utilities/Executable.pm index 6cde551..f013e79 100644 --- a/lib/WTSI/DNAP/Utilities/Executable.pm +++ b/lib/WTSI/DNAP/Utilities/Executable.pm @@ -64,7 +64,7 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2013-2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2013, 2014 Genome Research Limited. All Rights Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/lib/WTSI/DNAP/Utilities/IO.pm b/lib/WTSI/DNAP/Utilities/IO.pm index 15053ad..24734b9 100644 --- a/lib/WTSI/DNAP/Utilities/IO.pm +++ b/lib/WTSI/DNAP/Utilities/IO.pm @@ -83,7 +83,8 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2012-2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2012, 2013, 2014 Genome Research Limited. All Rights +Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/lib/WTSI/DNAP/Utilities/JSONCodec.pm b/lib/WTSI/DNAP/Utilities/JSONCodec.pm index 1caf3b0..d54170d 100644 --- a/lib/WTSI/DNAP/Utilities/JSONCodec.pm +++ b/lib/WTSI/DNAP/Utilities/JSONCodec.pm @@ -12,10 +12,11 @@ our $VERSION = ''; our @HANDLED_JSON_METHODS = qw(decode encode); has 'max_size' => - (is => 'ro', - isa => 'Int', - required => 1, - default => 4096); + (is => 'ro', + isa => 'Int', + required => 0, + default => 0, + documentation => 'The default max size is 0 which indicates no limit'); has 'parser' => (is => 'ro', @@ -49,7 +50,7 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2014, 2015 Genome Research Limited. All Rights Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/lib/WTSI/DNAP/Utilities/Loggable.pm b/lib/WTSI/DNAP/Utilities/Loggable.pm index 0dfb79c..cf661aa 100644 --- a/lib/WTSI/DNAP/Utilities/Loggable.pm +++ b/lib/WTSI/DNAP/Utilities/Loggable.pm @@ -54,7 +54,7 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2013-2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2013, 2014 Genome Research Limited. All Rights Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/lib/WTSI/DNAP/Utilities/Runnable.pm b/lib/WTSI/DNAP/Utilities/Runnable.pm index c1ed013..645d79e 100644 --- a/lib/WTSI/DNAP/Utilities/Runnable.pm +++ b/lib/WTSI/DNAP/Utilities/Runnable.pm @@ -134,7 +134,7 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2013-2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2013, 2014 Genome Research Limited. All Rights Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/lib/WTSI/DNAP/Utilities/Startable.pm b/lib/WTSI/DNAP/Utilities/Startable.pm index b42e073..799153e 100644 --- a/lib/WTSI/DNAP/Utilities/Startable.pm +++ b/lib/WTSI/DNAP/Utilities/Startable.pm @@ -129,7 +129,7 @@ Keith James =head1 COPYRIGHT AND DISCLAIMER -Copyright (c) 2013-2014 Genome Research Limited. All Rights Reserved. +Copyright (C) 2013, 2014 Genome Research Limited. All Rights Reserved. This program is free software: you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General diff --git a/t/lib/WTSI/DNAP/Utilities/JSONCodecTest.pm b/t/lib/WTSI/DNAP/Utilities/JSONCodecTest.pm index 3a8c875..d12e005 100644 --- a/t/lib/WTSI/DNAP/Utilities/JSONCodecTest.pm +++ b/t/lib/WTSI/DNAP/Utilities/JSONCodecTest.pm @@ -21,8 +21,6 @@ use Log::Log4perl; BEGIN { use_ok('WTSI::DNAP::Utilities::JSONCodec'); } -use WTSI::DNAP::Utilities::JSONCodecThing; - Log::Log4perl::init('./etc/log4perl_tests.conf'); my $json = '{"foo":"bar"}'; diff --git a/t/lib/WTSI/DNAP/Utilities/StartableTest.pm b/t/lib/WTSI/DNAP/Utilities/StartableTest.pm index c575dc8..2cd2bae 100644 --- a/t/lib/WTSI/DNAP/Utilities/StartableTest.pm +++ b/t/lib/WTSI/DNAP/Utilities/StartableTest.pm @@ -20,8 +20,6 @@ use Test::Exception; BEGIN { use_ok('WTSI::DNAP::Utilities::Startable'); } -use WTSI::DNAP::Utilities::StartableThing; - Log::Log4perl::init('./etc/log4perl_tests.conf'); sub start_stop : Test(5) {