Take into account some feedbacks of SonarCloud about cyclic dependencies

Author: mmoqui

core-library/src/main/java/org/silverpeas/core/admin/component/model/WAComponent.java

@@ -24,22 +24,10 @@
 package org.silverpeas.core.admin.component.model;
 
 import org.silverpeas.core.admin.component.WAComponentRegistry;
-import org.silverpeas.core.admin.service.AdminException;
-import org.silverpeas.core.admin.service.ComponentInstManager;
-import org.silverpeas.kernel.SilverpeasRuntimeException;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+
+import javax.xml.bind.annotation.*;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 import static org.silverpeas.core.i18n.I18NHelper.checkLanguage;
 
@@ -388,18 +376,4 @@ public boolean isTopicTracker() {
     return getBehaviors() != null &&
         getBehaviors().getBehavior().contains(ComponentBehavior.TOPIC_TRACKER);
   }
-
-  /**
-   * Gets all the identifiers of the instances of this WA component.
-   * @return a list of component instance identifiers. An empty list if there is no yet instances
-   * of this WA component.
-   * @throws SilverpeasRuntimeException if an error occurs while getting the existing instances.
-   */
-  public List<String> getAllInstanceIds() {
-    try {
-      return List.of(ComponentInstManager.get().getAllCompoIdsByComponentName(name));
-    } catch (AdminException e) {
-      throw new SilverpeasRuntimeException(e);
-    }
-  }
 }

core-library/src/main/java/org/silverpeas/core/admin/persistence/ComponentInstanceTable.java

@@ -27,16 +27,10 @@
 import org.silverpeas.core.annotation.Repository;
 import org.silverpeas.core.persistence.jdbc.DBUtil;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
+import java.sql.*;
 import java.util.Date;
 import java.util.List;
 
-import static org.silverpeas.core.SilverpeasExceptionMessages.unknown;
-
 /**
  * A ComponentInstanceTable object manages the ST_ComponentInstance table.
  */
@@ -113,22 +107,6 @@ public ComponentInstanceRow getComponentInstance(int id) throws SQLException {
     return getUniqueRow(SELECT_INSTANCE_BY_ID, id);
   }
 
-  /**
-   * Returns the ComponentInstance of a given user role.
-   * @param userRoleId id of user role
-   * @return the ComponentInstance of a given user role.
-   * @throws SQLException on error
-   */
-  public ComponentInstanceRow getComponentInstanceOfUserRole(int userRoleId)
-      throws SQLException {
-    return getUniqueRow(SELECT_USERROLE_INSTANCE, userRoleId);
-  }
-
-  private static final String SELECT_USERROLE_INSTANCE =
-      SELECT + Table.aliasColumns("i", INSTANCE_COLUMNS) +
-          " from ST_ComponentInstance i, ST_UserRole us" +
-          " where i.id = us.instanceId and us.id = ?";
-
   /**
    * Returns all the instances in a given space
    * @param spaceId the space id
@@ -138,7 +116,7 @@ public ComponentInstanceRow getComponentInstanceOfUserRole(int userRoleId)
   public ComponentInstanceRow[] getAllComponentInstancesInSpace(int spaceId)
       throws SQLException {
     List<ComponentInstanceRow> rows = getRows(SELECT_ALL_SPACE_INSTANCES, spaceId);
-    return rows.toArray(new ComponentInstanceRow[rows.size()]);
+    return rows.toArray(new ComponentInstanceRow[0]);
   }
 
   private static final String SELECT_ALL_SPACE_INSTANCES = SELECT + INSTANCE_COLUMNS +
@@ -167,7 +145,7 @@ public String[] getAllComponentInstanceIdsInSpace(int spaceId) throws SQLExcepti
    */
   public ComponentInstanceRow[] getRemovedComponents() throws SQLException {
     List<ComponentInstanceRow> rows = getRows(SELECT_REMOVED_COMPONENTS);
-    return rows.toArray(new ComponentInstanceRow[rows.size()]);
+    return rows.toArray(new ComponentInstanceRow[0]);
   }
 
   private static final String SELECT_REMOVED_COMPONENTS =
@@ -186,7 +164,7 @@ public ComponentInstanceRow[] getAllMatchingComponentInstances(
     String[] values =
         new String[]{sampleInstance.componentName, sampleInstance.name, sampleInstance.description};
     List<ComponentInstanceRow> rows = getMatchingRows(INSTANCE_COLUMNS, columns, values);
-    return rows.toArray(new ComponentInstanceRow[rows.size()]);
+    return rows.toArray(new ComponentInstanceRow[0]);
   }
 
   /**
@@ -196,10 +174,6 @@ public ComponentInstanceRow[] getAllMatchingComponentInstances(
    */
   public void createComponentInstance(ComponentInstanceRow instance)
       throws SQLException {
-    SpaceRow space = OrganizationSchema.get().space().getSpace(instance.spaceId);
-    if (space == null) {
-      throw new SQLException(unknown("space", String.valueOf(instance.spaceId)));
-    }
     insertRow(INSERT_INSTANCE, instance);
   }
 
@@ -268,7 +242,7 @@ public void updateComponentInheritance(int componentId, boolean inheritanceBlock
   /**
    * Updates in the database an instance row.
    * @param instance the row with the fields of the component instance
-   * @throws SQLException
+   * @throws SQLException if the update fails.
    */
   public void updateComponentInstance(ComponentInstanceRow instance)
       throws SQLException {
@@ -306,7 +280,6 @@ public boolean isComponentIntoBasket(int spaceId, String name) throws SQLExcepti
    * @param id the component id
    * @param tempLabel the temporary label
    * @param userId the user id that deletes the space
-   * @throws AdminPersistenceException on error
    */
   public void sendComponentToBasket(int id, String tempLabel, String userId)
       throws SQLException {

core-library/src/main/java/org/silverpeas/core/admin/persistence/UserRoleRow.java

@@ -132,6 +132,10 @@ public String getObjectType() {
     return objectType;
   }
 
+  public boolean isInstanceIdNotDefined() {
+    return instanceId == NO_VALUE;
+  }
+
   public boolean isObjectTypeDefined() {
     return StringUtil.isDefined(objectType);
   }