Avoid deprecation warnings

2 files changed, 4 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java
index a57c0f98b45..4269f5e1c57 100644
--- a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java
+++ b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java
@@ -25,6 +25,7 @@ public final class ParserFactory {
      * @param environment the environment settings to attach to the Parser
      * @return the created Parser
      */
+    @SuppressWarnings("deprecation")
     public static Parser newInstance(Query.Type type, ParserEnvironment environment) {
         switch (type) {
             case ALL:
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java
index 332f03c896c..0a935530a62 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java
@@ -6,6 +6,7 @@ import com.yahoo.prelude.query.Item;
 import com.yahoo.search.query.textserialize.serializer.DispatchForm;
 import com.yahoo.search.query.textserialize.serializer.ItemIdMapper;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ListIterator;
 
 /**
@@ -42,8 +43,8 @@ public class CompositeConverter<T extends CompositeItem> implements ItemFormConv
 
     private T newInstance() {
         try {
-            return itemClass.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
+            return itemClass.getDeclaredConstructor().newInstance();
+        } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
             throw new RuntimeException(e);
         }
     }