tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject [11/14] tomee git commit: @Override added
Date Mon, 03 Dec 2018 03:35:00 GMT
@Override added


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0377eefb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0377eefb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0377eefb

Branch: refs/heads/master
Commit: 0377eefb3ffe08ab3525cb4e477ec51cbdcb0b41
Parents: c2ef2a0
Author: Hayri Cicek <hayricicek@Hayris-MBP.lan>
Authored: Sun Sep 16 01:26:40 2018 +0200
Committer: Hayri Cicek <hayricicek@Hayris-MBP.lan>
Committed: Sun Sep 16 01:26:40 2018 +0200

----------------------------------------------------------------------
 .../org/apache/tomee/catalina/ContextValue.java |  3 +-
 .../tomee/catalina/GlobalListenerSupport.java   |  4 +++
 .../tomee/catalina/IgnoredStandardContext.java  |  1 +
 .../tomee/catalina/LazyStopStandardRoot.java    |  7 +++++
 .../apache/tomee/catalina/OpenEJBContext.java   | 29 ++++++++++++++++++++
 5 files changed, 43 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/0377eefb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java
index 28828fa..ad0ea29 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java
@@ -26,12 +26,13 @@ import java.util.TreeSet;
 public class ContextValue extends LinkRef {
     public static final String MODULES_PREFIX = "openejb/modules/";
 
-    private final Collection<String> links = new TreeSet<String>();
+    private final Collection<String> links = new TreeSet<>();
 
     public ContextValue(final String linkName) {
         super(linkName);
     }
 
+    @Override
     public synchronized String getLinkName() throws NamingException {
         if (links.size() == 1) {
             return "java:" + links.iterator().next();

http://git-wip-us.apache.org/repos/asf/tomee/blob/0377eefb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
index 59759cb..c82394f 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
@@ -90,6 +90,7 @@ public class GlobalListenerSupport implements PropertyChangeListener, LifecycleL
     /**
      * {@inheritDoc}
      */
+    @Override
     public void lifecycleEvent(final LifecycleEvent event) {
         final Object source = event.getSource();
         if (source instanceof StandardContext) {
@@ -337,6 +338,7 @@ public class GlobalListenerSupport implements PropertyChangeListener,
LifecycleL
     /**
      * {@inheritDoc}
      */
+    @Override
     public void propertyChange(final PropertyChangeEvent event) {
         if ("service".equals(event.getPropertyName())) {
             final Object oldValue = event.getOldValue();
@@ -418,6 +420,7 @@ public class GlobalListenerSupport implements PropertyChangeListener,
LifecycleL
             this.listener = listener;
         }
 
+        @Override
         public Object put(final Object key, final Object value) {
             final Object oldValue = super.put(key, value);
             final PropertyChangeEvent event = new PropertyChangeEvent(source, propertyName,
null, value);
@@ -425,6 +428,7 @@ public class GlobalListenerSupport implements PropertyChangeListener,
LifecycleL
             return oldValue;
         }
 
+        @Override
         public Object remove(final Object key) {
             final Object value = super.remove(key);
             final PropertyChangeEvent event = new PropertyChangeEvent(source, propertyName,
value, null);

http://git-wip-us.apache.org/repos/asf/tomee/blob/0377eefb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java
index 99a2671..018a751 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/IgnoredStandardContext.java
@@ -30,6 +30,7 @@ public class IgnoredStandardContext extends StandardContext {
         // Tomcat has a stupid rule where a life cycle listener must set
         // configured true, or it will treat it as a failed deployment
         addLifecycleListener(new LifecycleListener() {
+            @Override
             public void lifecycleEvent(final LifecycleEvent event) {
                 final Context context = Context.class.cast(event.getLifecycle());
                 if (event.getType().equals(Lifecycle.START_EVENT)

http://git-wip-us.apache.org/repos/asf/tomee/blob/0377eefb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
index ef77770..83bf25a 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
@@ -230,12 +230,14 @@ public class LazyStopStandardRoot implements WebResourceRoot, JmxEnabled
{
         return delegate.getBaseUrls();
     }
 
+    @Override
     public void setDomain(final String domain) {
         if (isJmxEnabled) {
             JmxEnabled.class.cast(delegate).setDomain(domain);
         }
     }
 
+    @Override
     public String getDomain() {
         if (isJmxEnabled) {
             return JmxEnabled.class.cast(delegate).getDomain();
@@ -243,6 +245,7 @@ public class LazyStopStandardRoot implements WebResourceRoot, JmxEnabled
{
         return null;
     }
 
+    @Override
     public ObjectName getObjectName() {
         if (isJmxEnabled) {
             return JmxEnabled.class.cast(delegate).getObjectName();
@@ -250,24 +253,28 @@ public class LazyStopStandardRoot implements WebResourceRoot, JmxEnabled
{
         return null;
     }
 
+    @Override
     public void postDeregister() {
         if (isLifecycleMBeanBase) {
             LifecycleMBeanBase.class.cast(delegate).postDeregister();
         }
     }
 
+    @Override
     public void postRegister(final Boolean registrationDone) {
         if (isLifecycleMBeanBase) {
             LifecycleMBeanBase.class.cast(delegate).postRegister(registrationDone);
         }
     }
 
+    @Override
     public void preDeregister() throws Exception {
         if (isLifecycleMBeanBase) {
             LifecycleMBeanBase.class.cast(delegate).preDeregister();
         }
     }
 
+    @Override
     public ObjectName preRegister(final MBeanServer server, final ObjectName name) throws
Exception {
         if (isLifecycleMBeanBase) {
             return LifecycleMBeanBase.class.cast(delegate).preRegister(server, name);

http://git-wip-us.apache.org/repos/asf/tomee/blob/0377eefb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
index 4e7703f..0a2276d 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
@@ -40,6 +40,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object lookup(final Name name) throws NamingException {
         return getThreadContext().lookup(name);
     }
@@ -47,6 +48,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object lookup(final String name) throws NamingException {
         return getThreadContext().lookup(name);
     }
@@ -54,6 +56,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void bind(final Name name, final Object obj) throws NamingException {
         getThreadContext().bind(name, obj);
     }
@@ -61,6 +64,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void bind(final String name, final Object obj) throws NamingException {
         getThreadContext().bind(name, obj);
     }
@@ -68,6 +72,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void rebind(final Name name, final Object obj) throws NamingException {
         getThreadContext().rebind(name, obj);
     }
@@ -75,6 +80,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void rebind(final String name, final Object obj) throws NamingException {
         getThreadContext().rebind(name, obj);
     }
@@ -82,6 +88,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unbind(final Name name) throws NamingException {
         getThreadContext().unbind(name);
     }
@@ -89,6 +96,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unbind(final String name) throws NamingException {
         getThreadContext().unbind(name);
     }
@@ -96,6 +104,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void rename(final Name oldName, final Name newName) throws NamingException {
         getThreadContext().rename(oldName, newName);
     }
@@ -103,6 +112,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void rename(final String oldName, final String newName) throws NamingException
{
         getThreadContext().rename(oldName, newName);
     }
@@ -110,6 +120,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public NamingEnumeration<NameClassPair> list(final Name name) throws NamingException
{
         return getThreadContext().list(name);
     }
@@ -117,6 +128,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public NamingEnumeration<NameClassPair> list(final String name) throws NamingException
{
         return getThreadContext().list(name);
     }
@@ -124,6 +136,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public NamingEnumeration<Binding> listBindings(final Name name) throws NamingException
{
         return getThreadContext().listBindings(name);
     }
@@ -131,6 +144,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public NamingEnumeration<Binding> listBindings(final String name) throws NamingException
{
         return getThreadContext().listBindings(name);
     }
@@ -138,6 +152,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void destroySubcontext(final Name name) throws NamingException {
         getThreadContext().destroySubcontext(name);
     }
@@ -145,6 +160,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void destroySubcontext(final String name) throws NamingException {
         getThreadContext().destroySubcontext(name);
     }
@@ -152,6 +168,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Context createSubcontext(final Name name) throws NamingException {
         return getThreadContext().createSubcontext(name);
     }
@@ -159,6 +176,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Context createSubcontext(final String name) throws NamingException {
         return getThreadContext().createSubcontext(name);
     }
@@ -166,6 +184,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object lookupLink(final Name name) throws NamingException {
         return getThreadContext().lookupLink(name);
     }
@@ -173,6 +192,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object lookupLink(final String name) throws NamingException {
         return getThreadContext().lookupLink(name);
     }
@@ -180,6 +200,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public NameParser getNameParser(final Name name) throws NamingException {
         return getThreadContext().getNameParser(name);
     }
@@ -187,6 +208,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public NameParser getNameParser(final String name) throws NamingException {
         return getThreadContext().getNameParser(name);
     }
@@ -194,6 +216,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Name composeName(final Name name, final Name prefix) throws NamingException {
         return getThreadContext().composeName(name, prefix);
     }
@@ -201,6 +224,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String composeName(final String name, final String prefix) throws NamingException
{
         return getThreadContext().composeName(name, prefix);
     }
@@ -208,6 +232,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object addToEnvironment(final String propName, final Object propVal) throws NamingException
{
         return getThreadContext().addToEnvironment(propName, propVal);
     }
@@ -215,6 +240,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object removeFromEnvironment(final String propName) throws NamingException {
         return getThreadContext().removeFromEnvironment(propName);
     }
@@ -222,6 +248,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Hashtable<?, ?> getEnvironment() throws NamingException {
         return getThreadContext().getEnvironment();
     }
@@ -229,6 +256,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void close() throws NamingException {
         getThreadContext().close();
     }
@@ -236,6 +264,7 @@ public class OpenEJBContext implements Context {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getNameInNamespace() throws NamingException {
         return "";
     }


Mime
View raw message