ATT-38: ComplexViewHelper2_0 to log a warning when unsupported view.

Author: mks-d

api-2.0/src/main/java/org/openmrs/module/attachments/obs/ComplexViewHelper2_0.java

@@ -1,5 +1,9 @@
 package org.openmrs.module.attachments.obs;
 
+import static org.openmrs.obs.ComplexObsHandler.RAW_VIEW;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.openmrs.Obs;
 import org.openmrs.annotation.OpenmrsProfile;
 import org.openmrs.api.ObsService;
@@ -12,17 +16,24 @@
 @OpenmrsProfile(openmrsPlatformVersion = "2.0.0")
 public class ComplexViewHelper2_0 implements ComplexViewHelper {
 
+	private final Log log = LogFactory.getLog(getClass());
+	
 	@Autowired
 	private ObsService obsService;
 
 	@Override
 	public String getView(Obs obs, String view) {
 
-		if (obsService.getHandler(obs).supportsView(view)) {
+		ComplexObsHandler handler = obsService.getHandler(obs);
+		
+		if (handler.supportsView(view)) {
 			return view;
+		} else {
+			log.warn("The requested view '" + view + "' is not supported by the complex obs handler '"
+			        + handler.getClass().getCanonicalName() + "', reverting to the default view '" + RAW_VIEW + "'.");
 		}
 
-		return ComplexObsHandler.RAW_VIEW;
+		return RAW_VIEW;
 
 	}
 }

omod-1.10/src/main/java/org/openmrs/module/attachments/rest/AttachmentBytesResource1_10.java

@@ -1,5 +1,11 @@
 package org.openmrs.module.attachments.rest;
 
+import static org.openmrs.module.attachments.AttachmentsContext.getContentFamily;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -8,6 +14,7 @@
 import org.openmrs.module.attachments.AttachmentsConstants;
 import org.openmrs.module.attachments.AttachmentsContext;
 import org.openmrs.module.attachments.obs.AttachmentComplexData;
+import org.openmrs.module.attachments.obs.ComplexViewHelper;
 import org.openmrs.module.attachments.obs.ValueComplex;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.response.GenericRestException;
@@ -21,11 +28,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-import static org.openmrs.module.attachments.AttachmentsContext.getContentFamily;
-
 @Controller
 @RequestMapping(value = "/rest/" + RestConstants.VERSION_1 + "/" + AttachmentsConstants.ATTACHMENT_URI)
 public class AttachmentBytesResource1_10 extends BaseRestController {