Removing CDI-Scope

cuioss · Dec 12, 2023 · c50b84f · c50b84f
1 parent 967fdd1
commit c50b84f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/...tal-common-cdi/src/main/java/de/cuioss/portal/common/bundle/PortalResourceBundleBean.java b/...tal-common-cdi/src/main/java/de/cuioss/portal/common/bundle/PortalResourceBundleBean.java
@@ -21,11 +21,10 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
 import javax.faces.application.Application;
-import javax.inject.Inject;
 
 import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
 /**
@@ -46,7 +45,7 @@
  *
  * @author Oliver Wolff
  */
-@Dependent
+@RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public class PortalResourceBundleBean extends ResourceBundle implements Serializable {
@@ -56,8 +55,7 @@ public class PortalResourceBundleBean extends ResourceBundle implements Serializ
     /** Lookup name for el-expression within views: "msgs" */
     public static final String BUNDLE_NAME = "msgs";
 
-    @Inject
-    private ResourceBundleWrapper resourceBundleWrapper;
+    private final ResourceBundleWrapper resourceBundleWrapper;
 
     private String allBundleNames;
 

diff --git a/...common-cdi/src/test/java/de/cuioss/portal/common/bundle/PortalResourceBundleBeanTest.java b/...common-cdi/src/test/java/de/cuioss/portal/common/bundle/PortalResourceBundleBeanTest.java
@@ -43,17 +43,14 @@
 import de.cuioss.portal.common.stage.ProjectStage;
 import de.cuioss.test.valueobjects.junit5.contracts.ShouldHandleObjectContracts;
 import de.cuioss.uimodel.application.CuiProjectStage;
-import lombok.Getter;
 
 @EnableAutoWeld
-@AddBeanClasses({ PortalMessages.class, ResourceBundleRegistry.class, ResourceBundleWrapperImpl.class,
-        PortalResourceBundleBean.class })
+@AddBeanClasses({ PortalMessages.class, ResourceBundleRegistry.class, ResourceBundleWrapperImpl.class })
 @ActivateScopes({ RequestScoped.class, SessionScoped.class })
 class PortalResourceBundleBeanTest implements ShouldHandleObjectContracts<PortalResourceBundleBean> {
 
     @Inject
-    @Getter
-    private PortalResourceBundleBean underTest;
+    private ResourceBundleWrapper wrapper;
 
     @Produces
     private CuiProjectStage projectStage;
@@ -74,13 +71,15 @@ void beforeEach() {
 
     @Test
     void testGetMessage() {
+        var underTest = getUnderTest();
         assertEquals("Internal server error", underTest.getString("page.error.title"));
         assertEquals("Internal server error", underTest.getString("page.error.srHeader"));
         assertEquals(PortalResourceBundleWrapperImplTest.PORTAL_TITLE, underTest.getString("portal.title"));
     }
 
     @Test
     void shouldSwitchMessageBundleOnLocaleChange() {
+        var underTest = getUnderTest();
         assertEquals("Internal server error", underTest.getString("page.error.title"));
         locale = Locale.GERMAN;
         localeChangeEvent.fire(Locale.GERMAN);
@@ -90,6 +89,7 @@ void shouldSwitchMessageBundleOnLocaleChange() {
 
     @Test
     void shouldFailOnInvalidKey() {
+        var underTest = getUnderTest();
         projectStage = ProjectStage.DEVELOPMENT;
         assertThrows(MissingResourceException.class, () -> {
             underTest.getString("not.there");
@@ -98,8 +98,13 @@ void shouldFailOnInvalidKey() {
 
     @Test
     void shouldReturnKeys() {
-        final List<String> keys = Collections.list(underTest.getKeys());
+        final List<String> keys = Collections.list(getUnderTest().getKeys());
         assertNotNull(keys);
         assertTrue(keys.size() > 60, "Found: " + keys.size());
     }
+
+    @Override
+    public PortalResourceBundleBean getUnderTest() {
+        return new PortalResourceBundleBean(wrapper);
+    }
 }