Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-1341 - Move off of Java8PluginRegistry in favor of Spring Plugin's update one.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-02-07 20:33:44 +01:00
parent af6f55a92c
commit 93b8e68bbf
10 changed files with 29 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DefaultSelfLinkProvider.java
View File

@@ -18,9 +18,9 @@ package org.springframework.data.rest.core.support;
import java.util.List;
import org.springframework.data.mapping.context.PersistentEntities;
import org.springframework.data.rest.core.util.Java8PluginRegistry;
import org.springframework.hateoas.EntityLinks;
import org.springframework.hateoas.Link;
import org.springframework.plugin.core.PluginRegistry;
import org.springframework.util.Assert;
/**
@@ -35,7 +35,7 @@ public class DefaultSelfLinkProvider implements SelfLinkProvider {
private final PersistentEntities entities;
private final EntityLinks entityLinks;
private final Java8PluginRegistry<EntityLookup<?>, Class<?>> lookups;
private final PluginRegistry<EntityLookup<?>, Class<?>> lookups;
/**
* Creates a new {@link DefaultSelfLinkProvider} from the {@link PersistentEntities}, {@link EntityLinks} and
@@ -54,7 +54,7 @@ public class DefaultSelfLinkProvider implements SelfLinkProvider {
this.entities = entities;
this.entityLinks = entityLinks;
this.lookups = Java8PluginRegistry.of(lookups);
this.lookups = PluginRegistry.of(lookups);
}
/*

6
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/UnwrappingRepositoryInvokerFactory.java
View File

@@ -28,7 +28,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.repository.support.RepositoryInvoker;
import org.springframework.data.repository.support.RepositoryInvokerFactory;
import org.springframework.data.rest.core.util.Java8PluginRegistry;
import org.springframework.plugin.core.PluginRegistry;
import org.springframework.util.Assert;
import org.springframework.util.MultiValueMap;
@@ -41,7 +41,7 @@ import org.springframework.util.MultiValueMap;
public class UnwrappingRepositoryInvokerFactory implements RepositoryInvokerFactory {
private final RepositoryInvokerFactory delegate;
private final Java8PluginRegistry<EntityLookup<?>, Class<?>> lookups;
private final PluginRegistry<EntityLookup<?>, Class<?>> lookups;
/**
* @param delegate must not be {@literal null}.
@@ -54,7 +54,7 @@ public class UnwrappingRepositoryInvokerFactory implements RepositoryInvokerFact
Assert.notNull(lookups, "EntityLookups must not be null!");
this.delegate = delegate;
this.lookups = Java8PluginRegistry.of(lookups);
this.lookups = PluginRegistry.of(lookups);
}
/*

5
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/Java8PluginRegistry.java
View File

@@ -21,20 +21,21 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.springframework.plugin.core.OrderAwarePluginRegistry;
import org.springframework.plugin.core.Plugin;
import org.springframework.plugin.core.PluginRegistry;
/**
* @author Oliver Gierke
* @deprecated since 3.2, for removal 3.3.
*/
@Deprecated
@RequiredArgsConstructor
public class Java8PluginRegistry<T extends Plugin<S>, S> {
private final PluginRegistry<T, S> registry;
public static <T extends Plugin<S>, S> Java8PluginRegistry<T, S> of(List<? extends T> plugins) {
return Java8PluginRegistry.of(OrderAwarePluginRegistry.create(plugins));
return Java8PluginRegistry.of(PluginRegistry.of(plugins));
}
public static <T extends Plugin<S>, S> Java8PluginRegistry<T, S> of(PluginRegistry<T, S> plugins) {