Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

cleanup outdated jaxb annotations

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-05-05 18:58:58 +02:00
parent a354822b81
commit beb9ad0d13
16 changed files with 367 additions and 2017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
@@ -31,7 +31,6 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.ConfigurationException;
import sonia.scm.SCMContextProvider;
import sonia.scm.installer.HgInstaller;
import sonia.scm.installer.HgInstallerFactory;
@@ -48,7 +47,6 @@ import sonia.scm.util.IOUtil;
import sonia.scm.util.SystemUtil;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -56,87 +54,47 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.text.MessageFormat;
//~--- JDK imports ------------------------------------------------------------
/**
*
* @author Sebastian Sdorra
*/
@Singleton
@Extension
public class HgRepositoryHandler
extends AbstractSimpleRepositoryHandler<HgConfig>
{
extends AbstractSimpleRepositoryHandler<HgConfig> {
/** Field description */
public static final String PATH_HOOK = ".hook-1.8";
/** Field description */
public static final String RESOURCE_VERSION =
"sonia/scm/version/scm-hg-plugin";
/** Field description */
public static final String RESOURCE_VERSION = "sonia/scm/version/scm-hg-plugin";
public static final String TYPE_DISPLAYNAME = "Mercurial";
/** Field description */
public static final String TYPE_NAME = "hg";
/** Field description */
public static final RepositoryType TYPE = new RepositoryType(TYPE_NAME,
TYPE_DISPLAYNAME,
HgRepositoryServiceProvider.COMMANDS,
HgRepositoryServiceProvider.FEATURES);
TYPE_DISPLAYNAME,
HgRepositoryServiceProvider.COMMANDS,
HgRepositoryServiceProvider.FEATURES);
/** the logger for HgRepositoryHandler */
private static final Logger logger =
LoggerFactory.getLogger(HgRepositoryHandler.class);
private static final Logger logger = LoggerFactory.getLogger(HgRepositoryHandler.class);
/** Field description */
public static final String PATH_HGRC =
".hg".concat(File.separator).concat("hgrc");
public static final String PATH_HGRC = ".hg".concat(File.separator).concat("hgrc");
private static final String CONFIG_SECTION_SCMM = "scmm";
private static final String CONFIG_KEY_REPOSITORY_ID = "repositoryid";
//~--- constructors ---------------------------------------------------------
private final Provider<HgContext> hgContextProvider;
private final HgWorkdirFactory workdirFactory;
private JAXBContext jaxbContext;
@Inject
public HgRepositoryHandler(ConfigurationStoreFactory storeFactory,
Provider<HgContext> hgContextProvider,
RepositoryLocationResolver repositoryLocationResolver,
PluginLoader pluginLoader, HgWorkdirFactory workdirFactory)
{
PluginLoader pluginLoader, HgWorkdirFactory workdirFactory) {
super(storeFactory, repositoryLocationResolver, pluginLoader);
this.hgContextProvider = hgContextProvider;
this.workdirFactory = workdirFactory;
try
{
this.jaxbContext = JAXBContext.newInstance(BrowserResult.class,
BlameResult.class, Changeset.class, ChangesetPagingResult.class,
HgVersion.class);
}
catch (JAXBException ex)
{
throw new ConfigurationException("could not create jaxbcontext", ex);
}
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param autoConfig
*/
public void doAutoConfiguration(HgConfig autoConfig)
{
public void doAutoConfiguration(HgConfig autoConfig) {
HgInstaller installer = HgInstallerFactory.createInstaller();
try
{
if (logger.isDebugEnabled())
{
try {
if (logger.isDebugEnabled()) {
logger.debug("installing mercurial with {}",
installer.getClass().getName());
}
@@ -144,161 +102,85 @@ public class HgRepositoryHandler
installer.install(baseDirectory, autoConfig);
config = autoConfig;
storeConfig();
}
catch (IOException ioe)
{
if (logger.isErrorEnabled())
{
} catch (IOException ioe) {
if (logger.isErrorEnabled()) {
logger.error("Could not write Hg CGI for inital config. "
+ "HgWeb may not function until a new Hg config is set", ioe);
}
}
}
/**
* Method description
*
*
* @param context
*/
@Override
public void init(SCMContextProvider context)
{
public void init(SCMContextProvider context) {
super.init(context);
writePythonScripts(context);
// fix wrong hg.bat from package installation
if (SystemUtil.isWindows())
{
if (SystemUtil.isWindows()) {
HgWindowsPackageFix.fixHgPackage(context, getConfig());
}
}
/**
* Method description
*
*/
@Override
public void loadConfig()
{
public void loadConfig() {
super.loadConfig();
if (config == null)
{
if (config == null) {
doAutoConfiguration(new HgConfig());
}
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
public HgContext getHgContext()
{
public HgContext getHgContext() {
HgContext context = hgContextProvider.get();
if (context == null)
{
if (context == null) {
context = new HgContext();
}
return context;
}
/**
* Method description
*
*
* @return
*/
@Override
public ImportHandler getImportHandler()
{
public ImportHandler getImportHandler() {
return new HgImportHandler(this);
}
/**
* Method description
*
*
* @return
*/
public JAXBContext getJaxbContext()
{
return jaxbContext;
}
/**
* Method description
*
*
* @return
*/
@Override
public RepositoryType getType()
{
public RepositoryType getType() {
return TYPE;
}
/**
* Method description
*
*
* @return
*/
@Override
public String getVersionInformation()
{
public String getVersionInformation() {
String version = getStringFromResource(RESOURCE_VERSION,
DEFAULT_VERSION_INFORMATION);
DEFAULT_VERSION_INFORMATION);
try
{
try {
HgVersion hgVersion = new HgVersionHandler(this, hgContextProvider.get(),
baseDirectory).getVersion();
baseDirectory).getVersion();
if (hgVersion != null)
{
if (logger.isDebugEnabled())
{
if (hgVersion != null) {
if (logger.isDebugEnabled()) {
logger.debug("mercurial/python informations: {}", hgVersion);
}
version = MessageFormat.format(version, hgVersion.getPython(),
hgVersion.getMercurial());
}
else if (logger.isWarnEnabled())
{
} else if (logger.isWarnEnabled()) {
logger.warn("could not retrieve version informations");
}
}
catch (Exception ex)
{
} catch (Exception ex) {
logger.error("could not read version informations", ex);
}
return version;
}
/**
* Method description
*
*
* @param repository
* @param directory
*
* @return
*/
@Override
protected ExtendedCommand buildCreateCommand(Repository repository,
File directory)
{
File directory) {
ExtendedCommand cmd = new ExtendedCommand(config.getHgBinary(), "init",
directory.getAbsolutePath());
directory.getAbsolutePath());
// copy system environment, because of the PATH variable
cmd.setUseSystemEnvironment(true);
@@ -315,13 +197,11 @@ public class HgRepositoryHandler
*
* @param repository
* @param directory
*
* @throws IOException
*/
@Override
protected void postCreate(Repository repository, File directory)
throws IOException
{
throws IOException {
File hgrcFile = new File(directory, PATH_HGRC);
INIConfiguration hgrc = new INIConfiguration();
@@ -336,55 +216,30 @@ public class HgRepositoryHandler
writer.write(hgrc, hgrcFile);
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
@Override
protected Class<HgConfig> getConfigClass()
{
protected Class<HgConfig> getConfigClass() {
return HgConfig.class;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param context
*/
private void writePythonScripts(SCMContextProvider context)
{
private void writePythonScripts(SCMContextProvider context) {
IOUtil.mkdirs(HgPythonScript.getScriptDirectory(context));
for (HgPythonScript script : HgPythonScript.values())
{
if (logger.isDebugEnabled())
{
for (HgPythonScript script : HgPythonScript.values()) {
if (logger.isDebugEnabled()) {
logger.debug("write python script {}", script.getName());
}
InputStream content = null;
OutputStream output = null;
try
{
try {
content = HgRepositoryHandler.class.getResourceAsStream(
script.getResourcePath());
output = new FileOutputStream(script.getFile(context));
IOUtil.copy(content, output);
}
catch (IOException ex)
{
} catch (IOException ex) {
logger.error("could not write script", ex);
}
finally
{
} finally {
IOUtil.close(content);
IOUtil.close(output);
}
@@ -395,13 +250,7 @@ public class HgRepositoryHandler
return workdirFactory;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private final Provider<HgContext> hgContextProvider;
/** Field description */
private JAXBContext jaxbContext;
private final HgWorkdirFactory workdirFactory;
public JAXBContext getJaxbContext() {
return jaxbContext;
}
}

139
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVersion.java
View File

@@ -21,138 +21,19 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
//~--- JDK imports ------------------------------------------------------------
/**
*
* @author Sebastian Sdorra
*/
@XmlRootElement(name = "version")
@XmlAccessorType(XmlAccessType.FIELD)
public class HgVersion
{
/**
* Method description
*
*
* @param obj
*
* @return
*/
@Override
public boolean equals(Object obj)
{
if (obj == null)
{
return false;
}
if (getClass() != obj.getClass())
{
return false;
}
final HgVersion other = (HgVersion) obj;
return Objects.equal(mercurial, other.mercurial)
&& Objects.equal(python, other.python);
}
/**
* Method description
*
*
* @return
*/
@Override
public int hashCode()
{
return Objects.hashCode(mercurial, python);
}
/**
* Method description
*
*
* @return
*/
@Override
public String toString()
{
//J-
return MoreObjects.toStringHelper(this)
.add("mercurial", mercurial)
.add("python", python)
.toString();
//J+
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
public String getMercurial()
{
return mercurial;
}
/**
* Method description
*
*
* @return
*/
public String getPython()
{
return python;
}
//~--- set methods ----------------------------------------------------------
/**
* Method description
*
*
* @param mercurial
*/
public void setMercurial(String mercurial)
{
this.mercurial = mercurial;
}
/**
* Method description
*
*
* @param python
*/
public void setPython(String python)
{
this.python = python;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
@EqualsAndHashCode
@ToString
@Getter
@Setter
public class HgVersion {
private String mercurial;
/** Field description */
private String python;
}

4
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/IncomingOutgoingTestBase.java
View File

@@ -42,7 +42,6 @@ import sonia.scm.repository.HgConfig;
import sonia.scm.repository.HgContext;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.HgTestUtil;
import sonia.scm.repository.RepositoryPathNotFoundException;
import sonia.scm.user.User;
import sonia.scm.user.UserTestData;
import sonia.scm.util.MockUtil;
@@ -66,11 +65,10 @@ public abstract class IncomingOutgoingTestBase extends AbstractTestBase
/**
* Method description
*
*
* @throws IOException
*/
@Before
public void initHgHandler() throws IOException, RepositoryPathNotFoundException {
public void initHgHandler() throws IOException {
HgRepositoryHandler temp = HgTestUtil.createHandler(tempFolder.newFolder());
HgTestUtil.checkForSkip(temp);