Skip to content

Commit 8df4a18

Browse files
safrissafris
committed
Explicit lambda argument types
1 parent bc75b34 commit 8df4a18

File tree

12 files changed

+21
-22
lines changed

12 files changed

+21
-22
lines changed

‎generator/src/main/java/org/jsonx/ArrayModel.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ private void writeElementIdsClause(final AttributeMap attributes, final int[] in
243243
}
244244

245245
private static Member[] parseMembers(final Registry registry, final ArrayModel referrer, final $ArrayMember xsb, final IdentityHashMap<$AnyType<?>,$FieldBinding> xsbToBinding) {
246-
return parseMembers(registry, referrer, xsb, xsbToBinding, Iterators.filter(xsb.elementIterator(), m -> m instanceof $Member), 0);
246+
return parseMembers(registry, referrer, xsb, xsbToBinding, Iterators.filter(xsb.elementIterator(), (final $AnyType<?> m) -> m instanceof $Member), 0);
247247
}
248248

249249
private static Member[] parseMembers(final Registry registry, final ArrayModel referrer, final $ArrayMember xsb, final IdentityHashMap<$AnyType<?>,$FieldBinding> xsbToBinding, final Iterator<? super $Member> iterator, final int depth) {
@@ -362,7 +362,7 @@ private ArrayModel(final Registry registry, final Declarer declarer, final $Arra
362362
private static LinkedHashMap<Integer,Annotation> parseIdToElement(final Annotation[] annotations, final String declaringTypeName) {
363363
final HashMap<Integer,Annotation> idToElement = new HashMap<>();
364364
final StrictDigraph<Integer> digraph = new StrictDigraph<>("Element cannot include itself as a member");
365-
JsdUtil.forEach(annotations, annotation -> {
365+
JsdUtil.forEach(annotations, (final Annotation annotation) -> {
366366
if (annotation instanceof ArrayProperty || annotation instanceof ArrayType || annotation instanceof Retention)
367367
return;
368368

‎generator/src/main/java/org/jsonx/Converter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private static void trapPrintUsage() {
3838
System.exit(1);
3939
}
4040

41-
private static final Settings settings = new Settings.Builder().withNamespacePackage(ns -> "").build();
41+
private static final Settings settings = new Settings.Builder().withNamespacePackage((final String ns) -> "").build();
4242

4343
public static void main(final String[] args) throws IOException {
4444
if (args.length != 1 && args.length != 2)

‎generator/src/main/java/org/jsonx/Member.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
import org.jaxsb.runtime.Attribute;
3131
import org.jaxsb.runtime.Bindings;
32-
import org.jsonx.www.binding_0_5.xL1gluGCXAA.$FieldIdentifier;
3332
import org.jsonx.www.binding_0_5.xL1gluGCXAA.$CodecTypeFieldBinding;
33+
import org.jsonx.www.binding_0_5.xL1gluGCXAA.$FieldIdentifier;
3434
import org.jsonx.www.schema_0_5.xL0gluGCXAA.$Array;
3535
import org.jsonx.www.schema_0_5.xL0gluGCXAA.$Boolean;
3636
import org.jsonx.www.schema_0_5.xL0gluGCXAA.$Documented;
@@ -88,7 +88,7 @@ static Bind.Type getBinding(final Registry registry, final List<? extends $Codec
8888
return getBinding(registry, binding);
8989
}
9090

91-
static final Function<yAA.$AnyType<?>,String> elementXPath = t -> {
91+
static final Function<yAA.$AnyType<?>,String> elementXPath = (final yAA.$AnyType<?> t) -> {
9292
final String name;
9393
if (t instanceof $Array)
9494
name = (($Array)t).getName$().text();

‎generator/src/main/java/org/jsonx/ObjectModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ private LinkedHashMap<String,Property> parseProperties(final $ObjectMember xsb,
367367

368368
private LinkedHashMap<String,Member> parseMembers(final $ObjectMember xsb, final ObjectModel objectModel, final IdentityHashMap<$AnyType<?>,$FieldBinding> xsbToBinding) {
369369
final LinkedHashMap<String,Member> members = new LinkedHashMap<>(); // FIXME: Does this need to be a LinkedHashMap?
370-
final Iterator<? super $Member> iterator = Iterators.filter(xsb.elementIterator(), m -> m instanceof $Member);
370+
final Iterator<? super $Member> iterator = Iterators.filter(xsb.elementIterator(), (final $AnyType<?> m) -> m instanceof $Member);
371371
while (iterator.hasNext()) {
372372
final $Member next = ($Member)iterator.next();
373373
if (next instanceof $Any) {

‎generator/src/main/java/org/jsonx/SchemaElement.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ private static String getName(final $Member obj) {
287287

288288
private static void assertNoCycle(final Schema schema) throws ValidationException {
289289
final StrictRefDigraph<$Member,String> digraph = new StrictRefDigraph<>("Object cannot inherit from itself", SchemaElement::getName);
290-
final Iterator<? super $Member> elementIterator = Iterators.filter(schema.elementIterator(), m -> m instanceof $Member);
290+
final Iterator<? super $Member> elementIterator = Iterators.filter(schema.elementIterator(), (final $AnyType<?> m) -> m instanceof $Member);
291291
while (elementIterator.hasNext()) {
292292
final $Member member = ($Member)elementIterator.next();
293293
if (member instanceof Schema.Object) {
@@ -318,7 +318,7 @@ static SchemaElement parse(final HashMap<String,Registry> namespaceToRegistry, f
318318

319319
private static HashSet<Class<?>> findClasses(final Package pkg, final ClassLoader classLoader, final Predicate<? super Class<?>> filter) throws IOException, PackageNotFoundException {
320320
final HashSet<Class<?>> classes = new HashSet<>();
321-
PackageLoader.getPackageLoader(classLoader).loadPackage(pkg, c -> {
321+
PackageLoader.getPackageLoader(classLoader).loadPackage(pkg, (final Class<?> c) -> {
322322
if ((JxObject.class.isAssignableFrom(c) || c.isAnnotationPresent(ArrayType.class)) && (filter == null || filter.test(c))) {
323323
classes.add(c);
324324
return true;
@@ -391,7 +391,7 @@ private SchemaElement(final HashMap<String,Registry> namespaceToRegistry, final
391391
assertNoCycle(schema);
392392

393393
final IdentityHashMap<$AnyType<?>,$FieldBinding> xsbToBinding = binding == null ? null : initBindingMap(schema, binding);
394-
final Iterator<? super $Member> elementIterator = Iterators.filter(schema.elementIterator(), m -> m instanceof $Member);
394+
final Iterator<? super $Member> elementIterator = Iterators.filter(schema.elementIterator(), (final $AnyType<?> m) -> m instanceof $Member);
395395
while (elementIterator.hasNext()) {
396396
final $Member member = ($Member)elementIterator.next();
397397
if (member instanceof Schema.Array)

‎generator/src/test/java/org/jsonx/ModelTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static void beforeClass() {
7777
.walk(generatedSourcesDir.toPath())
7878
.sorted(Comparator.reverseOrder())
7979
.map(Path::toFile)
80-
.filter(f -> !f.equals(generatedSourcesDir))
80+
.filter((final File f) -> !f.equals(generatedSourcesDir))
8181
.forEach(File::delete);
8282
}
8383
catch (final IOException e) {
@@ -193,7 +193,7 @@ private static Package getPackage(final ClassLoader classLoader, final String pa
193193
}
194194

195195
private static SchemaElement newSchema(final ClassLoader classLoader, final String packageName) throws IOException, PackageNotFoundException {
196-
return new SchemaElement(new HashMap<>(), getPackage(classLoader, packageName), classLoader, c -> c.getClassLoader() == classLoader);
196+
return new SchemaElement(new HashMap<>(), getPackage(classLoader, packageName), classLoader, (final Class<?> c) -> c.getClassLoader() == classLoader);
197197
}
198198

199199
/**

‎generator/src/test/java/org/jsonx/StrictDigraphTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void testStrictDigraph() {
3434

3535
@Test
3636
public void testStrictRefDigraph() {
37-
final StrictRefDigraph<String,String> digraph = new StrictRefDigraph<>("hello", s -> s);
37+
final StrictRefDigraph<String,String> digraph = new StrictRefDigraph<>("hello", (final String s) -> s);
3838
try {
3939
digraph.add("a", "a");
4040
fail("Expected ValidationException");

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,17 @@
143143
<dependency>
144144
<groupId>org.junit.jupiter</groupId>
145145
<artifactId>junit-jupiter</artifactId>
146-
<version>5.10.1</version>
146+
<version>5.11.1</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>org.junit.jupiter</groupId>
150150
<artifactId>junit-jupiter-migrationsupport</artifactId>
151-
<version>5.10.1</version>
151+
<version>5.11.1</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>org.junit.vintage</groupId>
155155
<artifactId>junit-vintage-engine</artifactId>
156-
<version>5.10.1</version>
156+
<version>5.11.1</version>
157157
</dependency>
158158
<dependency>
159159
<groupId>org.mockito</groupId>

‎runtime/src/main/java/org/jsonx/JsdUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
final class JsdUtil {
3939
static final Comparator<String> ATTRIBUTES = Comparators.newFixedOrderComparator("jx:ns", "jx:type", "id", "name", "names", "xsi:type", "abstract", "extends", "lang", "type", "field", "types", "booleans", "numbers", "objects", "strings", "elementIds", "scale", "range", "pattern", "use", "minIterate", "maxIterate", "minOccurs", "maxOccurs", "nullable", "decode", "encode");
4040
private static final char prefix = '_';
41-
private static final Function<Character,String> classSubs = c -> c == null ? "_" : c != '_' ? Integer.toHexString(c) : "__";
41+
private static final Function<Character,String> classSubs = (final Character c) -> c == null ? "_" : c != '_' ? Integer.toHexString(c) : "__";
4242
private static final String[] reservedWords = {"java", "org"}; // FIXME: This does not consider root package names of types declared in <binding> tags
4343

4444
/**
@@ -152,7 +152,7 @@ private static int[] checkElementIds(final int[] elementIds, final Annotation an
152152

153153
static int[] digest(Annotation[] annotations, final String declarerName, final IdToElement idToElement) {
154154
idToElement.putAll(annotations);
155-
final int[] elementIds = (int[])JsdUtil.forEach(annotations, annotation -> {
155+
final int[] elementIds = (int[])JsdUtil.forEach(annotations, (final Annotation annotation) -> {
156156
if (annotation instanceof ArrayProperty) {
157157
final ArrayProperty arrayProperty = (ArrayProperty)annotation;
158158
idToElement.setMinIterate(arrayProperty.minIterate());

‎runtime/src/test/java/org/jsonx/ArrayCodecTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private static void test(final Class<? extends Annotation> annotationType, final
144144
private static void testEncode(final Annotation[] annotations, final Class<? extends Annotation> annotationType, final List<Object> members, final String expected) throws IOException {
145145
final Relations relations = new Relations();
146146
final Error error = ArrayValidator.encode(annotationType, members, relations, true, null);
147-
final Relations flatRelations = CollectionUtil.flatten(relations, new Relations(), m -> m.member instanceof Relations ? (Relations)m.member : null, true);
147+
final Relations flatRelations = CollectionUtil.flatten(relations, new Relations(), (final Relation r) -> r.member instanceof Relations ? (Relations)r.member : null, true);
148148
final String errorString = error == null ? null : error.toString();
149149
if (expected != null && errorString != null && !expected.equals(errorString) && logger.isErrorEnabled()) {
150150
String msg = "\"" + Strings.escapeForJava(errorString) + "\"";

‎sample/invoice/src/main/resources/invoice.jsbx

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
xmlns="http://www.jsonx.org/binding-0.5.xsd"
1919
xmlns:xi="http://www.w3.org/2001/XInclude"
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://www.jsonx.org/binding-0.5.xsd http://www.jsonx.org/binding.xsd"
22-
targetNamespace="">
21+
xsi:schemaLocation="http://www.jsonx.org/binding-0.5.xsd http://www.jsonx.org/binding.xsd">
2322

2423
<schema
2524
xmlns="http://www.jsonx.org/schema-0.5.xsd"

‎validator/src/main/java/org/jsonx/Validator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static void main(final String[] args) throws CompilationException, IOExce
7979
@SuppressWarnings("unchecked")
8080
static int validate(final String[] args) throws CompilationException, IOException, PackageNotFoundException {
8181
final String pkg = "jsonx";
82-
final SchemaElement[] schemas = Generator.parse(new Settings.Builder().withNamespacePackage(t -> pkg + "._" + Integer.toHexString(t.hashCode())).build(), URLs.fromStringPath(args[0]));
82+
final SchemaElement[] schemas = Generator.parse(new Settings.Builder().withNamespacePackage((final String s) -> pkg + "._" + Integer.toHexString(s.hashCode())).build(), URLs.fromStringPath(args[0]));
8383
final InMemoryCompiler compiler = new InMemoryCompiler();
8484
for (final SchemaElement schema : schemas) { // [A]
8585
final Map<String,String> source = schema.toSource();
@@ -91,7 +91,7 @@ static int validate(final String[] args) throws CompilationException, IOExceptio
9191

9292
final HashSet<Class<? extends JxObject>> objectClasses = new HashSet<>();
9393
final HashSet<Class<? extends Annotation>> arrayClasses = new HashSet<>();
94-
PackageLoader.getPackageLoader(classLoader).loadPackage(pkg, cls -> {
94+
PackageLoader.getPackageLoader(classLoader).loadPackage(pkg, (final Class<?> cls) -> {
9595
if (cls.getDeclaringClass() == null) {
9696
if (Annotation.class.isAssignableFrom(cls))
9797
arrayClasses.add((Class<? extends Annotation>)cls);

0 commit comments

Comments
 (0)