Use only Spring, no Java EE!

pom.xml

@@ -64,16 +64,16 @@
             <artifactId>wicket-auth-roles</artifactId>
             <version>${wicket.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-cdi-1.1</artifactId>
-            <version>${wicket.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wicketstuff</groupId>
-            <artifactId>wicketstuff-javaee-inject</artifactId>
-            <version>${wicket.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.wicket</groupId>-->
+            <!--<artifactId>wicket-cdi-1.1</artifactId>-->
+            <!--<version>${wicket.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.wicketstuff</groupId>-->
+            <!--<artifactId>wicketstuff-javaee-inject</artifactId>-->
+            <!--<version>${wicket.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-spring</artifactId>
@@ -142,11 +142,11 @@
         </dependency>
 
         <!-- java ee7 -->
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>javax.enterprise</groupId>-->
+            <!--<artifactId>cdi-api</artifactId>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>

src/main/java/com/copperarrow/WicketApplication.java

@@ -1,18 +1,17 @@
 package com.copperarrow;
 
 import com.copperarrow.auth.SecureWebSession;
+import com.copperarrow.dao.UserDAO;
 import com.copperarrow.pages.AdminPage;
 import com.copperarrow.pages.HomePage;
 import com.copperarrow.pages.LoginPage;
 import com.copperarrow.pages.UserPage;
 import org.apache.wicket.Application;
 import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
-import org.apache.wicket.cdi.CdiConfiguration;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
-import org.wicketstuff.javaee.injection.JavaEEComponentInjector;
-import org.wicketstuff.javaee.naming.global.ModuleJndiNamingStrategy;
+import org.apache.wicket.spring.test.ApplicationContextMock;
 
 /**
  * Application object for your web application.
@@ -50,6 +49,7 @@ public void init() {
         super.init();
 
         configureCDIEJB();
+
         getComponentInstantiationListeners().add(new SpringComponentInjector(this));
 
         mountPage("login", LoginPage.class);
@@ -58,7 +58,7 @@ public void init() {
     }
 
     private void configureCDIEJB() {
-        getComponentInstantiationListeners().add(new JavaEEComponentInjector(this, new ModuleJndiNamingStrategy()));
+//        getComponentInstantiationListeners().add(new JavaEEComponentInjector(this, new ModuleJndiNamingStrategy()));
 //        new CdiConfiguration().configure(this);
     }
 

src/main/java/com/copperarrow/model/dataproviders/UserAccountDataProvider.java

@@ -1,48 +1,43 @@
 package com.copperarrow.model.dataproviders;
 
-import com.copperarrow.dao.UserDAO;
-import com.copperarrow.model.UserAccount;
-import org.apache.wicket.cdi.NonContextual;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.spring.injection.annot.SpringBean;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
 import java.util.Iterator;
 import java.util.List;
 
+import javax.ejb.Stateless;
+
+import com.copperarrow.dao.UserDAO;
+import com.copperarrow.model.UserAccount;
+
 /**
  * Created by dbeer on 11/02/17.
  */
 @Stateless(name = "UserAcDataProvider")
 public class UserAccountDataProvider extends SortableDataProvider<UserAccount, String> {
 
-    @EJB(name = "UserDAO")
+    @SpringBean
     private UserDAO userDAO;
 
     public UserAccountDataProvider() {
+        Injector.get().inject(this);
         setSort("firstName", SortOrder.ASCENDING);
     }
 
-    private void getDAO() {
-        if (userDAO == null) {
-            NonContextual.of(UserAccountDataProvider.class).inject(this);
-        }
-    }
-
     @Override
     public Iterator<UserAccount> iterator(long first, long last) {
-        getDAO();
         List<UserAccount> users = userDAO.sort(getSort().toString(), "firstName");
 
         return users.subList((int)first, (int)(first + last)).iterator();
     }
 
     @Override
     public long size() {
-        getDAO();
         return userDAO.size();
     }
 

src/main/java/com/copperarrow/pages/UserPage.java

@@ -34,7 +34,7 @@ public UserPage(PageParameters parameters) {
         super(parameters);
 
         Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        if (principal != null && principal instanceof UserAccount) {
+        if (principal instanceof UserAccount) {
             String username = ((UserAccount) principal).getUserName();
             add(new Label("username", username));
         } else {

src/test/java/com/copperarrow/WicketApplicationTest.java

@@ -1,15 +1,14 @@
 package com.copperarrow;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.cdi.CdiConfiguration;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 import org.apache.wicket.spring.test.ApplicationContextMock;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.Before;
 import org.springframework.stereotype.Component;
-import org.wicketstuff.javaee.injection.JavaEEComponentInjector;
-import org.wicketstuff.javaee.naming.global.ModuleJndiNamingStrategy;
+
+import com.copperarrow.dao.UserDAO;
 
 /**
  * Created by dbeer on 15/01/17.
@@ -44,7 +43,6 @@ protected void init() {
                 //Configures the SpringBean annotation support to use the mock application context.
                 //This ensures that the mock objects are injected instead of the actual bean classes.
                 getComponentInstantiationListeners().add(new SpringComponentInjector(this, applicationContextMock));
-                getComponentInstantiationListeners().add(new JavaEEComponentInjector(this, new ModuleJndiNamingStrategy()));
                 WicketApplicationTest.this.init(this);
             }
 

src/test/java/com/copperarrow/pages/AdminPageTest.java

@@ -4,6 +4,7 @@
 import com.copperarrow.auth.config.SecurityWebApplicationInitializer;
 import com.copperarrow.dao.EntitiesDAO;
 import com.copperarrow.dao.UserDAO;
+import com.copperarrow.model.UserAccount;
 import com.copperarrow.model.dataproviders.UserAccountDataProvider;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.util.tester.WicketTester;
@@ -18,7 +19,10 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.Collections;
+
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -53,6 +57,7 @@ protected void setupTest() {
         userDAO = mock(UserDAO.class);
 
         when(userDAO.size()).thenReturn(1);
+        when(userDAO.sort(anyString(), anyString())).thenReturn(Collections.singletonList(new UserAccount()));
         addMock("java:module/UserAcDataProvider", userAccountDataProvider);
         addMock(userDAO);
     }
@@ -63,4 +68,4 @@ public void renderSuccessfully() {
         tester.startPage(AdminPage.class);
         tester.assertRenderedPage(AdminPage.class);
     }
-}
+}