I hope your travel comes true in near future, I, too like to explore China and Japan. I just remind you something. Thing is wether your country is safe or not , rather than China/Japan is safe or not. Even if you think both countries are safe, it is impossible for you to visit and travel unless your country has managed to control the infection and China/Japan immigration allow visitors to enter. So it is better to check up-to-date information on restriction with China/Japan embassy.