Make use of builders instead of using BUILDARGS

Signed-off-by: Wesley Schwengle <[email protected]>

Author: waterkip

Makefile.PL

@@ -49,6 +49,7 @@ my %WriteMakefileArgs = (
     "XML::XPath" => 0,
     "base" => 0,
     "constant" => 0,
+    "namespace::autoclean" => 0,
     "strict" => 0,
     "vars" => 0,
     "warnings" => 0
@@ -66,8 +67,7 @@ my %WriteMakefileArgs = (
     "Test::Pod" => "1.14",
     "Test::Pod::Coverage" => "1.04",
     "XML::LibXML" => 0,
-    "XML::LibXML::XPathContext" => 0,
-    "namespace::autoclean" => 0
+    "XML::LibXML::XPathContext" => 0
   },
   "VERSION" => "0.26",
   "test" => {

cpanfile

@@ -33,6 +33,7 @@ requires "XML::Writer" => "0";
 requires "XML::XPath" => "0";
 requires "base" => "0";
 requires "constant" => "0";
+requires "namespace::autoclean" => "0";
 requires "perl" => "5.008_001";
 requires "strict" => "0";
 requires "vars" => "0";
@@ -52,7 +53,6 @@ on 'test' => sub {
   requires "Test::Pod::Coverage" => "1.04";
   requires "XML::LibXML" => "0";
   requires "XML::LibXML::XPathContext" => "0";
-  requires "namespace::autoclean" => "0";
 };
 
 on 'configure' => sub {

lib/Net/SAML2/Role/ProtocolMessage.pm

@@ -1,14 +1,14 @@
 package Net::SAML2::Role::ProtocolMessage;
+
 use Moose::Role;
-use MooseX::Types::Moose qw/ Str /;
-use MooseX::Types::URI qw/ Uri /;
-use DateTime::Format::XSD;
-use XML::Generator;
-use Net::SAML2::Util qw(generate_id);
 
-=head1 NAME
+# ABSTRACT: Common behaviour for Protocol messages
 
-Net::SAML2::Role::ProtocolMessage - common behaviour for Protocol messages
+use namespace::autoclean;
+
+use DateTime;
+use MooseX::Types::URI qw/ Uri /;
+use Net::SAML2::Util qw(generate_id);
 
 =head1 DESCRIPTION
 
@@ -19,27 +19,48 @@ implementation.
 
 =cut
 
-has 'id'            => (isa => Str, is => 'ro', required => 1);
-has 'issue_instant' => (isa => Str, is => 'ro', required => 1);
-has 'issuer'        => (isa => Uri, is => 'rw', required => 1, coerce => 1);
-has 'issuer_namequalifier' => (isa => Str, is => 'rw', required => 0);
-has 'issuer_format' => (isa => Str, is => 'rw', required => 0);
-has 'destination'   => (isa => Uri, is => 'rw', required => 0, coerce => 1);
-
-around 'BUILDARGS' => sub {
-    my $orig = shift;
-    my $class = shift;
-    my %args = @_;
-
-    # random ID for this message
-    $args{id} ||= generate_id();
-
-    # IssueInstant in UTC
-    my $dt = DateTime->now( time_zone => 'UTC' );
-    $args{issue_instant} ||= $dt->strftime('%FT%TZ');
+has id => (
+    isa     => 'Str',
+    is      => 'ro',
+    builder => "_build_id"
+);
+
+has issue_instant => (
+    isa     => 'Str',
+    is      => 'ro',
+    builder => '_build_issue_instant',
+);
+
+has issuer => (
+    isa      => Uri,
+    is       => 'rw',
+    required => 1,
+    coerce   => 1,
+);
+
+has issuer_namequalifier => (
+    isa => 'Str',
+    is  => 'rw'
+);
+
+has issuer_format => (
+    isa => 'Str',
+    is  => 'rw'
+);
+
+has destination => (
+    isa    => Uri,
+    is     => 'rw',
+    coerce => 1
+);
+
+sub _build_issue_instant {
+    return DateTime->now(time_zone => 'UTC')->strftime('%FT%TZ');
+}
 
-    return \%args;
-};
+sub _build_id {
+    return generate_id();
+}
 
 =head1 CONSTRUCTOR ARGUMENTS