Removed declarePublic/PrivateTool methods of Service and AlgTool

to use the same method name as Algorithm: declareTool

GaudiExamples/src/AlgTools/MyServiceWithTool.cpp

@@ -13,7 +13,7 @@ namespace GaudiTesting {
     SvcWithTool(const std::string& name, ISvcLocator *pSvcLocator):
       Service(name, pSvcLocator) {
 
-    	declarePublicTool(m_tool);
+      declareTool(m_tool);
 
     }
     ~SvcWithTool() override = default;

GaudiKernel/GaudiKernel/AlgTool.h

@@ -171,11 +171,19 @@ public:
   template <class T>
   StatusCode declareTool( ToolHandle<T>& handle, std::string toolTypeAndName = "", bool createIf = true )
   {
-    if ( handle.isPublic() ) {
-      return declarePublicTool( handle, toolTypeAndName, createIf );
-    } else {
-      return declarePrivateTool( handle, toolTypeAndName, createIf );
+
+    if ( toolTypeAndName == "" ) toolTypeAndName = handle.typeAndName();
+
+    StatusCode sc = handle.initialize( toolTypeAndName, handle.isPublic() ? nullptr : this, createIf );
+    if ( UNLIKELY( !sc ) ) {
+      throw GaudiException{std::string{"Cannot create handle for "} + ( handle.isPublic() ? "public" : "private" ) +
+                               " tool " + toolTypeAndName,
+                           name(), sc};
     }
+
+    m_toolHandles.push_back( &handle );
+
+    return sc;
   }
 
   // ==========================================================================
@@ -212,52 +220,6 @@ public:
     }
   }
 
-  /** Declare used public tool
-   *
-   *  @param handle ToolHandle<T>
-   *  @param toolTypeAndName
-   *  @param parent, default public tool
-   *  @param create if necessary, default true
-   */
-  template <class T>
-  StatusCode declarePublicTool( ToolHandle<T>& handle, std::string toolTypeAndName = "", bool createIf = true )
-  {
-
-    if ( toolTypeAndName == "" ) toolTypeAndName = handle.typeAndName();
-
-    StatusCode sc = handle.initialize( toolTypeAndName, 0, createIf );
-    if ( UNLIKELY( !sc ) ) {
-      throw GaudiException{"Cannot create handle for public tool " + toolTypeAndName, name(), sc};
-    }
-
-    m_toolHandles.push_back( &handle );
-
-    return sc;
-  }
-
-  /** Declare used private tool
-   *
-   *  @param handle ToolHandle<T>
-   *  @param toolTypeAndName
-   *  @param parent, default public tool
-   *  @param create if necessary, default true
-   */
-  template <class T>
-  StatusCode declarePrivateTool( ToolHandle<T>& handle, std::string toolTypeAndName = "", bool createIf = true )
-  {
-
-    if ( toolTypeAndName == "" ) toolTypeAndName = handle.typeAndName();
-
-    StatusCode sc = handle.initialize( toolTypeAndName, this, createIf );
-    if ( UNLIKELY( !sc ) ) {
-      throw GaudiException{"Cannot create handle for private tool " + toolTypeAndName, name(), sc};
-    }
-
-    m_toolHandles.push_back( &handle );
-
-    return sc;
-  }
-
   const std::vector<IAlgTool*>& tools() const;
 
 protected:

GaudiKernel/GaudiKernel/Service.h

@@ -126,53 +126,24 @@ public:
     return service( svcType + "/" + svcName, psvc );
   }
 
-  /** Declare used Private tool
-         *
-         *  @param handle ToolHandle<T>
-         *  @param toolTypeAndName
-         *  @param parent, default public tool
-         *  @param create if necessary, default true
-         */
-  template <class T>
-  StatusCode declarePrivateTool( ToolHandle<T>& handle, std::string toolTypeAndName = "", bool createIf = true )
-  {
-
-    if ( toolTypeAndName == "" ) toolTypeAndName = System::typeinfoName( typeid( T ) );
-
-    StatusCode sc = handle.initialize( toolTypeAndName, this, createIf );
-
-    if ( sc.isSuccess() ) {
-      if ( UNLIKELY( msgLevel( MSG::DEBUG ) ) )
-        debug() << "Handle for private tool" << toolTypeAndName << " successfully created and stored." << endmsg;
-    } else {
-
-      error() << "Handle for private tool" << toolTypeAndName << " could not be created." << endmsg;
-    }
-
-    return sc;
-  }
-
-  /** Declare used Public tool
- *
- *  @param handle ToolHandle<T>
- *  @param toolTypeAndName
- *  @param parent, default public tool
- *  @param create if necessary, default true
- */
+  /** Declare used tool
+   *
+   *  @param handle ToolHandle<T>
+   *  @param toolTypeAndName
+   *  @param parent, default public tool
+   *  @param create if necessary, default true
+   */
   template <class T>
-  StatusCode declarePublicTool( ToolHandle<T>& handle, std::string toolTypeAndName = "", bool createIf = true )
+  StatusCode declareTool( ToolHandle<T>& handle, std::string toolTypeAndName = "", bool createIf = true )
   {
 
-    if ( toolTypeAndName == "" ) toolTypeAndName = System::typeinfoName( typeid( T ) );
-
-    StatusCode sc = handle.initialize( toolTypeAndName, 0, createIf );
-
-    if ( sc.isSuccess() ) {
-      if ( UNLIKELY( msgLevel( MSG::DEBUG ) ) )
-        debug() << "Handle for public tool" << toolTypeAndName << " successfully created and stored." << endmsg;
-    } else {
+    if ( toolTypeAndName == "" ) toolTypeAndName = handle.typeAndName();
 
-      error() << "Handle for public tool" << toolTypeAndName << " could not be created." << endmsg;
+    StatusCode sc = handle.initialize( toolTypeAndName, handle.isPublic() ? nullptr : this, createIf );
+    if ( UNLIKELY( !sc ) ) {
+      throw GaudiException{std::string{"Cannot create handle for "} + ( handle.isPublic() ? "public" : "private" ) +
+                               " tool " + toolTypeAndName,
+                           name(), sc};
     }
 
     return sc;