Fix issues detected by SonarCloud

Author: mmoqui

core-api/src/main/java/org/silverpeas/core/calendar/Attendee.java

@@ -23,7 +23,6 @@
  */
 package org.silverpeas.core.calendar;
 
-import org.silverpeas.core.admin.user.model.User;
 import org.silverpeas.core.persistence.datasource.model.identifier.UuidIdentifier;
 import org.silverpeas.core.persistence.datasource.model.jpa.SilverpeasJpaEntity;
 import org.silverpeas.kernel.SilverpeasRuntimeException;
@@ -134,28 +133,12 @@ public Optional<Attendee> getDelegate() {
   /**
    * Delegates the participation of this attendee to another participant. The delegated is added
    * among the calendar event's attendees.
-   * @param user a user in Silverpeas.
+   * @param anotherAttendee a supplier of another attendee to the same calendar component.
    */
-  public void delegateTo(final User user) {
+  public void delegateTo(final AttendeeSupplier anotherAttendee) {
     participationStatusAnswered = this.participationStatus != ParticipationStatus.DELEGATED;
     this.participationStatus = ParticipationStatus.DELEGATED;
-    this.delegate = InternalAttendee.fromUser(user).to(this.component)
-        .withPresenceStatus(this.presenceStatus);
-    this.delegate.delegate = this;
-    this.component.getAttendees().add(this.delegate);
-  }
-
-  /**
-   * Delegates the participation of this attendee to another participant. The delegated is added
-   * among the calendar event's attendees.
-   * @param email the email of another attendee. This attendee is expected to be a person external
-   * to Silverpeas.
-   */
-  public void delegateTo(final String email) {
-    participationStatusAnswered = this.participationStatus != ParticipationStatus.DELEGATED;
-    this.participationStatus = ParticipationStatus.DELEGATED;
-    this.delegate = ExternalAttendee.withEmail(email).to(this.component)
-        .withPresenceStatus(this.presenceStatus);
+    this.delegate = anotherAttendee.to(this.component).withPresenceStatus(this.presenceStatus);
     this.delegate.delegate = this;
     this.component.getAttendees().add(this.delegate);
   }
@@ -365,7 +348,7 @@ public boolean isInformative() {
    * A supplier of an instance of a concrete implementation of {@link Attendee}
    */
   @FunctionalInterface
-  interface AttendeeSupplier {
+  public interface AttendeeSupplier {
 
     /**
      * Supplies an instance of an {@link Attendee} to the specified calendar component.

core-api/src/main/java/org/silverpeas/core/calendar/AttendeeSet.java

@@ -27,18 +27,9 @@
 import org.silverpeas.core.util.CollectionUtil;
 import org.silverpeas.kernel.annotation.NonNull;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.Set;
-import java.util.Spliterator;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -83,6 +74,7 @@ public Iterator<Attendee> iterator() {
    * relayed to the caller.
    * @param action the action to be performed for each attendee.
    */
+  @Override
   public void forEach(final Consumer<? super Attendee> action) {
     attendees.forEach(action);
   }
@@ -121,7 +113,7 @@ public Optional<Attendee> get(String id) {
    * @return the added attendee.
    */
   public Attendee add(final String email) {
-    Attendee attendee = ExternalAttendee.withEmail(email).to(component);
+    Attendee attendee = AttendeeSuppliers.fromEmail(email).to(component);
     attendees.add(attendee);
     return attendee;
   }
@@ -133,7 +125,7 @@ public Attendee add(final String email) {
    * @return the added attendee.
    */
   public Attendee add(final User user) {
-    Attendee attendee = InternalAttendee.fromUser(user).to(component);
+    Attendee attendee = AttendeeSuppliers.fromUser(user).to(component);
     attendees.add(attendee);
     return attendee;
   }

core-api/src/main/java/org/silverpeas/core/calendar/AttendeeSuppliers.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2000 - 2025 Silverpeas
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * As a special exception to the terms and conditions of version 3.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * Open Source Software ("FLOSS") applications as described in Silverpeas's
+ * FLOSS exception.  You should have received a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * "https://www.silverpeas.org/legal/floss_exception.html"
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.silverpeas.core.calendar;
+
+import org.silverpeas.core.admin.user.model.User;
+import org.silverpeas.core.calendar.Attendee.AttendeeSupplier;
+
+/**
+ * Providers of suppliers of Attendee objects by encapsulating their concrete implementation.
+ *
+ * @author mmoquillon
+ */
+public class AttendeeSuppliers {
+
+  private AttendeeSuppliers() {}
+
+  /**
+   * Gets a supplier of attendee representing a user from outside Silverpeas having the specified
+   * email address.
+   * @param email the email address of the attendee to supply later.
+   * @return a supplier of an external attendee.
+   */
+  public static AttendeeSupplier fromEmail(final String email) {
+    return ExternalAttendee.withEmail(email);
+  }
+
+  /**
+   * Gets a supplier of an attendee representing the specified user in Silverpeas.
+   * @param user a user in Silverpeas.
+   * @return a supplier of an internal attendee.
+   */
+  public static AttendeeSupplier fromUser(final User user) {
+    return InternalAttendee.fromUser(user);
+  }
+}
+  

core-api/src/main/java/org/silverpeas/core/calendar/ExternalAttendee.java

@@ -42,7 +42,7 @@ protected ExternalAttendee() {
     // empty constructor for JPA
   }
 
-  private ExternalAttendee(final String email, final CalendarComponent calendarComponent) {
+  ExternalAttendee(final String email, final CalendarComponent calendarComponent) {
     super(email, calendarComponent);
   }
 

core-api/src/main/java/org/silverpeas/core/calendar/InternalAttendee.java

@@ -43,7 +43,7 @@ protected InternalAttendee() {
     // empty constructor for JPA
   }
 
-  private InternalAttendee(final User user, final CalendarComponent calendarComponent) {
+  InternalAttendee(final User user, final CalendarComponent calendarComponent) {
     super(user.getId(), calendarComponent);
   }
 

core-api/src/test/java/org/silverpeas/core/calendar/EventAttendeeManagementTest.java

@@ -33,10 +33,10 @@
  * Unit tests on the management of attendees to events.
  * @author mmoquillon
  */
-public class EventAttendeeManagementTest {
+class EventAttendeeManagementTest {
 
   @Test
-  public void addAnAttendeeToAnEvent() {
+  void addAnAttendeeToAnEvent() {
     CalendarEvent event =
         anEvent().withAttendee("joe@dalton.com").withAttendee("averel@dalton.com");
     assertThat(
@@ -50,14 +50,14 @@ public void addAnAttendeeToAnEvent() {
   }
 
   @Test
-  public void delegateAnAttendeeToAnotherUserAddThisUserAmongTheAttendeesToTheEvent() {
+  void delegateAnAttendeeToAnotherUserAddThisUserAmongTheAttendeesToTheEvent() {
     CalendarEvent event = anEvent();
     Attendee attendee = ExternalAttendee.withEmail("joe@dalton.com")
         .to(event.asCalendarComponent());
     event.getAttendees().add(attendee);
     assertThat(event.getAttendees().size(), is(1));
 
-    attendee.delegateTo("averel@dalton.com");
+    attendee.delegateTo(AttendeeSuppliers.fromEmail("averel@dalton.com"));
 
     assertThat(event.getAttendees().size(), is(2));
     assertThat(
@@ -67,32 +67,34 @@ public void delegateAnAttendeeToAnotherUserAddThisUserAmongTheAttendeesToTheEven
   }
 
   @Test
-  public void delegateAnAttendeeToAnotherUserChangeTheParticipationStatus() {
+  void delegateAnAttendeeToAnotherUserChangeTheParticipationStatus() {
     CalendarEvent event = anEvent();
     Attendee attendee = ExternalAttendee.withEmail("joe@dalton.com")
         .to(event.asCalendarComponent());
     event.getAttendees().add(attendee);
     assertThat(event.getAttendees().size(), is(1));
 
-    attendee.delegateTo("averel@dalton.com");
+    attendee.delegateTo(AttendeeSuppliers.fromEmail("averel@dalton.com"));
 
     assertThat(attendee.getParticipationStatus(), is(Attendee.ParticipationStatus.DELEGATED));
   }
 
   @Test
-  public void delegateAnAttendeeToAnotherUserSetsTheDelegationBetweenTwoThem() {
+  void delegateAnAttendeeToAnotherUserSetsTheDelegationBetweenTwoThem() {
     CalendarEvent event = anEvent();
     Attendee attendee = ExternalAttendee.withEmail("joe@dalton.com")
         .to(event.asCalendarComponent());
     event.getAttendees().add(attendee);
     assertThat(event.getAttendees().size(), is(1));
 
-    attendee.delegateTo("averel@dalton.com");
+    attendee.delegateTo(AttendeeSuppliers.fromEmail("averel@dalton.com"));
 
     assertThat(attendee.getDelegate().isPresent(), is(true));
     assertThat(attendee.getDelegate().get(),
         is(ExternalAttendee.withEmail("averel@dalton.com")
             .to(event.asCalendarComponent())));
+    assertThat(attendee.getDelegate().isPresent(), is(true));
+    assertThat(attendee.getDelegate().get().getDelegate().isPresent(), is(true));
     assertThat(attendee.getDelegate().get().getDelegate().get(), is(attendee));
   }
 

core-library/src/integration-test/java/org/silverpeas/core/calendar/CalendarEventAttendeeManagementIT.java

@@ -198,7 +198,7 @@ public void delegateTheAttendanceToAnotherUser() {
 
     Attendee attendeeToDelegate =
         in(eventWithAttendees.getAttendees()).find(expectedUser().getId());
-    attendeeToDelegate.delegateTo(getUser());
+    attendeeToDelegate.delegateTo(AttendeeSuppliers.fromUser(getUser()));
     eventWithAttendees.update();
 
     mayBeEvent = calendar.event(EVENT_WITH_ATTENDEE);
@@ -358,7 +358,7 @@ private List<CalendarEventOccurrence> allOccurrencesOf(final CalendarEvent event
         .collect(Collectors.toList());
   }
 
-  public static AttendeeFinder in(final AttendeeSet attendees) {
+  static AttendeeFinder in(final AttendeeSet attendees) {
     return new AttendeeFinder(attendees);
   }
 

core-library/src/integration-test/java/org/silverpeas/core/calendar/CalendarEventNotificationIT.java

@@ -256,7 +256,7 @@ public void delegateParticipationSendTwoNotifications() {
     Optional<Attendee> mayBeAttendee = event.getAttendees().stream().findFirst();
     assertThat(mayBeAttendee.isPresent(), is(true));
     Attendee attendee = mayBeAttendee.get();
-    attendee.delegateTo(User.getById("2"));
+    attendee.delegateTo(AttendeeSuppliers.fromUser(User.getById("2")));
     event.update();
 
     assertThat(eventListener.hasBeenNotified(), is(false));

core-library/src/main/java/org/silverpeas/core/admin/space/SpaceProfileInst.java

@@ -75,4 +75,13 @@ public boolean isManager() {
     return SPACE_MANAGER.equalsIgnoreCase(getName());
   }
 
+  @Override
+  public boolean equals(Object o) {
+    return o instanceof SpaceProfileInst && super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
 }

core-library/src/main/java/org/silverpeas/core/admin/user/model/ProfileInst.java

@@ -135,4 +135,14 @@ public void setParentObjectId(final ProfiledObjectId parentObjectId) {
   public boolean isOnComponentInstance() {
     return this.objectId == ProfiledObjectId.NOTHING;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    return o instanceof ProfileInst && super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
 }