Simplify constant expressions

Author: vbauer

src/main/java/microsoft/exchange/webservices/data/property/complex/ExtendedProperty.java

@@ -31,6 +31,7 @@
 import microsoft.exchange.webservices.data.core.exception.service.local.ServiceXmlSerializationException;
 import microsoft.exchange.webservices.data.misc.MapiTypeConverter;
 import microsoft.exchange.webservices.data.property.definition.ExtendedPropertyDefinition;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -213,19 +214,13 @@ private String getStringValue() {
    * @return boolean
    */
   @Override
-  public boolean equals(Object obj) {
-
+  public boolean equals(final Object obj) {
     if (obj instanceof ExtendedProperty) {
-      ExtendedProperty other = (ExtendedProperty) obj;
-      if (other.getPropertyDefinition().equals(
-          this.getPropertyDefinition())) {
-        return this.getStringValue().equals(other.getStringValue());
-      } else {
-        return false;
-      }
-    } else {
-      return false;
+      final ExtendedProperty other = (ExtendedProperty) obj;
+      return other.getPropertyDefinition().equals(this.getPropertyDefinition())
+        && StringUtils.equals(this.getStringValue(), other.getStringValue());
     }
+    return false;
   }
 
   /**

src/main/java/microsoft/exchange/webservices/data/property/complex/FolderId.java

@@ -207,7 +207,7 @@ protected boolean getIsValid() {
    */
   @Override
   public boolean equals(Object obj) {
-    if (obj == this || (obj == null && this == null)) {
+    if (obj == this) {
       return true;
     } else if (obj instanceof FolderId) {
       FolderId other = (FolderId) obj;

src/main/java/microsoft/exchange/webservices/data/property/complex/ServiceId.java

@@ -28,6 +28,7 @@
 import microsoft.exchange.webservices.data.core.EwsUtilities;
 import microsoft.exchange.webservices.data.core.XmlAttributeNames;
 import microsoft.exchange.webservices.data.core.exception.service.local.ServiceXmlSerializationException;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Represents the Id of an Exchange object.
@@ -172,14 +173,8 @@ public void setChangeKey(String changeKey) {
    * @param other The ServiceId to compare with the current ServiceId.
    * @return true if equal otherwise false.
    */
-  public boolean sameIdAndChangeKey(ServiceId other) {
-    if (this.equals(other)) {
-      return ((this.getChangeKey() == null) &&
-          (other.getChangeKey() == null)) ||
-          this.getChangeKey().equals(other.getChangeKey());
-    } else {
-      return false;
-    }
+  public boolean sameIdAndChangeKey(final ServiceId other) {
+    return this.equals(other) && StringUtils.equals(this.getChangeKey(), other.getChangeKey());
   }
 
   /**

src/main/java/microsoft/exchange/webservices/data/property/complex/recurrence/DayOfTheWeekCollection.java

@@ -32,6 +32,7 @@
 import microsoft.exchange.webservices.data.core.exception.misc.ArgumentOutOfRangeException;
 import microsoft.exchange.webservices.data.core.exception.service.local.ServiceXmlSerializationException;
 import microsoft.exchange.webservices.data.property.complex.ComplexProperty;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -109,7 +110,7 @@ public void loadFromXml(EwsServiceXmlReader reader, String xmlElementName)
       throws XMLStreamException, ServiceXmlSerializationException {
     String daysOfWeekAsString = this.toString(" ");
 
-    if (!(daysOfWeekAsString == null || daysOfWeekAsString.isEmpty())) {
+    if (!StringUtils.isEmpty(daysOfWeekAsString)) {
       writer.writeElementValue(XmlNamespace.Types,
           XmlElementNames.DaysOfWeek, daysOfWeekAsString);
     }

src/main/java/microsoft/exchange/webservices/data/property/definition/StartTimeZonePropertyDefinition.java

@@ -84,17 +84,14 @@ public void writePropertyValueToXml(EwsServiceXmlWriter writer, PropertyBag prop
     Object value = propertyBag.getObjectFromPropertyDefinition(this);
 
     if (value != null) {
-      if (writer.getService().getRequestedServerVersion() == ExchangeVersion.Exchange2007_SP1) {
-        ExchangeService service = (ExchangeService) writer.getService();
-        if (service != null && !service.getExchange2007CompatibilityMode()) {
-          MeetingTimeZone meetingTimeZone = new MeetingTimeZone(
-              (TimeZoneDefinition) value);
-          meetingTimeZone.writeToXml(writer,
-              XmlElementNames.MeetingTimeZone);
+      final ExchangeService service = (ExchangeService) writer.getService();
+      if (service.getRequestedServerVersion() == ExchangeVersion.Exchange2007_SP1) {
+        if (!service.getExchange2007CompatibilityMode()) {
+          MeetingTimeZone meetingTimeZone = new MeetingTimeZone((TimeZoneDefinition) value);
+          meetingTimeZone.writeToXml(writer, XmlElementNames.MeetingTimeZone);
         }
       } else {
-        super.writePropertyValueToXml(writer, propertyBag,
-            isUpdateOperation);
+        super.writePropertyValueToXml(writer, propertyBag, isUpdateOperation);
       }
     }
   }

src/main/java/microsoft/exchange/webservices/data/search/filter/SearchFilter.java

@@ -1085,17 +1085,6 @@ protected void internalValidate() throws ServiceValidationException {
       if (this.otherPropertyDefinition == null && this.value == null) {
         throw new ServiceValidationException(
             "Either the OtherPropertyDefinition or the Value property must be set.");
-      } else if (value != null) {
-        // All objects implement Object.
-        // Value types that don't implement Object must implement
-        // ISearchStringProvider
-        // in order to be used in a search filter.
-        if (!((value instanceof Object) || (value instanceof ISearchStringProvider))) {
-          throw new ServiceValidationException(
-              String
-                  .format("Values of type '%s' cannot be as comparison values in search filter.",
-                      value.getClass().getName()));
-        }
       }
     }