#213. Documentation

ncsa · Oct 25, 2024 · 004b4ce · 004b4ce
1 parent ef0fa81
commit 004b4ce
Show file tree

Hide file tree

Showing 829 changed files with 5,590 additions and 2,371 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/client-api/src/main/java/org/oa4mp/client/api/AbstractOA4MPService.java b/client-api/src/main/java/org/oa4mp/client/api/AbstractOA4MPService.java
@@ -259,7 +259,7 @@ public AssetResponse getCert(String tempToken, String verifier, Identifier ident
      * @param v
      * @return
      */
-    protected Map<String, String> getATParameters(Asset asset, AuthorizationGrant ag, Verifier v) {
+    protected Map<String, Object> getATParameters(Asset asset, AuthorizationGrant ag, Verifier v) {
         Map m = new HashMap();
         m.put(getEnvironment().getConstants().get(ClientEnvironment.CALLBACK_URI_KEY), getEnvironment().getCallback().toString());
         return m;

diff --git a/client-installer/buildNumber.properties b/client-installer/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Sat Oct 19 08:08:47 CDT 2024
-buildNumber\\d*=460
+#Thu Oct 24 15:02:43 CDT 2024
+buildNumber\\d*=528
diff --git a/client-loader/src/main/java/org/oa4mp/client/loader/OA2MPService.java b/client-loader/src/main/java/org/oa4mp/client/loader/OA2MPService.java
@@ -100,8 +100,8 @@ public void preGetCert(Asset asset, Map parameters) {
     }
 
     @Override
-    protected Map<String, String> getATParameters(Asset asset, AuthorizationGrant ag, Verifier v) {
-        Map<String, String> m = super.getATParameters(asset, ag, v);
+    protected Map<String, Object> getATParameters(Asset asset, AuthorizationGrant ag, Verifier v) {
+        Map<String, Object> m = super.getATParameters(asset, ag, v);
         OA2Asset a = (OA2Asset) asset;
         if (a == null) {
             throw new GeneralException("Asset not found. You may need to clear your browser cookies.");
@@ -146,7 +146,7 @@ public ATResponse2 rfc8628Request(OA2Asset asset, String deviceCode, Map<String,
         dar.setAuthorizationGrant(new AuthorizationGrantImpl(URI.create(deviceCode)));
         dar.setClient(getEnvironment().getClient());
         dar.setKeyID(getEnvironment().getKid());
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.putAll(additionalParameters);
         dar.setParameters(map);
         return processAtRequest(asset, dar);
@@ -198,12 +198,14 @@ public OA2MPService(ClientEnvironment environment) {
         super(environment);
     }
 
-    public ATResponse2 getAccessToken(OA2Asset asset, AuthorizationGrant ag, Map<String, String> additionalParameters) {
+    public ATResponse2 getAccessToken(OA2Asset asset, AuthorizationGrant ag,
+                                      Map<String, Object> additionalParameters) {
         DelegatedAssetRequest dar = new DelegatedAssetRequest();
         dar.setAuthorizationGrant(ag);
         dar.setClient(getEnvironment().getClient());
         dar.setKeyID(getEnvironment().getKid());
-        Map<String, String> m1 = getATParameters(asset, ag, null);
+        Map<String, Object> m1 = new HashMap<>();
+        m1.putAll(getATParameters(asset, ag, null));
         if (additionalParameters != null) {
             m1.putAll(additionalParameters);
         }
@@ -253,7 +255,8 @@ public AssetResponse getCert(OA2Asset a,
         }
         a.setPrivateKey(keyPair.getPrivate());
         a.setCertReq(certReq);
-        Map<String, String> m1 = getAssetParameters(a);
+        Map<String, Object> m1 = new HashMap<>();
+                m1.putAll(getAssetParameters(a));
 
         preGetCert(a, m1);
 

diff --git a/client/src/main/java/org/oa4mp/delegation/client/DelegationService.java b/client/src/main/java/org/oa4mp/delegation/client/DelegationService.java
@@ -103,7 +103,7 @@ public DelegatedAssetResponse processAssetRequest(DelegatedAssetRequest delegati
 
     }
 
-    public DelegatedAssetResponse getCert(ATResponse atResponse, Client client, Map<String, String> assetParameters) {
+    public DelegatedAssetResponse getCert(ATResponse atResponse, Client client, Map<String, Object> assetParameters) {
         PARequest paReq = new PARequest();
         paReq.setClient(client);
         paReq.setAccessToken(atResponse.getAccessToken());

diff --git a/client/src/main/java/org/oa4mp/delegation/client/request/BasicRequest.java b/client/src/main/java/org/oa4mp/delegation/client/request/BasicRequest.java
@@ -68,9 +68,9 @@ public Response process(Server server) {
      *
      * @return
      */
-    public Map<String, String> getParameters() {
+    public Map<String, Object> getParameters() {
         if (parameters == null) {
-            parameters = new HashMap<String, String>();
+            parameters = new HashMap<String, Object>();
         }
         return parameters;
     }
@@ -79,7 +79,7 @@ public Map<String, String> getParameters() {
      * @param parameters
      * @see #getParameters() for what this is and does.
      */
-    public void setParameters(Map<String, String> parameters) {
+    public void setParameters(Map<String, Object> parameters) {
         this.parameters = parameters;
     }
 

diff --git a/docs/apidocs/allclasses-index.html b/docs/apidocs/allclasses-index.html
diff --git a/docs/apidocs/allclasses.html b/docs/apidocs/allclasses.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (11.0.24) on Wed Oct 02 16:49:29 CDT 2024 -->
+<!-- Generated by javadoc (11.0.24) on Thu Oct 24 15:02:45 CDT 2024 -->
 <title>All Classes (OA4MP Parent Project 5.6-SNAPSHOT API)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2024-10-02">
+<meta name="dc.created" content="2024-10-24">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
@@ -230,6 +230,9 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/oa4mp/delegation/client/server/ResourceOwner.html" title="interface in org.oa4mp.delegation.client.server"><span class="interfaceName">ResourceOwner</span></a></li>
 <li><a href="org/oa4mp/delegation/common/services/Response.html" title="interface in org.oa4mp.delegation.common.services"><span class="interfaceName">Response</span></a></li>
 <li><a href="org/oa4mp/delegation/server/storage/uuc/ResultStats.html" title="class in org.oa4mp.delegation.server.storage.uuc">ResultStats</a></li>
+<li><a href="org/oa4mp/delegation/client/request/RFC6749_4_4_Response.html" title="class in org.oa4mp.delegation.client.request">RFC6749_4_4_Response</a></li>
+<li><a href="org/oa4mp/delegation/client/request/RFC6749_4_4Request.html" title="class in org.oa4mp.delegation.client.request">RFC6749_4_4Request</a></li>
+<li><a href="org/oa4mp/delegation/server/client/RFC6749_4_4Server.html" title="class in org.oa4mp.delegation.server.client">RFC6749_4_4Server</a></li>
 <li><a href="org/oa4mp/delegation/client/request/RFC7009Request.html" title="class in org.oa4mp.delegation.client.request">RFC7009Request</a></li>
 <li><a href="org/oa4mp/delegation/client/request/RFC7009Response.html" title="class in org.oa4mp.delegation.client.request">RFC7009Response</a></li>
 <li><a href="org/oa4mp/delegation/client/server/RFC7009Server.html" title="interface in org.oa4mp.delegation.client.server"><span class="interfaceName">RFC7009Server</span></a></li>

diff --git a/docs/apidocs/allpackages-index.html b/docs/apidocs/allpackages-index.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (11.0.24) on Wed Oct 02 16:49:29 CDT 2024 -->
+<!-- Generated by javadoc (11.0.24) on Thu Oct 24 15:02:45 CDT 2024 -->
 <title>All Packages (OA4MP Parent Project 5.6-SNAPSHOT API)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2024-10-02">
+<meta name="dc.created" content="2024-10-24">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">