From 85ce04c5a373545f907f2c332aded3c6d337cef2 Mon Sep 17 00:00:00 2001 From: Julian Christl Date: Wed, 13 Sep 2023 23:15:55 +0200 Subject: [PATCH] Revert "Add missing branch attribute to programming-exercise.model.ts" This reverts commit e93b31721c3418f33149d7ce6d0d4bef383e8c0c. --- .../www1/artemis/web/rest/ProgrammingExerciseResource.java | 7 ------- .../web/rest/ProgrammingExerciseResourceErrorKeys.java | 2 -- src/main/webapp/app/entities/programming-exercise.model.ts | 1 - 3 files changed, 10 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java index cb8a84b9dc9c..fd265be5796f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java @@ -175,13 +175,6 @@ private void checkProgrammingExerciseForError(ProgrammingExercise exercise) { ProgrammingExerciseResourceErrorKeys.INVALID_TEST_CASE_WEIGHTS); } } - - if (exercise.getBranch() == null) { - // TODO: only activate this after the migration where all branches are set properly - log.warn("Branch of programming exercise {} is not specified.", exercise.getId()); - // throw new BadRequestAlertException("The branch of the programming exercise must be set.", "Exercise", - // ProgrammingExerciseResourceErrorKeys.INVALID_BRANCH); - } } /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResourceErrorKeys.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResourceErrorKeys.java index d5c187507298..f9842876f476 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResourceErrorKeys.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResourceErrorKeys.java @@ -18,8 +18,6 @@ public final class ProgrammingExerciseResourceErrorKeys { public static final String INVALID_AUXILIARY_REPOSITORY_DESCRIPTION = "invalid.auxiliary.repository.description"; - public static final String INVALID_BRANCH = "invalid.branch.description"; - public static final String INVALID_TEST_CASE_WEIGHTS = "invalid.testcases.weights"; private ProgrammingExerciseResourceErrorKeys() { diff --git a/src/main/webapp/app/entities/programming-exercise.model.ts b/src/main/webapp/app/entities/programming-exercise.model.ts index 7a2515370d41..bc25c1dd83af 100644 --- a/src/main/webapp/app/entities/programming-exercise.model.ts +++ b/src/main/webapp/app/entities/programming-exercise.model.ts @@ -63,7 +63,6 @@ export class ProgrammingExercise extends Exercise { public testCasesChanged?: boolean; public projectType?: ProjectType; - public branch?: string; public testwiseCoverageEnabled?: boolean;