CQL BBOX Round Trip

The org.geotools.filter.text.cql2.FilterToCQL class does not correctly create BBOX CQL statements. The order should be minX, minY, maxX, maxY, but it is encoded as minX, maxX, minY, maxY.

// Simple BBOX CQL Statement
String cql1 = "BBOX(the_geom, 10.0,20.0,30.0,40.0)";

// Create a Filter
Filter f = CQL.toFilter(cql1);

// Convert Filter back to CQL
String cql2 = CQL.toCQL(f);

System.out.println("CQL 1 = " + cql1);
>>> CQL 1 = BBOX(the_geom, 10.0,20.0,30.0,40.0)

System.out.println("CQL 2 = " + cql2);
>>> CQL 2 = BBOX(the_geom, 10.0,30.0,20.0,40.0)