Greek citizen traveling from Japan to Greece with a short stop in Beijing

Hello, I am a Greek citizen currently studying in Japan and on Christmas holidays I will travel from Osaka to Athens with a 10 hours stop to Beijing. Also, on my way back to Japan from Athens I will stop again in Beijing for 2 hours. Do I need to apply for a visa? If not, what travel documents do I need?