/*
 * Copyright 2010-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.mobile.autoconfigure;

import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.mobile.device.DeviceHandlerMethodArgumentResolver;
import org.springframework.mobile.device.DeviceResolver;
import org.springframework.mobile.device.DeviceResolverHandlerInterceptor;
import org.springframework.mobile.device.annotation.DeviceResolverConfigurer;
import org.springframework.mobile.device.annotation.EnableDeviceResolver;

/**
 * {@link EnableAutoConfiguration Auto-configuration} for Spring Mobile's
 * {@link DeviceResolver}.
 *
 * @author Roy Clarkson
 * @since 2.0
 */
@Configuration
@ConditionalOnClass({DeviceResolverHandlerInterceptor.class,
		DeviceHandlerMethodArgumentResolver.class})
@AutoConfigureAfter(WebMvcAutoConfiguration.class)
@ConditionalOnWebApplication(type = Type.SERVLET)
public class DeviceResolverAutoConfiguration {

	@Configuration
	@ConditionalOnBean(DeviceResolver.class)
	@ConditionalOnWebApplication(type = Type.SERVLET)
	@EnableDeviceResolver
	protected static class DeviceResolverConfigurationAdapter implements DeviceResolverConfigurer {

		private DeviceResolver deviceResolver;

		public DeviceResolverConfigurationAdapter(DeviceResolver deviceResolver) {
			this.deviceResolver = deviceResolver;
		}

		@Override
		public DeviceResolver getDeviceResolver() {
			return this.deviceResolver;
		}
	}

	@Configuration
	@ConditionalOnMissingBean(DeviceResolver.class)
	@ConditionalOnWebApplication(type = Type.SERVLET)
	@EnableDeviceResolver
	protected static class DefaultDeviceResolverConfigurationAdapter {

	}

}

@@ -2201,59 +2201,8 @@
 ss)%0A
-%09@ConditionalOnWebApplication(type = Type.SERVLET)%0A
 %09@En
@@ -2649,59 +2649,8 @@
 ss)%0A
-%09@ConditionalOnWebApplication(type = Type.SERVLET)%0A
 %09@En

Remove redundant conditional Auto-Configuration checks