// Path: inspektr-common/src/main/java/com/github/inspektr/common/web/ClientInfo.java
// public final class ClientInfo {
// 
//     public static ClientInfo EMPTY_CLIENT_INFO = new ClientInfo();
// 	
// 	/** IP Address of the server (local). */
// 	private final String serverIpAddress;
// 	
// 	/** IP Address of the client (Remote) */
// 	private final String clientIpAddress;
// 	
// 	private ClientInfo() {
// 		this((String) null, (String) null);
// 	}
// 	
// 	public ClientInfo(final HttpServletRequest request) {
// 		this(request.getLocalAddr(), request.getRemoteAddr());
// 	}
// 
//     public ClientInfo(final HttpServletRequest request, final String alternateLocation) {
//         this(request.getLocalAddr(), request.getHeader(alternateLocation) != null ? request.getHeader(alternateLocation) : request.getRemoteAddr());
//     }
// 	
// 	public ClientInfo(final String serverIpAddress, final String clientIpAddress) {
// 		this.serverIpAddress = serverIpAddress == null ? "unknown" : serverIpAddress;
// 		this.clientIpAddress = clientIpAddress == null ? "unknown" : clientIpAddress;
// 	}
// 
// 	public String getServerIpAddress() {
// 		return this.serverIpAddress;
// 	}
// 
// 	public String getClientIpAddress() {
// 		return this.clientIpAddress;
// 	}
// }
// 
// Path: inspektr-common/src/main/java/com/github/inspektr/common/web/ClientInfoHolder.java
// public final class ClientInfoHolder {
// 	
// 	private static final ThreadLocal<ClientInfo> clientInfoHolder = new ThreadLocal<ClientInfo>();
// 	
// 	public static void setClientInfo(final ClientInfo clientInfo) {
// 		clientInfoHolder.set(clientInfo);
// 	}
// 	
// 	public static ClientInfo getClientInfo() {
// 		return clientInfoHolder.get();
// 	}
// 	
// 	public static void clear() {
// 		clientInfoHolder.remove();
// 	}
// }


import org.aspectj.lang.JoinPoint;
import com.github.inspektr.common.web.ClientInfo;
import com.github.inspektr.common.web.ClientInfoHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
 * Licensed to Inspektr under one or more contributor license
 * agreements. See the NOTICE file distributed with this work
 * for additional information regarding copyright ownership.
 * Inspektr licenses this file to you 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 com.github.inspektr.common.spi;


/**
 * Default implementation that gets it from the ThreadLocal.
 * 
 * @author Scott Battaglia
 * @version $Revision$ $Date$
 * @since 1.0
 *
 */
public final class DefaultClientInfoResolver implements ClientInfoResolver {
	
	private final Logger log = LoggerFactory.getLogger(getClass());

	public ClientInfo resolveFrom(final JoinPoint joinPoint, final Object retVal) {
// Path: inspektr-common/src/main/java/com/github/inspektr/common/web/ClientInfo.java
// public final class ClientInfo {
// 
//     public static ClientInfo EMPTY_CLIENT_INFO = new ClientInfo();
// 	
// 	/** IP Address of the server (local). */
// 	private final String serverIpAddress;
// 	
// 	/** IP Address of the client (Remote) */
// 	private final String clientIpAddress;
// 	
// 	private ClientInfo() {
// 		this((String) null, (String) null);
// 	}
// 	
// 	public ClientInfo(final HttpServletRequest request) {
// 		this(request.getLocalAddr(), request.getRemoteAddr());
// 	}
// 
//     public ClientInfo(final HttpServletRequest request, final String alternateLocation) {
//         this(request.getLocalAddr(), request.getHeader(alternateLocation) != null ? request.getHeader(alternateLocation) : request.getRemoteAddr());
//     }
// 	
// 	public ClientInfo(final String serverIpAddress, final String clientIpAddress) {
// 		this.serverIpAddress = serverIpAddress == null ? "unknown" : serverIpAddress;
// 		this.clientIpAddress = clientIpAddress == null ? "unknown" : clientIpAddress;
// 	}
// 
// 	public String getServerIpAddress() {
// 		return this.serverIpAddress;
// 	}
// 
// 	public String getClientIpAddress() {
// 		return this.clientIpAddress;
// 	}
// }
// 
// Path: inspektr-common/src/main/java/com/github/inspektr/common/web/ClientInfoHolder.java
// public final class ClientInfoHolder {
// 	
// 	private static final ThreadLocal<ClientInfo> clientInfoHolder = new ThreadLocal<ClientInfo>();
// 	
// 	public static void setClientInfo(final ClientInfo clientInfo) {
// 		clientInfoHolder.set(clientInfo);
// 	}
// 	
// 	public static ClientInfo getClientInfo() {
// 		return clientInfoHolder.get();
// 	}
// 	
// 	public static void clear() {
// 		clientInfoHolder.remove();
// 	}
// }


// Path: inspektr-common/src/main/java/com/github/inspektr/common/spi/DefaultClientInfoResolver.java
import org.aspectj.lang.JoinPoint;
import com.github.inspektr.common.web.ClientInfo;
import com.github.inspektr.common.web.ClientInfoHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * Licensed to Inspektr under one or more contributor license
 * agreements. See the NOTICE file distributed with this work
 * for additional information regarding copyright ownership.
 * Inspektr licenses this file to you 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 com.github.inspektr.common.spi;


/**
 * Default implementation that gets it from the ThreadLocal.
 * 
 * @author Scott Battaglia
 * @version $Revision$ $Date$
 * @since 1.0
 *
 */
public final class DefaultClientInfoResolver implements ClientInfoResolver {
	
	private final Logger log = LoggerFactory.getLogger(getClass());

	public ClientInfo resolveFrom(final JoinPoint joinPoint, final Object retVal) {
		final ClientInfo clientInfo = ClientInfoHolder.getClientInfo();