You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by gerdogdu <gi...@git.apache.org> on 2018/12/31 09:05:26 UTC

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

GitHub user gerdogdu opened a pull request:

    https://github.com/apache/tomee/pull/332

    (TOMEE-2435) Simplify the Code in org.apache.openejb.OpenEjbContainer

    (TOMEE-2435) Simplify the Code in org.apache.openejb.OpenEjbContainer

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/gerdogdu/tomee master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/tomee/pull/332.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #332
    
----
commit 2d07795764771316889f555082552198c2d52e5f
Author: Gurkan Erdogdu <cg...@...>
Date:   2018-12-31T09:02:57Z

    (TOMEE-2435) Simplify the Code in org.apache.openejb.OpenEjbContainer

----


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by jgallimore <gi...@git.apache.org>.
Github user jgallimore commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244586465
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -71,57 +50,74 @@
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLClassLoader;
    -import java.util.Arrays;
    -import java.util.Collections;
    -import java.util.HashMap;
    -import java.util.Iterator;
    -import java.util.LinkedHashSet;
    -import java.util.List;
    -import java.util.Map;
    -import java.util.Properties;
    -import java.util.Set;
    +import java.util.*;
     import java.util.logging.LogManager;
     
     import static org.apache.openejb.cdi.ScopeHelper.startContexts;
     import static org.apache.openejb.cdi.ScopeHelper.stopContexts;
     
     /**
    - * @version $Rev$ $Date$
    + * Embeddable {@link EJBContainer} implementation based
    + * on OpenEJB container.
      */
     public final class OpenEjbContainer extends EJBContainer {
    +
         static {
             // if tomee embedded was ran we'll lost log otherwise
    -        final String logManger = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    -        if (logManger != null) {
    +        final String logManager = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    +        if (logManager != null) {
                 try {
    -                Thread.currentThread().getContextClassLoader().loadClass(logManger);
    +                Thread.currentThread().getContextClassLoader().loadClass(logManager);
                 } catch (final Exception ignored) {
    -                final Field field;
    +                Field field = null;
    +                boolean accessible = false;
                     try {
                         field = LogManager.class.getDeclaredField("manager");
    -                    field.setAccessible(true);
    -                    field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    if(field != null){
    +                        accessible = field.isAccessible();
    +                        field.setAccessible(true);
    +                        field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    }
    +
                     } catch (final Exception ignore) {
                         // ignore
    +                }finally{
    +                    if(field != null){
    +                        field.setAccessible(accessible);
    --- End diff --
    
    @gerdogdu There's a couple of comments for you on the dev@ mailing list:
    
    Is there any particular reason for flipping the imports to wildcards? We tend to import the individual classes elsewhere in the codebase. My personal preference would be to leave those as individual imports. It doesn't make the import list that much longer, and I find its clearer what is being imported and used. IDEs tend to fold those away unless you're specifically looking at them too.
    
    IntelliJ is definitely preferring the Java 8 style `moduleLocations.removeIf`, and will refactor the loop to it with one keystroke. I have the what is probably an unpopular opinion which is that I actually prefer the loop over the lambda. The reasons are: 
    
    1. Backporting changes is much harder when you have to work around language changes like this
    2. I personally find lots of things crammed into one line harder to read, and in this particular case, there's a cast and a negation (so a double negative) in the removeIf.
    
    I am currently running tests against your PR and master, along with code coverage. Although I appreciate you have extracted methods to make this more readable and not changed functionality, it is a core class, and I think running those checks is a reasonable thing to do.
    
    Generally speaking, I think this looks ok, and if you can reply to those couple of points on the list, I think we can get this merged in.
    
    Thanks again for taking the time to create the PR.


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by gerdogdu <gi...@git.apache.org>.
Github user gerdogdu commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244579276
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -71,57 +50,74 @@
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLClassLoader;
    -import java.util.Arrays;
    -import java.util.Collections;
    -import java.util.HashMap;
    -import java.util.Iterator;
    -import java.util.LinkedHashSet;
    -import java.util.List;
    -import java.util.Map;
    -import java.util.Properties;
    -import java.util.Set;
    +import java.util.*;
     import java.util.logging.LogManager;
     
     import static org.apache.openejb.cdi.ScopeHelper.startContexts;
     import static org.apache.openejb.cdi.ScopeHelper.stopContexts;
     
     /**
    - * @version $Rev$ $Date$
    + * Embeddable {@link EJBContainer} implementation based
    + * on OpenEJB container.
      */
     public final class OpenEjbContainer extends EJBContainer {
    +
         static {
             // if tomee embedded was ran we'll lost log otherwise
    -        final String logManger = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    -        if (logManger != null) {
    +        final String logManager = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    +        if (logManager != null) {
                 try {
    -                Thread.currentThread().getContextClassLoader().loadClass(logManger);
    +                Thread.currentThread().getContextClassLoader().loadClass(logManager);
                 } catch (final Exception ignored) {
    -                final Field field;
    +                Field field = null;
    +                boolean accessible = false;
                     try {
                         field = LogManager.class.getDeclaredField("manager");
    -                    field.setAccessible(true);
    -                    field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    if(field != null){
    +                        accessible = field.isAccessible();
    +                        field.setAccessible(true);
    +                        field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    }
    +
                     } catch (final Exception ignore) {
                         // ignore
    +                }finally{
    +                    if(field != null){
    +                        field.setAccessible(accessible);
    --- End diff --
    
    > This code you are touching is used by everything and is rarely touched. You are introducing extensive changes. Prudence advises to also add new tests to make sure the changes are ok.
    
    I did not change the logic of the class, just separated the big method to smaller parts for the purpose of readable and understandable code. 
    
    The idea is that TomEE community accept that the code is indeed unreadable and then can accept my patch and then if there needs to have any further changes, we can continue to patch or update. 
    
    I think that this is a normal procedure for working with community. This is a simple change. For example, if you want to look for an extensive change, it is a microprofile addition to the core TomEE codebase :)


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by brunobat <gi...@git.apache.org>.
Github user brunobat commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244574001
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -221,12 +218,13 @@ private static Logger logger() { // don't trigger init too eagerly to be sure to
         }
     
         public static class Provider implements EJBContainerProvider {
    +
             public static final String OPENEJB_ADDITIONNAL_CALLERS_KEY = "openejb.additionnal.callers";
     
             @Override
             public EJBContainer createEJBContainer(Map<?, ?> map) {
    -            if (map == null) { // JBoss EJB API pass null when calling EJBContainer.createEJBContainer()
    -                map = new HashMap<>();
    +            if (map == null) {
    +                map = new HashMap<Object, Object>();
    --- End diff --
    
    We should use the diamond operator only. 


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by gerdogdu <gi...@git.apache.org>.
Github user gerdogdu commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244588094
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -71,57 +50,74 @@
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLClassLoader;
    -import java.util.Arrays;
    -import java.util.Collections;
    -import java.util.HashMap;
    -import java.util.Iterator;
    -import java.util.LinkedHashSet;
    -import java.util.List;
    -import java.util.Map;
    -import java.util.Properties;
    -import java.util.Set;
    +import java.util.*;
     import java.util.logging.LogManager;
     
     import static org.apache.openejb.cdi.ScopeHelper.startContexts;
     import static org.apache.openejb.cdi.ScopeHelper.stopContexts;
     
     /**
    - * @version $Rev$ $Date$
    + * Embeddable {@link EJBContainer} implementation based
    + * on OpenEJB container.
      */
     public final class OpenEjbContainer extends EJBContainer {
    +
         static {
             // if tomee embedded was ran we'll lost log otherwise
    -        final String logManger = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    -        if (logManger != null) {
    +        final String logManager = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    +        if (logManager != null) {
                 try {
    -                Thread.currentThread().getContextClassLoader().loadClass(logManger);
    +                Thread.currentThread().getContextClassLoader().loadClass(logManager);
                 } catch (final Exception ignored) {
    -                final Field field;
    +                Field field = null;
    +                boolean accessible = false;
                     try {
                         field = LogManager.class.getDeclaredField("manager");
    -                    field.setAccessible(true);
    -                    field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    if(field != null){
    +                        accessible = field.isAccessible();
    +                        field.setAccessible(true);
    +                        field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    }
    +
                     } catch (final Exception ignore) {
                         // ignore
    +                }finally{
    +                    if(field != null){
    +                        field.setAccessible(accessible);
    --- End diff --
    
    Thanks for the comments. I will update my patch and attach again.
    Regards.
    Gurkan


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by gerdogdu <gi...@git.apache.org>.
Github user gerdogdu closed the pull request at:

    https://github.com/apache/tomee/pull/332


---

[GitHub] tomee issue #332: (TOMEE-2435) Simplify the Code in org.apache.openejb.OpenE...

Posted by gerdogdu <gi...@git.apache.org>.
Github user gerdogdu commented on the issue:

    https://github.com/apache/tomee/pull/332
  
    I will close this pull request and create another.


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by brunobat <gi...@git.apache.org>.
Github user brunobat commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244574174
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -71,57 +50,74 @@
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLClassLoader;
    -import java.util.Arrays;
    -import java.util.Collections;
    -import java.util.HashMap;
    -import java.util.Iterator;
    -import java.util.LinkedHashSet;
    -import java.util.List;
    -import java.util.Map;
    -import java.util.Properties;
    -import java.util.Set;
    +import java.util.*;
     import java.util.logging.LogManager;
     
     import static org.apache.openejb.cdi.ScopeHelper.startContexts;
     import static org.apache.openejb.cdi.ScopeHelper.stopContexts;
     
     /**
    - * @version $Rev$ $Date$
    + * Embeddable {@link EJBContainer} implementation based
    + * on OpenEJB container.
      */
     public final class OpenEjbContainer extends EJBContainer {
    +
         static {
             // if tomee embedded was ran we'll lost log otherwise
    -        final String logManger = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    -        if (logManger != null) {
    +        final String logManager = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    +        if (logManager != null) {
                 try {
    -                Thread.currentThread().getContextClassLoader().loadClass(logManger);
    +                Thread.currentThread().getContextClassLoader().loadClass(logManager);
                 } catch (final Exception ignored) {
    -                final Field field;
    +                Field field = null;
    +                boolean accessible = false;
                     try {
                         field = LogManager.class.getDeclaredField("manager");
    -                    field.setAccessible(true);
    -                    field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    if(field != null){
    +                        accessible = field.isAccessible();
    +                        field.setAccessible(true);
    +                        field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    }
    +
                     } catch (final Exception ignore) {
                         // ignore
    +                }finally{
    +                    if(field != null){
    +                        field.setAccessible(accessible);
    --- End diff --
    
    Won't this change the behaviour? What will be the consequences?


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by otaviojava <gi...@git.apache.org>.
Github user otaviojava commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244575326
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -221,12 +218,13 @@ private static Logger logger() { // don't trigger init too eagerly to be sure to
         }
     
         public static class Provider implements EJBContainerProvider {
    +
             public static final String OPENEJB_ADDITIONNAL_CALLERS_KEY = "openejb.additionnal.callers";
     
             @Override
             public EJBContainer createEJBContainer(Map<?, ?> map) {
    -            if (map == null) { // JBoss EJB API pass null when calling EJBContainer.createEJBContainer()
    -                map = new HashMap<>();
    +            if (map == null) {
    +                map = new HashMap<Object, Object>();
    --- End diff --
    
    why did you remove the diamond operator?


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by brunobat <gi...@git.apache.org>.
Github user brunobat commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244580685
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -71,57 +50,74 @@
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLClassLoader;
    -import java.util.Arrays;
    -import java.util.Collections;
    -import java.util.HashMap;
    -import java.util.Iterator;
    -import java.util.LinkedHashSet;
    -import java.util.List;
    -import java.util.Map;
    -import java.util.Properties;
    -import java.util.Set;
    +import java.util.*;
     import java.util.logging.LogManager;
     
     import static org.apache.openejb.cdi.ScopeHelper.startContexts;
     import static org.apache.openejb.cdi.ScopeHelper.stopContexts;
     
     /**
    - * @version $Rev$ $Date$
    + * Embeddable {@link EJBContainer} implementation based
    + * on OpenEJB container.
      */
     public final class OpenEjbContainer extends EJBContainer {
    +
         static {
             // if tomee embedded was ran we'll lost log otherwise
    -        final String logManger = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    -        if (logManger != null) {
    +        final String logManager = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    +        if (logManager != null) {
                 try {
    -                Thread.currentThread().getContextClassLoader().loadClass(logManger);
    +                Thread.currentThread().getContextClassLoader().loadClass(logManager);
                 } catch (final Exception ignored) {
    -                final Field field;
    +                Field field = null;
    +                boolean accessible = false;
                     try {
                         field = LogManager.class.getDeclaredField("manager");
    -                    field.setAccessible(true);
    -                    field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    if(field != null){
    +                        accessible = field.isAccessible();
    +                        field.setAccessible(true);
    +                        field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    }
    +
                     } catch (final Exception ignore) {
                         // ignore
    +                }finally{
    +                    if(field != null){
    +                        field.setAccessible(accessible);
    --- End diff --
    
    ok Gurkan.


---

[GitHub] tomee issue #332: (TOMEE-2435) Simplify the Code in org.apache.openejb.OpenE...

Posted by jgallimore <gi...@git.apache.org>.
Github user jgallimore commented on the issue:

    https://github.com/apache/tomee/pull/332
  
    Happy for you to do that, but your last push to this branch looked fine to merge.


---

[GitHub] tomee pull request #332: (TOMEE-2435) Simplify the Code in org.apache.openej...

Posted by gerdogdu <gi...@git.apache.org>.
Github user gerdogdu commented on a diff in the pull request:

    https://github.com/apache/tomee/pull/332#discussion_r244585692
  
    --- Diff: container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---
    @@ -71,57 +50,74 @@
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLClassLoader;
    -import java.util.Arrays;
    -import java.util.Collections;
    -import java.util.HashMap;
    -import java.util.Iterator;
    -import java.util.LinkedHashSet;
    -import java.util.List;
    -import java.util.Map;
    -import java.util.Properties;
    -import java.util.Set;
    +import java.util.*;
     import java.util.logging.LogManager;
     
     import static org.apache.openejb.cdi.ScopeHelper.startContexts;
     import static org.apache.openejb.cdi.ScopeHelper.stopContexts;
     
     /**
    - * @version $Rev$ $Date$
    + * Embeddable {@link EJBContainer} implementation based
    + * on OpenEJB container.
      */
     public final class OpenEjbContainer extends EJBContainer {
    +
         static {
             // if tomee embedded was ran we'll lost log otherwise
    -        final String logManger = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    -        if (logManger != null) {
    +        final String logManager = JavaSecurityManagers.getSystemProperty("java.util.logging.manager");
    +        if (logManager != null) {
                 try {
    -                Thread.currentThread().getContextClassLoader().loadClass(logManger);
    +                Thread.currentThread().getContextClassLoader().loadClass(logManager);
                 } catch (final Exception ignored) {
    -                final Field field;
    +                Field field = null;
    +                boolean accessible = false;
                     try {
                         field = LogManager.class.getDeclaredField("manager");
    -                    field.setAccessible(true);
    -                    field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    if(field != null){
    +                        accessible = field.isAccessible();
    +                        field.setAccessible(true);
    +                        field.set(null, new JuliLogStreamFactory.OpenEJBLogManager());
    +                    }
    +
                     } catch (final Exception ignore) {
                         // ignore
    +                }finally{
    +                    if(field != null){
    +                        field.setAccessible(accessible);
    --- End diff --
    
    > ok Gurkan.
    So, ok means will you commit?


---