Merge pull request #187 from Arquisoft/last-fixes-before-3rd-deliver

Fixed unused catch clauses and personalized exceptions
Arquisoft · Apr 8, 2024 · af04f3e · af04f3e
2 parents 48379ef + b13c746
commit af04f3e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/src/main/java/com/uniovi/components/MultipleQuestionGenerator.java b/src/main/java/com/uniovi/components/MultipleQuestionGenerator.java
@@ -3,6 +3,7 @@
 import com.uniovi.components.generators.QuestionGenerator;
 import com.uniovi.entities.Question;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -13,7 +14,7 @@ public MultipleQuestionGenerator(QuestionGenerator... generators) {
         this.generators = generators;
     }
 
-    public List<Question> getQuestions() throws InterruptedException {
+    public List<Question> getQuestions() throws InterruptedException, IOException {
         List<Question> questions = new ArrayList<>();
         for (QuestionGenerator generator : generators) {
             questions.addAll(generator.getQuestions());

diff --git a/src/main/java/com/uniovi/components/generators/AbstractQuestionGenerator.java b/src/main/java/com/uniovi/components/generators/AbstractQuestionGenerator.java
@@ -6,6 +6,8 @@
 import com.uniovi.entities.Category;
 import com.uniovi.entities.Question;
 import com.uniovi.services.CategoryService;
+
+import java.io.IOException;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.net.http.HttpClient;
@@ -46,10 +48,8 @@ public void questionGenerator(String statement, List<String> options, String cor
         questions.add(question);
     }
 
-    public List<Question> getQuestions() throws InterruptedException {
+    public List<Question> getQuestions() throws InterruptedException, IOException {
         HttpClient client = HttpClient.newHttpClient();
-        try {
-
             String endpointUrl = "https://query.wikidata.org/sparql?query=" +
                     URLEncoder.encode(this.getQuery(), StandardCharsets.UTF_8) +
                     "&format=json";
@@ -76,12 +76,6 @@ public List<Question> getQuestions() throws InterruptedException {
                 questionGenerator(questionStatement, options, correctAnswer, this.getCategory());
 
             }
-        } catch (InterruptedException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new QuestionGeneratorException("An error occurred while generating questions." + e.getMessage());
-        }
-
         return questions;
     }
 
@@ -90,9 +84,4 @@ public List<Question> getQuestions() throws InterruptedException {
 
     protected abstract String getQuestionSubject(JsonNode result);
 
-    private static class QuestionGeneratorException extends RuntimeException {
-        public QuestionGeneratorException(String message) {
-            super(message);
-        }
-    }
 }
diff --git a/src/main/java/com/uniovi/components/generators/QuestionGenerator.java b/src/main/java/com/uniovi/components/generators/QuestionGenerator.java
@@ -4,13 +4,14 @@
 import com.uniovi.entities.Question;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
 import java.util.List;
 
 @Component
 public interface QuestionGenerator {
 
     String getQuery();
-    List<Question> getQuestions() throws InterruptedException;
+    List<Question> getQuestions() throws InterruptedException, IOException;
 
     Category getCategory();
 

diff --git a/src/main/java/com/uniovi/services/InsertSampleDataService.java b/src/main/java/com/uniovi/services/InsertSampleDataService.java
@@ -22,6 +22,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -49,7 +50,7 @@ public InsertSampleDataService(PlayerService playerService, QuestionService ques
 
     @Transactional
     @EventListener(ApplicationReadyEvent.class) // Uncomment this line to insert sample data on startup
-    public void insertSampleQuestions() throws InterruptedException {
+    public void insertSampleQuestions() throws InterruptedException, IOException {
         if (!playerService.getUserByEmail("[email protected]").isPresent()) {
             PlayerDto player = new PlayerDto();
             player.setEmail("[email protected]");
@@ -74,7 +75,7 @@ public void generateTestQuestions() {
     }
 
     @Transactional
-    public void generateSampleData() throws InterruptedException {
+    public void generateSampleData() throws InterruptedException, IOException {
 
         questionRepository.deleteAll();
 

diff --git a/src/test/java/com/uniovi/Wiq_UnitTests.java b/src/test/java/com/uniovi/Wiq_UnitTests.java
@@ -104,7 +104,7 @@ public void testPlayerService() {
     }
     @Test
     @Order(2)
-    public void testQuestions() throws InterruptedException {
+    public void testQuestions() throws InterruptedException, IOException {
         sampleDataService.insertSampleQuestions();
         sampleDataService.generateSampleData();
         List<Question> questions = questionService.getAllQuestions();
@@ -113,7 +113,7 @@ public void testQuestions() throws InterruptedException {
     }
     @Test
     @Order(2)
-    public void testRandomQuestions() throws InterruptedException {
+    public void testRandomQuestions() throws InterruptedException, IOException {
         sampleDataService.insertSampleQuestions();
         sampleDataService.generateSampleData();
         List<Question> questions = questionService.getRandomQuestions(5);
@@ -122,7 +122,7 @@ public void testRandomQuestions() throws InterruptedException {
 
     @Test
     @Order(3)
-    public void testBorderQuestionsGenerator() throws InterruptedException {
+    public void testBorderQuestionsGenerator() throws InterruptedException, IOException {
         BorderQuestionGenerator borderQuestionGenerator=new BorderQuestionGenerator(categoryService,Question.SPANISH);
         List<Question> questions = borderQuestionGenerator.getQuestions();
         Assertions.assertFalse(questions.isEmpty());
@@ -136,7 +136,7 @@ public void testBorderQuestionsGenerator() throws InterruptedException {
 
     @Test
     @Order(4)
-    public void testCapitalQuestionsGenerator() throws InterruptedException {
+    public void testCapitalQuestionsGenerator() throws InterruptedException, IOException {
         CapitalQuestionGenerator capitalQuestionGenerator=new CapitalQuestionGenerator(categoryService,Question.SPANISH);
         List<Question> questions = capitalQuestionGenerator.getQuestions();
         Assertions.assertFalse(questions.isEmpty());
@@ -150,7 +150,7 @@ public void testCapitalQuestionsGenerator() throws InterruptedException {
 
     @Test
     @Order(5)
-    public void testContinentQuestionsGenerator() throws InterruptedException {
+    public void testContinentQuestionsGenerator() throws InterruptedException, IOException {
         ContinentQuestionGeneration continentQuestionGenerator=new ContinentQuestionGeneration(categoryService,Question.SPANISH);
         List<Question> questions = continentQuestionGenerator.getQuestions();
         Assertions.assertFalse(questions.isEmpty());
@@ -1619,7 +1619,7 @@ private JSONObject parseJsonResponse(HttpResponse<String> response) throws JSONE
     /**
      * Inserts some sample questions into the database
      */
-    private void insertSomeQuestions() throws InterruptedException {
+    private void insertSomeQuestions() throws InterruptedException, IOException {
         List<Question> qs = new ContinentQuestionGeneration(categoryService, Question.SPANISH).getQuestions();
         qs.forEach(questionService::addNewQuestion);
     }