mirror of
				https://github.com/scm-manager/scm-manager.git
				synced 2025-11-03 20:15:52 +01:00 
			
		
		
		
	move EdisonHalAppender to scm-core because we need it for plugins
This commit is contained in:
		@@ -22,22 +22,23 @@
 | 
				
			|||||||
 * SOFTWARE.
 | 
					 * SOFTWARE.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
package sonia.scm.api.v2.resources;
 | 
					package sonia.scm.web;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import de.otto.edison.hal.Embedded;
 | 
					import de.otto.edison.hal.Embedded;
 | 
				
			||||||
import de.otto.edison.hal.HalRepresentation;
 | 
					import de.otto.edison.hal.HalRepresentation;
 | 
				
			||||||
import de.otto.edison.hal.Link;
 | 
					import de.otto.edison.hal.Link;
 | 
				
			||||||
import de.otto.edison.hal.Links;
 | 
					import de.otto.edison.hal.Links;
 | 
				
			||||||
 | 
					import sonia.scm.api.v2.resources.HalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class EdisonHalAppender implements HalAppender {
 | 
					public class EdisonHalAppender implements HalAppender {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  private final Links.Builder linkBuilder;
 | 
					  private final Links.Builder linkBuilder;
 | 
				
			||||||
  private final Embedded.Builder embeddedBuilder;
 | 
					  private final Embedded.Builder embeddedBuilder;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  EdisonHalAppender(Links.Builder linkBuilder, Embedded.Builder embeddedBuilder) {
 | 
					  public EdisonHalAppender(Links.Builder linkBuilder, Embedded.Builder embeddedBuilder) {
 | 
				
			||||||
    this.linkBuilder = linkBuilder;
 | 
					    this.linkBuilder = linkBuilder;
 | 
				
			||||||
    this.embeddedBuilder = embeddedBuilder;
 | 
					    this.embeddedBuilder = embeddedBuilder;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
@@ -22,7 +22,7 @@
 | 
				
			|||||||
 * SOFTWARE.
 | 
					 * SOFTWARE.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
package sonia.scm.api.v2.resources;
 | 
					package sonia.scm.web;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import de.otto.edison.hal.Embedded;
 | 
					import de.otto.edison.hal.Embedded;
 | 
				
			||||||
import de.otto.edison.hal.HalRepresentation;
 | 
					import de.otto.edison.hal.HalRepresentation;
 | 
				
			||||||
@@ -30,6 +30,7 @@ import de.otto.edison.hal.Link;
 | 
				
			|||||||
import de.otto.edison.hal.Links;
 | 
					import de.otto.edison.hal.Links;
 | 
				
			||||||
import org.junit.jupiter.api.BeforeEach;
 | 
					import org.junit.jupiter.api.BeforeEach;
 | 
				
			||||||
import org.junit.jupiter.api.Test;
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -32,6 +32,7 @@ import org.mapstruct.Mapping;
 | 
				
			|||||||
import org.mapstruct.ObjectFactory;
 | 
					import org.mapstruct.ObjectFactory;
 | 
				
			||||||
import sonia.scm.repository.Branch;
 | 
					import sonia.scm.repository.Branch;
 | 
				
			||||||
import sonia.scm.repository.NamespaceAndName;
 | 
					import sonia.scm.repository.NamespaceAndName;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,22 +24,17 @@
 | 
				
			|||||||
    
 | 
					    
 | 
				
			||||||
package sonia.scm.api.v2.resources;
 | 
					package sonia.scm.api.v2.resources;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.google.common.annotations.VisibleForTesting;
 | 
					 | 
				
			||||||
import de.otto.edison.hal.Embedded;
 | 
					import de.otto.edison.hal.Embedded;
 | 
				
			||||||
import de.otto.edison.hal.Links;
 | 
					import de.otto.edison.hal.Links;
 | 
				
			||||||
import org.mapstruct.Context;
 | 
					import org.mapstruct.Context;
 | 
				
			||||||
import org.mapstruct.Mapper;
 | 
					import org.mapstruct.Mapper;
 | 
				
			||||||
import org.mapstruct.Mapping;
 | 
					import org.mapstruct.Mapping;
 | 
				
			||||||
import org.mapstruct.ObjectFactory;
 | 
					 | 
				
			||||||
import org.mapstruct.Qualifier;
 | 
					import org.mapstruct.Qualifier;
 | 
				
			||||||
import sonia.scm.repository.BrowserResult;
 | 
					import sonia.scm.repository.BrowserResult;
 | 
				
			||||||
import sonia.scm.repository.FileObject;
 | 
					import sonia.scm.repository.FileObject;
 | 
				
			||||||
import sonia.scm.repository.NamespaceAndName;
 | 
					import sonia.scm.repository.NamespaceAndName;
 | 
				
			||||||
import sonia.scm.repository.SubRepository;
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
import sonia.scm.repository.spi.BrowseCommand;
 | 
					 | 
				
			||||||
import sonia.scm.repository.spi.BrowseCommandRequest;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					 | 
				
			||||||
import java.lang.annotation.ElementType;
 | 
					import java.lang.annotation.ElementType;
 | 
				
			||||||
import java.lang.annotation.Retention;
 | 
					import java.lang.annotation.Retention;
 | 
				
			||||||
import java.lang.annotation.RetentionPolicy;
 | 
					import java.lang.annotation.RetentionPolicy;
 | 
				
			||||||
@@ -48,9 +43,6 @@ import java.time.Instant;
 | 
				
			|||||||
import java.util.Optional;
 | 
					import java.util.Optional;
 | 
				
			||||||
import java.util.OptionalLong;
 | 
					import java.util.OptionalLong;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import static de.otto.edison.hal.Embedded.embeddedBuilder;
 | 
					 | 
				
			||||||
import static de.otto.edison.hal.Link.link;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@Mapper
 | 
					@Mapper
 | 
				
			||||||
public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectDtoMapper {
 | 
					public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectDtoMapper {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,6 +37,7 @@ import sonia.scm.repository.Tag;
 | 
				
			|||||||
import sonia.scm.repository.api.Command;
 | 
					import sonia.scm.repository.api.Command;
 | 
				
			||||||
import sonia.scm.repository.api.RepositoryService;
 | 
					import sonia.scm.repository.api.RepositoryService;
 | 
				
			||||||
import sonia.scm.repository.api.RepositoryServiceFactory;
 | 
					import sonia.scm.repository.api.RepositoryServiceFactory;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,6 +31,7 @@ import org.mapstruct.ObjectFactory;
 | 
				
			|||||||
import sonia.scm.group.Group;
 | 
					import sonia.scm.group.Group;
 | 
				
			||||||
import sonia.scm.group.GroupPermissions;
 | 
					import sonia.scm.group.GroupPermissions;
 | 
				
			||||||
import sonia.scm.security.PermissionPermissions;
 | 
					import sonia.scm.security.PermissionPermissions;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,6 +38,7 @@ import sonia.scm.plugin.PluginPermissions;
 | 
				
			|||||||
import sonia.scm.security.Authentications;
 | 
					import sonia.scm.security.Authentications;
 | 
				
			||||||
import sonia.scm.security.PermissionPermissions;
 | 
					import sonia.scm.security.PermissionPermissions;
 | 
				
			||||||
import sonia.scm.user.UserPermissions;
 | 
					import sonia.scm.user.UserPermissions;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,6 +34,7 @@ import sonia.scm.security.Authentications;
 | 
				
			|||||||
import sonia.scm.user.User;
 | 
					import sonia.scm.user.User;
 | 
				
			||||||
import sonia.scm.user.UserManager;
 | 
					import sonia.scm.user.UserManager;
 | 
				
			||||||
import sonia.scm.user.UserPermissions;
 | 
					import sonia.scm.user.UserPermissions;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,6 +30,7 @@ import org.mapstruct.Mapper;
 | 
				
			|||||||
import org.mapstruct.ObjectFactory;
 | 
					import org.mapstruct.ObjectFactory;
 | 
				
			||||||
import sonia.scm.repository.RepositoryRole;
 | 
					import sonia.scm.repository.RepositoryRole;
 | 
				
			||||||
import sonia.scm.repository.RepositoryRolePermissions;
 | 
					import sonia.scm.repository.RepositoryRolePermissions;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,6 +38,7 @@ import sonia.scm.repository.api.Command;
 | 
				
			|||||||
import sonia.scm.repository.api.RepositoryService;
 | 
					import sonia.scm.repository.api.RepositoryService;
 | 
				
			||||||
import sonia.scm.repository.api.RepositoryServiceFactory;
 | 
					import sonia.scm.repository.api.RepositoryServiceFactory;
 | 
				
			||||||
import sonia.scm.repository.api.ScmProtocol;
 | 
					import sonia.scm.repository.api.ScmProtocol;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
import sonia.scm.web.api.RepositoryToHalMapper;
 | 
					import sonia.scm.web.api.RepositoryToHalMapper;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,6 +32,7 @@ import org.mapstruct.Mapping;
 | 
				
			|||||||
import org.mapstruct.ObjectFactory;
 | 
					import org.mapstruct.ObjectFactory;
 | 
				
			||||||
import sonia.scm.repository.NamespaceAndName;
 | 
					import sonia.scm.repository.NamespaceAndName;
 | 
				
			||||||
import sonia.scm.repository.Tag;
 | 
					import sonia.scm.repository.Tag;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,6 +33,7 @@ import sonia.scm.security.PermissionPermissions;
 | 
				
			|||||||
import sonia.scm.user.User;
 | 
					import sonia.scm.user.User;
 | 
				
			||||||
import sonia.scm.user.UserManager;
 | 
					import sonia.scm.user.UserManager;
 | 
				
			||||||
import sonia.scm.user.UserPermissions;
 | 
					import sonia.scm.user.UserPermissions;
 | 
				
			||||||
 | 
					import sonia.scm.web.EdisonHalAppender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.inject.Inject;
 | 
					import javax.inject.Inject;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user