Merge branch 'work/using-react-with-bootstrap4'

steinarb · Jun 17, 2024 · 7d255b7 · 7d255b7
2 parents be4454d + b5dd9b6
commit 7d255b7
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 39 deletions.
diff --git a/ukelonn.backend/src/test/java/no/priv/bang/ukelonn/backend/UkelonnServiceBaseTest.java b/ukelonn.backend/src/test/java/no/priv/bang/ukelonn/backend/UkelonnServiceBaseTest.java
@@ -129,61 +129,51 @@ public Account addAccount(User user) {
 
                 @Override
                 public List<SumYear> earningsSumOverYear(String username) {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public List<SumYearMonth> earningsSumOverMonth(String username) {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public List<Bonus> getActiveBonuses() {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public List<Bonus> getAllBonuses() {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public List<Bonus> createBonus(Bonus newBonus) {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public List<Bonus> modifyBonus(Bonus updatedBonus) {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public List<Bonus> deleteBonus(Bonus removedBonus) {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public Locale defaultLocale() {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public List<LocaleBean> availableLocales() {
-                    // TODO Auto-generated method stub
                     return null;
                 }
 
                 @Override
                 public Map<String, String> displayTexts(Locale locale) {
-                    // TODO Auto-generated method stub
                     return null;
                 }
             };

diff --git a/...test/java/no/priv/bang/ukelonn/db/liquibase/production/ProductionLiquibaseRunnerTest.java b/...test/java/no/priv/bang/ukelonn/db/liquibase/production/ProductionLiquibaseRunnerTest.java
@@ -82,7 +82,7 @@ void testInsertInitialDataInDatabaseFailToCreateLiquibase() throws Exception {
     }
 
     @Test
-    void testCreateUkelonnLiquibaseDefault() throws Exception {
+    void testCreateUkelonnLiquibaseDefault() {
         var runner = new ProductionLiquibaseRunner();
         var logservice = new MockLogService();
         runner.setLogService(logservice);

diff --git a/...se.test/src/test/java/no/priv/bang/ukelonn/db/liquibase/test/TestLiquibaseRunnerTest.java b/...se.test/src/test/java/no/priv/bang/ukelonn/db/liquibase/test/TestLiquibaseRunnerTest.java
@@ -61,7 +61,7 @@
 class TestLiquibaseRunnerTest {
 
     @Test
-    void testPrepareDatabase() throws SQLException, DatabaseException {
+    void testPrepareDatabase() throws Exception {
         var dataSourceFactory = new DerbyDataSourceFactory();
         var derbyMemoryCredentials = createDerbyMemoryCredentials("ukelonn_pure", "no");
         var datasource = dataSourceFactory.createDataSource(derbyMemoryCredentials);

diff --git a/ukelonn.web.frontend/src/main/frontend/package-lock.json b/ukelonn.web.frontend/src/main/frontend/package-lock.json
diff --git a/ukelonn.web.security/pom.xml b/ukelonn.web.security/pom.xml
@@ -179,6 +179,11 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>*,org.apache.shiro.web.filter.authc</Import-Package> <!-- import of package containing PassThruAuthenticationFilter for the Shiro INI parser -->
+                    </instructions>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>

diff --git a/ukelonn.web.security/src/main/java/no/priv/bang/ukelonn/web/security/UkelonnShiroFilter.java b/ukelonn.web.security/src/main/java/no/priv/bang/ukelonn/web/security/UkelonnShiroFilter.java
@@ -21,7 +21,6 @@
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.session.mgt.eis.SessionDAO;
 import org.apache.shiro.web.env.IniWebEnvironment;
-import org.apache.shiro.web.filter.authc.PassThruAuthenticationFilter;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.servlet.AbstractShiroFilter;
 import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
@@ -66,8 +65,8 @@ public void setSession(SessionDAO session) {
 
     @Activate
     public void activate() {
+        Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); // Set class loader that can find PassThruAuthenticationFilter for the Shiro INI parser
         var environment = new IniWebEnvironment();
-        environment.getObjects().put("authc", new PassThruAuthenticationFilter());
         environment.setIni(INI_FILE);
         environment.setServletContext(getServletContext());
         environment.init();

diff --git a/ukelonn.web.security/src/main/resources/shiro.ini b/ukelonn.web.security/src/main/resources/shiro.ini
@@ -1,5 +1,6 @@
 [main]
 shiro.loginUrl = /login
+authc = org.apache.shiro.web.filter.authc.PassThruAuthenticationFilter
 authc.loginUrl = /login
 shiro.unauthorizedUrl = /unauthorized
 

diff --git a/...nn.web.services/src/test/java/no/priv/bang/ukelonn/api/resources/AccountResourceTest.java b/...nn.web.services/src/test/java/no/priv/bang/ukelonn/api/resources/AccountResourceTest.java
@@ -40,7 +40,7 @@ class AccountResourceTest extends ServletTestBase {
     }
 
     @Test
-    void testGetAccount() throws Exception {
+    void testGetAccount() {
         // Create the request and response for the Shiro login
         var request = mock(HttpServletRequest.class);
         var session = mock(HttpSession.class);
@@ -77,7 +77,7 @@ void testGetAccount() throws Exception {
      * @throws Exception
      */
     @Test
-    void testGetAccountOtherUsername() throws Exception {
+    void testGetAccountOtherUsername() {
         // Create the request and response for the Shiro login
         var request = mock(HttpServletRequest.class);
         var session = mock(HttpSession.class);
@@ -111,7 +111,7 @@ void testGetAccountOtherUsername() throws Exception {
      * @throws Exception
      */
     @Test
-    void testGetAccountWhenLoggedInAsAdministrator() throws Exception {
+    void testGetAccountWhenLoggedInAsAdministrator() {
         // Create the request and response for the Shiro login
         var request = mock(HttpServletRequest.class);
         var session = mock(HttpSession.class);
@@ -142,7 +142,7 @@ void testGetAccountWhenLoggedInAsAdministrator() throws Exception {
     }
 
     @Test
-    void testGetAccountNoUsername() throws Exception {
+    void testGetAccountNoUsername() {
         // Create the request and response for the Shiro login
         var request = mock(HttpServletRequest.class);
         var session = mock(HttpSession.class);
@@ -166,7 +166,7 @@ void testGetAccountNoUsername() throws Exception {
     }
 
     @Test
-    void testGetAccountUsernameNotPresentInDatabase() throws Exception {
+    void testGetAccountUsernameNotPresentInDatabase() {
         // Create the request and response for the Shiro login
         var request = mock(HttpServletRequest.class);
         var session = mock(HttpSession.class);

diff --git a/ukelonn.web.services/src/test/java/no/priv/bang/ukelonn/api/resources/AccountsTest.java b/ukelonn.web.services/src/test/java/no/priv/bang/ukelonn/api/resources/AccountsTest.java
@@ -25,7 +25,7 @@
 class AccountsTest {
 
     @Test
-    void testGetAccounts() throws Exception {
+    void testGetAccounts() {
         // Create the object to be tested
         var resource = new Accounts();
 

diff --git a/ukelonn.web.services/src/test/java/no/priv/bang/ukelonn/api/resources/JobResourceTest.java b/ukelonn.web.services/src/test/java/no/priv/bang/ukelonn/api/resources/JobResourceTest.java
@@ -52,7 +52,7 @@ class JobResourceTest extends ServletTestBase {
     }
 
     @Test
-    void testRegisterJob() throws Exception {
+    void testRegisterJob() {
         // Create the request
         var account = getJadAccount();
         var originalBalance = account.balance();
@@ -101,7 +101,7 @@ void testRegisterJob() throws Exception {
      * @throws Exception
      */
     @Test
-    void testRegisterJobOtherUsername() throws Exception {
+    void testRegisterJobOtherUsername() {
         // Create the request
         var account = getJodAccount();
         var jobTypes = getJobtypes();
@@ -143,7 +143,7 @@ void testRegisterJobOtherUsername() throws Exception {
      * @throws Exception
      */
     @Test
-    void testRegisterJobtWhenLoggedInAsAdministrator() throws Exception {
+    void testRegisterJobtWhenLoggedInAsAdministrator() {
         // Create the request
         var account = getJadAccount();
         var originalBalance = account.balance();
@@ -186,7 +186,7 @@ void testRegisterJobtWhenLoggedInAsAdministrator() throws Exception {
     }
 
     @Test
-    void testRegisterJobNoUsername() throws Exception {
+    void testRegisterJobNoUsername() {
         // Create the request
         var account = Account.with().build();
         var jobTypes = getJobtypes();
@@ -230,7 +230,7 @@ void testRegisterJobNoUsername() throws Exception {
      * @throws Exception
      */
     @Test
-    void testRegisterJobInternalServerError() throws Exception {
+    void testRegisterJobInternalServerError() {
         // Create the request
         var account = Account.with().build();
         var jobTypes = getJobtypes();