Warning Cleanup and UsagePoint/show local time zone fix

jateeter · jateeter · commit 24df6fc84ce4 · 2014-02-14T17:17:07.000-05:00
diff --git a/src/main/java/org/energyos/espi/thirdparty/repository/impl/ResourceRESTRepositoryImpl.java b/src/main/java/org/energyos/espi/thirdparty/repository/impl/ResourceRESTRepositoryImpl.java
@@ -43,7 +43,8 @@ public class ResourceRESTRepositoryImpl implements ResourceRESTRepository {
     public IdentifiedObject get(Authorization authorization, String url) {
         HttpHeaders requestHeaders = new HttpHeaders();
         requestHeaders.set("Authorization", "Bearer " + authorization.getAccessToken());
-        HttpEntity<?> requestEntity = new HttpEntity(requestHeaders);
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+		HttpEntity<?> requestEntity = new HttpEntity(requestHeaders);
 
         HttpEntity<String> response = template.exchange(url, HttpMethod.GET, requestEntity, String.class);
 
diff --git a/src/main/java/org/energyos/espi/thirdparty/repository/impl/UsagePointRESTRepositoryImpl.java b/src/main/java/org/energyos/espi/thirdparty/repository/impl/UsagePointRESTRepositoryImpl.java
@@ -24,7 +24,6 @@
 import org.energyos.espi.common.domain.Authorization;
 import org.energyos.espi.common.domain.RetailCustomer;
 import org.energyos.espi.common.domain.UsagePoint;
-import org.energyos.espi.common.models.atom.FeedType;
 import org.energyos.espi.common.repositories.UsagePointRepository;
 import org.energyos.espi.common.service.AuthorizationService;
 import org.energyos.espi.common.service.ImportService;
@@ -134,16 +133,11 @@ public UsagePoint findByHashedId(Long retailCustomerId, String usagePointHashedI
         return null;
     }
 
-    private FeedType unmarshalFeedType(HttpEntity<String> response) throws JAXBException {
-        ByteArrayInputStream bs = new ByteArrayInputStream(response.getBody().toString().getBytes());
-        //TODO: hook in the import service
-        return atomMarshaller.unmarshal(bs);
-    }
-
     private HttpEntity<String> getUsagePoints(Authorization authorization) {
         HttpHeaders requestHeaders = new HttpHeaders();
         requestHeaders.set("Authorization", "Bearer " + authorization.getAccessToken());
-        HttpEntity<?> requestEntity = new HttpEntity(requestHeaders);
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+		HttpEntity<?> requestEntity = new HttpEntity(requestHeaders);
 
         return template.exchange(authorization.getResourceURI(), HttpMethod.GET, requestEntity, String.class);
     }
diff --git a/src/main/java/org/energyos/espi/thirdparty/web/ClientRestTemplate.java b/src/main/java/org/energyos/espi/thirdparty/web/ClientRestTemplate.java
@@ -55,7 +55,9 @@ public ClientRestTemplate(String username, String password) {
 
     static class PreemptiveAuthInterceptor implements HttpRequestInterceptor {
 
-        public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
+        @SuppressWarnings("deprecation")
+        // TODO there are two deprecated calls here ...
+		public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
             AuthState authState = (AuthState) context.getAttribute(ClientContext.TARGET_AUTH_STATE);
 
             if (authState.getAuthScheme() == null) {
diff --git a/src/main/java/org/energyos/espi/thirdparty/web/UsagePointController.java b/src/main/java/org/energyos/espi/thirdparty/web/UsagePointController.java
@@ -27,6 +27,7 @@
 import org.energyos.espi.common.domain.ElectricPowerUsageSummary;
 import org.energyos.espi.common.domain.MeterReading;
 import org.energyos.espi.common.domain.Routes;
+import org.energyos.espi.common.domain.TimeConfiguration;
 import org.energyos.espi.common.domain.UsagePoint;
 import org.energyos.espi.common.service.ApplicationInformationService;
 import org.energyos.espi.common.service.ResourceService;
@@ -74,7 +75,7 @@ public String index(ModelMap model, Principal principal) {
     public String show(@PathVariable Long retailCustomerId, @PathVariable Long usagePointId, ModelMap model) {
      try {
     	 
-    	UsagePoint usagePoint = resourceService.testById(usagePointId, UsagePoint.class);
+    	resourceService.testById(usagePointId, UsagePoint.class);
     	// because of the lazy loading from DB it's easier to build a bag and hand it off
         // in a separate transaction, fill up a display bag lazily - do it in  a private method
     	// so the transaction is scoped appropriately.
@@ -87,7 +88,7 @@ public String show(@PathVariable Long retailCustomerId, @PathVariable Long usage
      } catch (Exception e) {
 
     	 // got to do a dummy DB access to satify the transaction rollback needs ...
-    	 ApplicationInformation ai = resourceService.findById(1L, ApplicationInformation.class);
+    	 resourceService.findById(1L, ApplicationInformation.class);
     	 System.out.printf("UX Error: %s\n", e.toString());
     	 model.put("errorString", e.toString());
     	 try {
@@ -137,6 +138,7 @@ private HashMap<String, Object> buildDisplayBag(Long retailCustomerId, Long usag
 	displayBag.put("Uri", usagePoint.getSelfHref());
 	displayBag.put("usagePointId", usagePoint.getId());
 	// put the meterReadings
+	@SuppressWarnings("rawtypes")
 	List<HashMap> meterReadings = new ArrayList<HashMap> ();
 	Iterator <MeterReading> it = usagePoint.getMeterReadings().iterator();
 	while (it.hasNext()) {
@@ -155,6 +157,9 @@ private HashMap<String, Object> buildDisplayBag(Long retailCustomerId, Long usag
 	List <ElectricPowerUsageSummary> usageSummaryList = usagePoint.getElectricPowerUsageSummaries();
 	displayBag.put("QualitySummaryList", qualitySummaryList);
 	displayBag.put("UsageSummaryList", usageSummaryList);
+	
+	TimeConfiguration timeConfiguration = usagePoint.getLocalTimeParameters();
+	displayBag.put("localTimeParameters", timeConfiguration);
 
 	return displayBag;
     }
diff --git a/src/main/java/org/energyos/espi/thirdparty/web/custodian/RetailCustomerController.java b/src/main/java/org/energyos/espi/thirdparty/web/custodian/RetailCustomerController.java
@@ -85,7 +85,7 @@ public String show(@PathVariable Long retailCustomerId, ModelMap model) {
 
     public static class RetailCustomerValidator implements Validator {
 
-        public boolean supports(Class clazz) {
+        public boolean supports(@SuppressWarnings("rawtypes") Class clazz) {
             return RetailCustomer.class.isAssignableFrom(clazz);
         }
 
diff --git a/src/main/webapp/WEB-INF/jsp/customer/usagepoints/show.jsp b/src/main/webapp/WEB-INF/jsp/customer/usagepoints/show.jsp
@@ -183,7 +183,7 @@
                 <tbody>
                     <tr>
                         <td>
-                            <c:out value="${usagePoint.localTimeParameters.tzOffset}"/>
+                            <c:out value="${displayBag.get('localTimeParameters').tzOffset}"/>
                         </td>
                     </tr>
                 </tbody>
diff --git a/src/test/java/org/energyos/espi/thirdparty/integration/web/filters/CORSFilterTests.java b/src/test/java/org/energyos/espi/thirdparty/integration/web/filters/CORSFilterTests.java
@@ -15,7 +15,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.RequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.web.context.WebApplicationContext;
@@ -45,7 +44,7 @@ public void optionsResponse_hasCorrectFilters() throws Exception {
     	RequestBuilder requestBuilder = MockMvcRequestBuilders.options("/ThirdParty")
     			.header("Origin", "JUnit_Test");
 		
-    	MvcResult result = mockMvc.perform(requestBuilder)
+    	mockMvc.perform(requestBuilder)
         		.andExpect(header().string("Access-Control-Allow-Origin", is("*")))
         		.andExpect(header().string("Access-Control-Allow-Methods", is("GET, POST, PUT, DELETE, OPTIONS")))
         		.andExpect(header().string("Access-Control-Allow-Headers", is("Origin, Authorization, Accept, Content-Type")))
diff --git a/src/test/java/org/energyos/espi/thirdparty/mocks/MockClientRestTemplate.java b/src/test/java/org/energyos/espi/thirdparty/mocks/MockClientRestTemplate.java
@@ -6,7 +6,8 @@
 
 public class MockClientRestTemplate extends ClientRestTemplate {
 
-    public <T> T getForObject(String url, Class<T> responseType, Object... urlVariables) throws RestClientException {
+    @SuppressWarnings("unchecked")
+	public <T> T getForObject(String url, Class<T> responseType, Object... urlVariables) throws RestClientException {
         AccessToken accessToken = new AccessToken();
 
         accessToken.setAccessToken("6b945882-8349-471a-915f-25e791971248");
diff --git a/src/test/java/org/energyos/espi/thirdparty/mocks/MockRestTemplate.java b/src/test/java/org/energyos/espi/thirdparty/mocks/MockRestTemplate.java
@@ -13,7 +13,8 @@
 
 public class MockRestTemplate extends RestTemplate {
 
-    public <T> T getForObject(String url, Class<T> responseType, Object... urlVariables) throws RestClientException {
+    @SuppressWarnings("unchecked")
+	public <T> T getForObject(String url, Class<T> responseType, Object... urlVariables) throws RestClientException {
         ClassPathResource sourceFile = new ClassPathResource("/fixtures/test_usage_data.xml");
         String inputStreamString;
         try {
@@ -26,7 +27,8 @@ public <T> T getForObject(String url, Class<T> responseType, Object... urlVariab
 
     }
 
-    @Override
+    @SuppressWarnings("unchecked")
+	@Override
     public <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) throws RestClientException {
         ClassPathResource sourceFile = new ClassPathResource("/fixtures/test_usage_data.xml");
         String inputStreamString;
diff --git a/src/test/java/org/energyos/espi/thirdparty/repository/impl/ResourceRESTRepositoryImplTests.java b/src/test/java/org/energyos/espi/thirdparty/repository/impl/ResourceRESTRepositoryImplTests.java
@@ -47,7 +47,8 @@ public class ResourceRESTRepositoryImplTests {
     public Authorization authorization;
     public String uri;
 
-    @Before
+    @SuppressWarnings("unchecked")
+	@Before
     public void before() {
         repository = new ResourceRESTRepositoryImpl();
         marshaller = mock(Jaxb2Marshaller.class);
@@ -64,18 +65,21 @@ public void before() {
         uri = Routes.DATA_CUSTODIAN_REST_USAGE_POINT_GET;
     }
 
-    @Test
+    @SuppressWarnings("unchecked")
+	@Test
     public void get_fetchesResource() throws JAXBException {
         repository.get(authorization, uri);
 
         verify(template).exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), any(Class.class));
     }
 
-    @Test
+    @SuppressWarnings("unchecked")
+	@Test
     public void get_usesAccessToken() throws JAXBException {
         repository.get(authorization, uri);
 
-        ArgumentCaptor<HttpEntity> argumentCaptor = ArgumentCaptor.forClass(HttpEntity.class);
+        @SuppressWarnings("rawtypes")
+		ArgumentCaptor<HttpEntity> argumentCaptor = ArgumentCaptor.forClass(HttpEntity.class);
         verify(template).exchange(anyString(), eq(HttpMethod.GET), argumentCaptor.capture(), any(Class.class));
         assertEquals("Bearer token", argumentCaptor.getValue().getHeaders().get("Authorization").get(0));
     }
diff --git a/src/test/java/org/energyos/espi/thirdparty/repository/impl/UsagePointRESTRepositoryImplTest.java b/src/test/java/org/energyos/espi/thirdparty/repository/impl/UsagePointRESTRepositoryImplTest.java
@@ -59,7 +59,8 @@ public void findAllByRetailCustomerId() throws JAXBException {
         List<UsagePoint> expectedList = new ArrayList<>();
         expectedList.add(newUsagePoint());
 
-        ResponseEntity<String> response = mock(ResponseEntity.class);
+        @SuppressWarnings("unchecked")
+		ResponseEntity<String> response = mock(ResponseEntity.class);
 
         when(authorizationService.findAllByRetailCustomerId(1L)).thenReturn(authorizations);
         when(response.getBody()).thenReturn("body");
diff --git a/src/test/java/org/energyos/espi/thirdparty/web/MeterReadingControllerTests.java b/src/test/java/org/energyos/espi/thirdparty/web/MeterReadingControllerTests.java
@@ -30,7 +30,6 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.ui.ModelMap;
 
 public class MeterReadingControllerTests {
@@ -48,7 +47,6 @@ public void setupUp() {
     @Test
     @Ignore
     public void show_displaysShowView() throws Exception {
-        TestingAuthenticationToken authentication = new TestingAuthenticationToken(mock(RetailCustomer.class), null);
         assertEquals("/meterreadings/show", controller.show(1L, 1L, 1L, mock(ModelMap.class)));
     }
 
@@ -59,7 +57,6 @@ public void show_setsMeterReadingModel() throws JAXBException {
         ModelMap model = new ModelMap();
         RetailCustomer retailCustomer = EspiFactory.newRetailCustomer();
         retailCustomer.setId(99L);
-        TestingAuthenticationToken authentication = new TestingAuthenticationToken(retailCustomer, null);
         when(service.findById(1L)).thenReturn(meterReading);
 
         controller.show(1L, 1L, 1L, model);
diff --git a/src/test/java/org/energyos/espi/thirdparty/web/ScopeSelectionControllerTests.java b/src/test/java/org/energyos/espi/thirdparty/web/ScopeSelectionControllerTests.java
@@ -74,7 +74,8 @@ public void get_scopeSelection_displaysScopeSelectionView() throws Exception {
         assertEquals("/RetailCustomer/ScopeSelection", controller.scopeSelection(new String [] {}, new ModelMap()));
     }
 
-    @Test
+    @SuppressWarnings("unchecked")
+	@Test
     public void get_scopeSelection_setsScopeListModel() throws Exception {
         ModelMap model = new ModelMap();
 
diff --git a/src/test/java/org/energyos/espi/thirdparty/web/UsagePointControllerTests.java b/src/test/java/org/energyos/espi/thirdparty/web/UsagePointControllerTests.java
@@ -28,7 +28,6 @@
 
 import org.energyos.espi.common.domain.RetailCustomer;
 import org.energyos.espi.common.domain.UsagePoint;
-import org.energyos.espi.common.repositories.jpa.UsagePointRepositoryImpl;
 import org.energyos.espi.common.service.UsagePointService;
 import org.energyos.espi.common.service.impl.ResourceServiceImpl;
 import org.energyos.espi.common.service.impl.UsagePointServiceImpl;
@@ -47,8 +46,7 @@ public class UsagePointControllerTests {
     private ResourceServiceImpl resourceService;
     private Authentication authentication;
     private RetailCustomer retailCustomer;
-    private UsagePointRepositoryImpl usagePointRepository;
-
+    
     @Before
     public void setup() {
         controller = new UsagePointController();
diff --git a/src/test/java/org/energyos/espi/thirdparty/web/tools/BatchListControllerTest.java b/src/test/java/org/energyos/espi/thirdparty/web/tools/BatchListControllerTest.java
@@ -14,13 +14,10 @@
 import org.energyos.espi.thirdparty.BaseTest;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
 import org.springframework.ui.ModelMap;
 
 public class BatchListControllerTest extends BaseTest {
-    private MockHttpServletResponse response = new MockHttpServletResponse();
-
     BatchListController controller;
 
     @Mock

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public String show(@PathVariable Long retailCustomerId, ModelMap model) {`
`85`	`85`
`86`	`86`	`public static class RetailCustomerValidator implements Validator {`
`87`	`87`
`88`		`- public boolean supports(Class clazz) {`
	`88`	`+ public boolean supports(@SuppressWarnings("rawtypes") Class clazz) {`
`89`	`89`	`return RetailCustomer.class.isAssignableFrom(clazz);`
`90`	`90`	`}`
`91`	`91`