Merge remote-tracking branch 'origin/1.3.x' into 1.3.x

Author: mrafiei

api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-root</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

api/src/main/java/com/stormpath/sdk/application/ApplicationOptions.java

@@ -79,4 +79,14 @@ public interface ApplicationOptions<T> extends AccountStoreOptions<T> {
      * @since 1.0.0
      */
     T withWebConfig();
+
+    /**
+     * Ensures that when retrieving an Application, the Application's {@link Application#getSamlPolicy() samlPolicy}
+     * is also retrieved in the same request. This enhances performance by leveraging a single request to retrieve multiple
+     * related resources you know you will use.
+     *
+     * @return this instance for method chaining.
+     * @since 1.3.0
+     */
+    T withSamlPolicy();
 }

api/src/main/java/com/stormpath/sdk/lang/Strings.java

@@ -16,6 +16,7 @@
 package com.stormpath.sdk.lang;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1264,4 +1265,34 @@ public static String arrayToCommaDelimitedString(Object[] arr) {
         return arrayToDelimitedString(arr, ",");
     }
 
+    /**
+     * Calls {@link String#getBytes(Charset)}
+     *
+     * @param string  The string to encode (if null, return null).
+     * @param charset The {@link Charset} to encode the <code>String</code>
+     * @return the encoded bytes
+     * @since 1.2.1
+     */
+    private static byte[] getBytes(final String string, final Charset charset) {
+        if (string == null) {
+            return null;
+        }
+        return string.getBytes(charset);
+    }
+
+    /**
+     * Encodes the given string into a sequence of bytes using the UTF-8 charset, storing the result into a new byte
+     * array.
+     *
+     * @param string the String to encode, may be <code>null</code>
+     * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
+     * @throws NullPointerException Thrown if {@link StandardCharsets#UTF_8} is not initialized, which should never happen since it is
+     *                              required by the Java platform specification.
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     * @since 1.2.1
+     */
+    public static byte[] getBytesUtf8(final String string) {
+        return getBytes(string, StandardCharsets.UTF_8);
+    }
+
 }

api/src/main/java/com/stormpath/sdk/phone/Phone.java

@@ -52,7 +52,7 @@ public interface Phone extends Resource, Saveable, Deletable, Auditable {
 
     /**
      * Sets the phone's name.
-     * @param name he phone's name.
+     * @param name the phone's name.
      *
      * @return this instance for method chaining.
      */
@@ -67,7 +67,7 @@ public interface Phone extends Resource, Saveable, Deletable, Auditable {
 
     /**
      * Sets the phone's description.
-     * @param description he phone's description.
+     * @param description the phone's description.
      *
      * @return this instance for method chaining.
      */

api/src/main/java/com/stormpath/sdk/phone/Phones.java

@@ -229,7 +229,7 @@ public static EqualsExpressionFactory verificationStatus() {
      * Phones.where(<b>Phones.createdAt()</b>.matches("[,2014-04-05T12:00:00]");
      * </pre>
      * The above example invokes the returned factory's <code>matches("[,2014-04-05T12:00:00]"))</code> method.  This
-     * produces a name-specific {@link Criterion} which is added to the criteria query (via the
+     * produces a createdAt-specific {@link Criterion} which is added to the criteria query (via the
      * {@link #where(Criterion) where} method).
      * <pre>
      * For example, the following code is equivalent:
@@ -254,7 +254,7 @@ public static DateExpressionFactory createdAt(){
      * Phones.where(<b>Phones.modifiedAt()</b>.matches("[,2014-04-05T12:00:00]");
      * </pre>
      * The above example invokes the returned factory's <code>matches("[,2014-04-05T12:00:00]"))</code> method.  This
-     * produces a name-specific {@link Criterion} which is added to the criteria query (via the
+     * produces a modifiedAt-specific {@link Criterion} which is added to the criteria query (via the
      * {@link #where(Criterion) where} method).
      * <pre>
      * For example, the following code is equivalent:
@@ -279,12 +279,12 @@ private static DateExpressionFactory newDateExpressionFactory(String propName) {
     }
 
     /**
-     * Creates a new {@link com.stormpath.sdk.phone.CreatePhoneRequestBuilder CreatePhoneRequestBuilder}
+     * Creates a new {@link com.stormpath.sdk.phone.CreatePhoneRequestBuilder createPhoneRequestBuilder}
      * instance reflecting the specified {@link com.stormpath.sdk.phone.Phone} instance. The builder can be used to customize any
      * creation request options as necessary.
      *
      * @param phone the phone to create a new record for within Stormpath
-     * @return a new {@link com.stormpath.sdk.phone.CreatePhoneRequestBuilder CreatePhoneRequestBuilder}
+     * @return a new {@link com.stormpath.sdk.phone.CreatePhoneRequestBuilder createPhoneRequestBuilder}
      *         instance reflecting the specified {@link com.stormpath.sdk.phone.Phone} instance.
      ** @see com.stormpath.sdk.account.Account#createPhone(CreatePhoneRequest)
      *

api/src/main/java/com/stormpath/sdk/saml/AttributeStatementMappingRules.java

@@ -15,9 +15,10 @@
 */
 package com.stormpath.sdk.saml;
 
+import com.stormpath.sdk.resource.Deletable;
 import com.stormpath.sdk.resource.Resource;
+import com.stormpath.sdk.resource.Saveable;
 
-import java.util.Collection;
 import java.util.Set;
 
 /**
@@ -31,7 +32,7 @@
  *
  * @since 1.0.RC8
  */
-public interface AttributeStatementMappingRules extends Resource, Set<AttributeStatementMappingRule> {
+public interface AttributeStatementMappingRules extends Resource, Set<AttributeStatementMappingRule>, Saveable, Deletable{
 
     /**
      * Removes the {@link AttributeStatementMappingRule}(s) identified by {@code ruleNames}.

api/src/main/java/com/stormpath/sdk/saml/CreateRegisteredSamlServiceProviderRequest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.saml;
+
+
+/**
+ * Represents an attempt to create a new {@link RegisteredSamlServiceProvider} record in Stormpath.
+ *
+ * @see com.stormpath.sdk.tenant.Tenant#createRegisterdSamlServiceProvider(RegisteredSamlServiceProvider)
+ * @since 1.3.0
+ */
+public interface CreateRegisteredSamlServiceProviderRequest {
+
+    /**
+     * Returns the RegisteredSamlServiceProvider instance for which a new record will be created in Stormpath.
+     *
+     * @return the RegisteredSamlServiceProvider instance for which a new record will be created in Stormpath.
+     */
+    RegisteredSamlServiceProvider getRegisteredSamlServiceProvider();
+
+    /**
+     * Returns true in case RegisteredSamlServiceProvider has options.
+     *
+     * @return true in case RegisteredSamlServiceProvider has options.
+     */
+    boolean hasRegisteredSamlServiceProviderOptions();
+
+    /**
+     * Returns the {@link RegisteredSamlServiceProviderOptions}.
+     *
+     * @return  {@link RegisteredSamlServiceProviderOptions}.
+     */
+    RegisteredSamlServiceProviderOptions getRegisteredSamlServiceProviderOptions() throws IllegalStateException;
+
+}

api/src/main/java/com/stormpath/sdk/saml/CreateRegisteredSamlServiceProviderRequestBuilder.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.saml;
+
+/**
+ * A Builder to construct {@link CreateRegisteredSamlServiceProviderRequest}s.
+ *
+ * @see com.stormpath.sdk.tenant.Tenant#createRegisterdSamlServiceProvider(RegisteredSamlServiceProvider)
+ * @since 1.3.0
+ */
+public interface CreateRegisteredSamlServiceProviderRequestBuilder {
+
+    /**
+     * Ensures that after a RegisteredSamlServiceProvider is created, the creation response is retrieved with the specified registeredSamlServiceProvider's
+     * options. This enhances performance by leveraging a single request to retrieve multiple related
+     * resources you know you will use.
+     *
+     * @return the builder instance for method chaining.
+     * @throws IllegalArgumentException if {@code options} is null.
+     */
+    CreateRegisteredSamlServiceProviderRequestBuilder withResponseOptions(RegisteredSamlServiceProviderOptions options) throws IllegalArgumentException;
+
+    /**
+     * Creates a new {@code CreateRegisteredSamlServiceProviderRequest} instance based on the current builder state.
+     *
+     * @return a new {@code CreateRegisteredSamlServiceProviderRequest} instance based on the current builder state.
+     */
+    CreateRegisteredSamlServiceProviderRequest build();
+}

api/src/main/java/com/stormpath/sdk/saml/CreateSamlServiceProviderRegistrationRequest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.saml;
+
+
+/**
+ * Represents an attempt to create a new {@link SamlServiceProviderRegistration} record in Stormpath.
+ *
+ * @see com.stormpath.sdk.saml.SamlIdentityProvider#createSamlServiceProviderRegistration(CreateSamlServiceProviderRegistrationRequest)
+ * @since 1.3.0
+ */
+public interface CreateSamlServiceProviderRegistrationRequest {
+
+    /**
+     * Returns the SamlServiceProviderRegistration instance for which a new record will be created in Stormpath.
+     *
+     * @return the SamlServiceProviderRegistration instance for which a new record will be created in Stormpath.
+     */
+    SamlServiceProviderRegistration getSamlServiceProviderRegistration();
+
+    /**
+     * Returns true in case SamlServiceProviderRegistration has options.
+     *
+     * @return true in case SamlServiceProviderRegistration has options.
+     */
+    boolean hasSamlServiceProviderRegistrationOptions();
+
+    /**
+     * Returns the {@link SamlServiceProviderRegistrationOptions}.
+     *
+     * @return  {@link SamlServiceProviderRegistrationOptions}.
+     */
+    SamlServiceProviderRegistrationOptions getSamlServiceProviderRegistrationOptions() throws IllegalStateException;
+
+}

api/src/main/java/com/stormpath/sdk/saml/CreateSamlServiceProviderRegistrationRequestBuilder.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.saml;
+
+/**
+ * A Builder to construct {@link CreateSamlServiceProviderRegistrationRequest}s.
+ *
+ * @see com.stormpath.sdk.saml.SamlIdentityProvider#createSamlServiceProviderRegistration(CreateSamlServiceProviderRegistrationRequest)
+ * @since 1.3.0
+ */
+public interface CreateSamlServiceProviderRegistrationRequestBuilder {
+
+    /**
+     * Ensures that after a SamlServiceProviderRegistration is created, the creation response is retrieved with the specified samlServiceProviderRegistration's
+     * options. This enhances performance by leveraging a single request to retrieve multiple related
+     * resources you know you will use.
+     *
+     * @return the builder instance for method chaining.
+     * @throws IllegalArgumentException if {@code options} is null.
+     */
+    CreateSamlServiceProviderRegistrationRequestBuilder withResponseOptions(SamlServiceProviderRegistrationOptions options) throws IllegalArgumentException;
+
+    /**
+     * Creates a new {@code CreateSamlServiceProviderRegistrationRequest} instance based on the current builder state.
+     *
+     * @return a new {@code CreateSamlServiceProviderRegistrationRequest} instance based on the current builder state.
+     */
+    CreateSamlServiceProviderRegistrationRequest build();
+}