Development: Autowire Spring Atlas Components based on Spring properties instead of Spring profiles

docs/admin/setup/aeolus.rst

@@ -18,7 +18,7 @@ Enable the ``aeolus`` Spring profile
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,aeolus
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,aeolus
 
 Configure the Aeolus Endpoint
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/apollon.rst

@@ -9,7 +9,7 @@ Enable the ``apollon`` Spring profile:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,apollon
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,apollon
 
 Configure API Endpoints:
 ^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/athena.rst

@@ -11,7 +11,7 @@ Enable the ``athena`` Spring profile:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,athena
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,athena
 
 Configure API Endpoints:
 ^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/distributed.rst

@@ -528,7 +528,7 @@ For ICL, the run configuration for core nodes need to include the additional pro
 
 ::
 
-        --spring.profiles.active=prod,core,atlas,ldap-only,localvc,localci,athena,scheduling,iris,lti
+        --spring.profiles.active=prod,core,ldap-only,localvc,localci,athena,scheduling,iris,lti
 
 Core nodes do not require further adjustments to the ``application-prod.yml``, as long as you have added the necessary variables as described in the :ref:`Integrated Code Lifecycle Setup <Integrated Code Lifecycle Setup>`.
 

docs/admin/setup/iris.rst

@@ -20,7 +20,7 @@ Enable the ``iris`` Spring profile:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,iris
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local,iris
 
 Configure Pyris API Endpoints:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/admin/setup/production-setup-tips.rst

@@ -73,7 +73,7 @@ permissions in the ``/opt/artemis/`` directory that contains the ``Artemis.war``
      --add-opens java.management/sun.management=ALL-UNNAMED \
      --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED \
      -jar Artemis.war \
-     --spring.profiles.active=prod,localci,localvc,artemis,scheduling,buildagent,core,atlas,local,openapi
+     --spring.profiles.active=prod,localci,localvc,artemis,scheduling,buildagent,core,local,openapi
    SuccessExitStatus=143
    StandardOutput=/opt/artemis/artemis.log  # remove to use default journald logging/cleanup mechanisms
    StandardError=inherit

docs/dev/setup/aeolus.rst

@@ -77,7 +77,7 @@ e.g.:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,aeolus,artemis,scheduling,atlas,local
+   --spring.profiles.active=dev,localci,localvc,aeolus,artemis,scheduling,local
 
 
 More information on how Aeolus works can be found on `GitHub <https://github.com/ls1intum/Aeolus>`_ or in the `Aeolus documentation <https://ls1intum.github.io/Aeolus/>`_.

docs/dev/setup/integrated-code-lifecycle.rst

@@ -92,7 +92,7 @@ e.g.:
 
 ::
 
-   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,atlas,local
+   --spring.profiles.active=dev,localci,localvc,artemis,scheduling,buildagent,core,local
 
 All of these profiles are enabled by default when using the ``Artemis (Server, LocalVC & LocalCI)`` run configuration in IntelliJ.
 Please read :ref:`Server Setup` for more details.

docs/dev/setup/jenkins-gitlab.rst

@@ -90,7 +90,7 @@ In addition, you have to start Artemis with the profiles ``gitlab`` and
 
 ::
 
-   --spring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling
+   --spring.profiles.active=dev,jenkins,gitlab,artemis,scheduling
 
 Please read :ref:`Server Setup` for more details.
 

docs/dev/setup/jenkins-localvc.rst

@@ -86,7 +86,7 @@ In addition, you have to start Artemis with the profiles ``localvc`` and
 
 ::
 
-   --spring.profiles.active=dev,jenkins,localvc,artemis,atlas,scheduling
+   --spring.profiles.active=dev,jenkins,localvc,artemis,scheduling
 
 Please read :ref:`Server Setup` for more details.
 

docs/dev/setup/server.rst

@@ -216,15 +216,15 @@ The Artemis server should startup by running the main class
 
 ::
 
-   --spring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling
+   --spring.profiles.active=dev,jenkins,gitlab,artemis,scheduling
 
 If you use IntelliJ (Community or Ultimate) you can set the active
 profiles by
 
 * Choosing ``Run | Edit Configurations...``
 * Going to the ``Configuration Tab``
 * Expanding the ``Environment`` section to reveal ``VM Options`` and setting them to
-  ``-Dspring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling``
+  ``-Dspring.profiles.active=dev,jenkins,gitlab,artemis,scheduling``
 
 Set Spring profiles with IntelliJ Ultimate
 """"""""""""""""""""""""""""""""""""""""""
@@ -245,4 +245,4 @@ sure to pass the active profiles to the ``gradlew`` command like this:
 
 .. code:: bash
 
-   ./gradlew bootRun --args='--spring.profiles.active=dev,jenkins,gitlab,artemis,atlas,scheduling'
+   ./gradlew bootRun --args='--spring.profiles.active=dev,jenkins,gitlab,artemis,scheduling'

src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyApi.java

@@ -1,15 +1,14 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyService;
 import de.tum.cit.aet.artemis.lecture.domain.Lecture;
 
+@Conditional(AtlasEnabled.class)
 @Controller
-@Profile(PROFILE_ATLAS)
 public class CompetencyApi extends AbstractAtlasApi {
 
     private final CompetencyService competencyService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyProgressApi.java

@@ -1,14 +1,13 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.domain.LearningObject;
 import de.tum.cit.aet.artemis.atlas.domain.competency.Competency;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency;
@@ -19,7 +18,7 @@
 import de.tum.cit.aet.artemis.exercise.domain.participation.Participant;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class CompetencyProgressApi extends AbstractAtlasApi {
 
     private final CompetencyProgressService competencyProgressService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/CompetencyRelationApi.java

@@ -1,20 +1,19 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
 import java.util.List;
 
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyExerciseLink;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyLectureUnitLink;
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyExerciseLinkRepository;
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyLectureUnitLinkRepository;
 import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class CompetencyRelationApi extends AbstractAtlasApi {
 
     private final CompetencyRelationRepository competencyRelationRepository;

src/main/java/de/tum/cit/aet/artemis/atlas/api/CourseCompetencyApi.java

@@ -1,15 +1,14 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency;
 import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class CourseCompetencyApi extends AbstractAtlasApi {
 
     private final CourseCompetencyRepository courseCompetencyRepository;

src/main/java/de/tum/cit/aet/artemis/atlas/api/LearnerProfileApi.java

@@ -1,19 +1,18 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
 import java.util.Set;
 
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.service.profile.CourseLearnerProfileService;
 import de.tum.cit.aet.artemis.atlas.service.profile.LearnerProfileService;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class LearnerProfileApi extends AbstractAtlasApi {
 
     private final LearnerProfileService learnerProfileService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/LearningMetricsApi.java

@@ -1,15 +1,14 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO;
 import de.tum.cit.aet.artemis.atlas.service.LearningMetricsService;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class LearningMetricsApi extends AbstractAtlasApi {
 
     private final LearningMetricsService metricsService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/LearningPathApi.java

@@ -1,18 +1,17 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
 import jakarta.validation.constraints.NotNull;
 
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class LearningPathApi extends AbstractAtlasApi {
 
     private final LearningPathService learningPathService;

src/main/java/de/tum/cit/aet/artemis/atlas/api/PrerequisitesApi.java

@@ -1,16 +1,15 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite;
 import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository;
 import de.tum.cit.aet.artemis.core.domain.Course;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class PrerequisitesApi extends AbstractAtlasApi {
 
     private final PrerequisiteRepository prerequisiteRepository;

src/main/java/de/tum/cit/aet/artemis/atlas/api/ScienceEventApi.java

@@ -1,17 +1,16 @@
 package de.tum.cit.aet.artemis.atlas.api;
 
-import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATLAS;
-
 import java.util.Set;
 
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Controller;
 
+import de.tum.cit.aet.artemis.atlas.config.AtlasEnabled;
 import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent;
 import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository;
 
 @Controller
-@Profile(PROFILE_ATLAS)
+@Conditional(AtlasEnabled.class)
 public class ScienceEventApi extends AbstractAtlasApi {
 
     private final ScienceEventRepository scienceEventRepository;

src/main/java/de/tum/cit/aet/artemis/atlas/config/AtlasEnabled.java

@@ -0,0 +1,25 @@
+package de.tum.cit.aet.artemis.atlas.config;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import de.tum.cit.aet.artemis.core.config.ArtemisConfigHelper;
+
+/**
+ * Condition to check if the Atlas module is enabled.
+ * Based on this condition, Spring components concerning atlas functionality can be enabled or disabled.
+ */
+public class AtlasEnabled implements Condition {
+
+    private final ArtemisConfigHelper artemisConfigHelper;
+
+    public AtlasEnabled() {
+        this.artemisConfigHelper = new ArtemisConfigHelper();
+    }
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        return artemisConfigHelper.isAtlasEnabled(context.getEnvironment());
+    }
+}