Removed obsoleted parameters

phax · Jan 9, 2025 · d38d7bb · d38d7bb
1 parent 93beacb
commit d38d7bb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 35 deletions.
diff --git a/...odb/src/main/java/com/helger/phoss/smp/backend/mongodb/mgr/SMPManagerProviderMongoDB.java b/...odb/src/main/java/com/helger/phoss/smp/backend/mongodb/mgr/SMPManagerProviderMongoDB.java
@@ -80,15 +80,13 @@ public ISMPServiceGroupManager createServiceGroupMgr ()
   }
 
   @Nonnull
-  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     return new SMPRedirectManagerMongoDB (aIdentifierFactory);
   }
 
   @Nonnull
-  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                                    @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     return new SMPServiceInformationManagerMongoDB (aIdentifierFactory);
   }

diff --git a/...backend-sql/src/main/java/com/helger/phoss/smp/backend/sql/mgr/SMPManagerProviderSQL.java b/...backend-sql/src/main/java/com/helger/phoss/smp/backend/sql/mgr/SMPManagerProviderSQL.java
@@ -130,15 +130,13 @@ public ISMPServiceGroupManager createServiceGroupMgr ()
   }
 
   @Nonnull
-  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     return new SMPRedirectManagerJDBC (SMPDBExecutor::new);
   }
 
   @Nonnull
-  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                                    @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     return new SMPServiceInformationManagerJDBC (SMPDBExecutor::new);
   }

diff --git a/...backend-xml/src/main/java/com/helger/phoss/smp/backend/xml/mgr/SMPManagerProviderXML.java b/...backend-xml/src/main/java/com/helger/phoss/smp/backend/xml/mgr/SMPManagerProviderXML.java
@@ -19,6 +19,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.helger.commons.exception.InitializationException;
 import com.helger.commons.state.ETriState;
 import com.helger.commons.string.ToStringGenerator;
 import com.helger.dao.DAOException;
@@ -71,7 +72,7 @@ public ISMLInfoManager createSMLInfoMgr ()
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 
@@ -84,7 +85,7 @@ public ISMPSettingsManager createSettingsMgr ()
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 
@@ -97,7 +98,7 @@ public ISMPTransportProfileManager createTransportProfileMgr ()
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 
@@ -110,35 +111,33 @@ public ISMPServiceGroupManager createServiceGroupMgr ()
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 
   @Nonnull
-  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     try
     {
       return new SMPRedirectManagerXML (SMP_REDIRECT_XML);
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 
   @Nonnull
-  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                                    @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     try
     {
       return new SMPServiceInformationManagerXML (SMP_SERVICE_INFORMATION_XML);
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 
@@ -151,7 +150,7 @@ public ISMPParticipantMigrationManager createParticipantMigrationMgr ()
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 
@@ -165,7 +164,7 @@ public ISMPBusinessCardManager createBusinessCardMgr (@Nonnull final IIdentifier
     }
     catch (final DAOException ex)
     {
-      throw new RuntimeException (ex.getMessage (), ex);
+      throw new InitializationException (ex.getMessage (), ex);
     }
   }
 

diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/ISMPManagerProvider.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/ISMPManagerProvider.java
@@ -85,25 +85,19 @@ default void afterInitManagers ()
   /**
    * @param aIdentifierFactory
    *        The identifier factory to be used. May not be <code>null</code>.
-   * @param aServiceGroupMgr
-   *        The service group manager to use. May not be <code>null</code>.
    * @return A new SMP redirect manager. May not be <code>null</code>.
    */
   @Nonnull
-  ISMPRedirectManager createRedirectMgr (@Nonnull IIdentifierFactory aIdentifierFactory,
-                                         @Nonnull ISMPServiceGroupManager aServiceGroupMgr);
+  ISMPRedirectManager createRedirectMgr (@Nonnull IIdentifierFactory aIdentifierFactory);
 
   /**
    * @param aIdentifierFactory
    *        The identifier factory to be used. May not be <code>null</code>.
-   * @param aServiceGroupMgr
-   *        The service group manager to use. May not be <code>null</code>.
    * @return A new SMP service information manager. May not be
    *         <code>null</code>.
    */
   @Nonnull
-  ISMPServiceInformationManager createServiceInformationMgr (@Nonnull IIdentifierFactory aIdentifierFactory,
-                                                             @Nonnull ISMPServiceGroupManager aServiceGroupMgr);
+  ISMPServiceInformationManager createServiceInformationMgr (@Nonnull IIdentifierFactory aIdentifierFactory);
 
   /**
    * @return A new SMP participant migration manager. May not be

diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/SMPMetaManager.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/SMPMetaManager.java
@@ -229,12 +229,11 @@ protected void onAfterInstantiation (@Nonnull final IScope aScope)
       if (m_aServiceGroupMgr == null)
         throw new IllegalStateException ("Failed to create ServiceGroup manager!");
 
-      m_aRedirectMgr = s_aManagerProvider.createRedirectMgr (m_aIdentifierFactory, m_aServiceGroupMgr);
+      m_aRedirectMgr = s_aManagerProvider.createRedirectMgr (m_aIdentifierFactory);
       if (m_aRedirectMgr == null)
         throw new IllegalStateException ("Failed to create Redirect manager!");
 
-      m_aServiceInformationMgr = s_aManagerProvider.createServiceInformationMgr (m_aIdentifierFactory,
-                                                                                 m_aServiceGroupMgr);
+      m_aServiceInformationMgr = s_aManagerProvider.createServiceInformationMgr (m_aIdentifierFactory);
       if (m_aServiceInformationMgr == null)
         throw new IllegalStateException ("Failed to create ServiceInformation manager!");
 

diff --git a/phoss-smp-backend/src/test/java/com/helger/phoss/smp/mock/MockSMPManagerProvider.java b/phoss-smp-backend/src/test/java/com/helger/phoss/smp/mock/MockSMPManagerProvider.java
@@ -65,15 +65,13 @@ public ISMPServiceGroupManager createServiceGroupMgr ()
   }
 
   @Nonnull
-  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPRedirectManager createRedirectMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     return new MockSMPRedirectManager ();
   }
 
   @Nonnull
-  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory,
-                                                                    @Nonnull final ISMPServiceGroupManager aServiceGroupMgr)
+  public ISMPServiceInformationManager createServiceInformationMgr (@Nonnull final IIdentifierFactory aIdentifierFactory)
   {
     return new MockSMPServiceInformationManager ();
   }