/*
 * See the NOTICE file distributed with this work for additional
 * information regarding copyright ownership.
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2.1 of
 * the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this software; if not, write to the Free
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
package com.celements.web.plugin.cmd;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xwiki.captcha.CaptchaVerifier;

import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.web.Utils;

public class CaptchaCommand {

  private static Log _LOGGER = LogFactory.getFactory().getInstance(
      CaptchaCommand.class);

  public boolean checkCaptcha(XWikiContext context) {
    String answer = context.getRequest().get("captcha_answer");
    if((answer != null) && (answer.length() > 0)) {
      CaptchaVerifier cv = Utils.getComponent(CaptchaVerifier.class, context.getRequest(
          ).get("captcha_type"));
        try {
          _LOGGER.info("Checking answer for user id '" 
              + cv.getUserId(context.getRequest()) + "'");
          return cv.isAnswerCorrect(context.getRequest().get("captcha_id"), answer);
//        return cv.isAnswerCorrect(cv.getUserId(context.getRequest()), answer);
        } catch (Exception e) {
          _LOGGER.error("Exception while attempting to verify captcha", e);
        }
    }
    return false;
  }

  public String getCaptchaId(XWikiContext context) {
    CaptchaVerifier cv = Utils.getComponent(CaptchaVerifier.class, "image");
  try {
    _LOGGER.info("Captcha user id is '" + cv.getUserId(context.getRequest()) + "'");
    return cv.getUserId(context.getRequest());
  } catch (Exception e) {
    _LOGGER.error("Exception while attempting to verify captcha", e);
  }
    return "";
  }
}
@@ -937,128 +937,54 @@
 ort 
-org.apache.commons.logging.Log;%0Aimport org.apache.commons.logging.LogFactory;%0Aimport org.xwiki.captcha.
+com.celements.web.service.I
 Captcha
-Verifier;%0A
+ServiceRole;
 %0Aimp
@@ -1052,333 +1052,258 @@
 s;%0A%0A
-public class CaptchaCommand %7B%0A%0A  private static Log _LOGGER = LogFactory.getFactory().getInstance(%0A      CaptchaCommand.class);%0A%0A  public boolean checkCaptcha(XWikiContext context) %7B%0A    String answer = context.getRequest().get(%22captcha_answer%22);%0A    if((answer != null) && (answer.length() %3E 0)) %7B%0A      CaptchaVerifier cv =
+/**%0A * @deprecated instead use ICaptchaServiceRole%0A */%0A@Deprecated%0Apublic class CaptchaCommand %7B%0A%0A  /**%0A   * @deprecated instead use ICaptchaServiceRole.checkCaptcha%0A   */%0A  @Deprecated%0A  public boolean checkCaptcha(XWikiContext context) %7B%0A    return
  Uti
@@ -1322,526 +1322,143 @@
 ent(
+I
 Captcha
-Verifier.class, context.getRequest(%0A          ).get(%22captcha_type%22));%0A        try %7B%0A          _LOGGER.info(%22Checking answer for user id '%22 %0A              + cv.getUserId(context.getRequest()) + %22'%22);%0A          return cv.isAnswerCorrect(context.getRequest().get(%22captcha_id%22), answer);%0A//        return cv.isAnswerCorrect(cv.getUserId(context.getRequest()), answer);%0A        %7D catch (Exception e) %7B%0A          _LOGGER.error(%22Exception while attempting to verify captcha%22, e);%0A        %7D%0A    %7D%0A    return false;%0A  %7D%0A
+ServiceRole.class).checkCaptcha();%0A  %7D%0A%0A  /**%0A   * @deprecated instead use ICaptchaServiceRole.getCaptchaId%0A   */%0A  @Deprecated
 %0A  p
@@ -1515,28 +1515,14 @@
     
-CaptchaVerifier cv =
+return
  Uti
@@ -1541,294 +1541,49 @@
 ent(
+I
 Captcha
-Verifier.class, %22image%22);%0A  try %7B%0A    _LOGGER.info(%22Captcha user id is '%22 + cv.getUserId(context.getRequest()) + %22'%22);%0A    return cv.getUserId(context.getRequest());%0A  %7D catch (Exception e) %7B%0A    _LOGGER.error(%22Exception while attempting to verify captcha%22, e);%0A  %7D%0A    return %22%22
+ServiceRole.class).getCaptchaId()
 ;%0A  

add delegation to CaptchaService and mark CaptchaCommand deprecated