[java-shib-attribute] branch main updated: Add ParameterName annotations to factory methods.
Scott Cantor
cantor.2 at osu.edu
Wed Aug 2 19:59:47 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=42a2b29aa156cbca8d64e05ba9a57ec58c5cd540
The following commit(s) were added to refs/heads/main by this push:
new 42a2b29aa Add ParameterName annotations to factory methods.
42a2b29aa is described below
commit 42a2b29aa156cbca8d64e05ba9a57ec58c5cd540
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 2 15:59:44 2023 -0400
Add ParameterName annotations to factory methods.
---
.../http/impl/ScriptedResponseMappingStrategy.java | 25 ++++++++++++++--------
.../impl/ScriptedStorageMappingStrategy.java | 25 ++++++++++++++--------
2 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
index 9dbc33d4b..cc256f105 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
@@ -39,6 +39,7 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.dc.http.HTTPResponseMappingStrategy;
+import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
@@ -281,8 +282,10 @@ public final class ScriptedResponseMappingStrategy extends AbstractScriptEvaluat
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedResponseMappingStrategy resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull static ScriptedResponseMappingStrategy resourceScript(
+ @Nonnull @NotEmpty @ParameterName(name="engineName") final String engineName,
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
try (final InputStream is = resource.getInputStream()) {
final EvaluableScript script = new EvaluableScript();
script.setEngineName(engineName);
@@ -301,8 +304,9 @@ public final class ScriptedResponseMappingStrategy extends AbstractScriptEvaluat
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedResponseMappingStrategy resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull static ScriptedResponseMappingStrategy resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -315,8 +319,10 @@ public final class ScriptedResponseMappingStrategy extends AbstractScriptEvaluat
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedResponseMappingStrategy inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull static ScriptedResponseMappingStrategy inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="engineName") final String engineName,
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setEngineName(engineName);
script.setScript(scriptSource);
@@ -332,9 +338,10 @@ public final class ScriptedResponseMappingStrategy extends AbstractScriptEvaluat
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedResponseMappingStrategy inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull static ScriptedResponseMappingStrategy inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
return inlineScript(DEFAULT_ENGINE, scriptSource);
}
-}
+}
\ No newline at end of file
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java
index e369c3371..5675b889d 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java
@@ -35,6 +35,7 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.dc.storage.StorageMappingStrategy;
+import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
@@ -165,8 +166,10 @@ public final class ScriptedStorageMappingStrategy extends AbstractScriptEvaluato
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedStorageMappingStrategy resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull static ScriptedStorageMappingStrategy resourceScript(
+ @Nonnull @NotEmpty @ParameterName(name="engineName") final String engineName,
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
try (final InputStream is = resource.getInputStream()) {
final EvaluableScript script = new EvaluableScript();
script.setEngineName(engineName);
@@ -185,8 +188,9 @@ public final class ScriptedStorageMappingStrategy extends AbstractScriptEvaluato
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedStorageMappingStrategy resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull static ScriptedStorageMappingStrategy resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -199,8 +203,10 @@ public final class ScriptedStorageMappingStrategy extends AbstractScriptEvaluato
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedStorageMappingStrategy inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull static ScriptedStorageMappingStrategy inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="engineName") final String engineName,
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setEngineName(engineName);
script.setScript(scriptSource);
@@ -216,9 +222,10 @@ public final class ScriptedStorageMappingStrategy extends AbstractScriptEvaluato
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the script object fails to initialize
*/
- @Nonnull static ScriptedStorageMappingStrategy inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull static ScriptedStorageMappingStrategy inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
return inlineScript(DEFAULT_ENGINE, scriptSource);
}
-}
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list