repo refactor

Author: mtiessler

src/main/java/upc/edu/gessi/repo/repository/ReviewRepository.java

@@ -4,7 +4,7 @@
 
 import org.eclipse.rdf4j.query.TupleQueryResult;
 import upc.edu.gessi.repo.dto.Review.ReviewDTO;
-import upc.edu.gessi.repo.dto.Review.ReviewFeatureDTO;
+import upc.edu.gessi.repo.dto.Review.ReviewFeatureResponseDTO;
 import upc.edu.gessi.repo.dto.Review.SentenceDTO;
 import upc.edu.gessi.repo.dto.graph.GraphReview;
 import upc.edu.gessi.repo.exception.Reviews.NoReviewsFoundException;
@@ -34,5 +34,5 @@ List<ReviewDTO> getReviewsByAppNameAndIdentifierWithLimit(String appName,
                                                               String appIdentifier,
                                                               Integer limit);
 
-    List<ReviewFeatureDTO> findAllByFeatures(List<String> features) throws NoReviewsFoundException;
+    List<ReviewFeatureResponseDTO> findAllByAppIdAndFeatures(String appId, List<String> features) throws NoReviewsFoundException;
 }

src/main/java/upc/edu/gessi/repo/repository/impl/ReviewRepositoryImpl.java

@@ -133,15 +133,17 @@ public List<ReviewDTO> findListed(final List<String> reviewIds) throws NoReviews
 
 
     @Override
-    public List<ReviewFeatureDTO> findAllByFeatures(final List<String> features) throws NoReviewsFoundException {
-        TupleQueryResult reviewsResult = runSparqlQuery(reviewQueryBuilder.findReviewsByFeatures(features));
+    public List<ReviewFeatureResponseDTO> findAllByAppIdAndFeatures(final String appId,
+                                                                    final List<String> features) throws NoReviewsFoundException {
+        TupleQueryResult reviewsResult = runSparqlQuery(reviewQueryBuilder
+                .findReviewsByAppIdAndFeatures(appId, features));
         if (!reviewsResult.hasNext()) {
             throw new NoReviewsFoundException("No review was found");
         }
-        List<ReviewFeatureDTO> reviewDTOs = new ArrayList<>();
+        List<ReviewFeatureResponseDTO> reviewDTOs = new ArrayList<>();
         while (reviewsResult.hasNext()) {
-            ReviewFeatureDTO reviewFeatureDTO = getReviewFeatureDTO(reviewsResult.next());
-            reviewDTOs.add(reviewFeatureDTO);
+            ReviewFeatureResponseDTO reviewFeatureResponseDTO = getReviewFeatureDTO(reviewsResult.next());
+            reviewDTOs.add(reviewFeatureResponseDTO);
         }
         return reviewDTOs;
     }
@@ -391,17 +393,17 @@ private void commitChanges(final List<Statement> statements) {
         repoConnection.close();
     }
 
-    private ReviewFeatureDTO getReviewFeatureDTO(final BindingSet bindings) {
-        ReviewFeatureDTO reviewFeatureDTO = new ReviewFeatureDTO();
+    private ReviewFeatureResponseDTO getReviewFeatureDTO(final BindingSet bindings) {
+        ReviewFeatureResponseDTO reviewFeatureResponseDTO = new ReviewFeatureResponseDTO();
         if (existsShortReviewBinding(bindings)) {
             if (bindings.getBinding("id") != null && bindings.getBinding("id").getValue() != null) {
                 String idValue = bindings.getBinding("id").getValue().stringValue();
-                reviewFeatureDTO.setId(idValue);
+                reviewFeatureResponseDTO.setId(idValue);
             }
 
             if (bindings.getBinding("text") != null && bindings.getBinding("text").getValue() != null) {
                 String textValue = bindings.getBinding("text").getValue().stringValue();
-                reviewFeatureDTO.setReviewText(textValue);
+                reviewFeatureResponseDTO.setReviewText(textValue);
             }
 
         }
@@ -415,10 +417,10 @@ private ReviewFeatureDTO getReviewFeatureDTO(final BindingSet bindings) {
             String model = bindings.getBinding("model").getValue().stringValue();
             featureDTO.setLanguageModel(new LanguageModelDTO(model));
         }
-        reviewFeatureDTO.setFeatureDTOs(Collections.singletonList(featureDTO));
+        reviewFeatureResponseDTO.setFeatureDTOs(Collections.singletonList(featureDTO));
 
 
-        return reviewFeatureDTO;
+        return reviewFeatureResponseDTO;
     }