summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java10
-rw-r--r--processing/src/main/java/com/yahoo/processing/request/CloneHelper.java6
-rw-r--r--processing/src/main/java/com/yahoo/processing/request/Properties.java4
-rw-r--r--processing/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java1
4 files changed, 17 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java
index 934f1cacf32..76d94f3f0a2 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyMap.java
@@ -2,8 +2,9 @@
package com.yahoo.search.query.properties;
import com.yahoo.processing.request.*;
import com.yahoo.search.query.Properties;
-import java.util.*;
-import java.util.logging.Logger;
+import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.HashMap;
/**
* A Map backing of Properties.
@@ -76,4 +77,9 @@ public class PropertyMap extends Properties {
return map;
}
+ /** Clones this object if it is clonable, and the clone is public. Returns null if not */
+ public static Object clone(Object object) {
+ return cloneHelper.clone(object);
+ }
+
}
diff --git a/processing/src/main/java/com/yahoo/processing/request/CloneHelper.java b/processing/src/main/java/com/yahoo/processing/request/CloneHelper.java
index 9bc1c89135c..279769514d0 100644
--- a/processing/src/main/java/com/yahoo/processing/request/CloneHelper.java
+++ b/processing/src/main/java/com/yahoo/processing/request/CloneHelper.java
@@ -6,8 +6,12 @@ import com.yahoo.processing.request.properties.PublicCloneable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.*;
import java.util.logging.Logger;
+import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
/**
* @author : baldersheim
diff --git a/processing/src/main/java/com/yahoo/processing/request/Properties.java b/processing/src/main/java/com/yahoo/processing/request/Properties.java
index 00be00f9794..ea506aad7b2 100644
--- a/processing/src/main/java/com/yahoo/processing/request/Properties.java
+++ b/processing/src/main/java/com/yahoo/processing/request/Properties.java
@@ -577,4 +577,8 @@ public class Properties implements Cloneable {
public static Map<CompoundName, Object> cloneMap(Map<CompoundName, Object> map) {
return cloneHelper.cloneMap(map);
}
+ /** Clones this object if it is clonable, and the clone is public. Returns null if not */
+ public static Object clone(Object object) {
+ return cloneHelper.clone(object);
+ }
}
diff --git a/processing/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java b/processing/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java
index 105de5f5347..33fd03410e3 100644
--- a/processing/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java
+++ b/processing/src/main/java/com/yahoo/processing/request/properties/PropertyMap.java
@@ -6,7 +6,6 @@ import com.yahoo.processing.request.Properties;
import java.util.HashMap;
import java.util.Map;
-import java.util.Arrays;
/**
* A HashMap backing of Properties.