From f91c7411818462fd908b0ee2b99d0d409e6ee3e0 Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Sat, 25 Mar 2023 06:22:39 -0500
Subject: [PATCH] Fixes issue #38 - Fix code smells (#39)

---
 .../lifecycle/action/DefaultActionParameterProducer.java    | 4 ++--
 .../lifecycle/action/DefaultActionResponseHandler.java      | 6 +++---
 .../manorrock/oyena/lifecycle/cdi/CdiLifecycleFactory.java  | 2 ++
 .../manorrock/oyena/lifecycle/rest/RestMappingMatch.java    | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionParameterProducer.java b/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionParameterProducer.java
index 15ec58a..f963e07 100644
--- a/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionParameterProducer.java
+++ b/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionParameterProducer.java
@@ -125,8 +125,8 @@ private ActionQueryParameter getActionQueryParameterAnnotation(Annotation[] anno
         ActionQueryParameter result = null;
         if (annotations != null && annotations.length > 0) {
             for (Annotation annotation : annotations) {
-                if (annotation instanceof ActionQueryParameter) {
-                    result = (ActionQueryParameter) annotation;
+                if (annotation instanceof ActionQueryParameter actionQueryParameter) {
+                    result = actionQueryParameter;
                     break;
                 }
             }
diff --git a/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionResponseHandler.java b/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionResponseHandler.java
index f3325ff..5ae0388 100644
--- a/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionResponseHandler.java
+++ b/lifecycle/action/src/main/java/com/manorrock/oyena/lifecycle/action/DefaultActionResponseHandler.java
@@ -50,9 +50,9 @@ public class DefaultActionResponseHandler implements ActionResponseHandler {
      * Get the default lifecycle.
      *
      * <p>
-     * FIXME - This method lazily gets the default lifecycle as FactoryFinder is
-     * not properly re-entrant. We should be able to initialize the
-     * defaultLifecycle variable in the constructor of this class. See
+     * NOTE - This method lazily gets the default lifecycle as FactoryFinder is
+     * not properly re-entrant (as of 20230324). We should be able to initialize
+     * the defaultLifecycle variable in the constructor of this class. See
      * https://github.com/eclipse-ee4j/mojarra/issues/4379
      * </p>
      *
diff --git a/lifecycle/cdi/src/main/java/com/manorrock/oyena/lifecycle/cdi/CdiLifecycleFactory.java b/lifecycle/cdi/src/main/java/com/manorrock/oyena/lifecycle/cdi/CdiLifecycleFactory.java
index 88fdcb9..3d0707d 100644
--- a/lifecycle/cdi/src/main/java/com/manorrock/oyena/lifecycle/cdi/CdiLifecycleFactory.java
+++ b/lifecycle/cdi/src/main/java/com/manorrock/oyena/lifecycle/cdi/CdiLifecycleFactory.java
@@ -95,12 +95,14 @@ public BeanManager getBeanManager() {
             InitialContext initialContext = new InitialContext();
             beanManager = (BeanManager) initialContext.lookup("java:comp/BeanManager");
         } catch (NamingException ne) {
+            // swallowing this on purpose.
         }
         if (beanManager == null) {
             try {
                 InitialContext initialContext = new InitialContext();
                 beanManager = (BeanManager) initialContext.lookup("java:comp/env/BeanManager");
             } catch (NamingException ne) {
+                // swallowing this on purpose.
             }
         }
         return beanManager;
diff --git a/lifecycle/rest/src/main/java/com/manorrock/oyena/lifecycle/rest/RestMappingMatch.java b/lifecycle/rest/src/main/java/com/manorrock/oyena/lifecycle/rest/RestMappingMatch.java
index 3ab1109..58ecf6b 100644
--- a/lifecycle/rest/src/main/java/com/manorrock/oyena/lifecycle/rest/RestMappingMatch.java
+++ b/lifecycle/rest/src/main/java/com/manorrock/oyena/lifecycle/rest/RestMappingMatch.java
@@ -39,7 +39,7 @@ public class RestMappingMatch {
     /**
      * Stores the bean.
      */
-    private Bean<? extends Object> bean;
+    private Bean bean;
 
     /**
      * Stores the method.
@@ -61,7 +61,7 @@ public class RestMappingMatch {
      *
      * @return the bean.
      */
-    public Bean<? extends Object> getBean() {
+    public Bean getBean() {
         return bean;
     }
 
@@ -106,7 +106,7 @@ public String getRestPath() {
      *
      * @param bean the bean.
      */
-    public void setBean(Bean<? extends Object> bean) {
+    public void setBean(Bean bean) {
         this.bean = bean;
     }