[java-identity-provider] 02/02: Fix warnings and infos in eclipse
Rod Widdowson
rdw at steadingsoftware.com
Wed Aug 19 15:53:19 UTC 2020
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d0ef007506710b2aa24c551c8016ce1f2ea1e036
commit d0ef007506710b2aa24c551c8016ce1f2ea1e036
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Aug 19 16:53:11 2020 +0100
Fix warnings and infos in eclipse
---
.../idp/admin/BasicAdministrativeFlowDescriptor.java | 4 ++--
.../impl/NumOfAttributeValuesPolicyRule.java | 4 ++--
.../filter/matcher/impl/ScriptedMatcherTest.java | 1 +
.../filter/matcher/logic/impl/AndMatcherTest.java | 1 +
.../filter/matcher/logic/impl/NotMatcherTest.java | 1 +
.../filter/matcher/logic/impl/OrMatcherTest.java | 1 +
.../filter/policyrule/impl/ScriptedPolicyRuleTest.java | 1 +
.../policyrule/logic/impl/AndPolicyRuleTest.java | 1 +
.../policyrule/logic/impl/NotPolicyRuleTest.java | 1 +
.../filter/policyrule/logic/impl/OrPolicyRuleTest.java | 1 +
.../resolver/ad/impl/DecryptedAttributeTest.java | 1 +
.../resolver/dc/impl/SubjectDataConnectorTest.java | 2 ++
.../resolver/impl/AttributeResolverImplTest.java | 1 +
.../impl/AuthenticationFlowDescriptorManager.java | 2 +-
.../idp/installer/ant/impl/PasswordHandler.java | 18 ++++++++----------
15 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java b/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
index f7473327e..16d483d24 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
@@ -564,8 +564,8 @@ public class BasicAdministrativeFlowDescriptor extends AbstractProfileConfigurat
@Positive final int w) {
super(url, lang);
- height = (int) Constraint.isGreaterThan(0, h, "Height must be greater than zero.");
- width = (int) Constraint.isGreaterThan(0, w, "Width must be greater than zero.");
+ height = Constraint.isGreaterThan(0, h, "Height must be greater than zero.");
+ width = Constraint.isGreaterThan(0, w, "Width must be greater than zero.");
}
/**
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRule.java
index 8b73d80b3..d580a3a2e 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRule.java
@@ -126,7 +126,7 @@ public class NumOfAttributeValuesPolicyRule extends AbstractPolicyRule {
* @param minValues The minimumValues to set.
*/
public void setMinimum(final int minValues) {
- minimumValues = (int) Constraint.isGreaterThanOrEqual(0, minValues, "min value must be >= 0");
+ minimumValues = Constraint.isGreaterThanOrEqual(0, minValues, "min value must be >= 0");
}
/**
@@ -144,7 +144,7 @@ public class NumOfAttributeValuesPolicyRule extends AbstractPolicyRule {
* @param maxValues The maximumValues to set.
*/
public void setMaximum(final int maxValues) {
- maximumValues = (int) Constraint.isGreaterThan(0, maxValues, "max value must be > 0");
+ maximumValues = Constraint.isGreaterThan(0, maxValues, "max value must be > 0");
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
index 82acd7a8e..41a87e848 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
@@ -51,6 +51,7 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/** {@link ScriptedMatcher} unit test. */
+ at SuppressWarnings("javadoc")
public class ScriptedMatcherTest extends AbstractMatcherPolicyRuleTest {
/** A script that returns a set that contains the one of values the attribute. */
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
index b8b0025b2..155c6c89d 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
@@ -46,6 +46,7 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link AndMatcher} unit test. */
+ at SuppressWarnings("javadoc")
public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
@BeforeClass public void setup() throws Exception {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
index 4c0f45891..9f57487f3 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
@@ -42,6 +42,7 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** Test the {@link NotMatcher} matcher. */
+ at SuppressWarnings("javadoc")
public class NotMatcherTest extends AbstractMatcherPolicyRuleTest {
@BeforeClass public void setup() throws Exception {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
index 6b0645a8d..660f7e871 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
@@ -47,6 +47,7 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link OrMatcher} unit test. */
+ at SuppressWarnings("javadoc")
public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
@BeforeClass public void setup() throws Exception {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
index 7289b48a8..c3b1de846 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
@@ -46,6 +46,7 @@ import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/** {@link ScriptedPolicyRule} unit test. */
@ThreadSafe
+ at SuppressWarnings("javadoc")
public class ScriptedPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
/** A script that returns null. */
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
index 6c18b1e1e..f154331ae 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
@@ -37,6 +37,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link AndPolicyRule} unit test. */
+ at SuppressWarnings("javadoc")
public class AndPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
@BeforeClass public void setup() throws Exception {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
index 533d366c3..3766eb4a5 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
@@ -35,6 +35,7 @@ import net.shibboleth.utilities.java.support.component.UninitializedComponentExc
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** Test the {@link NotPolicyRule} matcher. */
+ at SuppressWarnings("javadoc")
public class NotPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
@BeforeClass public void setup() throws Exception {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
index a4d8cf62f..260cecb0f 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
@@ -37,6 +37,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** {@link OrPolicyRule} unit test. */
+ at SuppressWarnings("javadoc")
public class OrPolicyRuleTest extends AbstractMatcherPolicyRuleTest {
@BeforeClass public void setup() throws Exception {
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
index 0bdb05419..90acc8c7c 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
@@ -54,6 +54,7 @@ import net.shibboleth.utilities.java.support.security.DataSealerException;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
/** Test for {@link DecryptedAttributeDefinition}. */
+ at SuppressWarnings("javadoc")
public class DecryptedAttributeTest {
private static final String TEST_ATTRIBUTE_NAME = "decrypted";
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SubjectDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SubjectDataConnectorTest.java
index f869b3ddd..8a57d52f8 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SubjectDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SubjectDataConnectorTest.java
@@ -115,6 +115,7 @@ public class SubjectDataConnectorTest {
assertTrue(copy.getValues().contains(new StringAttributeValue(SIMPLE_VALUE + "2")));
}
+ @SuppressWarnings("removal")
@Test public void emptyOk() throws ComponentInitializationException, ResolutionException {
final SubjectDataConnector defn = new SubjectDataConnector();
@@ -135,6 +136,7 @@ public class SubjectDataConnectorTest {
assertTrue(results.isEmpty());
}
+ @SuppressWarnings("removal")
@Test(expectedExceptions=ResolutionException.class)
public void emptyError() throws ComponentInitializationException, ResolutionException {
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index 5ad7166c1..cb3e91422 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -190,6 +190,7 @@ public class AttributeResolverImplTest {
assertEquals(context.getResolvedIdPAttributes().get("ad1"), attribute);
}
+ @SuppressWarnings("removal")
@Test public void resolveWithExports() throws Exception {
final IdPAttribute attribute1 = new IdPAttribute("ad1");
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java
index ce4678fe4..74313bc92 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AuthenticationFlowDescriptorManager.java
@@ -35,7 +35,7 @@ public class AuthenticationFlowDescriptorManager extends IdentifiedComponentMana
/**
* Constructor.
*
- * @param freeObjects
+ * @param freeObjects free-standing objects
*/
@Autowired
public AuthenticationFlowDescriptorManager(
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/PasswordHandler.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/PasswordHandler.java
index 5f2042b53..7f54b57bb 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/PasswordHandler.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/PasswordHandler.java
@@ -47,18 +47,16 @@ public class PasswordHandler extends SecureInputHandler {
// set up
saveProps.replaceProperty(propertyName, password);
-
- // save
- final ByteArrayOutputStream saveStream = new ByteArrayOutputStream();
- saveProps.store(saveStream);
-
- // reload
final Properties loadProps = new Properties();
- final ByteArrayInputStream loadStream = new ByteArrayInputStream(saveStream.toByteArray());
- saveStream.close();
- loadProps.load(loadStream);
- loadStream.close();
+ try (final ByteArrayOutputStream saveStream = new ByteArrayOutputStream()) {
+ saveProps.store(saveStream);
+
+ // reload
+ try(final ByteArrayInputStream loadStream = new ByteArrayInputStream(saveStream.toByteArray())) {
+ loadProps.load(loadStream);
+ }
+ }
// test
return password.equals(loadProps.getProperty(propertyName));
} catch (final IOException e) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list