diff --git a/core/test-api/lib/src/main/java/org/opennms/core/test/MockLogAppender.java b/core/test-api/lib/src/main/java/org/opennms/core/test/MockLogAppender.java
index c334c45bc9d9..82c799cce267 100644
--- a/core/test-api/lib/src/main/java/org/opennms/core/test/MockLogAppender.java
+++ b/core/test-api/lib/src/main/java/org/opennms/core/test/MockLogAppender.java
@@ -28,15 +28,15 @@
 
 package org.opennms.core.test;
 
-import junit.framework.AssertionFailedError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
+import junit.framework.AssertionFailedError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * <p>MockLogAppender class. If you do not specify the log level specifically, the level
  * will default to DEBUG and you can control the level by setting the <code>mock.logLevel</code>
diff --git a/features/measurements/api/src/main/java/org/opennms/netmgt/measurements/api/FetchResults.java b/features/measurements/api/src/main/java/org/opennms/netmgt/measurements/api/FetchResults.java
index 789a40996fcb..7c1278d5bd30 100644
--- a/features/measurements/api/src/main/java/org/opennms/netmgt/measurements/api/FetchResults.java
+++ b/features/measurements/api/src/main/java/org/opennms/netmgt/measurements/api/FetchResults.java
@@ -28,6 +28,10 @@
 
 package org.opennms.netmgt.measurements.api;
 
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Collections2;
@@ -36,10 +40,6 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.opennms.netmgt.jasper.analytics.Filter;
 
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 /**
  * Used to store the results of a fetch.
  *
diff --git a/features/measurements/rest/src/main/java/org/opennms/web/rest/v1/MeasurementsRestService.java b/features/measurements/rest/src/main/java/org/opennms/web/rest/v1/MeasurementsRestService.java
index 1898813d4bc7..3c06b413e338 100644
--- a/features/measurements/rest/src/main/java/org/opennms/web/rest/v1/MeasurementsRestService.java
+++ b/features/measurements/rest/src/main/java/org/opennms/web/rest/v1/MeasurementsRestService.java
@@ -28,6 +28,23 @@
 
 package org.opennms.web.rest.v1;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.RowSortedTable;
@@ -51,23 +68,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * The Measurements API provides read-only access to values
  * persisted by the collectors.