/*
 * Copyright © 2015-2018 Santer Reply S.p.A.
 *
 * 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 it.reply.orchestrator.service;

import it.reply.orchestrator.dal.entity.Deployment;
import it.reply.orchestrator.dal.repository.DeploymentRepository;
import it.reply.orchestrator.resource.DeploymentResource;
import it.reply.orchestrator.resource.DeploymentResourceAssembler;

import lombok.extern.slf4j.Slf4j;

import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;

@Service
@Slf4j
public class CallbackServiceImpl implements CallbackService {

  private DeploymentRepository deploymentRepository;

  private DeploymentResourceAssembler deploymentResourceAssembler;

  private RestTemplate restTemplate;

  /**
   * Creates a new CallbackServiceImpl.
   * 
   * @param deploymentRepository
   *          the DeploymentRepository to use
   * @param deploymentResourceAssembler
   *          the DeploymentResourceAssembler to use
   * @param restTemplateBuilder
   *          the RestTemplateBuilder to use
   */
  public CallbackServiceImpl(DeploymentRepository deploymentRepository,
      DeploymentResourceAssembler deploymentResourceAssembler,
      RestTemplateBuilder restTemplateBuilder) {
    this.deploymentRepository = deploymentRepository;
    this.deploymentResourceAssembler = deploymentResourceAssembler;
    this.restTemplate = restTemplateBuilder.build();
  }

  @Override
  @Transactional(readOnly = true)
  public boolean doCallback(String deploymentId) {
    Deployment deployment = deploymentRepository.findOne(deploymentId);
    return doCallback(deployment);
  }

  private boolean doCallback(Deployment deployment) {
    if (deployment.getCallback() != null) {
      DeploymentResource deploymentResource = deploymentResourceAssembler.toResource(deployment);
      try {
        restTemplate.postForEntity(deployment.getCallback(), deploymentResource, Object.class);
        return true;
      } catch (HttpStatusCodeException ex) {
        LOG.error("Error executing callback for deployment {}", deployment.getId(), ex);
        return false;
      }
    }
    return false;
  }

}

@@ -1092,99 +1092,29 @@
 ork.
-transaction.annotation.Transactional;%0D%0Aimport org.springframework.web.client.HttpStatusCode
+web.client.RestClient
 Exce
@@ -2131,43 +2131,8 @@
 de%0D%0A
-  @Transactional(readOnly = true)%0D%0A
   pu
@@ -2645,22 +2645,18 @@
 ch (
-HttpStatusCode
+RestClient
 Exce

Fix exceptions during callback causing transaction rollback