144 hour visa free transit policy by cruise

After reading the 144 hr visa free as updated recently in Nov, 2019. Seems like we do not need a Chinese visa for this itinerary??? We are holding Canadian passports. Cruise (Holland America) embarks in Hong Kong, first port of call is Xiamen (same day transit), at sea, then 2nd port of call is Shanghai (2 day stay), at sea, then Japan. Any insights? Thanks.