Projects >> ngrinder >>bee964966a4f678b6f298137fd04fba58d505271

Chunk
Conflicting content
	 * @param content
	 * 			file content.
		try {
<<<<<<< HEAD
package org.ngrinder.operation.service;

import java.io.File;
import java.io.IOException;

import org.apache.commons.io.FileUtils;
import org.ngrinder.infra.config.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * System configuration file operation service.
 * 
 * @author Alex Qin
 * @since 3.1
 */
@Service
public class SystemConfigService {

	private static final Logger LOG = LoggerFactory.getLogger(SystemConfigService.class);

	@Autowired
	private Config config;

	/**
	 * Get system configuration file content.
	 * 
	 * @return file content.
	 */
	public String getSystemConfigFile() {
		File sysFile = config.getHome().getSubFile("system.conf");
			return FileUtils.readFileToString(sysFile, "UTF-8");
		} catch (Exception e) {
			LOG.error("Error while reading system configuration file.");
			return null;
		}
	}

	/**
	 * Save content to system configuration file.
	 * 
	 * @param content
	 * 			file content.
	 * @return save successfully or not.
	 */
	public boolean saveSystemConfigFile(String content) {
		File sysFile = config.getHome().getSubFile("system.conf");

		try {
			FileUtils.writeStringToFile(sysFile, content);
		} catch (IOException e) {
			LOG.error("Error while writing system configuration file.");
			return false;
		}
		config.loadSystemProperties(); //refresh the content of systemProperties.
		
		return true;
	}
}
=======
package org.ngrinder.operation.service;

import java.io.File;
import java.io.IOException;

import org.apache.commons.io.FileUtils;
import org.ngrinder.infra.config.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * System configuration file operation service.
 * 
 * @author Alex Qin
 * @since 3.1
 */
@Service
public class SystemConfigService {

	private static final Logger LOG = LoggerFactory.getLogger(SystemConfigService.class);

	@Autowired
	private Config config;

	/**
	 * Get system configuration file content.
	 * 
	 * @return file content.
	 */
	public String getSystemConfigFile() {
		File sysFile = config.getHome().getSubFile("system.conf");
		try {
			return FileUtils.readFileToString(sysFile, "UTF-8");
		} catch (Exception e) {
			LOG.error("Error while reading system configuration file.");
			return null;
		}
	}

	/**
	 * Save content to system configuration file.
	 * 
	 * @return save successfully or not.
	 */
	public boolean saveSystemConfigFile(String content) {
		File sysFile = config.getHome().getSubFile("system.conf");

		try {
			FileUtils.writeStringToFile(sysFile, content);
		} catch (IOException e) {
			LOG.error("Error while writing system configuration file.");
			return false;
		}
		
		return true;
	}
}
>>>>>>> ef41e3c859add76d0f9848881dd51c250c2d07de
Solution content
package org.ngrinder.operation.service;

import java.io.File;
import java.io.IOException;

import org.apache.commons.io.FileUtils;
import org.ngrinder.infra.config.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * System configuration file operation service.
 * 
 * @author Alex Qin
 * @since 3.1
 */
@Service
public class SystemConfigService {

	private static final Logger LOG = LoggerFactory.getLogger(SystemConfigService.class);

	@Autowired
	private Config config;

	/**
	 * Get system configuration file content.
	 * 
	 * @return file content.
	 */
	public String getSystemConfigFile() {
		File sysFile = config.getHome().getSubFile("system.conf");
		try {
			return FileUtils.readFileToString(sysFile, "UTF-8");
		} catch (Exception e) {
			LOG.error("Error while reading system configuration file.");
			return null;
		}
	}

	/**
	 * Save content to system configuration file.
	 * 
	 * @param content
	 * 			file content.
	 * @return save successfully or not.
	 */
	public boolean saveSystemConfigFile(String content) {
		File sysFile = config.getHome().getSubFile("system.conf");

		try {
			FileUtils.writeStringToFile(sysFile, content);
		} catch (IOException e) {
			LOG.error("Error while writing system configuration file.");
			return false;
		}
		config.loadSystemProperties(); //refresh the content of systemProperties.
		
		return true;
	}
}
File
SystemConfigService.java
Developer's decision
Version 1
Kind of conflict
Annotation
Class declaration
Comment
Import
Package declaration