Remove unnecessary "instanceof" operator in the ComplexPropertyDefinitionBase class

vbauer · vbauer · commit 794b44e2d982 · 2015-06-05T16:09:44.000+06:00
diff --git a/src/main/java/microsoft/exchange/webservices/data/property/definition/ComplexPropertyDefinitionBase.java b/src/main/java/microsoft/exchange/webservices/data/property/definition/ComplexPropertyDefinitionBase.java
@@ -25,11 +25,12 @@
 
 import microsoft.exchange.webservices.data.core.EwsServiceXmlReader;
 import microsoft.exchange.webservices.data.core.EwsServiceXmlWriter;
+import microsoft.exchange.webservices.data.core.ExchangeService;
 import microsoft.exchange.webservices.data.core.PropertyBag;
-import microsoft.exchange.webservices.data.core.service.ServiceObject;
 import microsoft.exchange.webservices.data.core.enumeration.misc.ExchangeVersion;
-import microsoft.exchange.webservices.data.core.enumeration.property.PropertyDefinitionFlags;
 import microsoft.exchange.webservices.data.core.enumeration.misc.XmlNamespace;
+import microsoft.exchange.webservices.data.core.enumeration.property.PropertyDefinitionFlags;
+import microsoft.exchange.webservices.data.core.service.ServiceObject;
 import microsoft.exchange.webservices.data.misc.OutParam;
 import microsoft.exchange.webservices.data.property.complex.ComplexProperty;
 
@@ -92,19 +93,18 @@ protected ComplexPropertyDefinitionBase(String xmlElementName, String uri,
    * @param propertyBag The property bag.
    * @throws Exception the exception
    */
-  protected void internalLoadFromXml(EwsServiceXmlReader reader,
-      PropertyBag propertyBag) throws Exception {
-    OutParam<Object> complexProperty = new OutParam<Object>();
+  protected void internalLoadFromXml(
+    final EwsServiceXmlReader reader, final PropertyBag propertyBag
+  ) throws Exception {
+    final OutParam<ComplexProperty> complexProperty = new OutParam<ComplexProperty>();
+    final boolean justCreated = getPropertyInstance(propertyBag, complexProperty);
 
-    boolean justCreated = getPropertyInstance(propertyBag, complexProperty);
     if (!justCreated && this.hasFlag(PropertyDefinitionFlags.UpdateCollectionItems,
         propertyBag.getOwner().getService().getRequestedServerVersion())) {
-      Object c = complexProperty.getParam();
-      if (c instanceof ComplexProperty) {
-        ((ComplexProperty) c).updateFromXml(reader, reader.getLocalName());
-      }
+      final ComplexProperty c = complexProperty.getParam();
+      c.updateFromXml(reader, reader.getLocalName());
     } else {
-      ComplexProperty c = (ComplexProperty) complexProperty.getParam();
+      final ComplexProperty c = complexProperty.getParam();
       c.loadFromXml(reader, reader.getLocalName());
     }
 
@@ -121,17 +121,18 @@ protected void internalLoadFromXml(EwsServiceXmlReader reader,
    * @param complexProperty The property instance.
    * @return True if the instance is newly created.
    */
-  private boolean getPropertyInstance(PropertyBag propertyBag, OutParam<Object> complexProperty) {
-    boolean retValue = false;
-    if (!propertyBag.tryGetValue(this, complexProperty) || !this
-        .hasFlag(PropertyDefinitionFlags.ReuseInstance,
-            propertyBag.getOwner().getService().getRequestedServerVersion())) {
-      complexProperty.setParam(this.createPropertyInstance(propertyBag
-          .getOwner()));
-      retValue = true;
+  private boolean getPropertyInstance(
+    final PropertyBag propertyBag, final OutParam<ComplexProperty> complexProperty
+  ) {
+    final ServiceObject owner = propertyBag.getOwner();
+    final ExchangeService service = owner.getService();
+
+    if (!propertyBag.tryGetValue(this, complexProperty)
+        || !hasFlag(PropertyDefinitionFlags.ReuseInstance, service.getRequestedServerVersion())) {
+      complexProperty.setParam(createPropertyInstance(owner));
+      return true;
     }
-    return retValue;
-
+    return false;
   }
 
   /**
