Pull request #200: Fixed dossier dictionary and dictionary rank sorting

Merge in RED/redaction-service from RankFix2.1.x to release/2.27.x

* commit '94d6fc3e28b377ca2f65802d2bf4ab4e61604991':
  Fixed dossier dictionary and dictionary rank sorting

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeResponseService.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 public class AnalyzeResponseService {
 
     public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount, RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
-        boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(RedactionLogEntry::isHint);
+        boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive"));
 
         boolean hasRequests = redactionLog.getRedactionLogEntry()
                 .stream()

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java

@@ -210,7 +210,7 @@ public class DictionaryService {
             dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
         }
 
-        return new Dictionary(copy, DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
     }