From 83ecf2d76f2e5d2b0302d99c89f987fde587f127 Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Fri, 13 Sep 2024 13:18:57 +0200 Subject: [PATCH] Enable all architecture tests --- .../web/{ => admin}/AdminStandardizedCompetencyResource.java | 2 +- .../web/{ => admin}/AdminSystemNotificationResource.java | 2 +- .../cit/aet/artemis/core/web/{ => admin}/AuditResource.java | 2 +- .../artemis/core/web/{ => admin}/FeatureToggleResource.java | 2 +- .../tum/cit/aet/artemis/core/web/{ => admin}/LogResource.java | 2 +- .../exercise/web/{ => admin}/AdminExerciseResource.java | 2 +- .../aet/artemis/iris/service/pyris/PyrisConnectorService.java | 2 +- .../iris/web/{ => admin}/AdminIrisSettingsResource.java | 2 +- .../iris/web/{ => open}/PublicPyrisStatusUpdateResource.java | 2 +- .../lti/web/{ => admin}/AdminLtiConfigurationResource.java | 2 +- .../web/{ => admin}/AdminModelingExerciseResource.java | 2 +- .../text/web/{ => admin}/AdminTextAssessmentEventResource.java | 2 +- .../artemis/authorization/AuthorizationArchitectureTest.java | 3 --- 13 files changed, 12 insertions(+), 15 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/atlas/web/{ => admin}/AdminStandardizedCompetencyResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/communication/web/{ => admin}/AdminSystemNotificationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/core/web/{ => admin}/AuditResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/core/web/{ => admin}/FeatureToggleResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/core/web/{ => admin}/LogResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/exercise/web/{ => admin}/AdminExerciseResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/iris/web/{ => admin}/AdminIrisSettingsResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/iris/web/{ => open}/PublicPyrisStatusUpdateResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/lti/web/{ => admin}/AdminLtiConfigurationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/modeling/web/{ => admin}/AdminModelingExerciseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/text/web/{ => admin}/AdminTextAssessmentEventResource.java (97%) diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/admin/AdminStandardizedCompetencyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/atlas/web/AdminStandardizedCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/admin/AdminStandardizedCompetencyResource.java index aa7889ec35b0..376cedb132dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/admin/AdminStandardizedCompetencyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.web; +package de.tum.cit.aet.artemis.atlas.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/admin/AdminSystemNotificationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/AdminSystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/admin/AdminSystemNotificationResource.java index adee7ca161eb..6850598633e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/admin/AdminSystemNotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web; +package de.tum.cit.aet.artemis.communication.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AuditResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/web/AuditResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java index 03be23e493f2..f0ed8ee2c438 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AuditResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static tech.jhipster.web.util.PaginationUtil.generatePaginationHttpHeaders; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/FeatureToggleResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/FeatureToggleResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java index 6634a39ba454..84a58f7918aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/FeatureToggleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/LogResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java index 88cca685fd55..375deea352f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AdminExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/admin/AdminExerciseResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/exercise/web/AdminExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/admin/AdminExerciseResource.java index cc824e67405d..306ad29ddd4f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AdminExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/admin/AdminExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.exercise.web; +package de.tum.cit.aet.artemis.exercise.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java index 6d54a5592771..785fc59b9ed7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.cit.aet.artemis.iris.web.PublicPyrisStatusUpdateResource; +import de.tum.cit.aet.artemis.iris.web.open.PublicPyrisStatusUpdateResource; /** * This service connects to the Python implementation of Iris (called Pyris). diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/admin/AdminIrisSettingsResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/admin/AdminIrisSettingsResource.java index 03bfaaad6c62..b8ea1f92ba31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/admin/AdminIrisSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.iris.web; +package de.tum.cit.aet.artemis.iris.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java index 117aa63c1202..05fecc5a287e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.iris.web; +package de.tum.cit.aet.artemis.iris.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/admin/AdminLtiConfigurationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/lti/web/admin/AdminLtiConfigurationResource.java index 622879915037..654facd44302 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/admin/AdminLtiConfigurationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.lti.web; +package de.tum.cit.aet.artemis.lti.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/admin/AdminModelingExerciseResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/modeling/web/AdminModelingExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/web/admin/AdminModelingExerciseResource.java index 25c4c6a83df8..215ea0a05293 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/admin/AdminModelingExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.modeling.web; +package de.tum.cit.aet.artemis.modeling.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/AdminTextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/admin/AdminTextAssessmentEventResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/text/web/AdminTextAssessmentEventResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/admin/AdminTextAssessmentEventResource.java index 51ee57b167b2..78b6a9f8871b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/AdminTextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/admin/AdminTextAssessmentEventResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.text.web; +package de.tum.cit.aet.artemis.text.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java index 4d9a9482250e..56f00bf87486 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java @@ -4,7 +4,6 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMethods; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; @@ -44,7 +43,6 @@ void testNoPreAuthorizeOnRestEndpoints() { rule.check(productionClasses); } - @Disabled // TODO: Enable this test once the restructuring is done @Test void testEnforceAdminAnnotations() { ArchRule rule = methods().that().areAnnotatedWith(EnforceAdmin.class).and().areNotAnnotatedWith(ManualConfig.class).should().beDeclaredInClassesThat() @@ -80,7 +78,6 @@ void testEnforceAtLeastStudentAnnotations() { rule.check(productionClasses); } - @Disabled // TODO: Enable this test once the restructuring is done @Test void testEnforceNothingAnnotations() { ArchRule rule = methods().that().areAnnotatedWith(EnforceNothing.class).and().areNotAnnotatedWith(ManualConfig.class).should().beDeclaredInClassesThat()