China Visa Exemption

I have Australian passport and will fly from Hong Kong to Shanghai then transit to a cruise ship that sails to Japan same day, but returns to Shanghai five days later. Then transit again on a confirmed flight to Hong Kong on same day.
Since both transit times in Shanghai less than 24 hours is this ok without obtaining a visa?