More work on java api suite
Finish JavaAPISuite