Merge branch 'develop' into test-data-improvements

core/pom.xml

@@ -23,36 +23,14 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>javax.inject</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-jaxb</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>javax.inject</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>javax.inject</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriod.java

@@ -176,18 +176,16 @@ public class ApplicationPeriod extends DomainObject {
         return Collections.unmodifiableSet(answerSet);
     }
 
-    public void setProjectTypes(Iterable<ProjectType> projectTypes) {
+    public void setProjectTypes(Set<ProjectType> projectTypes) {
-        this.projectTypes.clear();
+        this.projectTypes.removeIf(appt -> !projectTypes.contains(appt.getProjectType()));
         for (ProjectType pt : projectTypes) {
-            this.projectTypes.add(new ApplicationPeriodProjectType(this, pt));
+            if (this.projectTypes.stream().noneMatch(appt -> appt.getProjectType().equals(pt))) {
+                addProjectType(pt);
+            }
         }
     }
 
     public void addProjectType(ProjectType projectType) {
         this.projectTypes.add(new ApplicationPeriodProjectType(this, projectType));
     }
-
-    public void removeProjectType(ProjectType projectType) {
-        this.projectTypes.removeIf(next -> next.getProjectType().equals(projectType));
-    }
 }

pom.xml

@@ -296,13 +296,6 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
-        <!-- Additional dependencies -->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-
         <!-- Test stuff -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java

@@ -123,13 +123,7 @@ public class AdminApplicationPeriodsPanel extends Panel {
                     item.add(
                         new DisplayMultiplesPanel<>(
                             s,
-                            new ListAdapterModel<>(
+                            new ListAdapterModel<>(iModel.map(ApplicationPeriod::getProjectTypes))
-                                LambdaModel.of(
-                                    iModel,
-                                    ApplicationPeriod::getProjectTypes,
-                                    ApplicationPeriod::setProjectTypes
-                                )
-                            )
                         ) {
                             @Override
                             public Component getComponent(String componentId, IModel<ProjectType> t) {

view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java

@@ -22,12 +22,7 @@ public class AddTargetLinkPanel extends Panel {
     public AddTargetLinkPanel(String id, final IModel<ApplicationPeriod> model) {
         super(id, model);
         add(
-            new ListView<>(
+            new ListView<>("list", new ListAdapterModel<>(model.map(ApplicationPeriod::getProjectTypes))) {
-                "list",
-                new ListAdapterModel<>(
-                    LambdaModel.of(model, ApplicationPeriod::getProjectTypes, ApplicationPeriod::setProjectTypes)
-                )
-            ) {
                 @Override
                 protected void populateItem(ListItem<ProjectType> item) {
                     item.add(new Label("pc", item.getModelObject().getName()));

view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java

@@ -76,13 +76,7 @@ public class ProjectPartnerPage extends AbstractIdeaProjectPage implements MenuH
             }
         );
         final IModel<? extends List<ProjectType>> matchableTypes = getMatchableTypes(
-            new ListAdapterModel<>(
+            new ListAdapterModel<>(applicationPeriod.map(ApplicationPeriod::getProjectTypes))
-                LambdaModel.of(
-                    applicationPeriod,
-                    ApplicationPeriod::getProjectTypes,
-                    ApplicationPeriod::setProjectTypes
-                )
-            )
         );
         panelContainer.add(
             new ListView<>("ads", matchableTypes) {

war/src/main/java/se/su/dsv/scipro/war/CurrentUserFromSpringSecurity.java

@@ -4,6 +4,7 @@ import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.Serializable;
 import java.security.Principal;
 import java.util.Collections;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -81,7 +82,7 @@ public class CurrentUserFromSpringSecurity implements AuthenticationContext {
         return authentication.getName();
     }
 
-    private static final class WicketControlledPrincipal implements Principal {
+    private static final class WicketControlledPrincipal implements Principal, Serializable {
 
         private final String username;