Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java Mon Jul 7 19:07:41 2014 @@ -47,7 +47,7 @@ public class ThirdStatelessInterceptedBe * A simple dummy business method to concat 2 strings * @see org.apache.openejb.test.stateless.BasicStatelessInterceptedLocal#concat(java.lang.String, java.lang.String) */ - public String concat(String str1, String str2) { + public String concat(final String str1, final String str2) { return str1.concat(str2); } @@ -56,15 +56,15 @@ public class ThirdStatelessInterceptedBe * @see org.apache.openejb.test.stateless.BasicStatelessInterceptedLocal#reverse(java.lang.String) */ @Interceptors({MethodInterceptor.class}) - public String reverse(String str) { - StringBuffer b = new StringBuffer(str); + public String reverse(final String str) { + final StringBuffer b = new StringBuffer(str); return b.reverse().toString(); } /** * @param ctxData the contextData to set */ - private void setContextData(Map<String, Object> ctxData) { + private void setContextData(final Map<String, Object> ctxData) { ThirdStatelessInterceptedBean.contextData.putAll(ctxData); } @@ -93,8 +93,8 @@ public class ThirdStatelessInterceptedBe * @throws Exception runtime exceptions or application exceptions that are allowed in the throws clause of the business method. */ @AroundInvoke - public Object inBeanInterceptor(InvocationContext ctx) throws Exception { - Map<String, Object> ctxData = Interceptor.profile(ctx, "inBeanInterceptor"); + public Object inBeanInterceptor(final InvocationContext ctx) throws Exception { + final Map<String, Object> ctxData = Interceptor.profile(ctx, "inBeanInterceptor"); setContextData(ctxData); return ctx.proceed(); @@ -108,7 +108,7 @@ public class ThirdStatelessInterceptedBe */ @PostConstruct public void inBeanInterceptorPostConstruct() throws Exception { - Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPostConstruct"); + final Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPostConstruct"); setContextData(ctxData); } @@ -121,7 +121,7 @@ public class ThirdStatelessInterceptedBe */ @PreDestroy public void inBeanInterceptorPreDestroy() throws Exception { - Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPreDestroy"); + final Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPreDestroy"); setContextData(ctxData); }
Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java Mon Jul 7 19:07:41 2014 @@ -95,10 +95,10 @@ public class AnnotatedServlet extends Ht @EJB private BasicStatefulBusinessRemote statefulBusinessRemote; - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void service(final HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/plain"); ServletOutputStream out = response.getOutputStream(); - PrintStream printStream = new PrintStream(out); + final PrintStream printStream = new PrintStream(out); String methodName = request.getParameter("method"); if (methodName == null) { @@ -107,7 +107,7 @@ public class AnnotatedServlet extends Ht try { Method method = getClass().getMethod(methodName); method.invoke(this); - } catch (Throwable e) { + } catch (final Throwable e) { // response.setStatus(580); printStream.println("FAILED"); e.printStackTrace(printStream); @@ -116,12 +116,12 @@ public class AnnotatedServlet extends Ht printStream.flush(); } - public void testAll(PrintStream printStream) { + public void testAll(final PrintStream printStream) { for (Method method : JndiTestServlet.class.getMethods()) { try { method.invoke(this); printStream.println(method.getName() + " PASSED"); - } catch (Throwable e) { + } catch (final Throwable e) { printStream.println(method.getName() + " FAILED"); e.printStackTrace(printStream); printStream.flush(); @@ -159,62 +159,62 @@ public class AnnotatedServlet extends Ht } public void lookupStringEntry() { - String expected = "1"; + final String expected = "1"; Assert.assertNotNull("The String looked up is null", striing); Assert.assertEquals(expected, striing); } public void lookupDoubleEntry() { - Double expected = 1.0D; + final Double expected = 1.0D; Assert.assertNotNull("The Double looked up is null", doouble); Assert.assertEquals(expected, doouble); } public void lookupLongEntry() { - Long expected = 1L; + final Long expected = 1L; Assert.assertNotNull("The Long looked up is null", loong); Assert.assertEquals(expected, loong); } public void lookupFloatEntry() { - Float expected = 1.0F; + final Float expected = 1.0F; Assert.assertNotNull("The Float looked up is null", flooat); Assert.assertEquals(expected, flooat); } public void lookupIntegerEntry() { - Integer expected = 1; + final Integer expected = 1; Assert.assertNotNull("The Integer looked up is null", inteeger); Assert.assertEquals(expected, inteeger); } public void lookupShortEntry() { - Short expected = (short) 1; + final Short expected = (short) 1; Assert.assertNotNull("The Short looked up is null", shoort); Assert.assertEquals(expected, shoort); } public void lookupBooleanEntry() { - Boolean expected = true; + final Boolean expected = true; Assert.assertNotNull("The Boolean looked up is null", booolean); Assert.assertEquals(expected, booolean); } public void lookupByteEntry() { - Byte expected = (byte) 1; + final Byte expected = (byte) 1; Assert.assertNotNull("The Byte looked up is null", byyte); Assert.assertEquals(expected, byyte); } public void lookupCharacterEntry() { - Character expected = 'D'; + final Character expected = 'D'; Assert.assertNotNull("The Character looked up is null", chaaracter); Assert.assertEquals(expected, chaaracter); @@ -229,15 +229,15 @@ public class AnnotatedServlet extends Ht testJmsConnection(coonnectionFactory.createConnection()); testJmsConnection(queueCoonnectionFactory.createConnection()); testJmsConnection(topicCoonnectionFactory.createConnection()); - } catch (Exception e){ + } catch (final Exception e){ e.printStackTrace(); Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage()); } } - private void testJmsConnection(javax.jms.Connection connection) throws JMSException { - Session session = connection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE); - Topic topic = session.createTopic("test"); + private void testJmsConnection(final javax.jms.Connection connection) throws JMSException { + final Session session = connection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE); + final Topic topic = session.createTopic("test"); MessageProducer producer = session.createProducer(topic); producer.send(session.createMessage()); producer.close(); @@ -255,7 +255,7 @@ public class AnnotatedServlet extends Ht try { // call a do nothing method to assure entity manager actually exists em.getFlushMode(); - } catch (Exception e) { + } catch (final Exception e) { Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage()); } } Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java Mon Jul 7 19:07:41 2014 @@ -34,12 +34,12 @@ public class EjbServlet extends HttpServ @EJB private BasicStatelessBusinessLocal statelessBusinessLocal; - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void service(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/plain"); ServletOutputStream out = response.getOutputStream(); PrintStream printStream = new PrintStream(out); - String methodName = request.getParameter("method"); + final String methodName = request.getParameter("method"); if (methodName == null) { testAll(printStream); } else { @@ -55,8 +55,8 @@ public class EjbServlet extends HttpServ printStream.flush(); } - public void testAll(PrintStream printStream) { - for (Method method : EjbServlet.class.getMethods()) { + public void testAll(final PrintStream printStream) { + for (final Method method : EjbServlet.class.getMethods()) { if (!method.getName().startsWith("invoke")) continue; try { Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/JndiServlet.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/JndiServlet.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/JndiServlet.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/JndiServlet.java Mon Jul 7 19:07:41 2014 @@ -32,9 +32,9 @@ import java.util.Map; import java.util.TreeMap; public class JndiServlet extends HttpServlet { - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void doGet(final HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/plain"); - ServletOutputStream out = response.getOutputStream(); + final ServletOutputStream out = response.getOutputStream(); Map<String, Object> bindings = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER); try { @@ -54,16 +54,16 @@ public class JndiServlet extends HttpSer } } - private void addBindings(String path, Map<String, Object> bindings, Context context) { + private void addBindings(final String path, final Map<String, Object> bindings, Context context) { try { for (NameClassPair pair : Collections.list(context.list(""))) { - String name = pair.getName(); + final String name = pair.getName(); String className = pair.getClassName(); if ("org.apache.naming.resources.FileDirContext$FileResource".equals(className)) { bindings.put(path + name, "<file>"); } else { try { - Object value = context.lookup(name); + final Object value = context.lookup(name); if (value instanceof Context) { Context nextedContext = (Context) value; bindings.put(path + name, ""); Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java Mon Jul 7 19:07:41 2014 @@ -35,19 +35,19 @@ public class RunAsServlet extends HttpSe @EJB private SecureEJBLocal secureEJBLocal; - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void service(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/plain"); - ServletOutputStream out = response.getOutputStream(); - PrintStream printStream = new PrintStream(out); + final ServletOutputStream out = response.getOutputStream(); + final PrintStream printStream = new PrintStream(out); - String methodName = request.getParameter("method"); + final String methodName = request.getParameter("method"); if (methodName == null) { testAll(request, printStream); } else { try { - Method method = getClass().getMethod(methodName, HttpServletRequest.class); + final Method method = getClass().getMethod(methodName, HttpServletRequest.class); method.invoke(this, request); - } catch (Throwable e) { + } catch (final Throwable e) { // response.setStatus(580); printStream.println("FAILED"); e.printStackTrace(printStream); @@ -56,14 +56,14 @@ public class RunAsServlet extends HttpSe printStream.flush(); } - public void testAll(HttpServletRequest request, PrintStream printStream) { - for (Method method : EjbServlet.class.getMethods()) { + public void testAll(final HttpServletRequest request, final PrintStream printStream) { + for (final Method method : EjbServlet.class.getMethods()) { if (!method.getName().startsWith("invoke")) continue; try { method.invoke(this); printStream.println(method.getName() + " PASSED"); - } catch (Throwable e) { + } catch (final Throwable e) { printStream.println(method.getName() + " FAILED"); e.printStackTrace(printStream); printStream.flush(); @@ -72,7 +72,7 @@ public class RunAsServlet extends HttpSe } } - public void invokeGetCallerPrincipal(HttpServletRequest request) { + public void invokeGetCallerPrincipal(final HttpServletRequest request) { // Servlet environment - running as "user" Principal principal = request.getUserPrincipal(); Assert.assertNotNull(principal); @@ -84,7 +84,7 @@ public class RunAsServlet extends HttpSe Assert.assertEquals("runas", principal.getName()); } - public void invokeIsCallerInRole(HttpServletRequest request) { + public void invokeIsCallerInRole(final HttpServletRequest request) { // Servlet environment - running as "user" Assert.assertTrue(request.isUserInRole("user")); Assert.assertFalse(request.isUserInRole("manager")); @@ -98,35 +98,35 @@ public class RunAsServlet extends HttpSe Assert.assertTrue(secureEJBLocal.isCallerInRole("runas")); } - public void invokeIsAllowed(HttpServletRequest request) { + public void invokeIsAllowed(final HttpServletRequest request) { try { secureEJBLocal.allowUserMethod(); Assert.fail("Method allowUserMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } try { secureEJBLocal.allowManagerMethod(); Assert.fail("Method allowManagerMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } try { secureEJBLocal.allowUnknownMethod(); Assert.fail("Method allowUnknownMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } try { secureEJBLocal.allowRunasMethod(); - } catch(EJBAccessException e) { + } catch(final EJBAccessException e) { Assert.fail("Method allowRunasMethod() NOT ALLOWED"); } try { secureEJBLocal.denyAllMethod(); Assert.fail("Method denyAllMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } } } \ No newline at end of file Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureEJB.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureEJB.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureEJB.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureEJB.java Mon Jul 7 19:07:41 2014 @@ -35,7 +35,7 @@ public class SecureEJB implements Secure return context.getCallerPrincipal(); } - public boolean isCallerInRole(String role) { + public boolean isCallerInRole(final String role) { return context.isCallerInRole(role); } Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java Mon Jul 7 19:07:41 2014 @@ -35,19 +35,19 @@ public class SecureServlet extends HttpS @EJB private SecureEJBLocal secureEJBLocal; - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void service(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/plain"); - ServletOutputStream out = response.getOutputStream(); - PrintStream printStream = new PrintStream(out); + final ServletOutputStream out = response.getOutputStream(); + final PrintStream printStream = new PrintStream(out); - String methodName = request.getParameter("method"); + final String methodName = request.getParameter("method"); if (methodName == null) { testAll(request, printStream); } else { try { - Method method = getClass().getMethod(methodName, HttpServletRequest.class); + final Method method = getClass().getMethod(methodName, HttpServletRequest.class); method.invoke(this, request); - } catch (Throwable e) { + } catch (final Throwable e) { // response.setStatus(580); printStream.println("FAILED"); e.printStackTrace(printStream); @@ -56,14 +56,14 @@ public class SecureServlet extends HttpS printStream.flush(); } - public void testAll(HttpServletRequest request, PrintStream printStream) { - for (Method method : EjbServlet.class.getMethods()) { + public void testAll(final HttpServletRequest request, final PrintStream printStream) { + for (final Method method : EjbServlet.class.getMethods()) { if (!method.getName().startsWith("invoke")) continue; try { method.invoke(this); printStream.println(method.getName() + " PASSED"); - } catch (Throwable e) { + } catch (final Throwable e) { printStream.println(method.getName() + " FAILED"); e.printStackTrace(printStream); printStream.flush(); @@ -72,7 +72,7 @@ public class SecureServlet extends HttpS } } - public void invokeGetCallerPrincipal(HttpServletRequest request) { + public void invokeGetCallerPrincipal(final HttpServletRequest request) { // Servlet environment Principal principal = request.getUserPrincipal(); Assert.assertNotNull(principal); @@ -84,7 +84,7 @@ public class SecureServlet extends HttpS Assert.assertEquals("user", principal.getName()); } - public void invokeIsCallerInRole(HttpServletRequest request) { + public void invokeIsCallerInRole(final HttpServletRequest request) { // Servlet environment Assert.assertTrue(request.isUserInRole("user")); Assert.assertFalse(request.isUserInRole("manager")); @@ -98,35 +98,35 @@ public class SecureServlet extends HttpS Assert.assertFalse(secureEJBLocal.isCallerInRole("runas")); } - public void invokeIsAllowed(HttpServletRequest request) { + public void invokeIsAllowed(final HttpServletRequest request) { try { secureEJBLocal.allowUserMethod(); - } catch(EJBAccessException e) { + } catch(final EJBAccessException e) { Assert.fail("Method allowUserMethod() NOT ALLOWED"); } try { secureEJBLocal.allowManagerMethod(); Assert.fail("Method allowManagerMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } try { secureEJBLocal.allowUnknownMethod(); Assert.fail("Method allowUnknownMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } try { secureEJBLocal.allowRunasMethod(); Assert.fail("Method allowRunasMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } try { secureEJBLocal.denyAllMethod(); Assert.fail("Method denyAllMethod() ALLOWED"); - } catch(EJBAccessException expected) { + } catch(final EJBAccessException expected) { } } } \ No newline at end of file Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java?rev=1608563&r1=1608562&r2=1608563&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java (original) +++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java Mon Jul 7 19:07:41 2014 @@ -36,19 +36,19 @@ public class WebserviceServlet extends H @WebServiceRef private HelloEjb helloEjb; - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void service(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/plain"); - ServletOutputStream out = response.getOutputStream(); - PrintStream printStream = new PrintStream(out); + final ServletOutputStream out = response.getOutputStream(); + final PrintStream printStream = new PrintStream(out); - String methodName = request.getParameter("method"); + final String methodName = request.getParameter("method"); if (methodName == null) { testAll(printStream); } else { try { - Method method = getClass().getMethod(methodName); + final Method method = getClass().getMethod(methodName); method.invoke(this); - } catch (Throwable e) { + } catch (final Throwable e) { // response.setStatus(580); printStream.println("FAILED"); e.printStackTrace(printStream); @@ -57,14 +57,14 @@ public class WebserviceServlet extends H printStream.flush(); } - public void testAll(PrintStream printStream) { - for (Method method : EjbServlet.class.getMethods()) { + public void testAll(final PrintStream printStream) { + for (final Method method : EjbServlet.class.getMethods()) { if (!method.getName().startsWith("invoke")) continue; try { method.invoke(this); printStream.println(method.getName() + " PASSED"); - } catch (Throwable e) { + } catch (final Throwable e) { printStream.println(method.getName() + " FAILED"); e.printStackTrace(printStream); printStream.flush();
