Author: andygumbrecht
Date: Thu Mar 13 13:48:40 2014
New Revision: 1577163
URL: http://svn.apache.org/r1577163
Log:
finals and formatting
Modified:
tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
Modified:
tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java?rev=1577163&r1=1577162&r2=1577163&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
(original)
+++
tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
Thu Mar 13 13:48:40 2014
@@ -62,7 +62,7 @@ public class AxisWsContainer implements
private final ClassLoader classLoader;
private final Map wsdlMap;
- public AxisWsContainer(URL wsdlURL, SOAPService service, Map wsdlMap,
ClassLoader classLoader) {
+ public AxisWsContainer(final URL wsdlURL, final SOAPService service, final
Map wsdlMap, final ClassLoader classLoader) {
this.wsdlLocation = wsdlURL;
this.service = service;
this.wsdlMap = wsdlMap;
@@ -73,8 +73,8 @@ public class AxisWsContainer implements
}
}
- public void onMessage(HttpRequest request, HttpResponse response) throws
Exception {
- SaajUniverse universe = new SaajUniverse();
+ public void onMessage(final HttpRequest request, final HttpResponse
response) throws Exception {
+ final SaajUniverse universe = new SaajUniverse();
universe.set(SaajUniverse.AXIS1);
try {
doService(request, response);
@@ -82,19 +82,19 @@ public class AxisWsContainer implements
universe.unset();
}
}
-
- protected void doService(HttpRequest req, HttpResponse res) throws
Exception {
- org.apache.axis.MessageContext messageContext = new
org.apache.axis.MessageContext(null);
+
+ protected void doService(final HttpRequest req, final HttpResponse res)
throws Exception {
+ final org.apache.axis.MessageContext messageContext = new
org.apache.axis.MessageContext(null);
req.setAttribute(WsConstants.MESSAGE_CONTEXT, messageContext);
messageContext.setClassLoader(classLoader);
- Message responseMessage = null;
+ Message responseMessage;
String contentType = req.getHeader(HTTPConstants.HEADER_CONTENT_TYPE);
- String contentLocation =
req.getHeader(HTTPConstants.HEADER_CONTENT_LOCATION);
- InputStream inputStream = req.getInputStream();
- Message requestMessage = new Message(inputStream, false, contentType,
contentLocation);
+ final String contentLocation =
req.getHeader(HTTPConstants.HEADER_CONTENT_LOCATION);
+ final InputStream inputStream = req.getInputStream();
+ final Message requestMessage = new Message(inputStream, false,
contentType, contentLocation);
messageContext.setRequestMessage(requestMessage);
messageContext.setProperty(HTTPConstants.MC_HTTP_SERVLETPATHINFO,
req.getURI().getPath());
@@ -104,10 +104,10 @@ public class AxisWsContainer implements
messageContext.setProperty(RESPONSE, res);
messageContext.setProperty(AxisEngine.PROP_DISABLE_PRETTY_XML,
Boolean.TRUE);
- ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
+ final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
try {
- String characterEncoding = (String)
requestMessage.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
+ final String characterEncoding = (String)
requestMessage.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
if (characterEncoding != null) {
messageContext.setProperty(SOAPMessage.CHARACTER_SET_ENCODING,
characterEncoding);
} else {
@@ -115,34 +115,34 @@ public class AxisWsContainer implements
}
- String soapAction =
req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
+ final String soapAction =
req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (soapAction != null) {
messageContext.setUseSOAPAction(true);
messageContext.setSOAPActionURI(soapAction);
}
- SOAPEnvelope env = requestMessage.getSOAPEnvelope();
+ final SOAPEnvelope env = requestMessage.getSOAPEnvelope();
if (env != null && env.getSOAPConstants() != null) {
messageContext.setSOAPConstants(env.getSOAPConstants());
}
- SOAPService service = messageContext.getService();
+ final SOAPService service = messageContext.getService();
Thread.currentThread().setContextClassLoader(classLoader);
service.invoke(messageContext);
responseMessage = messageContext.getResponseMessage();
- } catch (AxisFault fault) {
-
-
if(req.getMethod().equals(HttpRequest.Method.GET.name()) &&
req.getParameters().isEmpty()){
- String serviceName = req.getURI().getRawPath();
- serviceName =
serviceName.substring(serviceName.lastIndexOf("/")+1);
- printServiceInfo(res,serviceName);
- return;
- }else{
- responseMessage = handleFault(fault, res,
messageContext);
- }
+ } catch (final AxisFault fault) {
+
+ if (req.getMethod().equals(HttpRequest.Method.GET.name()) &&
req.getParameters().isEmpty()) {
+ String serviceName = req.getURI().getRawPath();
+ serviceName =
serviceName.substring(serviceName.lastIndexOf("/") + 1);
+ printServiceInfo(res, serviceName);
+ return;
+ } else {
+ responseMessage = handleFault(fault, res, messageContext);
+ }
- } catch (Exception e) {
+ } catch (final Exception e) {
responseMessage = handleException(messageContext, res, e);
}
//TODO investigate and fix operation == null!
@@ -159,13 +159,13 @@ public class AxisWsContainer implements
return;
}
try {
- SOAPConstants soapConstants =
messageContext.getSOAPConstants();
- String contentType1 =
responseMessage.getContentType(soapConstants);
+ final SOAPConstants soapConstants =
messageContext.getSOAPConstants();
+ final String contentType1 =
responseMessage.getContentType(soapConstants);
res.setContentType(contentType1);
// Transfer MIME headers to HTTP headers for response message.
- MimeHeaders responseMimeHeaders =
responseMessage.getMimeHeaders();
- for (Iterator i = responseMimeHeaders.getAllHeaders();
i.hasNext();) {
- MimeHeader responseMimeHeader = (MimeHeader) i.next();
+ final MimeHeaders responseMimeHeaders =
responseMessage.getMimeHeaders();
+ for (final Iterator i = responseMimeHeaders.getAllHeaders();
i.hasNext(); ) {
+ final MimeHeader responseMimeHeader = (MimeHeader)
i.next();
res.setHeader(responseMimeHeader.getName(),
responseMimeHeader.getValue());
}
@@ -185,7 +185,7 @@ public class AxisWsContainer implements
contentType = responseMessage.getContentType(messageContext.
getSOAPConstants());
responseMessage.writeTo(res.getOutputStream());
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.warning(Messages.getMessage("exception00"), e);
}
} finally {
@@ -193,7 +193,7 @@ public class AxisWsContainer implements
}
}
- private Message handleException(MessageContext context, HttpResponse res,
Exception e) {
+ private Message handleException(final MessageContext context, final
HttpResponse res, final Exception e) {
Message responseMessage;
//other exceptions are internal trouble
responseMessage = context.getResponseMessage();
@@ -201,9 +201,9 @@ public class AxisWsContainer implements
Message responseMsg = responseMessage;
logger.warning(Messages.getMessage("exception00"), e);
if (responseMsg == null) {
- AxisFault fault = AxisFault.makeFault(e);
+ final AxisFault fault = AxisFault.makeFault(e);
//log the fault
- Element runtimeException =
fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
+ final Element runtimeException =
fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
if (runtimeException != null) {
logger.debug(Messages.getMessage("axisFault00"), fault);
//strip runtime details
@@ -212,14 +212,14 @@ public class AxisWsContainer implements
responseMsg = new Message(fault);
}
responseMessage = responseMsg;
- SOAPPart soapPart = (SOAPPart) responseMessage.getSOAPPart();
+ final SOAPPart soapPart = (SOAPPart) responseMessage.getSOAPPart();
soapPart.getMessage().setMessageContext(context);
return responseMessage;
}
- private Message handleFault(AxisFault fault, HttpResponse res,
MessageContext context) {
+ private Message handleFault(final AxisFault fault, final HttpResponse res,
final MessageContext context) {
Message responseMessage;
- Element runtimeException =
fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
+ final Element runtimeException =
fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
logger.warning(Messages.getMessage("axisFault00"), fault);
if (runtimeException != null) {
@@ -227,7 +227,7 @@ public class AxisWsContainer implements
fault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
}
- int status =
fault.getFaultCode().getLocalPart().startsWith("Server.Unauth")
+ final int status =
fault.getFaultCode().getLocalPart().startsWith("Server.Unauth")
? HttpServletResponse.SC_UNAUTHORIZED
: HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
if (status == HttpServletResponse.SC_UNAUTHORIZED) {
@@ -239,37 +239,37 @@ public class AxisWsContainer implements
responseMessage = context.getResponseMessage();
if (responseMessage == null) {
responseMessage = new Message(fault);
- SOAPPart soapPart = (SOAPPart) responseMessage.getSOAPPart();
+ final SOAPPart soapPart = (SOAPPart) responseMessage.getSOAPPart();
soapPart.getMessage().setMessageContext(context);
}
return responseMessage;
}
- public void getWsdl(HttpRequest request, HttpResponse response) throws
Exception {
- URI realLocation = request.getURI();
+ public void getWsdl(final HttpRequest request, final HttpResponse
response) throws Exception {
+ final URI realLocation = request.getURI();
// log.info("Request at " + realLocation);
- String query = realLocation.getQuery();
+ final String query = realLocation.getQuery();
if (query == null || !query.toLowerCase().startsWith("wsdl")) {
throw new IllegalStateException("request must contain a wsdl or
WSDL parameter: " + request.getParameters());
}
- String locationKey;
+ final String locationKey;
if (query.length() > 4) {
locationKey = query.substring(5);
} else {
locationKey = wsdlLocation.toString();
}
- Object wsdl = wsdlMap.get(locationKey);
+ final Object wsdl = wsdlMap.get(locationKey);
if (wsdl == null) {
throw new IllegalStateException("No wsdl or schema known at
location: " + locationKey);
}
- URI updated = new URI(realLocation.getScheme(),
+ final URI updated = new URI(realLocation.getScheme(),
realLocation.getUserInfo(),
realLocation.getHost(),
realLocation.getPort(),
null, //try null for no path
null,
null);
- String replaced = ((String)
wsdl).replaceAll(WsConstants.LOCATION_REPLACEMENT_TOKEN, updated.toString());
+ final String replaced = ((String)
wsdl).replaceAll(WsConstants.LOCATION_REPLACEMENT_TOKEN, updated.toString());
response.getOutputStream().write(replaced.getBytes());
response.getOutputStream().flush();
}
@@ -279,20 +279,21 @@ public class AxisWsContainer implements
/**
* print a snippet of service info.
- * @param response response
+ *
+ * @param response response
* @param serviceName Name of the service
*/
- private void printServiceInfo(HttpResponse response,String serviceName)
throws IOException{
+ private void printServiceInfo(final HttpResponse response, final String
serviceName) throws IOException {
response.setContentType("text/html; charset=utf-8");
- StringBuffer output = new StringBuffer("<h1>")
+ final StringBuffer output = new StringBuffer("<h1>")
.append(serviceName).append("</h1>\n");
output.append("<p>").append(Messages.getMessage("axisService00"))
.append("</p>\n");
output.append(
"<i>").append(
- Messages.getMessage("perhaps00") ).append(
+ Messages.getMessage("perhaps00")).append(
"</i>\n");
response.getOutputStream().write(output.toString().getBytes());
}
Modified:
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1577163&r1=1577162&r2=1577163&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
(original)
+++
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Thu Mar 13 13:48:40 2014
@@ -73,6 +73,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+@SuppressWarnings("UnusedDeclaration")
public abstract class RESTService implements ServerService, SelfManaging {
public static final Logger LOGGER =
Logger.getInstance(LogCategory.OPENEJB_RS, RESTService.class);
@@ -90,12 +91,12 @@ public abstract class RESTService implem
private Assembler assembler;
private CoreContainerSystem containerSystem;
private RsRegistry rsRegistry;
- private List<DeployedService> services = new ArrayList<DeployedService>();
+ private final List<DeployedService> services = new
ArrayList<DeployedService>();
private String virtualHost = "localhost";
private String auth = "NONE";
private String realm = "PropertiesLogin";
private boolean enabled = true;
- private String wildcard =
SystemInstance.get().getProperty("openejb.rest.wildcard", ".*"); // embedded =
regex, tomee = servlet
+ private final String wildcard =
SystemInstance.get().getProperty("openejb.rest.wildcard", ".*"); // embedded =
regex, tomee = servlet
public void afterApplicationCreated(final AppInfo appInfo, final
WebAppInfo webApp) {
final WebContext webContext =
containerSystem.getWebContext(webApp.moduleId);
@@ -128,7 +129,7 @@ public abstract class RESTService implem
for (final String name : webApp.jaxRsProviders) {
try {
additionalProviders.add(classLoader.loadClass(name));
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
LOGGER.warning("can't load '" + name + "'", e);
}
}
@@ -154,11 +155,11 @@ public abstract class RESTService implem
if (owbCtx.getBeanManagerImpl().isInUse()) {
try {
webContext.inject(application);
- } catch (Exception e) {
+ } catch (final Exception e) {
// not important since not required by the spec
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRestRuntimeException("can't create
class " + app, e);
}
@@ -223,7 +224,7 @@ public abstract class RESTService implem
} else {
additionalProviders.add(loaded);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new
OpenEJBRestRuntimeException("can't load class " + clazz, e);
}
}
@@ -262,7 +263,7 @@ public abstract class RESTService implem
} else {
additionalProviders.add(loaded);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRestRuntimeException("can't load
class " + clazz, e);
}
}
@@ -293,7 +294,7 @@ public abstract class RESTService implem
}
}
- private void addEjbToApplication(Application application, Map<String,
EJBRestServiceInfo> restEjbs) {
+ private void addEjbToApplication(final Application application, final
Map<String, EJBRestServiceInfo> restEjbs) {
for (final Map.Entry<String, EJBRestServiceInfo> ejb :
restEjbs.entrySet()) {
application.getClasses().add(ejb.getValue().context.getBeanClass());
}
@@ -333,11 +334,11 @@ public abstract class RESTService implem
if (owbCtx.getBeanManagerImpl().isInUse()) {
try {
webContext.inject(appInstance);
- } catch (Exception e) {
+ } catch (final Exception e) {
// not important since not required by the spec
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRestRuntimeException("can't create class " +
app, e);
}
@@ -418,7 +419,7 @@ public abstract class RESTService implem
deployPojo(webApp.contextRoot, appPrefix, loadedClazz,
null, classLoader, injections, context, owbCtx,
additionalProviders,
new
ServiceConfiguration(PojoUtil.findConfiguration(pojoConfigurations,
loadedClazz.getName()), appInfo.services));
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new OpenEJBRestRuntimeException("can't find
class " + clazz, e);
}
}
@@ -526,7 +527,7 @@ public abstract class RESTService implem
for (final String name : appInfo.jaxRsProviders) {
try {
additionalProviders.add(classLoader.loadClass(name));
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
LOGGER.warning("can't load '" + name + "'", e);
}
}
@@ -802,7 +803,7 @@ public abstract class RESTService implem
try {
builtUrl = UriBuilder.fromUri(new
URI(root)).path(usedClass).build().toURL().toString();
return replaceParams(builtUrl); // pathparam at class level
- } catch (IllegalArgumentException iae) {
+ } catch (final IllegalArgumentException iae) {
if (builtUrl != null) {
return builtUrl;
}
@@ -1007,7 +1008,7 @@ public abstract class RESTService implem
}
public boolean isInWebApp(final WebAppInfo webApp) {
- return (webApp.contextRoot != null &&
webApp.contextRoot.equals(webapp)) || (webapp != null &&
webapp.startsWith(webApp.contextRoot));
+ return (webApp.contextRoot != null &&
webApp.contextRoot.equals(webapp)) || (webapp != null &&
webapp.startsWith(webApp.contextRoot != null ? webApp.contextRoot : ""));
}
}
Modified:
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java?rev=1577163&r1=1577162&r2=1577163&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java
(original)
+++
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java
Thu Mar 13 13:48:40 2014
@@ -60,7 +60,7 @@ public class OpenEJBHttpWsRegistry exten
httpListener = new BasicAuthHttpListenerWrapper(httpListener,
realmName);
}
- StringBuilder deployedPath = new StringBuilder("");
+ final StringBuilder deployedPath = new StringBuilder("");
if (context != null) {
if (!context.startsWith("/")) {
deployedPath.append("/");
@@ -84,7 +84,7 @@ public class OpenEJBHttpWsRegistry exten
}
@Override
- public void removeWsContainer(String path) {
+ public void removeWsContainer(final String path) {
registry.removeHttpListener(path);
}
}
Modified:
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1577163&r1=1577162&r2=1577163&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
(original)
+++
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
Thu Mar 13 13:48:40 2014
@@ -72,6 +72,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
+@SuppressWarnings("UnusedDeclaration")
public abstract class WsService implements ServerService, SelfManaging {
public static final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_WS, WsService.class);
@@ -245,7 +246,7 @@ public abstract class WsService implemen
if (ejbJar.path != null) {
try {
moduleBaseUrl = new File(ejbJar.path).toURI().toURL();
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
logger.error("Invalid ejb jar location " + ejbJar.path, e);
}
}
@@ -316,7 +317,7 @@ public abstract class WsService implemen
addressesForApp(appInfo.appId).add(new
EndpointInfo(address, port.getWsdlService(),
beanContext.getBeanClass().getName()));
}
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
logger.error("Error deploying JAX-WS Web Service for
EJB " + beanContext.getDeploymentID(), e);
} finally {
Thread.currentThread().setContextClassLoader(old);
@@ -359,7 +360,7 @@ public abstract class WsService implemen
URL moduleBaseUrl = null;
try {
moduleBaseUrl = new File(webApp.path).toURI().toURL();
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
logger.error("Invalid ejb jar location " + webApp.path, e);
}
@@ -415,7 +416,7 @@ public abstract class WsService implemen
servletAddresses.put(webApp.moduleId + "." +
servlet.servletName, address);
addressesForApp(webApp.moduleId).add(new
EndpointInfo(address, port.getWsdlService(), target.getName()));
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
logger.error("Error deploying CXF webservice for servlet " +
portInfo.serviceLink, e);
} finally {
Thread.currentThread().setContextClassLoader(old);
@@ -497,7 +498,7 @@ public abstract class WsService implemen
if (this.wsRegistry != null) {
try {
this.wsRegistry.clearWsContainer(webApp.contextRoot, virtualHost, servlet);
- } catch (IllegalArgumentException ignored) {
+ } catch (final IllegalArgumentException ignored) {
// no-op
}
}
