[java-support] branch master updated: Apply latest Eclipse compiler settings, some cleanup.
Scott Cantor
cantor.2 at osu.edu
Fri Aug 16 17:27:20 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-support.
View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=a42d063f12a1adaac0eab8e0c1e3f6218d48fc88
The following commit(s) were added to refs/heads/master by this push:
new a42d063 Apply latest Eclipse compiler settings, some cleanup.
a42d063 is described below
commit a42d063f12a1adaac0eab8e0c1e3f6218d48fc88
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Aug 16 17:26:39 2019 -0400
Apply latest Eclipse compiler settings, some cleanup.
---
.settings/org.eclipse.jdt.apt.core.prefs | 2 +
.settings/org.eclipse.jdt.core.prefs | 73 ++++++++++++++++++++--
.../java/support/codec/Base32Support.java | 6 +-
.../java/support/codec/Base64Support.java | 6 +-
.../java/support/collection/CollectionSupport.java | 9 +--
.../support/collection/IndexingObjectStore.java | 6 +-
.../java/support/collection/LazyList.java | 6 +-
.../utilities/java/support/collection/LazyMap.java | 6 +-
.../utilities/java/support/collection/LazySet.java | 6 +-
.../support/collection/ValueTypeIndexedMap.java | 3 +-
.../java/support/component/ComponentSupport.java | 12 ++--
.../httpclient/ContextHandlingHttpClient.java | 21 +++----
.../support/httpclient/IdleConnectionSweeper.java | 4 +-
.../java/support/httpclient/TLSSocketFactory.java | 4 +-
.../java/support/logic/AllMatchPredicate.java | 3 +-
.../support/logic/TransformAndCheckFunction.java | 4 +-
.../java/support/net/HttpServletSupport.java | 4 +-
.../java/support/net/MediaTypeSupport.java | 17 +++--
.../net/StripMediaTypeParametersFunction.java | 8 +--
.../java/support/net/impl/BasicURLComparator.java | 5 +-
.../java/support/primitive/ObjectSupport.java | 11 ++--
.../java/support/primitive/TimerSupport.java | 4 +-
.../resolver/CriterionPredicateRegistry.java | 8 +--
.../java/support/resolver/ResolverSupport.java | 3 +-
.../java/support/scripting/EvaluableScript.java | 6 +-
.../security/impl/BasicKeystoreKeyStrategy.java | 3 +-
.../impl/RandomIdentifierGenerationStrategy.java | 3 +-
.../support/security/impl/ScriptedKeyStrategy.java | 3 +-
.../Type4UUIDIdentifierGenerationStrategy.java | 3 +-
.../java/support/xml/AttributeSupport.java | 5 +-
.../java/support/xml/ClasspathResolver.java | 5 +-
.../utilities/java/support/xml/ElementSupport.java | 12 +---
.../utilities/java/support/xml/QNameSupport.java | 3 +-
.../java/support/xml/SimpleNamespaceContext.java | 6 +-
.../primitive/LazilyFormattedStringTest.java | 34 +++++-----
.../java/support/repository/RepositorySupport.java | 3 +-
.../java/support/resolver/ResolverSupportTest.java | 42 +++++--------
.../support/scripting/EvaluableScriptTest.java | 6 +-
.../security/impl/ScriptedKeyStrategyTest.java | 9 ++-
.../java/support/testing/TestSupport.java | 5 +-
.../java/support/xml/SchemaBuilderTest.java | 15 ++---
41 files changed, 201 insertions(+), 193 deletions(-)
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..d4313d4
--- /dev/null
+++ b/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 6063eee..7fa508c 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,14 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
org.eclipse.jdt.core.codeComplete.fieldPrefixes=
@@ -10,22 +19,38 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=info
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -33,45 +58,79 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=info
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=info
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
@@ -350,3 +409,5 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java b/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
index 3366634..348ccb2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
@@ -65,10 +65,10 @@ public final class Base32Support {
if (chunked) {
return Constraint.isNotNull(StringSupport.trim(CHUNKED_ENCODER.encodeToString(data)),
"Encoded data was null");
- } else {
- return Constraint.isNotNull(StringSupport.trim(UNCHUNKED_ENCODER.encodeToString(data)),
- "Encoded data was null");
}
+
+ return Constraint.isNotNull(StringSupport.trim(UNCHUNKED_ENCODER.encodeToString(data)),
+ "Encoded data was null");
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java b/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
index 49f161c..0696e1c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
@@ -65,10 +65,10 @@ public final class Base64Support {
if (chunked) {
return Constraint.isNotNull(StringSupport.trim(CHUNKED_ENCODER.encodeToString(data)),
"Encoded data was null");
- } else {
- return Constraint.isNotNull(StringSupport.trim(UNCHUNKED_ENCODER.encodeToString(data)),
- "Encoded data was null");
}
+
+ return Constraint.isNotNull(StringSupport.trim(UNCHUNKED_ENCODER.encodeToString(data)),
+ "Encoded data was null");
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java b/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
index 38082d1..c8c1648 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
@@ -58,9 +58,8 @@ public final class CollectionSupport {
@Nullable final Collection<? extends T> source) {
if (source != null) {
return ImmutableList.copyOf(source);
- } else {
- return Collections.emptyList();
}
+ return Collections.emptyList();
}
/**
@@ -77,9 +76,8 @@ public final class CollectionSupport {
@Nullable final Collection<? extends T> source) {
if (source != null) {
return ImmutableSet.copyOf(source);
- } else {
- return Collections.emptySet();
}
+ return Collections.emptySet();
}
/**
@@ -97,9 +95,8 @@ public final class CollectionSupport {
@Nullable final Map<? extends K, ? extends V> source) {
if (source != null) {
return ImmutableMap.copyOf(source);
- } else {
- return Collections.emptyMap();
}
+ return Collections.emptyMap();
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java b/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
index 44c0761..c6d04f2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
@@ -116,11 +116,7 @@ public class IndexingObjectStore<T> {
readLock.lock();
try {
final Integer index = indexStore.get(instance);
- if (index == null) {
- return false;
- } else {
- return objectStore.containsKey(index.toString());
- }
+ return index != null ? objectStore.containsKey(index.toString()) : false;
} finally {
readLock.unlock();
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
index 729d23b..3fcd4ad 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
@@ -46,10 +46,10 @@ public class LazyList<ElementType> implements List<ElementType>, Serializable {
if (delegate.isEmpty()) {
delegate = Collections.singletonList(item);
return true;
- } else {
- delegate = buildList();
- return delegate.add(item);
}
+
+ delegate = buildList();
+ return delegate.add(item);
}
/** {@inheritDoc} */
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
index 803b1b4..af90f72 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
@@ -83,10 +83,10 @@ public class LazyMap<KeyType, ValueType> implements Map<KeyType, ValueType>, Ser
if (delegate.isEmpty()) {
delegate = Collections.singletonMap(key, value);
return null;
- } else {
- delegate = buildMap();
- return delegate.put(key, value);
}
+
+ delegate = buildMap();
+ return delegate.put(key, value);
}
/** {@inheritDoc} */
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
index 1a87c05..88354e0 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
@@ -45,10 +45,10 @@ public class LazySet<ElementType> implements Set<ElementType>, Serializable {
if (delegate.isEmpty()) {
delegate = Collections.singleton(element);
return true;
- } else {
- delegate = createImplementation();
- return delegate.add(element);
}
+
+ delegate = createImplementation();
+ return delegate.add(element);
}
/** {@inheritDoc} */
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
index dd484a8..e90ec1d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
@@ -228,9 +228,8 @@ public class ValueTypeIndexedMap<KeyType, ValueType> implements Map<KeyType, Val
}
if (index.containsKey(key)) {
return Collections.unmodifiableMap((Map<KeyType, SubType>) index.get(key));
- } else {
- return Collections.emptyMap();
}
+ return Collections.emptyMap();
}
/** {@inheritDoc} */
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
index 91dc369..e52a982 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
@@ -84,9 +84,8 @@ public final class ComponentSupport {
throw new DestroyedComponentException("Component '"
+ StringSupport.trimOrNull(((IdentifiedComponent) component).getId())
+ "' has already been destroyed and can no longer be used.");
- } else {
- throw new DestroyedComponentException("Component has already been destroyed and can no longer be used");
}
+ throw new DestroyedComponentException("Component has already been destroyed and can no longer be used");
}
}
@@ -107,10 +106,8 @@ public final class ComponentSupport {
throw new UninitializedComponentException("Component '"
+ StringSupport.trimOrNull(((IdentifiedComponent) component).getId())
+ "' has not yet been initialized and cannot be used.");
- } else {
- throw new UninitializedComponentException(
- "Component has not yet been initialized and cannot be used.");
}
+ throw new UninitializedComponentException("Component has not yet been initialized and cannot be used.");
}
}
@@ -130,10 +127,9 @@ public final class ComponentSupport {
throw new UnmodifiableComponentException("Component '"
+ StringSupport.trimOrNull(((IdentifiedComponent) component).getId())
+ "' has already been initialized and can no longer be modified");
- } else {
- throw new UnmodifiableComponentException(
- "Component has already been initialized and can no longer be modified");
}
+ throw new UnmodifiableComponentException(
+ "Component has already been initialized and can no longer be modified");
}
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
index 5b607ff..b4326ec 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
@@ -247,19 +247,18 @@ class ContextHandlingHttpClient extends CloseableHttpClient {
final Throwable t = errors.get(0);
if (IOException.class.isInstance(t)) {
return IOException.class.cast(t);
- } else {
- return new IOException(
- String.format("Context handler threw non-IOException Throwable in stage '%s'", stage), t);
- }
- } else {
- final IOException e = new IOException(
- String.format("Multiple context handlers in stage '%s' reported error, see suppressed list",
- stage));
- for (final Throwable t : errors) {
- e.addSuppressed(t);
}
- return e;
+ return new IOException(
+ String.format("Context handler threw non-IOException Throwable in stage '%s'", stage), t);
+ }
+
+ final IOException e = new IOException(
+ String.format("Multiple context handlers in stage '%s' reported error, see suppressed list",
+ stage));
+ for (final Throwable t : errors) {
+ e.addSuppressed(t);
}
+ return e;
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
index d9b6277..fd620b5 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
@@ -108,9 +108,9 @@ public class IdleConnectionSweeper implements DestructableComponent {
if (executionTime != null) {
return executionTime;
- } else {
- return Instant.ofEpochMilli(sweeper.scheduledExecutionTime());
}
+
+ return Instant.ofEpochMilli(sweeper.scheduledExecutionTime());
}
/** {@inheritDoc} */
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
index 7fb8098..435ab24 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
@@ -278,9 +278,9 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
sslsock.startHandshake();
verifyHostname(sslsock, host.getHostName(), context);
return sock;
- } else {
- return createLayeredSocket(sock, host.getHostName(), remoteAddress.getPort(), context);
}
+
+ return createLayeredSocket(sock, host.getHostName(), remoteAddress.getPort(), context);
}
// Checkstyle: ParameterNumber ON
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
index a69c369..fa57093 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
@@ -53,9 +53,8 @@ public class AllMatchPredicate<T> implements Predicate<Iterable<T>> {
for (final T input : inputs) {
if (!predicate.test(input)) {
return false;
- } else {
- matchedAll = true;
}
+ matchedAll = true;
}
return matchedAll;
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
index 543d9ed..cb74ff5 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
@@ -74,9 +74,9 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
if (failOnConstraintViolation) {
throw new IllegalArgumentException(input + " does not meet constraint");
- } else {
- return Optional.absent();
}
+
+ return Optional.absent();
}
/** {@inheritDoc} */
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
index 5156f70..7b90ea1 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
@@ -85,9 +85,9 @@ public final class HttpServletSupport {
if (request.getPathInfo() == null) {
return servletPath;
- } else {
- return servletPath + request.getPathInfo();
}
+
+ return servletPath + request.getPathInfo();
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/MediaTypeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/MediaTypeSupport.java
index 4c74ff6..d029828 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/MediaTypeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/MediaTypeSupport.java
@@ -77,18 +77,17 @@ public final class MediaTypeSupport {
}
}
return false;
- } else {
- final MediaType mediaType = MediaType.parse(contentTypeValue).withoutParameters();
- final Set<MediaType> validTypesWithoutParameters = new HashSet<>();
- validTypesWithoutParameters.addAll(Collections2.filter(
- Collections2.transform(validTypes, STRIP_PARAMS::apply),
- Predicates.notNull()));
- return validTypesWithoutParameters.contains(mediaType);
}
- } else {
- return noContentTypeIsValid;
+
+ final MediaType mediaType = MediaType.parse(contentTypeValue).withoutParameters();
+ final Set<MediaType> validTypesWithoutParameters = new HashSet<>();
+ validTypesWithoutParameters.addAll(Collections2.filter(
+ Collections2.transform(validTypes, STRIP_PARAMS::apply),
+ Predicates.notNull()));
+ return validTypesWithoutParameters.contains(mediaType);
}
+ return noContentTypeIsValid;
}
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/StripMediaTypeParametersFunction.java b/src/main/java/net/shibboleth/utilities/java/support/net/StripMediaTypeParametersFunction.java
index 8e8f476..7421761 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/StripMediaTypeParametersFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/StripMediaTypeParametersFunction.java
@@ -30,11 +30,7 @@ public class StripMediaTypeParametersFunction implements Function<MediaType, Med
/** {@inheritDoc} */
@Nullable public MediaType apply(@Nullable final MediaType input) {
- if (input == null) {
- return null;
- } else {
- return input.withoutParameters();
- }
+ return input != null ? input.withoutParameters() : null;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/impl/BasicURLComparator.java b/src/main/java/net/shibboleth/utilities/java/support/net/impl/BasicURLComparator.java
index 141bcda..2292e2c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/impl/BasicURLComparator.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/impl/BasicURLComparator.java
@@ -78,10 +78,9 @@ public class BasicURLComparator implements URIComparator {
if (isCaseInsensitive()) {
return uri1Canon.equalsIgnoreCase(uri2Canon);
- } else {
- return uri1Canon.equals(uri2Canon);
}
+ return uri1Canon.equals(uri2Canon);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
index 38b1580..cf46a61 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
@@ -62,13 +62,14 @@ public final class ObjectSupport {
@Nullable public static <T> T firstNonNull(@Nullable final T ... objects) {
if (objects == null) {
return null;
- } else {
- for (final T obj : objects) {
- if (obj != null) {
- return obj;
- }
+ }
+
+ for (final T obj : objects) {
+ if (obj != null) {
+ return obj;
}
}
+
return null;
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
index bfa2bd2..45c36ce 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
@@ -109,8 +109,8 @@ public final class TimerSupport {
if (additionalData != null) {
return String.format("Timer for %s (%s)", baseName, additionalData);
- } else {
- return String.format("Timer for %s", baseName);
}
+
+ return String.format("Timer for %s", baseName);
}
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
index e126915..a22b877 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
@@ -89,11 +89,11 @@ public class CriterionPredicateRegistry<T> {
log.error("Error instantiating new Predicate instance", e);
throw new ResolverException("Could not create new Predicate instance", e);
}
- } else {
- log.debug("Registry did not locate Predicate implementation registered for Criterion class {}",
- criterion.getClass().getName());
- return null;
}
+
+ log.debug("Registry did not locate Predicate implementation registered for Criterion class {}",
+ criterion.getClass().getName());
+ return null;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
index dbd10ec..004248a 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
@@ -102,9 +102,8 @@ public final class ResolverSupport {
if (predicates == null || predicates.isEmpty()) {
if (onEmptyPredicatesReturnEmpty) {
return Collections.emptySet();
- } else {
- return candidates;
}
+ return candidates;
}
final Predicate<T> predicate;
diff --git a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
index 75fdba9..2f68a2a 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
@@ -176,9 +176,8 @@ public class EvaluableScript {
@Nullable public Object eval(@Nonnull final Bindings scriptBindings) throws ScriptException {
if (compiledScript != null) {
return compiledScript.eval(scriptBindings);
- } else {
- return scriptEngine.eval(script, scriptBindings);
}
+ return scriptEngine.eval(script, scriptBindings);
}
/**
@@ -193,9 +192,8 @@ public class EvaluableScript {
@Nullable public Object eval(@Nonnull final ScriptContext scriptContext) throws ScriptException {
if (compiledScript != null) {
return compiledScript.eval(scriptContext);
- } else {
- return scriptEngine.eval(script, scriptContext);
}
+ return scriptEngine.eval(script, scriptContext);
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
index 1064188..67a6dee 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
@@ -294,9 +294,8 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
synchronized(this) {
if (defaultKey != null) {
return new Pair<>(currentAlias, defaultKey);
- } else {
- throw new KeyException("Passwords not supplied, keystore is locked");
}
+ throw new KeyException("Passwords not supplied, keystore is locked");
}
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/RandomIdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/RandomIdentifierGenerationStrategy.java
index 2f67fcb..102b4c4 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/RandomIdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/RandomIdentifierGenerationStrategy.java
@@ -107,9 +107,8 @@ public class RandomIdentifierGenerationStrategy implements IdentifierGenerationS
try {
if (xmlSafe) {
return "_" + StringUtils.newStringUsAscii(encoder.encode(buf));
- } else {
- return StringUtils.newStringUsAscii(encoder.encode(buf));
}
+ return StringUtils.newStringUsAscii(encoder.encode(buf));
} catch (final EncoderException e) {
throw new RuntimeException(e);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
index f9700f2..071ce25 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
@@ -222,9 +222,8 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
synchronized(this) {
if (defaultKey != null) {
return new Pair<>(currentAlias, defaultKey);
- } else {
- throw new KeyException("Default key unavailable");
}
+ throw new KeyException("Default key unavailable");
}
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/Type4UUIDIdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/Type4UUIDIdentifierGenerationStrategy.java
index 55c9156..d031d3c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/Type4UUIDIdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/Type4UUIDIdentifierGenerationStrategy.java
@@ -38,8 +38,7 @@ public class Type4UUIDIdentifierGenerationStrategy implements IdentifierGenerati
@Nonnull @NotEmpty public String generateIdentifier(final boolean xmlSafe) {
if (xmlSafe) {
return "_" + UUID.randomUUID().toString();
- } else {
- return UUID.randomUUID().toString();
}
+ return UUID.randomUUID().toString();
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
index 946e949..5a6f599 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
@@ -345,10 +345,9 @@ public final class AttributeSupport {
final String[] valueComponents = attributeValue.split(":");
if (valueComponents.length == 1) {
return QNameSupport.constructQName(attribute.lookupNamespaceURI(null), valueComponents[0], null);
- } else {
- return QNameSupport.constructQName(attribute.lookupNamespaceURI(valueComponents[0]), valueComponents[1],
- valueComponents[0]);
}
+ return QNameSupport.constructQName(attribute.lookupNamespaceURI(valueComponents[0]), valueComponents[1],
+ valueComponents[0]);
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java b/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
index 3bea6ed..771533b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
@@ -97,10 +97,9 @@ public class ClasspathResolver implements EntityResolver, LSResourceResolver {
if (resourceIns == null) {
log.trace("Entity was not resolved from classpath, public id ({}), system id({})", publicId, systemId);
return null;
- } else {
- log.trace("Entity resolved from classpath");
- return resourceIns;
}
+ log.trace("Entity resolved from classpath");
+ return resourceIns;
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
index 57830ab..9fb671b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
@@ -361,11 +361,7 @@ public final class ElementSupport {
child = child.getNextSibling();
}
- if (child != null) {
- return (Element) child;
- } else {
- return null;
- }
+ return child != null ? (Element) child : null;
}
/**
@@ -415,11 +411,7 @@ public final class ElementSupport {
sib = sib.getNextSibling();
}
- if (sib != null) {
- return (Element) sib;
- } else {
- return null;
- }
+ return sib != null ? (Element) sib : null;
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
index c3334df..4670048 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
@@ -82,9 +82,8 @@ public final class QNameSupport {
if (trimmedPrefix == null) {
return new QName(StringSupport.trimOrNull(namespaceURI), trimmedLocalName);
- } else {
- return new QName(StringSupport.trimOrNull(namespaceURI), trimmedLocalName, trimmedPrefix);
}
+ return new QName(StringSupport.trimOrNull(namespaceURI), trimmedLocalName, trimmedPrefix);
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java b/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
index be19062..ad44605 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
@@ -87,9 +87,8 @@ public class SimpleNamespaceContext implements NamespaceContext {
final String uri = mappings.get(prefix);
if (uri == null) {
return javax.xml.XMLConstants.NULL_NS_URI;
- } else {
- return uri;
}
+ return uri;
}
/** {@inheritDoc} */
@@ -110,9 +109,8 @@ public class SimpleNamespaceContext implements NamespaceContext {
final String prefix = mappings.inverse().get(namespaceURI);
if (prefix == null) {
return Collections.<String> emptyList().iterator();
- } else {
- return Collections.singletonList(prefix).iterator();
}
+ return Collections.singletonList(prefix).iterator();
}
/**
diff --git a/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java b/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java
index 92a5e9f..a02f3be 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java
@@ -28,24 +28,24 @@ public class LazilyFormattedStringTest {
private final static String FORMAT = "%d--%o++%x";
@Test public void testFormat() {
- Formatter formatter = new Formatter();
- Object value = Integer.valueOf(1234567);
- formatter.format(FORMAT, value, value, value);
- LazilyFormattedString testString = new LazilyFormattedString(FORMAT, value, value, value);
-
- Assert.assertEquals(testString.toString(), formatter.out().toString(),
- "Should be the same result regardless of whether lazily or actively formatted");
- formatter.close();
+ try (final Formatter formatter = new Formatter()) {
+ final Object value = Integer.valueOf(1234567);
+ formatter.format(FORMAT, value, value, value);
+ final LazilyFormattedString testString = new LazilyFormattedString(FORMAT, value, value, value);
+
+ Assert.assertEquals(testString.toString(), formatter.out().toString(),
+ "Should be the same result regardless of whether lazily or actively formatted");
+ }
}
@Test public void testNullFormat() {
- Formatter formatter = new Formatter();
- Object value = Integer.valueOf(78654321);
- formatter.format(FORMAT, null, value, null, value);
- LazilyFormattedString testString = new LazilyFormattedString(FORMAT, null, value, null, value);
-
- Assert.assertEquals(testString.toString(), formatter.out().toString(),
- "Should be the same result regardless of whether lazily or actively formatted");
- formatter.close();
+ try (final Formatter formatter = new Formatter()) {
+ final Object value = Integer.valueOf(78654321);
+ formatter.format(FORMAT, null, value, null, value);
+ final LazilyFormattedString testString = new LazilyFormattedString(FORMAT, null, value, null, value);
+
+ Assert.assertEquals(testString.toString(), formatter.out().toString(),
+ "Should be the same result regardless of whether lazily or actively formatted");
+ }
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/net/shibboleth/utilities/java/support/repository/RepositorySupport.java b/src/test/java/net/shibboleth/utilities/java/support/repository/RepositorySupport.java
index b31062c..5accf35 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/repository/RepositorySupport.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/repository/RepositorySupport.java
@@ -63,9 +63,8 @@ public final class RepositorySupport {
if (https) {
return String.format("https://test.shibboleth.net/git/view/?p=%s.git&a=blob_plain&f=%s&hb=master", repo, path);
- } else {
- return String.format("http://git.shibboleth.net/view/?p=%s.git&a=blob_plain&f=%s&hb=master", repo, path);
}
+ return String.format("http://git.shibboleth.net/view/?p=%s.git&a=blob_plain&f=%s&hb=master", repo, path);
}
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
index e6f7bbe..f99684f 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
@@ -72,16 +72,14 @@ public class ResolverSupportTest {
Set<Foo> resultSet;
//Null candidates
- result = ResolverSupport.getFilteredIterable(null,
- Sets.<Predicate<Foo>>newHashSet(new EvaluableTestFooCriterion(true)),
+ result = ResolverSupport.getFilteredIterable(null, Sets.newHashSet(new EvaluableTestFooCriterion(true)),
false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
Assert.assertEquals(resultSet.size(), 0);
//Empty candidates
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(),
- Sets.<Predicate<Foo>>newHashSet(new EvaluableTestFooCriterion(true)),
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(), Sets.newHashSet(new EvaluableTestFooCriterion(true)),
false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
@@ -90,8 +88,8 @@ public class ResolverSupportTest {
// Single predicate tests
// predicate = true
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- Sets.<Predicate<Foo>>newHashSet(new EvaluableTestFooCriterion(true)),
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2),
+ Sets.newHashSet(new EvaluableTestFooCriterion(true)),
false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
@@ -100,8 +98,8 @@ public class ResolverSupportTest {
Assert.assertTrue(resultSet.contains(foo2));
// predicate = false
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- Sets.<Predicate<Foo>>newHashSet(new EvaluableTestFooCriterion(false)),
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2),
+ Sets.newHashSet(new EvaluableTestFooCriterion(false)),
false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
@@ -110,8 +108,8 @@ public class ResolverSupportTest {
// Multiple predicate tests
// satisfyAny = false, predicates all true
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- Sets.<Predicate<Foo>>newHashSet(new EvaluableTestFooCriterion(true), new EvaluableTestFooCriterion(true)),
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2),
+ Sets.newHashSet(new EvaluableTestFooCriterion(true), new EvaluableTestFooCriterion(true)),
false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
@@ -120,16 +118,16 @@ public class ResolverSupportTest {
Assert.assertTrue(resultSet.contains(foo2));
// satisfyAny = false, predicates true + false
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- Sets.<Predicate<Foo>>newHashSet(new EvaluableTestFooCriterion(true), new EvaluableTestFooCriterion(false)),
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2),
+ Sets.newHashSet(new EvaluableTestFooCriterion(true), new EvaluableTestFooCriterion(false)),
false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
Assert.assertEquals(resultSet.size(), 0);
// satisfyAny = true, predicates true + false
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- Sets.<Predicate<Foo>>newHashSet(new EvaluableTestFooCriterion(true), new EvaluableTestFooCriterion(false)),
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2),
+ Sets.newHashSet(new EvaluableTestFooCriterion(true), new EvaluableTestFooCriterion(false)),
true, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
@@ -140,9 +138,7 @@ public class ResolverSupportTest {
// Empty predicates tests
// onEmptyPredicatesReturnEmpty = false
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- Sets.<Predicate<Foo>>newHashSet(),
- false, false);
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2), Sets.newHashSet(), false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
Assert.assertEquals(resultSet.size(), 2);
@@ -150,9 +146,7 @@ public class ResolverSupportTest {
Assert.assertTrue(resultSet.contains(foo2));
// onEmptyPredicatesReturnEmpty = false, predicates = null
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- null,
- false, false);
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2), null, false, false);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
Assert.assertEquals(resultSet.size(), 2);
@@ -160,17 +154,13 @@ public class ResolverSupportTest {
Assert.assertTrue(resultSet.contains(foo2));
// onEmptyPredicatesReturnEmpty = true
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- Sets.<Predicate<Foo>>newHashSet(),
- false, true);
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2), Sets.newHashSet(), false, true);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
Assert.assertEquals(resultSet.size(), 0);
// onEmptyPredicatesReturnEmpty = true, predicates = null
- result = ResolverSupport.getFilteredIterable(Sets.<Foo>newHashSet(foo1, foo2),
- null,
- false, true);
+ result = ResolverSupport.getFilteredIterable(Sets.newHashSet(foo1, foo2), null, false, true);
Assert.assertNotNull(result);
resultSet = Sets.newHashSet(result);
Assert.assertEquals(resultSet.size(), 0);
diff --git a/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java b/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
index 50dcd21..764c870 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
@@ -85,9 +85,9 @@ public class EvaluableScriptTest {
theFile = File.createTempFile("EvaluableScriptTest", ".js");
- final FileWriter s = new FileWriter(theFile);
- s.write(TEST_SIMPLE_SCRIPT, 0, TEST_SIMPLE_SCRIPT.length());
- s.close();
+ try (final FileWriter s = new FileWriter(theFile)) {
+ s.write(TEST_SIMPLE_SCRIPT, 0, TEST_SIMPLE_SCRIPT.length());
+ }
Assert.assertEquals((new EvaluableScript(SCRIPT_LANGUAGE, theFile)).getScriptLanguage(), SCRIPT_LANGUAGE);
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategyTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategyTest.java
index 575ab13..1940179 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategyTest.java
@@ -67,15 +67,14 @@ public class ScriptedKeyStrategyTest {
@Test(expectedExceptions=ComponentInitializationException.class)
public void testNoScript() throws ComponentInitializationException {
- final ScriptedKeyStrategy strategy = new ScriptedKeyStrategy();
- strategy.initialize();
+ new ScriptedKeyStrategy().initialize();
}
@Test(expectedExceptions=ComponentInitializationException.class)
public void testScriptFailure() throws ComponentInitializationException, ScriptException {
- final ScriptedKeyStrategy strategy = new ScriptedKeyStrategy();
- strategy.setKeyScript(new EvaluableScript("null"));
- strategy.initialize();
+ final ScriptedKeyStrategy estrategy = new ScriptedKeyStrategy();
+ estrategy.setKeyScript(new EvaluableScript("null"));
+ estrategy.initialize();
}
@Test public void testScriptedKeystoreKeyStrategy() throws Exception {
diff --git a/src/test/java/net/shibboleth/utilities/java/support/testing/TestSupport.java b/src/test/java/net/shibboleth/utilities/java/support/testing/TestSupport.java
index 0088991..ee12739 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/testing/TestSupport.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/testing/TestSupport.java
@@ -102,10 +102,9 @@ public class TestSupport {
if (components[0].equals("1")) {
// Handle 1.6, 1.7, 1.8
return Integer.parseInt(components[1]);
- } else {
- // e.g., 9, 9.0.1, 10+43
- return Integer.parseInt(components[0]);
}
+ // e.g., 9, 9.0.1, 10+43
+ return Integer.parseInt(components[0]);
}
/**
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
index 17dbd15..1780bb6 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
@@ -78,10 +78,9 @@ public class SchemaBuilderTest {
validator.validate(workingSource());
boolean thrown = false;
- StreamSource fails = failingSource();
try {
- validator.validate(fails);
- } catch (Exception e) {
+ validator.validate(failingSource());
+ } catch (final Exception e) {
thrown = true;
}
Assert.assertTrue(thrown, "Should fail to validate");
@@ -101,10 +100,9 @@ public class SchemaBuilderTest {
validator.validate(workingSource());
boolean thrown = false;
- StreamSource fails = failingSource();
try {
- validator.validate(fails);
- } catch (Exception e) {
+ validator.validate(failingSource());
+ } catch (final Exception e) {
thrown = true;
}
Assert.assertTrue(thrown, "Should fail to validate");
@@ -124,10 +122,9 @@ public class SchemaBuilderTest {
validator.validate(workingSource());
boolean thrown = false;
- StreamSource fails = failingSource();
try {
- validator.validate(fails);
- } catch (Exception e) {
+ validator.validate(failingSource());
+ } catch (final Exception e) {
thrown = true;
}
Assert.assertTrue(thrown, "Should fail to validate");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list