solved ignore character '?' issue #1296

keeps · Sep 4, 2018 · df1037f · df1037f
1 parent b0a75a0
commit df1037f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/roda-core/roda-core/src/main/java/org/roda/core/index/utils/SolrUtils.java b/roda-core/roda-core/src/main/java/org/roda/core/index/utils/SolrUtils.java
@@ -18,7 +18,6 @@
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -184,7 +183,7 @@ public static <T extends IsIndexed> T retrieve(SolrClient index, Class<T> classT
   }
 
   public static <T extends IsIndexed> List<T> retrieve(SolrClient index, Class<T> classToRetrieve, List<String> id,
-    List<String> fieldsToReturn) throws NotFoundException, GenericException {
+    List<String> fieldsToReturn) throws GenericException {
     List<T> ret = new ArrayList<>();
     try {
       int block = RodaConstants.DEFAULT_PAGINATION_VALUE;
@@ -334,7 +333,7 @@ public static <T extends IsIndexed> IndexResult<T> find(SolrClient index, Class<
    * ____________________________________________________________________________________________________________________
    */
 
-  private static <T> boolean hasPermissionFilters(Class<T> resultClass) throws GenericException {
+  private static <T> boolean hasPermissionFilters(Class<T> resultClass) {
     return HasPermissionFilters.class.isAssignableFrom(resultClass);
   }
 
@@ -351,7 +350,7 @@ private static <T> boolean hasPermissionFilters(Class<T> resultClass) throws Gen
    */
   // FIXME perhaps && and || are not being properly escaped: see how to do it
   public static String escapeSolrSpecialChars(String string) {
-    return string.replaceAll("([+&|!(){}\\[\\-\\]\\^\\\\~?:\"/])", "\\\\$1");
+    return string.replaceAll("([+&|!(){}\\[\\-\\]\\^\\\\~:\"/])", "\\\\$1");
   }
 
   public static List<String> objectToListString(Object object) {
@@ -381,7 +380,6 @@ public static List<RepresentationInformationRelation> objectToListRelation(Objec
       ret = new ArrayList<>();
     } else if (object instanceof String) {
       try {
-        @SuppressWarnings("unchecked")
         List<LinkedHashMap<String, String>> l = JsonUtils.getObjectFromJson((String) object, List.class);
         ret = new ArrayList<>();
         for (LinkedHashMap<String, String> entry : l) {
@@ -992,7 +990,6 @@ private static String processToDate(Date toValue, DateGranularity granularity, i
     return processToDate(toValue, granularity, timeZoneOffset, true);
   }
 
-  @SuppressWarnings("deprecation")
   private static String processToDate(Date toValue, DateGranularity granularity, int timeZoneOffset,
     boolean returnAsteriskOnNull) {
     final String ret;
@@ -1203,7 +1200,7 @@ public static <T extends IsIndexed, S extends Object> ReturnWithExceptions<Void,
 
   public static <I extends IsIndexed, M extends IsModelObject, S extends Object> ReturnWithExceptions<Void, S> create2(
     SolrClient index, S source, Class<I> indexClass, M object, IndexingAdditionalInfo utils) {
-    ReturnWithExceptions<Void, S> ret = new ReturnWithExceptions<Void, S>(source);
+    ReturnWithExceptions<Void, S> ret = new ReturnWithExceptions<>(source);
     if (object != null) {
       try {
         SolrInputDocument solrDocument = SolrCollectionRegistry.toSolrDocument(indexClass, object, utils);
@@ -1383,7 +1380,7 @@ public static <T extends IsIndexed> String getObjectLabel(SolrClient index, Stri
   }
 
   public static Permissions getPermissions(SolrDocument doc) {
-    
+
     Permissions permissions = new Permissions();
 
     EnumMap<PermissionType, Set<String>> userPermissions = new EnumMap<>(PermissionType.class);

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/search/JobSearch.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/search/JobSearch.java
@@ -23,11 +23,10 @@
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 
-import config.i18n.client.ClientMessages;
-
 public class JobSearch extends Composite {
 
-  private static final ClientMessages messages = GWT.create(ClientMessages.class);
+  // private static final ClientMessages messages =
+  // GWT.create(ClientMessages.class);
 
   interface MyUiBinder extends UiBinder<Widget, JobSearch> {
   }

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/search/NotificationSearch.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/search/NotificationSearch.java
@@ -19,11 +19,10 @@
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 
-import config.i18n.client.ClientMessages;
-
 public class NotificationSearch extends Composite {
 
-  private static final ClientMessages messages = GWT.create(ClientMessages.class);
+  // private static final ClientMessages messages =
+  // GWT.create(ClientMessages.class);
 
   interface MyUiBinder extends UiBinder<Widget, NotificationSearch> {
   }

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/search/TransferredResourceSearch.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/search/TransferredResourceSearch.java
@@ -22,11 +22,10 @@
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 
-import config.i18n.client.ClientMessages;
-
 public class TransferredResourceSearch extends Composite {
 
-  private static final ClientMessages messages = GWT.create(ClientMessages.class);
+  // private static final ClientMessages messages =
+  // GWT.create(ClientMessages.class);
 
   interface MyUiBinder extends UiBinder<Widget, TransferredResourceSearch> {
   }