Remove NotSupportedException class

Author: vbauer

src/main/java/microsoft/exchange/webservices/data/core/exception/misc/NotSupportedException.java

@@ -31,15 +31,13 @@
 import microsoft.exchange.webservices.data.core.PropertyBag;
 import microsoft.exchange.webservices.data.core.PropertySet;
 import microsoft.exchange.webservices.data.core.XmlElementNames;
-import microsoft.exchange.webservices.data.core.service.schema.ServiceObjectSchema;
-import microsoft.exchange.webservices.data.core.enumeration.service.calendar.AffectedTaskOccurrence;
-import microsoft.exchange.webservices.data.core.enumeration.service.DeleteMode;
 import microsoft.exchange.webservices.data.core.enumeration.misc.ExchangeVersion;
+import microsoft.exchange.webservices.data.core.enumeration.service.DeleteMode;
 import microsoft.exchange.webservices.data.core.enumeration.service.SendCancellationsMode;
+import microsoft.exchange.webservices.data.core.enumeration.service.calendar.AffectedTaskOccurrence;
 import microsoft.exchange.webservices.data.core.exception.misc.InvalidOperationException;
-import microsoft.exchange.webservices.data.core.exception.misc.NotSupportedException;
 import microsoft.exchange.webservices.data.core.exception.service.local.ServiceLocalException;
-import microsoft.exchange.webservices.data.core.exception.service.local.ServiceObjectPropertyException;
+import microsoft.exchange.webservices.data.core.service.schema.ServiceObjectSchema;
 import microsoft.exchange.webservices.data.misc.OutParam;
 import microsoft.exchange.webservices.data.property.complex.ExtendedProperty;
 import microsoft.exchange.webservices.data.property.complex.ExtendedPropertyCollection;
@@ -395,27 +393,15 @@ public void load() throws Exception {
    */
   public Object getObjectFromPropertyDefinition(
       PropertyDefinitionBase propertyDefinition) throws Exception {
-    OutParam<Object> propertyValue = new OutParam<Object>();
     PropertyDefinition propDef = (PropertyDefinition) propertyDefinition;
 
     if (propDef != null) {
       return this.getPropertyBag().getObjectFromPropertyDefinition(propDef);
     } else {
-      ExtendedPropertyDefinition extendedPropDef = (ExtendedPropertyDefinition) propertyDefinition;
-      if (extendedPropDef != null) {
-        if (this.tryGetExtendedProperty(Object.class, extendedPropDef, propertyValue)) {
-          return propertyValue;
-        } else {
-          throw new ServiceObjectPropertyException(
-              "You must load or assign this property before you can read its value.",
-              propertyDefinition);
-        }
-      } else {
-        // E14:226103 -- Other subclasses of PropertyDefinitionBase are not supported.
-        throw new NotSupportedException(String.format(
-            "This operation isn't supported for property definition type %s.",
-            propertyDefinition.getType().getName()));
-      }
+      // E14:226103 -- Other subclasses of PropertyDefinitionBase are not supported.
+      throw new UnsupportedOperationException(String.format(
+          "This operation isn't supported for property definition type %s.",
+          propertyDefinition.getType().getName()));
     }
   }
 
@@ -470,15 +456,10 @@ public <T> boolean tryGetProperty(Class<T> cls, PropertyDefinitionBase propertyD
     if (propDef != null) {
       return this.getPropertyBag().tryGetPropertyType(cls, propDef, propertyValue);
     } else {
-      ExtendedPropertyDefinition extPropDef = (ExtendedPropertyDefinition) propertyDefinition;
-      if (extPropDef != null) {
-        return this.tryGetExtendedProperty(cls, extPropDef, propertyValue);
-      } else {
-        // E14:226103 -- Other subclasses of PropertyDefinitionBase are not supported.
-        throw new NotSupportedException(String.format(
-            "This operation isn't supported for property definition type %s.",
-            propertyDefinition.getType().getName()));
-      }
+      // E14:226103 -- Other subclasses of PropertyDefinitionBase are not supported.
+      throw new UnsupportedOperationException(String.format(
+          "This operation isn't supported for property definition type %s.",
+          propertyDefinition.getType().getName()));
     }
   }
 

src/main/java/microsoft/exchange/webservices/data/core/service/ServiceObject.java

@@ -23,7 +23,6 @@
 
 package microsoft.exchange.webservices.data.security;
 
-import microsoft.exchange.webservices.data.core.exception.misc.NotSupportedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.DOMImplementation;
@@ -56,37 +55,13 @@ public class SafeXmlDocument extends DocumentBuilder {
   /**
    * Initializes a new instance of the SafeXmlDocument class.
    */
-  public XMLInputFactory inputFactory;
+  private final XMLInputFactory inputFactory;
 
   public SafeXmlDocument() {
     super();
     inputFactory = XMLInputFactory.newInstance();
   }
 
-  /**
-   * Initializes a new instance of the SafeXmlDocument class with the
-   * specified XSImplementation.
-   *
-   * @param imp The XmlImplementation to use.
-   * @throws NotSupportedException
-   */
-  // <remarks>Not supported do to no use within exchange dev code.</remarks>
-  public SafeXmlDocument(DocumentBuilder imp) throws NotSupportedException {
-    throw new NotSupportedException("Not supported");
-  }
-
-  /**
-   * Initializes a new instance of the SafeXmlDocument class with the
-   * specified XmlNameTable.
-   *
-   * @param nt The XmlNameTable to use.
-   */
-  public SafeXmlDocument(XmlNameTable nt) {
-    super();
-    if (inputFactory == null) {
-      inputFactory = XMLInputFactory.newInstance();
-    }
-  }
 
   /**
    * Loads the XML document from the specified stream.