diff --git a/messaging/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java b/messaging/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java index 2ae5201..c86ffab 100644 --- a/messaging/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java +++ b/messaging/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java @@ -376,7 +376,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } } @@ -450,7 +450,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } checkClusterConnectionConstraints(reader, seen); @@ -549,7 +549,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR checkOnlyOneOfElements(reader, seen, Element.STATIC_CONNECTORS, Element.DISCOVERY_GROUP_REF); if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } updates.add(bridgeAdd); @@ -594,7 +594,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } } @@ -626,7 +626,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } updates.add(groupingHandlerAdd); @@ -682,7 +682,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } } if(name == null) { - ParseUtils.missingRequired(reader, Collections.singleton(Attribute.NAME)); + throw missingRequired(reader, Collections.singleton(Attribute.NAME)); } ModelNode broadcastGroupAdd = org.jboss.as.controller.operations.common.Util.getEmptyOperation(ADD, address.clone().add(CommonAttributes.BROADCAST_GROUP, name)); @@ -712,7 +712,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } checkBroadcastGroupConstraints(reader, seen); @@ -759,7 +759,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } } if(name == null) { - ParseUtils.missingRequired(reader, Collections.singleton(Attribute.NAME)); + throw missingRequired(reader, Collections.singleton(Attribute.NAME)); } ModelNode discoveryGroup = org.jboss.as.controller.operations.common.Util.getEmptyOperation(ADD, address.clone().add(CommonAttributes.DISCOVERY_GROUP, name)); @@ -786,7 +786,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } checkDiscoveryGroupConstraints(reader, seen); @@ -1091,7 +1091,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } } if(name == null) { - ParseUtils.missingRequired(reader, Collections.singleton(Attribute.NAME)); + throw missingRequired(reader, Collections.singleton(Attribute.NAME)); } final ModelNode connectorAddress = address.clone(); @@ -1108,7 +1108,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } case NETTY_CONNECTOR: { connectorAddress.add(REMOTE_CONNECTOR, name); if(socketBinding == null) { - ParseUtils.missingRequired(reader, Collections.singleton(Attribute.SOCKET_BINDING)); + throw missingRequired(reader, Collections.singleton(Attribute.SOCKET_BINDING)); } operation.get(RemoteTransportDefinition.SOCKET_BINDING.getName()).set(socketBinding); parseTransportConfiguration(reader, operation, false); @@ -1158,7 +1158,6 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR localName = reader.getLocalName(); final Element element = Element.forName(localName); - SWITCH: switch (element) { case DEAD_LETTER_ADDRESS: case EXPIRY_ADDRESS: @@ -1173,7 +1172,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR case REDISTRIBUTION_DELAY: case SEND_TO_DLA_ON_NO_ROUTE: { handleElementText(reader, element, addressSettingsSpec); - break SWITCH; + break; } default: { break; } @@ -1242,7 +1241,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } } if(path == null) { - throw ParseUtils.missingRequired(reader, Collections.singleton(Attribute.PATH)); + throw missingRequired(reader, Collections.singleton(Attribute.PATH)); } requireNoContent(reader); final ModelNode operation = new ModelNode(); @@ -1314,7 +1313,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR } if(!required.isEmpty()) { - missingRequired(reader, required); + throw missingRequired(reader, required); } list.add(divertAdd); @@ -1400,7 +1399,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR final String name = reader.getAttributeValue(0); if(name == null) { - ParseUtils.missingRequired(reader, Collections.singleton("name")); + throw missingRequired(reader, Collections.singleton("name")); } final ModelNode topic = new ModelNode(); @@ -1475,7 +1474,7 @@ public class MessagingSubsystemParser implements XMLStreamConstants, XMLElementR void processPooledConnectionFactory(final XMLExtendedStreamReader reader, ModelNode address, List updates) throws XMLStreamException { final String name = reader.getAttributeValue(0); if(name == null) { - ParseUtils.missingRequired(reader, Collections.singleton("name")); + throw missingRequired(reader, Collections.singleton("name")); } final ModelNode connectionFactory = new ModelNode();