Enterprise class Java code
javacodegeeks.com
javacodegeeks.com
I don't think the "right" way you describe is somehow not following the principles of clean/GOOS/test driven code. They are still good principles to follow, but I think you've demonstrated that you can't follow them without weighing many different concerns at once - and that it's really hard to tell which ones should be more important than others until you've had some hard-earned experience.