Following up shapefile-ng swap in GeoTools