archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Refactoring to use gitplex.utils

Browse Source
This commit is contained in:
robin shen 2017-11-01 16:16:45 +08:00
parent d64af55a90
commit 9b28a0ee75
12 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/pom.xml
View File

@ -137,7 +137,7 @@
</dependency>
<dependency>
<groupId>com.gitplex</groupId>
<artifactId>launcher-bootstrap</artifactId>
<artifactId>launcher-loader</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
@ -173,12 +173,6 @@
<groupId>com.gitplex</groupId>
<artifactId>jsymbol</artifactId>
<version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.gitplex</groupId>

7
core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java
View File

@ -20,11 +20,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitplex.launcher.loader.ListenerRegistry;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.event.RefUpdated;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.model.User;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.User;
import com.gitplex.server.persistence.UnitOfWork;
import com.gitplex.utils.StringUtils;
import com.google.common.base.Preconditions;
@ -61,7 +60,7 @@ public class GitPostReceiveCallback extends HttpServlet {
return;
}
List<String> fields = LoaderUtils.splitAndTrim(request.getPathInfo(), "/");
List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");
Preconditions.checkState(fields.size() == 2);
Long projectId = Long.valueOf(fields.get(0));
@ -80,7 +79,7 @@ public class GitPostReceiveCallback extends HttpServlet {
callbackData = StringUtils.reverse(StringUtils.remove(callbackData, '\n'));
fields.clear();
fields.addAll(LoaderUtils.splitAndTrim(callbackData, " "));
fields.addAll(StringUtils.splitAndTrim(callbackData, " "));
unitOfWork.doAsync(new Runnable() {

5
core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
View File

@ -17,7 +17,6 @@ import org.apache.shiro.SecurityUtils;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.Project;
@ -74,7 +73,7 @@ public class GitPreReceiveCallback extends HttpServlet {
return;
}
List<String> fields = LoaderUtils.splitAndTrim(request.getPathInfo(), "/");
List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");
Preconditions.checkState(fields.size() == 2);
SecurityUtils.getSubject().runAs(User.asPrincipal(Long.valueOf(fields.get(1))));
@ -94,7 +93,7 @@ public class GitPreReceiveCallback extends HttpServlet {
*/
String callbackData = new String(baos.toByteArray());
callbackData = StringUtils.reverse(StringUtils.remove(callbackData, '\n'));
fields = LoaderUtils.splitAndTrim(callbackData, " ");
fields = StringUtils.splitAndTrim(callbackData, " ");
int pos = 0;
while (true) {

3
core/src/main/java/com/gitplex/server/git/GitVersion.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import org.apache.commons.lang3.math.NumberUtils;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.utils.StringUtils;
public class GitVersion implements Comparable<GitVersion> {
@ -16,7 +15,7 @@ public class GitVersion implements Comparable<GitVersion> {
private boolean msysgit = false;
public GitVersion(String versionStr) {
for (String each: LoaderUtils.splitAndTrim(versionStr, ".")) {
for (String each: StringUtils.splitAndTrim(versionStr, ".")) {
if (NumberUtils.isDigits(each))
parts.add(Integer.valueOf(each));
else if (each.equals("msysgit"))

3
core/src/main/java/com/gitplex/server/model/Project.java
View File

@ -59,7 +59,6 @@ import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.validator.constraints.NotEmpty;
import com.gitplex.launcher.loader.ListenerRegistry;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.GitPlex;
import com.gitplex.server.event.RefUpdated;
import com.gitplex.server.git.BlameBlock;
@ -659,7 +658,7 @@ public class Project extends AbstractEntity {
String path = null;
String url = null;
for (String line: LoaderUtils.splitAndTrim(content, "\r\n")) {
for (String line: StringUtils.splitAndTrim(content, "\r\n")) {
if (line.startsWith("[") && line.endsWith("]")) {
if (path != null && url != null)
submodules.put(path, url);

4
core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java
View File

@ -41,7 +41,6 @@ import org.hibernate.tool.schema.TargetType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.migration.DatabaseMigrator;
import com.gitplex.server.migration.MigrationHelper;
import com.gitplex.server.migration.VersionedDocument;
@ -51,6 +50,7 @@ import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.util.validation.EntityValidator;
import com.gitplex.utils.BeanUtils;
import com.gitplex.utils.ClassUtils;
import com.gitplex.utils.FileUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
@ -119,7 +119,7 @@ public class DefaultPersistManager implements PersistManager {
protected Metadata buildMetadata() {
MetadataSources metadataSources = new MetadataSources(serviceRegistry);
for (Class<? extends AbstractEntity> each: LoaderUtils.findImplementations(AbstractEntity.class, AbstractEntity.class)) {
for (Class<? extends AbstractEntity> each: ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class)) {
metadataSources.addAnnotatedClass(each);
}

4
web/src/main/java/com/gitplex/server/web/editable/list/ListEditSupport.java
View File

@ -8,7 +8,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.util.editable.EditableUtils;
import com.gitplex.server.util.editable.annotation.ChoiceProvider;
import com.gitplex.server.util.editable.annotation.Editable;
@ -23,6 +22,7 @@ import com.gitplex.server.web.editable.list.concrete.ConcreteListPropertyEditor;
import com.gitplex.server.web.editable.list.concrete.ConcreteListPropertyViewer;
import com.gitplex.server.web.editable.list.polymorphic.PolymorphicListPropertyEditor;
import com.gitplex.server.web.editable.list.polymorphic.PolymorphicListPropertyViewer;
import com.gitplex.utils.ClassUtils;
@SuppressWarnings("serial")
public class ListEditSupport implements EditSupport {
@ -106,7 +106,7 @@ public class ListEditSupport implements EditSupport {
}
};
} else if (LoaderUtils.isConcrete(elementClass)) {
} else if (ClassUtils.isConcrete(elementClass)) {
if (elementClass.getAnnotation(Editable.class) != null) {
return new PropertyContext<List<Serializable>>(propertyDescriptor) {

6
web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyEditor.java
View File

@ -27,7 +27,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.util.editable.EditableUtils;
import com.gitplex.server.web.behavior.sortable.SortBehavior;
import com.gitplex.server.web.behavior.sortable.SortPosition;
@ -35,10 +34,11 @@ import com.gitplex.server.web.editable.BeanDescriptor;
import com.gitplex.server.web.editable.EditorChanged;
import com.gitplex.server.web.editable.ErrorContext;
import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.editable.PathSegment.Property;
import com.gitplex.server.web.editable.PropertyContext;
import com.gitplex.server.web.editable.PropertyDescriptor;
import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.editable.PathSegment.Property;
import com.gitplex.utils.ClassUtils;
@SuppressWarnings("serial")
public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable>> {
@ -62,7 +62,7 @@ public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable
@SuppressWarnings("unchecked")
private List<Serializable> newList() {
if (LoaderUtils.isConcrete(getPropertyDescriptor().getPropertyClass())) {
if (ClassUtils.isConcrete(getPropertyDescriptor().getPropertyClass())) {
try {
return (List<Serializable>) getPropertyDescriptor().getPropertyClass().newInstance();
} catch (InstantiationException | IllegalAccessException e) {

4
web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java
View File

@ -26,7 +26,6 @@ import org.apache.wicket.util.convert.ConversionException;
import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.launcher.loader.ImplementationRegistry;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.util.editable.EditableUtils;
import com.gitplex.server.util.editable.annotation.Horizontal;
import com.gitplex.server.util.editable.annotation.Vertical;
@ -39,6 +38,7 @@ import com.gitplex.server.web.editable.ErrorContext;
import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.editable.PropertyDescriptor;
import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.utils.ClassUtils;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
@ -75,7 +75,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
@SuppressWarnings("unchecked")
private List<Serializable> newList() {
if (LoaderUtils.isConcrete(getPropertyDescriptor().getPropertyClass())) {
if (ClassUtils.isConcrete(getPropertyDescriptor().getPropertyClass())) {
try {
return (List<Serializable>) getPropertyDescriptor().getPropertyClass().newInstance();
} catch (InstantiationException | IllegalAccessException e) {

4
web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicEditSuport.java
View File

@ -6,7 +6,6 @@ import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.util.editable.annotation.Editable;
import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.EditSupport;
@ -15,6 +14,7 @@ import com.gitplex.server.web.editable.PropertyContext;
import com.gitplex.server.web.editable.PropertyDescriptor;
import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.editable.PropertyViewer;
import com.gitplex.utils.ClassUtils;
@SuppressWarnings("serial")
public class PolymorphicEditSuport implements EditSupport {
@ -28,7 +28,7 @@ public class PolymorphicEditSuport implements EditSupport {
public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {
PropertyDescriptor propertyDescriptpr = new PropertyDescriptor(beanClass, propertyName);
Class<?> propertyClass = propertyDescriptpr.getPropertyClass();
if (propertyClass.getAnnotation(Editable.class) != null && !LoaderUtils.isConcrete(propertyClass)) {
if (propertyClass.getAnnotation(Editable.class) != null && !ClassUtils.isConcrete(propertyClass)) {
return new PropertyContext<Serializable>(propertyDescriptpr) {
@Override

6
web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionEditSupport.java
View File

@ -6,7 +6,6 @@ import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.util.editable.annotation.Editable;
import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.BeanDescriptor;
@ -18,13 +17,14 @@ import com.gitplex.server.web.editable.PropertyContext;
import com.gitplex.server.web.editable.PropertyDescriptor;
import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.editable.PropertyViewer;
import com.gitplex.utils.ClassUtils;
@SuppressWarnings("serial")
public class ReflectionEditSupport implements EditSupport {
@Override
public BeanContext<?> getBeanEditContext(Class<?> beanClass, Set<String> excludeProperties) {
if (beanClass.getAnnotation(Editable.class) != null && LoaderUtils.isConcrete(beanClass)) {
if (beanClass.getAnnotation(Editable.class) != null && ClassUtils.isConcrete(beanClass)) {
return new BeanContext<Serializable>(beanClass, excludeProperties) {
@Override
@ -54,7 +54,7 @@ public class ReflectionEditSupport implements EditSupport {
public PropertyContext<?> getPropertyEditContext(Class<?> beanClass, String propertyName) {
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);
Class<?> propertyClass = propertyDescriptor.getPropertyClass();
if (propertyClass.getAnnotation(Editable.class) != null && LoaderUtils.isConcrete(propertyClass)) {
if (propertyClass.getAnnotation(Editable.class) != null && ClassUtils.isConcrete(propertyClass)) {
return new PropertyContext<Serializable>(propertyDescriptor) {
@Override

4
web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundleReferences.java
View File

@ -26,7 +26,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.bundles.ConcatResourceBundleReference;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.utils.ClassUtils;
import com.gitplex.utils.DependencyAware;
import com.gitplex.utils.DependencyUtils;
@ -150,7 +150,7 @@ public class ResourceBundleReferences {
Map<ResourceReference, DependencyAware<ResourceReference>> dependencyMap = new LinkedHashMap<>();
Collection<Class<? extends ResourceReference>> resourceClasses = new ArrayList<>();
for (Class<?> packageScope: packageScopes) {
for (Class<? extends ResourceReference> resourceClass: LoaderUtils.findImplementations(ResourceReference.class, packageScope)) {
for (Class<? extends ResourceReference> resourceClass: ClassUtils.findImplementations(ResourceReference.class, packageScope)) {
if (JavaScriptResourceReference.class.isAssignableFrom(resourceClass)
|| CssResourceReference.class.isAssignableFrom(resourceClass)) {
resourceClasses.add(resourceClass);