[java-opensaml COMMIT] in /trunk/opensaml-messaging-impl/src: main/java/org/opensaml/messaging/handler/impl/SchemaVal...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Apr 28 22:49:43 2013
New Revision: 3320

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3320&view=rev
Log:
Adjust use of generic.

Modified:
    trunk/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessage.java
    trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java

Modified: trunk/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessage.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessage.java?rev=3320&r1=3319&r2=3320&view=diff
==============================================================================
--- trunk/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessage.java (original)
+++ trunk/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessage.java Sun Apr 28 22:49:43 2013
@@ -37,9 +37,11 @@
 /**
  * A handler that schema validates an XML-based message.
  * 
+ * @param <MessageType> type of message on which to operate
+ * 
  * @pre <pre>MessageContext.getMessage().getDOM() != null</pre>
  */
-public class SchemaValidateXmlMessage extends AbstractMessageHandler<XMLObject> {
+public class SchemaValidateXmlMessage<MessageType extends XMLObject> extends AbstractMessageHandler<MessageType> {
 
     /** Class logger. */
     private Logger log = LoggerFactory.getLogger(SchemaValidateXmlMessage.class);
@@ -66,7 +68,7 @@
     }
 
     /** {@inheritDoc} */
-    protected boolean doPreInvoke(@Nonnull final MessageContext<XMLObject> messageContext)
+    protected boolean doPreInvoke(@Nonnull final MessageContext<MessageType> messageContext)
             throws MessageHandlerException {
         
         if (messageContext.getMessage() == null) {
@@ -84,7 +86,7 @@
     }
     
     /** {@inheritDoc} */
-    protected void doInvoke(@Nonnull final MessageContext<XMLObject> messageContext)
+    protected void doInvoke(@Nonnull final MessageContext<MessageType> messageContext)
             throws MessageHandlerException {
 
         log.debug("{} Attempting to schema validate incoming message", getLogPrefix());

Modified: trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java?rev=3320&r1=3319&r2=3320&view=diff
==============================================================================
--- trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java (original)
+++ trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java Sun Apr 28 22:49:43 2013
@@ -84,7 +84,7 @@
     /** Test a null dom. */
     @Test public void testNullDom() throws Exception {
 
-        SchemaValidateXmlMessage handler = new SchemaValidateXmlMessage(schema);
+        SchemaValidateXmlMessage<SimpleXMLObject> handler = new SchemaValidateXmlMessage(schema);
         handler.initialize();
 
         MessageContext messageContext = new MessageContext();