svn commit: r640316 - in /hadoop/core/trunk: ./ src/contrib/streaming/src/java/org/apache/hadoop/streaming/ src/java/org/apache/hadoop/conf/ src/test/org/apache/hadoop/dfs/

[dd...@apache.org]

Author: ddas
Date: Sun Mar 23 22:02:45 2008
New Revision: 640316

URL: http://svn.apache.org/viewvc?rev=640316&view=rev
Log:
HADOOP-2828. The following deprecated methods in Configuration.java have been removed getObject(String name) setObject(String name, Object value) get(String name, Object defaultValue) set(String name, Object value) entries(). Contributed by Amareshwari Sriramadasu.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
    hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
    hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=640316&r1=640315&r2=640316&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Sun Mar 23 22:02:45 2008
@@ -40,6 +40,16 @@
     HADOOP-2116. Changes the layout of the task execution directory. 
     (Amareshwari Sriramadasu via ddas)
 
+    HADOOP-2828. The following deprecated methods in Configuration.java
+    have been removed
+        getObject(String name)
+        setObject(String name, Object value)
+        get(String name, Object defaultValue)
+        set(String name, Object value)
+        Iterator entries()
+    (Amareshwari Sriramadasu via ddas)
+
+
   NEW FEATURES
 
     HADOOP-1398.  Add HBase in-memory block cache.  (tomwhite)

Modified: hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java?rev=640316&r1=640315&r2=640316&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java Sun Mar 23 22:02:45 2008
@@ -254,7 +254,7 @@
     if (debug_) {
       logprintln("addJobConfToEnvironment: begin");
     }
-    Iterator it = conf.entries();
+    Iterator it = conf.iterator();
     while (it.hasNext()) {
       Map.Entry en = (Map.Entry) it.next();
       String name = (String) en.getKey();

Modified: hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=640316&r1=640315&r2=640316&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Sun Mar 23 22:02:45 2008
@@ -869,7 +869,7 @@
   protected void listJobConfProperties()
   {
     msg("==== JobConf properties:");
-    Iterator it = jobConf_.entries();
+    Iterator it = jobConf_.iterator();
     TreeMap sorted = new TreeMap();
     while(it.hasNext()) {
       Map.Entry en = (Map.Entry)it.next();

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java?rev=640316&r1=640315&r2=640316&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java Sun Mar 23 22:02:45 2008
@@ -227,33 +227,6 @@
     finalParameters.clear();                      // clear site-limits
   }
   
-  /**
-   * Returns the value of the <code>name</code> property, or null if no such
-   * property exists.
-   * @deprecated A side map of Configuration to Object should be used instead.
-   */
-  @Deprecated
-  public Object getObject(String name) { return getProps().get(name);}
-
-  /** Sets the value of the <code>name</code> property. 
-   * @deprecated
-   */
-  @Deprecated
-  public void setObject(String name, Object value) {
-    getProps().put(name, value);
-  }
-
-  /** Returns the value of the <code>name</code> property.  If no such property
-   * exists, then <code>defaultValue</code> is returned.
-   * @deprecated A side map of Configuration to Object should be used instead.
-   */
-  @Deprecated
-  public Object get(String name, Object defaultValue) {
-    Object res = getObject(name);
-    if (res != null) return res;
-    else return defaultValue;
-  }
-  
   private static Pattern varPat = Pattern.compile("\\$\\{[^\\}\\$\u0020]+\\}");
   private static int MAX_SUBST = 20;
 
@@ -311,15 +284,6 @@
     return getProps().getProperty(name);
   }
 
-  /** Sets the value of the <code>name</code> property. 
-   * @deprecated
-   */
-  @Deprecated
-  public void set(String name, Object value) {
-    getOverlay().setProperty(name, value.toString());
-    getProps().setProperty(name, value.toString());
-  }
-  
   /** 
    * Set the <code>value</code> of the <code>name</code> property.
    * 
@@ -780,14 +744,6 @@
         properties.putAll(overlay);
     }
     return properties;
-  }
-
-  /** @return Iterator&lt; Map.Entry&lt;String,String> >  
-   * @deprecated Use {@link #iterator()} instead. 
-   */
-  @Deprecated
-  public Iterator entries() {
-    return iterator();
   }
 
   /**

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java?rev=640316&r1=640315&r2=640316&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java Sun Mar 23 22:02:45 2008
@@ -68,7 +68,7 @@
    */
   public void testTrash() throws IOException {
     Configuration conf = new Configuration();
-    conf.set("fs.trash.interval", 10); // 10 minute
+    conf.set("fs.trash.interval", "10"); // 10 minute
     MiniDFSCluster cluster = new MiniDFSCluster(conf, 2, true, null);
     FileSystem fs = cluster.getFileSystem();
     DistributedFileSystem fileSys = (DistributedFileSystem) fs;