Hungarian citizen travels to China and Japan

I'm planning to travel to China for tourism for a short period. After that I would like to travel to Japan for the same reason. Do I need a visa for entering Japan? If yes, where can I issue it? As far as I know, as a Hungarian citizen I need a one for entering mainland. Does this situation differ?
Thank you.