small code refactorings

.github/workflows/build_test_analyse.yml

@@ -24,7 +24,7 @@ jobs:
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Build, run tests and analyse
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage -Dsonar.projectKey=europeana_annotation
+        run: mvn -B clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage -Dsonar.projectKey=europeana_annotation
         env:
           # Needed to get some information about the pull request, if any
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

annotation-solr/src/main/java/eu/europeana/annotation/solr/service/impl/SolrAnnotationServiceImpl.java

@@ -616,10 +616,17 @@ private SolrQuery solrUniquenessQueryDebias(Annotation anno, boolean noSelfDuppl
         query.setQuery(WebAnnotationModelFields.MOTIVATION + ":\"" + MotivationTypes.HIGHLIGHTING.getOaType() + "\"");
 
         StringBuilder targetOrQuery=new StringBuilder();
-        targetOrQuery.append("(\"" + anno.getTarget().get(0).getSource() + "\"");
+        //all validated annotations have at least one target 
         for(Target t : anno.getTarget()) {
-        	targetOrQuery.append(" OR \"" + t.getSource() + "\"");
+          if(targetOrQuery.isEmpty()) {
+            //for first entry append the bracket
+            targetOrQuery.append("(\"" + anno.getTarget().get(0).getSource() + "\"");
+          }else {
+            //for the rest of the entries append the OR operator
+            targetOrQuery.append(" OR \"" + t.getSource() + "\"");  
+          }  
         }
+        //close bracket in the end
         targetOrQuery.append(")");
         query.addFilterQuery(SolrAnnotationConstants.TARGET_URI + ":" + targetOrQuery.toString());