Skip to content

Commit 5497f90

Browse files
committed
Remove references to Iterators.<T>emptyIterator().
Fixes #57.
1 parent cbe6adf commit 5497f90

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/main/java/com/github/fge/jsonschema/core/report/AbstractProcessingReport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package com.github.fge.jsonschema.core.report;
2121

2222
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
23+
import com.google.common.collect.ImmutableSet;
2324
import com.google.common.collect.Iterators;
2425
import com.google.common.collect.Lists;
2526

@@ -183,7 +184,7 @@ protected final void dispatch(final ProcessingMessage message)
183184
@Override
184185
public Iterator<ProcessingMessage> iterator()
185186
{
186-
return Iterators.emptyIterator();
187+
return ImmutableSet.<ProcessingMessage>of().iterator();
187188
}
188189

189190
@Override

src/test/java/com/github/fge/jsonschema/core/keyword/syntax/checkers/SyntaxCheckersTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.github.fge.jsonschema.core.tree.SchemaTree;
4141
import com.github.fge.msgsimple.bundle.MessageBundle;
4242
import com.github.fge.msgsimple.load.MessageBundles;
43-
import com.google.common.collect.Iterators;
43+
import com.google.common.collect.ImmutableSet;
4444
import com.google.common.collect.Lists;
4545
import org.mockito.ArgumentCaptor;
4646
import org.testng.annotations.BeforeMethod;
@@ -189,7 +189,7 @@ public final void invalidTypesAreReportedAsErrors(final JsonNode node)
189189
protected final Iterator<Object[]> getValueTests()
190190
{
191191
if (valueTests.isMissingNode())
192-
return Iterators.emptyIterator();
192+
return ImmutableSet.<Object[]>of().iterator();
193193

194194
final List<Object[]> list = Lists.newArrayList();
195195

@@ -247,7 +247,7 @@ public final void valueTestsSucceed(final JsonNode schema,
247247
protected final Iterator<Object[]> getPointerTests()
248248
{
249249
if (pointerTests.isMissingNode())
250-
return Iterators.emptyIterator();
250+
return ImmutableSet.<Object[]>of().iterator();
251251

252252
final List<Object[]> list = Lists.newArrayList();
253253

src/test/java/com/github/fge/jsonschema/core/processing/ProcessingResultTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.github.fge.jsonschema.core.report.ProcessingReport;
2828
import com.github.fge.msgsimple.bundle.MessageBundle;
2929
import com.github.fge.msgsimple.load.MessageBundles;
30-
import com.google.common.collect.Iterators;
30+
import com.google.common.collect.ImmutableSet;
3131
import com.google.common.collect.Lists;
3232
import org.testng.annotations.BeforeMethod;
3333
import org.testng.annotations.Test;
@@ -143,7 +143,7 @@ public void uncheckedReportCorrectlyReportsException()
143143
when(processor.process(anyReport(), any(In.class)))
144144
.thenThrow(exception);
145145
when(report.iterator())
146-
.thenReturn(Iterators.<ProcessingMessage>emptyIterator());
146+
.thenReturn(ImmutableSet.<ProcessingMessage>of().iterator());
147147

148148
final ProcessingResult<Out> result
149149
= ProcessingResult.uncheckedResult(processor, report, input);

0 commit comments

Comments
 (0)