You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2017/03/22 15:18:55 UTC
svn commit: r1788119 -
/felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/SchematizingConverterBuilderImpl.java
Author: davidb
Date: Wed Mar 22 15:18:55 2017
New Revision: 1788119
URL: http://svn.apache.org/viewvc?rev=1788119&view=rev
Log:
Felix Schematizer - Fix compilation errors.
Modified:
felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/SchematizingConverterBuilderImpl.java
Modified: felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/SchematizingConverterBuilderImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/SchematizingConverterBuilderImpl.java?rev=1788119&r1=1788118&r2=1788119&view=diff
==============================================================================
--- felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/SchematizingConverterBuilderImpl.java (original)
+++ felix/trunk/converter/schematizer/src/main/java/org/apache/felix/schematizer/impl/SchematizingConverterBuilderImpl.java Wed Mar 22 15:18:55 2017
@@ -18,12 +18,11 @@ package org.apache.felix.schematizer.imp
import java.lang.reflect.Type;
+import org.osgi.util.converter.ConvertFunction;
import org.osgi.util.converter.Converter;
import org.osgi.util.converter.ConverterBuilder;
-import org.osgi.util.converter.Rule;
import org.osgi.util.converter.StandardConverter;
-import org.osgi.util.converter.TypeReference;
-import org.osgi.util.function.Function;
+import org.osgi.util.converter.TargetRule;
public class SchematizingConverterBuilderImpl implements ConverterBuilder {
@@ -32,31 +31,22 @@ public class SchematizingConverterBuilde
@Override
public Converter build()
{
- Converter converter = builder.build();
+ Converter converter = builder.build();
return new SchematizingConverterImpl(converter);
}
- @Override
- public <F, T> ConverterBuilder rule( Rule<F, T> rule )
- {
- return builder.rule(rule);
- }
-
- @Override
- public <F, T> ConverterBuilder rule( Class<F> fromCls, Class<T> toCls, Function<F, T> toFun, Function<T, F> fromFun )
- {
- return builder.rule(fromCls, toCls, toFun, fromFun);
+ public <T> ConverterBuilder rule(Type type, ConvertFunction<T> function) {
+ builder.rule(type, function);
+ return this;
}
- @Override
- public <F, T> ConverterBuilder rule( TypeReference<F> fromRef, TypeReference<T> toRef, Function<F, T> toFun, Function<T, F> fromFun )
- {
- return builder.rule(fromRef, toRef, toFun, fromFun);
+ public <T> ConverterBuilder rule(TargetRule<T> rule) {
+ builder.rule(rule);
+ return this;
}
- @Override
- public <F, T> ConverterBuilder rule( Type fromType, Type toType, Function<F, T> toFun, Function<T, F> fromFun )
- {
- return builder.rule(fromType, toType, toFun, fromFun);
+ public <T> ConverterBuilder rule(ConvertFunction<T> func) {
+ builder.rule(func);
+ return this;
}
}