Revert "Revert "Remove deprecated Tree, TreeEntry, FileTreeEntry and

friends""

This reverts commit 2cc80187d3633adedc99eb97132e0a749b457c19.

Bug: 486105
Change-Id: Id4f9987c33d66cbed9de6e4d4d6784afdd01a3cf
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

5 files changed, 111 insertions, 474 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java
index 5670a9634d..a100ff357f 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java
@@ -67,7 +67,6 @@ import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.CommitBuilder;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.FileTreeEntry;
 import org.eclipse.jgit.lib.ObjectDatabase;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectInserter;
@@ -75,7 +74,6 @@ import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.RefUpdate;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.TagBuilder;
-import org.eclipse.jgit.lib.Tree;
 import org.eclipse.jgit.lib.TreeFormatter;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTag;
@@ -419,29 +417,6 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase {
 	}
 
 	@Test
-	public void test012_SubtreeExternalSorting() throws IOException {
-		final ObjectId emptyBlob = insertEmptyBlob();
-		final Tree t = new Tree(db);
-		final FileTreeEntry e0 = t.addFile("a-");
-		final FileTreeEntry e1 = t.addFile("a-b");
-		final FileTreeEntry e2 = t.addFile("a/b");
-		final FileTreeEntry e3 = t.addFile("a=");
-		final FileTreeEntry e4 = t.addFile("a=b");
-
-		e0.setId(emptyBlob);
-		e1.setId(emptyBlob);
-		e2.setId(emptyBlob);
-		e3.setId(emptyBlob);
-		e4.setId(emptyBlob);
-
-		final Tree a = (Tree) t.findTreeMember("a");
-		a.setId(insertTree(a));
-		assertEquals(ObjectId
-				.fromString("b47a8f0a4190f7572e11212769090523e23eb1ea"),
-				insertTree(t));
-	}
-
-	@Test
 	public void test020_createBlobTag() throws IOException {
 		final ObjectId emptyId = insertEmptyBlob();
 		final TagBuilder t = new TagBuilder();
@@ -464,9 +439,8 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase {
 	@Test
 	public void test021_createTreeTag() throws IOException {
 		final ObjectId emptyId = insertEmptyBlob();
-		final Tree almostEmptyTree = new Tree(db);
-		almostEmptyTree.addEntry(new FileTreeEntry(almostEmptyTree, emptyId,
-				"empty".getBytes(), false));
+		TreeFormatter almostEmptyTree = new TreeFormatter();
+		almostEmptyTree.append("empty", FileMode.REGULAR_FILE, emptyId);
 		final ObjectId almostEmptyTreeId = insertTree(almostEmptyTree);
 		final TagBuilder t = new TagBuilder();
 		t.setObjectId(almostEmptyTreeId, Constants.OBJ_TREE);
@@ -488,9 +462,8 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase {
 	@Test
 	public void test022_createCommitTag() throws IOException {
 		final ObjectId emptyId = insertEmptyBlob();
-		final Tree almostEmptyTree = new Tree(db);
-		almostEmptyTree.addEntry(new FileTreeEntry(almostEmptyTree, emptyId,
-				"empty".getBytes(), false));
+		TreeFormatter almostEmptyTree = new TreeFormatter();
+		almostEmptyTree.append("empty", FileMode.REGULAR_FILE, emptyId);
 		final ObjectId almostEmptyTreeId = insertTree(almostEmptyTree);
 		final CommitBuilder almostEmptyCommit = new CommitBuilder();
 		almostEmptyCommit.setAuthor(new PersonIdent(author, 1154236443000L,
@@ -520,9 +493,8 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase {
 	@Test
 	public void test023_createCommitNonAnullii() throws IOException {
 		final ObjectId emptyId = insertEmptyBlob();
-		final Tree almostEmptyTree = new Tree(db);
-		almostEmptyTree.addEntry(new FileTreeEntry(almostEmptyTree, emptyId,
-				"empty".getBytes(), false));
+		TreeFormatter almostEmptyTree = new TreeFormatter();
+		almostEmptyTree.append("empty", FileMode.REGULAR_FILE, emptyId);
 		final ObjectId almostEmptyTreeId = insertTree(almostEmptyTree);
 		CommitBuilder commit = new CommitBuilder();
 		commit.setTreeId(almostEmptyTreeId);
@@ -542,9 +514,8 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase {
 	@Test
 	public void test024_createCommitNonAscii() throws IOException {
 		final ObjectId emptyId = insertEmptyBlob();
-		final Tree almostEmptyTree = new Tree(db);
-		almostEmptyTree.addEntry(new FileTreeEntry(almostEmptyTree, emptyId,
-				"empty".getBytes(), false));
+		TreeFormatter almostEmptyTree = new TreeFormatter();
+		almostEmptyTree.append("empty", FileMode.REGULAR_FILE, emptyId);
 		final ObjectId almostEmptyTreeId = insertTree(almostEmptyTree);
 		CommitBuilder commit = new CommitBuilder();
 		commit.setTreeId(almostEmptyTreeId);
@@ -746,14 +717,6 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase {
 		return emptyId;
 	}
 
-	private ObjectId insertTree(Tree tree) throws IOException {
-		try (ObjectInserter oi = db.newObjectInserter()) {
-			ObjectId id = oi.insert(Constants.OBJ_TREE, tree.format());
-			oi.flush();
-			return id;
-		}
-	}
-
 	private ObjectId insertTree(TreeFormatter tree) throws IOException {
 		try (ObjectInserter oi = db.newObjectInserter()) {
 			ObjectId id = oi.insert(tree);
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
index a5cd7b5c0b..7fcee3dc82 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
@@ -99,8 +99,7 @@ public class IndexDiffTest extends RepositoryTestCase {
 	public void testAdded() throws IOException {
 		writeTrashFile("file1", "file1");
 		writeTrashFile("dir/subfile", "dir/subfile");
-		Tree tree = new Tree(db);
-		tree.setId(insertTree(tree));
+		ObjectId tree = insertTree(new TreeFormatter());
 
 		DirCache index = db.lockDirCache();
 		DirCacheEditor editor = index.editor();
@@ -108,7 +107,7 @@ public class IndexDiffTest extends RepositoryTestCase {
 		editor.add(add(db, trash, "dir/subfile"));
 		editor.commit();
 		FileTreeIterator iterator = new FileTreeIterator(db);
-		IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
+		IndexDiff diff = new IndexDiff(db, tree, iterator);
 		diff.diff();
 		assertEquals(2, diff.getAdded().size());
 		assertTrue(diff.getAdded().contains("file1"));
@@ -124,18 +123,16 @@ public class IndexDiffTest extends RepositoryTestCase {
 		writeTrashFile("file2", "file2");
 		writeTrashFile("dir/file3", "dir/file3");
 
-		Tree tree = new Tree(db);
-		tree.addFile("file2");
-		tree.addFile("dir/file3");
-		assertEquals(2, tree.memberCount());
-		tree.findBlobMember("file2").setId(ObjectId.fromString("30d67d4672d5c05833b7192cc77a79eaafb5c7ad"));
-		Tree tree2 = (Tree) tree.findTreeMember("dir");
-		tree2.findBlobMember("file3").setId(ObjectId.fromString("873fb8d667d05436d728c52b1d7a09528e6eb59b"));
-		tree2.setId(insertTree(tree2));
-		tree.setId(insertTree(tree));
+		TreeFormatter dir = new TreeFormatter();
+		dir.append("file3", FileMode.REGULAR_FILE, ObjectId.fromString("873fb8d667d05436d728c52b1d7a09528e6eb59b"));
+
+		TreeFormatter tree = new TreeFormatter();
+		tree.append("file2", FileMode.REGULAR_FILE, ObjectId.fromString("30d67d4672d5c05833b7192cc77a79eaafb5c7ad"));
+		tree.append("dir", FileMode.TREE, insertTree(dir));
+		ObjectId treeId = insertTree(tree);
 
 		FileTreeIterator iterator = new FileTreeIterator(db);
-		IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
+		IndexDiff diff = new IndexDiff(db, treeId, iterator);
 		diff.diff();
 		assertEquals(2, diff.getRemoved().size());
 		assertTrue(diff.getRemoved().contains("file2"));
@@ -157,16 +154,16 @@ public class IndexDiffTest extends RepositoryTestCase {
 
 		writeTrashFile("dir/file3", "changed");
 
-		Tree tree = new Tree(db);
-		tree.addFile("file2").setId(ObjectId.fromString("0123456789012345678901234567890123456789"));
-		tree.addFile("dir/file3").setId(ObjectId.fromString("0123456789012345678901234567890123456789"));
-		assertEquals(2, tree.memberCount());
+		TreeFormatter dir = new TreeFormatter();
+		dir.append("file3", FileMode.REGULAR_FILE, ObjectId.fromString("0123456789012345678901234567890123456789"));
+
+		TreeFormatter tree = new TreeFormatter();
+		tree.append("dir", FileMode.TREE, insertTree(dir));
+		tree.append("file2", FileMode.REGULAR_FILE, ObjectId.fromString("0123456789012345678901234567890123456789"));
+		ObjectId treeId = insertTree(tree);
 
-		Tree tree2 = (Tree) tree.findTreeMember("dir");
-		tree2.setId(insertTree(tree2));
-		tree.setId(insertTree(tree));
 		FileTreeIterator iterator = new FileTreeIterator(db);
-		IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
+		IndexDiff diff = new IndexDiff(db, treeId, iterator);
 		diff.diff();
 		assertEquals(2, diff.getChanged().size());
 		assertTrue(diff.getChanged().contains("file2"));
@@ -314,17 +311,16 @@ public class IndexDiffTest extends RepositoryTestCase {
 		git.add().addFilepattern("a=c").call();
 		git.add().addFilepattern("a=d").call();
 
-		Tree tree = new Tree(db);
+		TreeFormatter tree = new TreeFormatter();
 		// got the hash id'd from the data using echo -n a.b|git hash-object -t blob --stdin
-		tree.addFile("a.b").setId(ObjectId.fromString("f6f28df96c2b40c951164286e08be7c38ec74851"));
-		tree.addFile("a.c").setId(ObjectId.fromString("6bc0e647512d2a0bef4f26111e484dc87df7f5ca"));
-		tree.addFile("a=c").setId(ObjectId.fromString("06022365ddbd7fb126761319633bf73517770714"));
-		tree.addFile("a=d").setId(ObjectId.fromString("fa6414df3da87840700e9eeb7fc261dd77ccd5c2"));
-
-		tree.setId(insertTree(tree));
+		tree.append("a.b", FileMode.REGULAR_FILE, ObjectId.fromString("f6f28df96c2b40c951164286e08be7c38ec74851"));
+		tree.append("a.c", FileMode.REGULAR_FILE, ObjectId.fromString("6bc0e647512d2a0bef4f26111e484dc87df7f5ca"));
+		tree.append("a=c", FileMode.REGULAR_FILE, ObjectId.fromString("06022365ddbd7fb126761319633bf73517770714"));
+		tree.append("a=d", FileMode.REGULAR_FILE, ObjectId.fromString("fa6414df3da87840700e9eeb7fc261dd77ccd5c2"));
+		ObjectId treeId = insertTree(tree);
 
 		FileTreeIterator iterator = new FileTreeIterator(db);
-		IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
+		IndexDiff diff = new IndexDiff(db, treeId, iterator);
 		diff.diff();
 		assertEquals(0, diff.getChanged().size());
 		assertEquals(0, diff.getAdded().size());
@@ -356,24 +352,27 @@ public class IndexDiffTest extends RepositoryTestCase {
 				.addFilepattern("a/c").addFilepattern("a=c")
 				.addFilepattern("a=d").call();
 
-		Tree tree = new Tree(db);
+
 		// got the hash id'd from the data using echo -n a.b|git hash-object -t blob --stdin
-		tree.addFile("a.b").setId(ObjectId.fromString("f6f28df96c2b40c951164286e08be7c38ec74851"));
-		tree.addFile("a.c").setId(ObjectId.fromString("6bc0e647512d2a0bef4f26111e484dc87df7f5ca"));
-		tree.addFile("a/b.b/b").setId(ObjectId.fromString("8d840bd4e2f3a48ff417c8e927d94996849933fd"));
-		tree.addFile("a/b").setId(ObjectId.fromString("db89c972fc57862eae378f45b74aca228037d415"));
-		tree.addFile("a/c").setId(ObjectId.fromString("52ad142a008aeb39694bafff8e8f1be75ed7f007"));
-		tree.addFile("a=c").setId(ObjectId.fromString("06022365ddbd7fb126761319633bf73517770714"));
-		tree.addFile("a=d").setId(ObjectId.fromString("fa6414df3da87840700e9eeb7fc261dd77ccd5c2"));
-
-		Tree tree3 = (Tree) tree.findTreeMember("a/b.b");
-		tree3.setId(insertTree(tree3));
-		Tree tree2 = (Tree) tree.findTreeMember("a");
-		tree2.setId(insertTree(tree2));
-		tree.setId(insertTree(tree));
+		TreeFormatter bb = new TreeFormatter();
+		bb.append("b", FileMode.REGULAR_FILE, ObjectId.fromString("8d840bd4e2f3a48ff417c8e927d94996849933fd"));
+
+		TreeFormatter a = new TreeFormatter();
+		a.append("b", FileMode.REGULAR_FILE, ObjectId
+				.fromString("db89c972fc57862eae378f45b74aca228037d415"));
+		a.append("b.b", FileMode.TREE, insertTree(bb));
+		a.append("c", FileMode.REGULAR_FILE, ObjectId.fromString("52ad142a008aeb39694bafff8e8f1be75ed7f007"));
+
+		TreeFormatter tree = new TreeFormatter();
+		tree.append("a.b", FileMode.REGULAR_FILE, ObjectId.fromString("f6f28df96c2b40c951164286e08be7c38ec74851"));
+		tree.append("a.c", FileMode.REGULAR_FILE, ObjectId.fromString("6bc0e647512d2a0bef4f26111e484dc87df7f5ca"));
+		tree.append("a", FileMode.TREE, insertTree(a));
+		tree.append("a=c", FileMode.REGULAR_FILE, ObjectId.fromString("06022365ddbd7fb126761319633bf73517770714"));
+		tree.append("a=d", FileMode.REGULAR_FILE, ObjectId.fromString("fa6414df3da87840700e9eeb7fc261dd77ccd5c2"));
+		ObjectId treeId = insertTree(tree);
 
 		FileTreeIterator iterator = new FileTreeIterator(db);
-		IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
+		IndexDiff diff = new IndexDiff(db, treeId, iterator);
 		diff.diff();
 		assertEquals(0, diff.getChanged().size());
 		assertEquals(0, diff.getAdded().size());
@@ -383,9 +382,9 @@ public class IndexDiffTest extends RepositoryTestCase {
 		assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());
 	}
 
-	private ObjectId insertTree(Tree tree) throws IOException {
+	private ObjectId insertTree(TreeFormatter tree) throws IOException {
 		try (ObjectInserter oi = db.newObjectInserter()) {
-			ObjectId id = oi.insert(Constants.OBJ_TREE, tree.format());
+			ObjectId id = oi.insert(tree);
 			oi.flush();
 			return id;
 		}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0002_TreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0002_TreeTest.java
deleted file mode 100644
index 651e62c9ca..0000000000
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0002_TreeTest.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
- * Copyright (C) 2006-2008, Shawn O. Pearce <spearce@spearce.org>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.lib;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
-import org.junit.Test;
-
-@SuppressWarnings("deprecation")
-public class T0002_TreeTest extends SampleDataRepositoryTestCase {
-	private static final ObjectId SOME_FAKE_ID = ObjectId.fromString(
-			"0123456789abcdef0123456789abcdef01234567");
-
-	private static int compareNamesUsingSpecialCompare(String a, String b)
-			throws UnsupportedEncodingException {
-		char lasta = '\0';
-		byte[] abytes;
-		if (a.length() > 0 && a.charAt(a.length()-1) == '/') {
-			lasta = '/';
-			a = a.substring(0, a.length() - 1);
-		}
-		abytes = a.getBytes("ISO-8859-1");
-		char lastb = '\0';
-		byte[] bbytes;
-		if (b.length() > 0 && b.charAt(b.length()-1) == '/') {
-			lastb = '/';
-			b = b.substring(0, b.length() - 1);
-		}
-		bbytes = b.getBytes("ISO-8859-1");
-		return Tree.compareNames(abytes, bbytes, lasta, lastb);
-	}
-
-	@Test
-	public void test000_sort_01() throws UnsupportedEncodingException {
-		assertEquals(0, compareNamesUsingSpecialCompare("a","a"));
-	}
-
-	@Test
-	public void test000_sort_02() throws UnsupportedEncodingException {
-		assertEquals(-1, compareNamesUsingSpecialCompare("a","b"));
-		assertEquals(1, compareNamesUsingSpecialCompare("b","a"));
-	}
-
-	@Test
-	public void test000_sort_03() throws UnsupportedEncodingException {
-		assertEquals(1, compareNamesUsingSpecialCompare("a:","a"));
-		assertEquals(1, compareNamesUsingSpecialCompare("a/","a"));
-		assertEquals(-1, compareNamesUsingSpecialCompare("a","a/"));
-		assertEquals(-1, compareNamesUsingSpecialCompare("a","a:"));
-		assertEquals(1, compareNamesUsingSpecialCompare("a:","a/"));
-		assertEquals(-1, compareNamesUsingSpecialCompare("a/","a:"));
-	}
-
-	@Test
-	public void test000_sort_04() throws UnsupportedEncodingException {
-		assertEquals(-1, compareNamesUsingSpecialCompare("a.a","a/a"));
-		assertEquals(1, compareNamesUsingSpecialCompare("a/a","a.a"));
-	}
-
-	@Test
-	public void test000_sort_05() throws UnsupportedEncodingException {
-		assertEquals(-1, compareNamesUsingSpecialCompare("a.","a/"));
-		assertEquals(1, compareNamesUsingSpecialCompare("a/","a."));
-
-	}
-
-	@Test
-	public void test001_createEmpty() throws IOException {
-		final Tree t = new Tree(db);
-		assertTrue("isLoaded", t.isLoaded());
-		assertTrue("isModified", t.isModified());
-		assertTrue("no parent", t.getParent() == null);
-		assertTrue("isRoot", t.isRoot());
-		assertTrue("no name", t.getName() == null);
-		assertTrue("no nameUTF8", t.getNameUTF8() == null);
-		assertTrue("has entries array", t.members() != null);
-		assertEquals("entries is empty", 0, t.members().length);
-		assertEquals("full name is empty", "", t.getFullName());
-		assertTrue("no id", t.getId() == null);
-		assertTrue("database is r", t.getRepository() == db);
-		assertTrue("no foo child", t.findTreeMember("foo") == null);
-		assertTrue("no foo child", t.findBlobMember("foo") == null);
-	}
-
-	@Test
-	public void test002_addFile() throws IOException {
-		final Tree t = new Tree(db);
-		t.setId(SOME_FAKE_ID);
-		assertTrue("has id", t.getId() != null);
-		assertFalse("not modified", t.isModified());
-
-		final String n = "bob";
-		final FileTreeEntry f = t.addFile(n);
-		assertNotNull("have file", f);
-		assertEquals("name matches", n, f.getName());
-		assertEquals("name matches", f.getName(), new String(f.getNameUTF8(),
-				"UTF-8"));
-		assertEquals("full name matches", n, f.getFullName());
-		assertTrue("no id", f.getId() == null);
-		assertTrue("is modified", t.isModified());
-		assertTrue("has no id", t.getId() == null);
-		assertTrue("found bob", t.findBlobMember(f.getName()) == f);
-
-		final TreeEntry[] i = t.members();
-		assertNotNull("members array not null", i);
-		assertTrue("iterator is not empty", i != null && i.length > 0);
-		assertTrue("iterator returns file", i != null && i[0] == f);
-		assertTrue("iterator is empty", i != null && i.length == 1);
-	}
-
-	@Test
-	public void test004_addTree() throws IOException {
-		final Tree t = new Tree(db);
-		t.setId(SOME_FAKE_ID);
-		assertTrue("has id", t.getId() != null);
-		assertFalse("not modified", t.isModified());
-
-		final String n = "bob";
-		final Tree f = t.addTree(n);
-		assertNotNull("have tree", f);
-		assertEquals("name matches", n, f.getName());
-		assertEquals("name matches", f.getName(), new String(f.getNameUTF8(),
-				"UTF-8"));
-		assertEquals("full name matches", n, f.getFullName());
-		assertTrue("no id", f.getId() == null);
-		assertTrue("parent matches", f.getParent() == t);
-		assertTrue("repository matches", f.getRepository() == db);
-		assertTrue("isLoaded", f.isLoaded());
-		assertFalse("has items", f.members().length > 0);
-		assertFalse("is root", f.isRoot());
-		assertTrue("parent is modified", t.isModified());
-		assertTrue("parent has no id", t.getId() == null);
-		assertTrue("found bob child", t.findTreeMember(f.getName()) == f);
-
-		final TreeEntry[] i = t.members();
-		assertTrue("iterator is not empty", i.length > 0);
-		assertTrue("iterator returns file", i[0] == f);
-		assertEquals("iterator is empty", 1, i.length);
-	}
-
-	@Test
-	public void test005_addRecursiveFile() throws IOException {
-		final Tree t = new Tree(db);
-		final FileTreeEntry f = t.addFile("a/b/c");
-		assertNotNull("created f", f);
-		assertEquals("c", f.getName());
-		assertEquals("b", f.getParent().getName());
-		assertEquals("a", f.getParent().getParent().getName());
-		assertTrue("t is great-grandparent", t == f.getParent().getParent()
-				.getParent());
-	}
-
-	@Test
-	public void test005_addRecursiveTree() throws IOException {
-		final Tree t = new Tree(db);
-		final Tree f = t.addTree("a/b/c");
-		assertNotNull("created f", f);
-		assertEquals("c", f.getName());
-		assertEquals("b", f.getParent().getName());
-		assertEquals("a", f.getParent().getParent().getName());
-		assertTrue("t is great-grandparent", t == f.getParent().getParent()
-				.getParent());
-	}
-
-	@Test
-	public void test006_addDeepTree() throws IOException {
-		final Tree t = new Tree(db);
-
-		final Tree e = t.addTree("e");
-		assertNotNull("have e", e);
-		assertTrue("e.parent == t", e.getParent() == t);
-		final Tree f = t.addTree("f");
-		assertNotNull("have f", f);
-		assertTrue("f.parent == t", f.getParent() == t);
-		final Tree g = f.addTree("g");
-		assertNotNull("have g", g);
-		assertTrue("g.parent == f", g.getParent() == f);
-		final Tree h = g.addTree("h");
-		assertNotNull("have h", h);
-		assertTrue("h.parent = g", h.getParent() == g);
-
-		h.setId(SOME_FAKE_ID);
-		assertTrue("h not modified", !h.isModified());
-		g.setId(SOME_FAKE_ID);
-		assertTrue("g not modified", !g.isModified());
-		f.setId(SOME_FAKE_ID);
-		assertTrue("f not modified", !f.isModified());
-		e.setId(SOME_FAKE_ID);
-		assertTrue("e not modified", !e.isModified());
-		t.setId(SOME_FAKE_ID);
-		assertTrue("t not modified.", !t.isModified());
-
-		assertEquals("full path of h ok", "f/g/h", h.getFullName());
-		assertTrue("Can find h", t.findTreeMember(h.getFullName()) == h);
-		assertTrue("Can't find f/z", t.findBlobMember("f/z") == null);
-		assertTrue("Can't find y/z", t.findBlobMember("y/z") == null);
-
-		final FileTreeEntry i = h.addFile("i");
-		assertNotNull(i);
-		assertEquals("full path of i ok", "f/g/h/i", i.getFullName());
-		assertTrue("Can find i", t.findBlobMember(i.getFullName()) == i);
-		assertTrue("h modified", h.isModified());
-		assertTrue("g modified", g.isModified());
-		assertTrue("f modified", f.isModified());
-		assertTrue("e not modified", !e.isModified());
-		assertTrue("t modified", t.isModified());
-
-		assertTrue("h no id", h.getId() == null);
-		assertTrue("g no id", g.getId() == null);
-		assertTrue("f no id", f.getId() == null);
-		assertTrue("e has id", e.getId() != null);
-		assertTrue("t no id", t.getId() == null);
-	}
-
-	@Test
-	public void test007_manyFileLookup() throws IOException {
-		final Tree t = new Tree(db);
-		final List<FileTreeEntry> files = new ArrayList<FileTreeEntry>(26 * 26);
-		for (char level1 = 'a'; level1 <= 'z'; level1++) {
-			for (char level2 = 'a'; level2 <= 'z'; level2++) {
-				final String n = "." + level1 + level2 + "9";
-				final FileTreeEntry f = t.addFile(n);
-				assertNotNull("File " + n + " added.", f);
-				assertEquals(n, f.getName());
-				files.add(f);
-			}
-		}
-		assertEquals(files.size(), t.memberCount());
-		final TreeEntry[] ents = t.members();
-		assertNotNull(ents);
-		assertEquals(files.size(), ents.length);
-		for (int k = 0; k < ents.length; k++) {
-			assertTrue("File " + files.get(k).getName()
-					+ " is at " + k + ".", files.get(k) == ents[k]);
-		}
-	}
-
-	@Test
-	public void test008_SubtreeInternalSorting() throws IOException {
-		final Tree t = new Tree(db);
-		final FileTreeEntry e0 = t.addFile("a-b");
-		final FileTreeEntry e1 = t.addFile("a-");
-		final FileTreeEntry e2 = t.addFile("a=b");
-		final Tree e3 = t.addTree("a");
-		final FileTreeEntry e4 = t.addFile("a=");
-
-		final TreeEntry[] ents = t.members();
-		assertSame(e1, ents[0]);
-		assertSame(e0, ents[1]);
-		assertSame(e3, ents[2]);
-		assertSame(e4, ents[3]);
-		assertSame(e2, ents[4]);
-	}
-
-	@Test
-	public void test009_SymlinkAndGitlink() throws IOException {
-		final Tree symlinkTree = mapTree("symlink");
-		assertTrue("Symlink entry exists", symlinkTree.existsBlob("symlink.txt"));
-		final Tree gitlinkTree = mapTree("gitlink");
-		assertTrue("Gitlink entry exists", gitlinkTree.existsBlob("submodule"));
-	}
-
-	private Tree mapTree(String name) throws IOException {
-		ObjectId id = db.resolve(name + "^{tree}");
-		return new Tree(db, id, db.open(id).getCachedBytes());
-	}
-}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
index 2a59f58c66..9c9edc1476 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
@@ -47,11 +47,10 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.FileTreeEntry;
+import org.eclipse.jgit.lib.FileMode;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectInserter;
-import org.eclipse.jgit.lib.Tree;
+import org.eclipse.jgit.lib.TreeFormatter;
 import org.junit.Test;
 
 @SuppressWarnings("deprecation")
@@ -220,28 +219,24 @@ public class ObjectWalkTest extends RevWalkTestCase {
 				.fromString("abbbfafe3129f85747aba7bfac992af77134c607");
 		final RevTree tree_root, tree_A, tree_AB;
 		final RevCommit b;
-		{
-			Tree root = new Tree(db);
-			Tree A = root.addTree("A");
-			FileTreeEntry B = root.addFile("B");
-			B.setId(bId);
-
-			Tree A_A = A.addTree("A");
-			Tree A_B = A.addTree("B");
-
-			try (final ObjectInserter inserter = db.newObjectInserter()) {
-				A_A.setId(inserter.insert(Constants.OBJ_TREE, A_A.format()));
-				A_B.setId(inserter.insert(Constants.OBJ_TREE, A_B.format()));
-				A.setId(inserter.insert(Constants.OBJ_TREE, A.format()));
-				root.setId(inserter.insert(Constants.OBJ_TREE, root.format()));
-				inserter.flush();
-			}
-
-			tree_root = rw.parseTree(root.getId());
-			tree_A = rw.parseTree(A.getId());
-			tree_AB = rw.parseTree(A_A.getId());
-			assertSame(tree_AB, rw.parseTree(A_B.getId()));
-			b = commit(rw.parseTree(root.getId()));
+		try (ObjectInserter inserter = db.newObjectInserter()) {
+			ObjectId empty = inserter.insert(new TreeFormatter());
+
+			TreeFormatter A = new TreeFormatter();
+			A.append("A", FileMode.TREE, empty);
+			A.append("B", FileMode.TREE, empty);
+			ObjectId idA = inserter.insert(A);
+
+			TreeFormatter root = new TreeFormatter();
+			root.append("A", FileMode.TREE, idA);
+			root.append("B", FileMode.REGULAR_FILE, bId);
+			ObjectId idRoot = inserter.insert(root);
+			inserter.flush();
+
+			tree_root = objw.parseTree(idRoot);
+			tree_A = objw.parseTree(idA);
+			tree_AB = objw.parseTree(empty);
+			b = commit(tree_root);
 		}
 
 		markStart(b);
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/TreeWalkBasicDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/TreeWalkBasicDiffTest.java
index aca7c80fd7..c3ff7df8f2 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/TreeWalkBasicDiffTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/TreeWalkBasicDiffTest.java
@@ -44,7 +44,6 @@
 package org.eclipse.jgit.treewalk;
 
 import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
-import static org.eclipse.jgit.lib.Constants.OBJ_TREE;
 import static org.eclipse.jgit.lib.Constants.encode;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -54,11 +53,10 @@ import org.eclipse.jgit.junit.RepositoryTestCase;
 import org.eclipse.jgit.lib.FileMode;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectInserter;
-import org.eclipse.jgit.lib.Tree;
+import org.eclipse.jgit.lib.TreeFormatter;
 import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.junit.Test;
 
-@SuppressWarnings("deprecation")
 public class TreeWalkBasicDiffTest extends RepositoryTestCase {
 	@Test
 	public void testMissingSubtree_DetectFileAdded_FileModified()
@@ -72,62 +70,63 @@ public class TreeWalkBasicDiffTest extends RepositoryTestCase {
 
 			// Create sub-a/empty, sub-c/empty = hello.
 			{
-				final Tree root = new Tree(db);
+				TreeFormatter root = new TreeFormatter();
 				{
-					final Tree subA = root.addTree("sub-a");
-					subA.addFile("empty").setId(aFileId);
-					subA.setId(inserter.insert(OBJ_TREE, subA.format()));
+					TreeFormatter subA = new TreeFormatter();
+					subA.append("empty", FileMode.REGULAR_FILE, aFileId);
+					root.append("sub-a", FileMode.TREE, inserter.insert(subA));
 				}
 				{
-					final Tree subC = root.addTree("sub-c");
-					subC.addFile("empty").setId(cFileId1);
-					subC.setId(inserter.insert(OBJ_TREE, subC.format()));
+					TreeFormatter subC = new TreeFormatter();
+					subC.append("empty", FileMode.REGULAR_FILE, cFileId1);
+					root.append("sub-c", FileMode.TREE, inserter.insert(subC));
 				}
-				oldTree = inserter.insert(OBJ_TREE, root.format());
+				oldTree = inserter.insert(root);
 			}
 
 			// Create sub-a/empty, sub-b/empty, sub-c/empty.
 			{
-				final Tree root = new Tree(db);
+				TreeFormatter root = new TreeFormatter();
 				{
-					final Tree subA = root.addTree("sub-a");
-					subA.addFile("empty").setId(aFileId);
-					subA.setId(inserter.insert(OBJ_TREE, subA.format()));
+					TreeFormatter subA = new TreeFormatter();
+					subA.append("empty", FileMode.REGULAR_FILE, aFileId);
+					root.append("sub-a", FileMode.TREE, inserter.insert(subA));
 				}
 				{
-					final Tree subB = root.addTree("sub-b");
-					subB.addFile("empty").setId(bFileId);
-					subB.setId(inserter.insert(OBJ_TREE, subB.format()));
+					TreeFormatter subB = new TreeFormatter();
+					subB.append("empty", FileMode.REGULAR_FILE, bFileId);
+					root.append("sub-b", FileMode.TREE, inserter.insert(subB));
 				}
 				{
-					final Tree subC = root.addTree("sub-c");
-					subC.addFile("empty").setId(cFileId2);
-					subC.setId(inserter.insert(OBJ_TREE, subC.format()));
+					TreeFormatter subC = new TreeFormatter();
+					subC.append("empty", FileMode.REGULAR_FILE, cFileId2);
+					root.append("sub-c", FileMode.TREE, inserter.insert(subC));
 				}
-				newTree = inserter.insert(OBJ_TREE, root.format());
+				newTree = inserter.insert(root);
 			}
 			inserter.flush();
 		}
 
-		final TreeWalk tw = new TreeWalk(db);
-		tw.reset(oldTree, newTree);
-		tw.setRecursive(true);
-		tw.setFilter(TreeFilter.ANY_DIFF);
+		try (TreeWalk tw = new TreeWalk(db)) {
+			tw.reset(oldTree, newTree);
+			tw.setRecursive(true);
+			tw.setFilter(TreeFilter.ANY_DIFF);
 
-		assertTrue(tw.next());
-		assertEquals("sub-b/empty", tw.getPathString());
-		assertEquals(FileMode.MISSING, tw.getFileMode(0));
-		assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(1));
-		assertEquals(ObjectId.zeroId(), tw.getObjectId(0));
-		assertEquals(bFileId, tw.getObjectId(1));
+			assertTrue(tw.next());
+			assertEquals("sub-b/empty", tw.getPathString());
+			assertEquals(FileMode.MISSING, tw.getFileMode(0));
+			assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(1));
+			assertEquals(ObjectId.zeroId(), tw.getObjectId(0));
+			assertEquals(bFileId, tw.getObjectId(1));
 
-		assertTrue(tw.next());
-		assertEquals("sub-c/empty", tw.getPathString());
-		assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(0));
-		assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(1));
-		assertEquals(cFileId1, tw.getObjectId(0));
-		assertEquals(cFileId2, tw.getObjectId(1));
+			assertTrue(tw.next());
+			assertEquals("sub-c/empty", tw.getPathString());
+			assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(0));
+			assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(1));
+			assertEquals(cFileId1, tw.getObjectId(0));
+			assertEquals(cFileId2, tw.getObjectId(1));
 
-		assertFalse(tw.next());
+			assertFalse(tw.next());
+		}
 	}
 }