@@ -182,10 +182,10 @@ acceptor.<JvmGenericType> accept(jvmTypesBuilder.toClass(catalog, checkGenerator
182182 // Create catalog injections
183183 Iterables .addAll (it .getMembers (), createInjectedField (catalog , checkGeneratorNaming .catalogInstanceName (catalog ), _typeReferenceBuilder .typeRef (catalogClass )));
184184 // Create fields
185- Iterables .addAll (it .getMembers (), ListExtensions .<Member , JvmField > map (catalog .getMembers (), (final Member m ) -> jvmTypesBuilder .toField (m , m .getName (), m .getType (), (final JvmField it1 ) -> {
185+ Iterables .addAll (it .getMembers (), IterableExtensions .< JvmField > filterNull ( ListExtensions .<Member , JvmField > map (catalog .getMembers (), (final Member m ) -> jvmTypesBuilder .toField (m , m .getName (), m .getType (), (final JvmField it1 ) -> {
186186 jvmTypesBuilder .setInitializer (it1 , m .getValue ());
187187 jvmTypesBuilder .addAnnotations (it1 , m .getAnnotations ());
188- })));
188+ })))) ;
189189 // Create catalog name function
190190 it .getMembers ().add (jvmTypesBuilder .toMethod (catalog , "getQualifiedCatalogName" , _typeReferenceBuilder .typeRef (String .class ), (final JvmOperation it1 ) -> {
191191 jvmTypesBuilder .setBody (it1 , (final ITreeAppendable appendable ) -> {
@@ -208,7 +208,7 @@ acceptor.<JvmGenericType> accept(jvmTypesBuilder.toClass(catalog, checkGenerator
208208 EList <Check > checks = catalog .getChecks ();
209209 Iterable <Check > flattenedCatChecks = Iterables .<Check > concat (ListExtensions .<Category , EList <Check >> map (catalog .getCategories (), (final Category cat ) -> cat .getChecks ()));
210210 Iterable <Check > allChecks = Iterables .<Check > concat (checks , flattenedCatChecks );
211- Iterables .addAll (it .getMembers (), Iterables .<JvmMember > concat (IterableExtensions .<Check , Iterable <JvmMember >> map (allChecks , (final Check chk ) -> createCheck (chk ))));
211+ Iterables .addAll (it .getMembers (), IterableExtensions .< JvmMember > filterNull ( Iterables .<JvmMember > concat (IterableExtensions .<Check , Iterable <JvmMember >> map (allChecks , (final Check chk ) -> createCheck (chk ) ))));
212212 // Create methods for stand-alone context implementations
213213 Iterables .addAll (it .getMembers (), IterableExtensions .<JvmOperation > filterNull (ListExtensions .<Implementation , JvmOperation > map (catalog .getImplementations (), (final Implementation impl ) -> createCheckMethod (impl .getContext ()))));
214214 });
0 commit comments