Projects >> openengsb >>0949227787593872dad00babf0093e1bc2ea6003

Chunk
Conflicting content 
    @Override
    public Object getServiceWithId(String className, String id, long timeout) throws OsgiServiceNotAvailableException {
<<<<<<< HEAD
        Filter filter;
        try {
            filter = makeFilter(className, String.format("(%s=%s)", org.openengsb.core.api.Constants.SERVICE_ID, id));
        } catch (InvalidSyntaxException e) {
            throw new IllegalArgumentException(e);
        }
=======
        Filter filter = makeFilter(className, String.format("(%s=%s)", org.openengsb.core.api.Constants.ID_KEY, id));
>>>>>>> 9828da5346be5f1d76b5082e1cc0a8c55c200d4a
        return getService(filter, timeout);
    }
Solution content 
    @Override
    public Object getServiceWithId(String className, String id, long timeout) throws OsgiServiceNotAvailableException {
        Filter filter = makeFilter(className, String.format("(%s=%s)", org.openengsb.core.api.Constants.ID_KEY, id));
        return getService(filter, timeout);
    }
File
DefaultOsgiUtilsService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
    @SuppressWarnings("unchecked")
    @Override
    public  T getOsgiServiceProxy(final Filter filter, Class targetClass, final long timeout) {
<<<<<<< HEAD
        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[]{ targetClass },
            new InvocationHandler() {
                @Override
                public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                    LOGGER.info("dynamically resolving service for filter : {}", filter);
                    Object service = getService(filter, timeout);
                    return method.invoke(service, args);
                }
            });
    }

    @Override
    @SuppressWarnings("unchecked")
    public  T getOsgiServiceProxy(final String filter, Class targetClass, final long timeout) {
        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[]{ targetClass },
            new InvocationHandler() {
                @Override
                public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                    LOGGER.info("dynamically resolving service for filter : {}", filter);
                    Object service = getService(filter, timeout);
                    return method.invoke(service, args);
                }
            });
=======
        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[] { targetClass },
            new ServiceTrackerInvocationHandler(filter, timeout));
    }

    @Override
    public  T getOsgiServiceProxy(final String filter, Class targetClass, long timeout) {
        return getOsgiServiceProxy(createFilter(filter), targetClass, timeout);
    }

    /**
     * creates a Filter, but wraps the {@link InvalidSyntaxException} into an {@link IllegalArgumentException}
     */
    public static Filter createFilter(String filterString) {
        try {
            return FrameworkUtil.createFilter(filterString);
        } catch (InvalidSyntaxException e) {
            throw new IllegalArgumentException(e);
        }
>>>>>>> 9828da5346be5f1d76b5082e1cc0a8c55c200d4a
    }

    @SuppressWarnings("unchecked")
Solution content 
    @SuppressWarnings("unchecked")
    @Override
    public  T getOsgiServiceProxy(final Filter filter, Class targetClass, final long timeout) {
        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[] { targetClass },
            new ServiceTrackerInvocationHandler(filter, timeout));
    }

    @Override
    public  T getOsgiServiceProxy(final String filter, Class targetClass, long timeout) {
        return getOsgiServiceProxy(createFilter(filter), targetClass, timeout);
    }

    /**
     * creates a Filter, but wraps the {@link InvalidSyntaxException} into an {@link IllegalArgumentException}
     */
    public static Filter createFilter(String filterString) {
        try {
            return FrameworkUtil.createFilter(filterString);
        } catch (InvalidSyntaxException e) {
            throw new IllegalArgumentException(e);
        }
    }

    @SuppressWarnings("unchecked")
File
DefaultOsgiUtilsService.java
Developer's decision
Version 2
Kind of conflict
Annotation
Cast expression
Comment
Method declaration
Method signature
Return statement
Try statement
Chunk
Conflicting content 
    }

    @SuppressWarnings("unchecked")
<<<<<<< HEAD
    public  T getOsgiServiceProxy(final Class targetClass, final long timeout) {
        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[]{ targetClass },
            new InvocationHandler() {
                @Override
                public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                    LOGGER.info("dynamically resolving service for class : {}", targetClass.toString());
                    Object service = getService(targetClass, timeout);
                    try {
                        return method.invoke(service, args);
                    } catch (InvocationTargetException e) {
                        throw e.getCause();
                    }
                }
            });
=======
    @Override
    public  T getOsgiServiceProxy(Class targetClass, long timeout) {
        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[] { targetClass },
            new ServiceTrackerInvocationHandler(targetClass, timeout));
>>>>>>> 9828da5346be5f1d76b5082e1cc0a8c55c200d4a
    }

    @Override
Solution content 
    }

    @SuppressWarnings("unchecked")
    @Override
    public  T getOsgiServiceProxy(Class targetClass, long timeout) {
        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[] { targetClass },
            new ServiceTrackerInvocationHandler(targetClass, timeout));
    }

    @Override
File
DefaultOsgiUtilsService.java
Developer's decision
Version 2
Kind of conflict
Annotation
Cast expression
Method signature
Return statement