You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2008/06/17 13:07:50 UTC
svn commit: r668616 - in
/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src:
main/java/org/apache/servicemix/validation/
main/java/org/apache/servicemix/validation/handler/
test/java/org/apache/servicemix/validation/
Author: lhein
Date: Tue Jun 17 04:07:50 2008
New Revision: 668616
URL: http://svn.apache.org/viewvc?rev=668616&view=rev
Log:
updated code style according to pmd and checkstyle rules
Modified:
servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpoint.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpointType.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/CountingErrorHandler.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAggregatingErrorHandler.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandler.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandlerFactory.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpoint.java?rev=668616&r1=668615&r2=668616&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpoint.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpoint.java Tue Jun 17 04:07:50 2008
@@ -33,6 +33,8 @@
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
+import org.xml.sax.SAXException;
+
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.jbi.FaultException;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -42,7 +44,6 @@
import org.apache.servicemix.validation.handler.MessageAwareErrorHandler;
import org.apache.servicemix.validation.handler.MessageAwareErrorHandlerFactory;
import org.springframework.core.io.Resource;
-import org.xml.sax.SAXException;
/**
* @org.apache.xbean.XBean element="endpoint"
@@ -110,7 +111,7 @@
} else {
schemaSource = new StreamSource(schemaResource
.getInputStream(), schemaResource.getURL()
- .toExternalForm());
+ .toExternalForm());
}
}
schema = factory.newSchema(schemaSource);
@@ -140,7 +141,7 @@
*/
@Override
protected void processInOnly(MessageExchange exchange, NormalizedMessage in)
- throws Exception {
+ throws Exception {
NormalizedMessage out = exchange.createMessage();
Fault fault = exchange.createFault();
this.startValidation(exchange, in, out, fault);
@@ -191,7 +192,8 @@
try {
// Only DOMSource and SAXSource are allowed for validating
// See
- // http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/validation/Validator.html#validate(javax.xml.transform.Source,%20javax.xml.transform.Result)
+ // http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/validation/
+ // Validator.html#validate(javax.xml.transform.Source,%20javax.xml.transform.Result)
// As we expect a DOMResult as output, we must ensure that the input
// is a DOMSource
DOMSource src = sourceTransformer.toDOMSource(in.getContent());
@@ -301,7 +303,7 @@
* java.lang.Exception)
*/
protected void fail(MessageExchange messageExchange, Exception e)
- throws MessagingException {
+ throws MessagingException {
super.fail(messageExchange, e);
}
@@ -311,7 +313,7 @@
* @see org.apache.servicemix.common.endpoints.SimpleEndpoint#send(javax.jbi.messaging.MessageExchange)
*/
protected void send(MessageExchange messageExchange)
- throws MessagingException {
+ throws MessagingException {
super.send(messageExchange);
}
@@ -321,7 +323,7 @@
* @see org.apache.servicemix.common.endpoints.SimpleEndpoint#sendSync(javax.jbi.messaging.MessageExchange)
*/
protected void sendSync(MessageExchange messageExchange)
- throws MessagingException {
+ throws MessagingException {
super.sendSync(messageExchange);
}
@@ -331,7 +333,7 @@
* @see org.apache.servicemix.common.endpoints.SimpleEndpoint#done(javax.jbi.messaging.MessageExchange)
*/
protected void done(MessageExchange messageExchange)
- throws MessagingException {
+ throws MessagingException {
super.done(messageExchange);
}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpointType.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpointType.java?rev=668616&r1=668615&r2=668616&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpointType.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/ValidationEndpointType.java Tue Jun 17 04:07:50 2008
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.servicemix.validation;
/**
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/CountingErrorHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/CountingErrorHandler.java?rev=668616&r1=668615&r2=668616&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/CountingErrorHandler.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/CountingErrorHandler.java Tue Jun 17 04:07:50 2008
@@ -18,9 +18,8 @@
import javax.jbi.messaging.MessagingException;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
/**
* A simple implementation of {@link ErrorHandler} which just counts the number of warnings, errors and fatal errors.
@@ -85,21 +84,25 @@
* @see org.apache.servicemix.components.validation.MessageAwareErrorHandler#capturesMessages()
*/
public boolean capturesMessages() {
- return false;
+ return false;
}
- /* (non-Javadoc)
- * @see org.apache.servicemix.components.validation.MessageAwareErrorHandler#getMessagesAs(java.lang.Class)
- */
- public Object getMessagesAs(Class format) throws MessagingException {
- throw new MessagingException("Unsupported message format: " + format.getName());
- }
-
- /* (non-Javadoc)
- * @see org.apache.servicemix.components.validation.MessageAwareErrorHandler#supportsMessageFormat(java.lang.Class)
- */
- public boolean supportsMessageFormat(Class format) {
- return false;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.servicemix.components.validation.MessageAwareErrorHandler#getMessagesAs(java.lang.Class)
+ */
+ public Object getMessagesAs(Class format) throws MessagingException {
+ throw new MessagingException("Unsupported message format: " + format.getName());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.servicemix.components.validation.MessageAwareErrorHandler#supportsMessageFormat(java.lang.Class)
+ */
+ public boolean supportsMessageFormat(Class format) {
+ return false;
+ }
}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAggregatingErrorHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAggregatingErrorHandler.java?rev=668616&r1=668615&r2=668616&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAggregatingErrorHandler.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAggregatingErrorHandler.java Tue Jun 17 04:07:50 2008
@@ -25,11 +25,11 @@
import javax.xml.transform.TransformerException;
import javax.xml.transform.dom.DOMSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXException;
/**
* An implementation of {@link ErrorHandler} which aggregates all warnings and
@@ -39,14 +39,14 @@
*/
public class MessageAggregatingErrorHandler implements MessageAwareErrorHandler {
- private static final String openCDATA = "<![CDATA[";
- private static final String closeCDATA = "]]>";
- private static final String openError = "<error>";
- private static final String closeError = "</error>";
- private static final String openFatalError = "<fatalError>";
- private static final String closeFatalError = "</fataError>";
- private static final String openWarning = "<warning>";
- private static final String closeWarning = "</warning>";
+ private static final String OPEN_CDATA = "<![CDATA[";
+ private static final String CLOSE_CDATA = "]]>";
+ private static final String OPEN_ERROR = "<error>";
+ private static final String CLOSE_ERROR = "</error>";
+ private static final String OPEN_FATAL = "<fatalError>";
+ private static final String CLOSE_FATAL = "</fataError>";
+ private static final String OPEN_WARNING = "<warning>";
+ private static final String CLOSE_WARNING = "</warning>";
private String openRootElement;
private String closeRootElement;
@@ -134,7 +134,8 @@
}
if (pathElements.length > 0) {
- for (int i = 1, j = pathElements.length - 1; i < pathElements.length; i++, j--) {
+ int j = pathElements.length - 1;
+ for (int i = 1; i < pathElements.length; i++, j--) {
openRootElementSB.append("<").append(pathElements[i]).append(">");
closeRootElementSB.append("</").append(pathElements[j]).append(">");
}
@@ -182,13 +183,13 @@
++warningCount;
// open warning and CDATA tags
- messages.append(openWarning).append(openCDATA);
+ messages.append(OPEN_WARNING).append(OPEN_CDATA);
// append the fatal error message
appendErrorMessage(e);
// close CDATA and warning tags
- messages.append(closeCDATA).append(closeWarning);
+ messages.append(CLOSE_CDATA).append(CLOSE_WARNING);
}
/* (non-Javadoc)
@@ -198,13 +199,13 @@
++errorCount;
// open fatal error and CDATA tags
- messages.append(openError).append(openCDATA);
+ messages.append(OPEN_ERROR).append(OPEN_CDATA);
// append the error message
appendErrorMessage(e);
// close CDATA and error tags
- messages.append(closeCDATA).append(closeError);
+ messages.append(CLOSE_CDATA).append(CLOSE_ERROR);
}
/* (non-Javadoc)
@@ -214,13 +215,13 @@
++fatalErrorCount;
// open fatal error and CDATA tags
- messages.append(openFatalError).append(openCDATA);
+ messages.append(OPEN_FATAL).append(OPEN_CDATA);
// append the fatal error message
appendErrorMessage(e);
// close CDATA and fatal error tags
- messages.append(closeCDATA).append(closeFatalError);
+ messages.append(CLOSE_CDATA).append(CLOSE_FATAL);
}
/**
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandler.java?rev=668616&r1=668615&r2=668616&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandler.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandler.java Tue Jun 17 04:07:50 2008
@@ -21,56 +21,54 @@
import org.xml.sax.ErrorHandler;
public interface MessageAwareErrorHandler extends ErrorHandler {
-
+
/**
* Does the error handler contain any error messages?
*
* @return
*/
- public boolean hasErrors();
+ boolean hasErrors();
/**
* Return the number of warnings.
*
* @return
*/
- public int getWarningCount();
+ int getWarningCount();
/**
* Return the number of errors.
*
* @return
*/
- public int getErrorCount();
+ int getErrorCount();
/**
* Return the number of fatal errors.
*
* @return
*/
- public int getFatalErrorCount();
+ int getFatalErrorCount();
+
+ /**
+ * Does this ErrorHandler implementation capture error messages?
+ *
+ * @return
+ */
+ boolean capturesMessages();
- /**
- * Does this ErrorHandler implementation capture error messages?
- *
- * @return
- */
- public boolean capturesMessages();
-
- /**
- * Get the messages from this ErrorHandler in a particular format.
- *
- * @return
- */
- public Object getMessagesAs(Class format) throws MessagingException;
-
- /**
- * Does the message support a given format?
- *
- * @param clazz
- * The Class of the format for which support is required.
- * @return
- */
- public boolean supportsMessageFormat(Class format);
-
+ /**
+ * Get the messages from this ErrorHandler in a particular format.
+ *
+ * @return
+ */
+ Object getMessagesAs(Class format) throws MessagingException;
+
+ /**
+ * Does the message support a given format?
+ *
+ * @param clazz The Class of the format for which support is required.
+ * @return
+ */
+ boolean supportsMessageFormat(Class format);
}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandlerFactory.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandlerFactory.java?rev=668616&r1=668615&r2=668616&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandlerFactory.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/main/java/org/apache/servicemix/validation/handler/MessageAwareErrorHandlerFactory.java Tue Jun 17 04:07:50 2008
@@ -20,14 +20,12 @@
* Simple factory interface to a MessageAwareErrorHandler implementation
*
* @author gmcdonald
- *
*/
-public interface MessageAwareErrorHandlerFactory {
-
+public interface MessageAwareErrorHandlerFactory {
/**
* Create and return a concrete MessageAwareErrorHandler implementation
*
* @return
*/
- public MessageAwareErrorHandler createMessageAwareErrorHandler();
+ MessageAwareErrorHandler createMessageAwareErrorHandler();
}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java?rev=668616&r1=668615&r2=668616&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/src/test/java/org/apache/servicemix/validation/ValidationComponentTest.java Tue Jun 17 04:07:50 2008
@@ -41,7 +41,7 @@
private static final String VALID_FILE = "target/test-classes/requestValid.xml";
private static final String INVALID_FILE = "target/test-classes/requestInvalid.xml";
- public void testValidationOK_Flow() throws Exception {
+ public void testValidationOKFlow() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
InOut me = client.createInOutExchange();
me.setService(new QName("urn:test", "service"));
@@ -63,7 +63,7 @@
client.done(me);
}
- public void testValidationNotOK_Flow() throws Exception {
+ public void testValidationNotOKFlow() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
InOut me = client.createInOutExchange();
me.setService(new QName("urn:test", "service"));
@@ -80,7 +80,7 @@
client.done(me);
}
- public void testValidationOK_Jbi() throws Exception {
+ public void testValidationOKJbi() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
InOut me = client.createInOutExchange();
me.setService(new QName("urn:test", "service2"));
@@ -102,7 +102,7 @@
client.done(me);
}
- public void testValidationNotOK_Jbi() throws Exception {
+ public void testValidationNotOKJbi() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
InOut me = client.createInOutExchange();
me.setService(new QName("urn:test", "service2"));
@@ -119,7 +119,7 @@
log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
}
- public void testValidationOK_Flow_Captures() throws Exception {
+ public void testValidationOKFlowCaptures() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
InOut me = client.createInOutExchange();
me.setService(new QName("urn:test", "service3"));
@@ -141,7 +141,7 @@
client.done(me);
}
- public void testValidationNotOK_Flow_Captures() throws Exception {
+ public void testValidationNotOKFlowCaptures() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
InOut me = client.createInOutExchange();
me.setService(new QName("urn:test", "service3"));