merging

Author: Paul Gray

pom.xml

@@ -10,7 +10,7 @@
     <url>https://github.com/IMSGlobal/basiclti-util-java</url>
     <groupId>org.imsglobal</groupId>
     <artifactId>basiclti-util</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.2</version>
     <organization>
         <name>IMS Global Learning Consortium</name>
         <url>www.imsglobal.org/</url>
@@ -197,9 +197,6 @@
                         <goals>
                             <goal>jar</goal>
                         </goals>
-                        <configuration>
-                            <failOnError>false</failOnError>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

src/main/java/org/imsglobal/lti/BasicLTIUtil.java

@@ -437,7 +437,7 @@ public static Map<String, String> signProperties(
      * Check if the properties are properly signed
      *
      * @deprecated See:
-     * {@link BasicLTIUtil#checkProperties(Map, String, String, String, String, String, String, String, String, String)}
+     * {@link BasicLTIUtil#checkProperties(Map, String, String, String, String)}
      *
      * @param postProp
      * @param url
@@ -755,7 +755,7 @@ public static String prepareForExport(String descriptor) {
      * neither a number or letter is replaced with an "underscore". So if a
      * custom entry was as follows:
      *
-     * <parameter name="Vendor:Chapter">1.2.56</parameter>
+     * {@code <parameter name="Vendor:Chapter">1.2.56</parameter>}
      *
      * Would map to: custom_vendor_chapter=1.2.56
      */
@@ -780,7 +780,7 @@ public static String mapKeyName(String keyname) {
     }
 
     /**
-     * Mutates the passed Map<String, String> map variable. Puts the key,value
+     * Mutates the passed {@code Map<String, String> map} variable. Puts the key,value
      * into the Map if the value is not null and is not empty.
      *
      * @param map Variable is mutated by this method.
@@ -831,7 +831,6 @@ public static String htmlspecialchars(String input) {
      * Simple utility method deal with a request that has the wrong URL when
      * behind a proxy.
      *
-     * @param request
      * @param extUrl The url that the external world sees us as responding to.
      * This needs to be up to but not including the last slash like and not
      * include any path information http://www.sakaiproject.org - although we do
@@ -858,8 +857,7 @@ static public String getRealPath(HttpServletRequest request, String extUrl) {
     }
 
     /**
-     * Simple utility method to help with the migration from Properties to
-     * Map<String, String>.
+     * Simple utility method to help with the migration from {@code Properties} to {@code Map<String, String>}.
      *
      * @param properties
      * @return
@@ -871,10 +869,10 @@ public static Map<String, String> convertToMap(final Properties properties) {
     }
 
     /**
-     * Simple utility method to help with the migration from Map<String, String>
-     * to Properties.
+     * Simple utility method to help with the migration from {@code Map<String, String>}
+     * to {@code Properties}.
      *
-     * @deprecated Should migrate to Map<String, String> signatures.
+     * @deprecated Should migrate to {@code Map<String, String>} signatures.
      * @param map
      * @return
      */

src/main/java/org/imsglobal/lti/launch/LtiOauthVerifier.java

@@ -51,7 +51,7 @@ public LtiVerificationResult verify(HttpServletRequest request, String secret) t
 
     /**
      * This method will verify a collection of parameters
-     * @param parameters the parameters that will be verified. mapped by key & value
+     * @param parameters the parameters that will be verified. mapped by key & value
      * @param url the url this request was made at
      * @param method the method this url was requested with
      * @param secret the secret to verify the propertihes with

src/main/java/org/imsglobal/lti/launch/LtiSigner.java

@@ -35,8 +35,8 @@ public interface LtiSigner {
      * overwrite reserved parameters from the underlying
      * specification. For example, if you are using the Oauth
      * implementation, <b>oauth_signature</b> will be removed
-     * & replaced with the generated signature from the properties.
-     * @param parameters the parameters that will be signed. mapped by key & value
+     * &amp; replaced with the generated signature from the properties.
+     * @param parameters the parameters that will be signed. mapped by key &amp; value
      * @param key the key that will be added to the request.
      * @param secret the secret to be sign the parameters with
      * @return a map of signed parameters (including the signature)

src/main/java/org/imsglobal/lti/launch/LtiVerifier.java

@@ -28,8 +28,8 @@ public interface LtiVerifier {
 
     /**
      * This method will verify a list of properties (mapped
-     * by key & value).
-     * @param parameters the parameters that will be verified. mapped by key & value
+     * by key & value).
+     * @param parameters the parameters that will be verified. mapped by key & value
      * @param url the url this request was made at
      * @param method the method this url was requested with
      * @param secret the secret to verify the propertihes with