> optionalDataStore;
-
- @Mock
- private DataStore dataStore;
-
- @Before
- public void setup() {
- when(dataStoreManager.get(any())).thenReturn(optionalDataStore);
- when(optionalDataStore.orElseThrow(any())).thenReturn(dataStore);
-
- withAnnotation = new WithAnnotation();
- withoutAnnotation = new WithoutAnnotation();
- withFromAnnotation = new WithFromAnnotation();
- withLatestFromAnnotation = new WithLatestFromAnnotation();
- }
-
- @Test
- public void testNoneClusteredModeAllAreAlwaysEnabled() {
- underTest = new DatabaseCheckImplForTest(dataStoreManager, false);
-
- assertTrue(underTest.isAllowedByVersion(withAnnotation.getClass()));
- assertTrue(underTest.isAllowedByVersion(withoutAnnotation.getClass()));
- assertTrue(underTest.isAllowedByVersion(withFromAnnotation.getClass()));
- assertTrue(underTest.isAllowedByVersion(withLatestFromAnnotation.getClass()));
- }
-
- @Test
- public void testClusteredModeIsDeterminedByVersion() {
- underTest = new DatabaseCheckImplForTest(dataStoreManager, true);
-
- assertTrue(underTest.isAllowedByVersion(withAnnotation.getClass()));
- assertFalse(underTest.isAllowedByVersion(withoutAnnotation.getClass()));
- assertTrue(underTest.isAllowedByVersion(withFromAnnotation.getClass()));
- assertFalse(underTest.isAllowedByVersion(withLatestFromAnnotation.getClass()));
- }
-
- private static class DatabaseCheckImplForTest extends DatabaseCheckImpl {
- public DatabaseCheckImplForTest(
- final DataStoreManager dataStoreManager,
- final boolean datastoreClustered)
- {
- super(dataStoreManager, datastoreClustered);
- }
-
- @Override
- MigrationVersion getMigrationVersion(final DataSource dataSource) {
- return MigrationVersion.fromVersion("1.4");
- }
- }
-
- private static class WithoutAnnotation {}
-
- @AvailabilityVersion(from = "1.0")
- private static class WithAnnotation {}
-
- @AvailabilityVersion(from = "1.3")
- private static class WithFromAnnotation {}
-
- @AvailabilityVersion(from = "1.6")
- private static class WithLatestFromAnnotation {}
-
-}
\ No newline at end of file
diff --git a/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/rest/api/SimpleApiRepositoryAdapterTest.java b/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/rest/api/SimpleApiRepositoryAdapterTest.java
index 57bcb79df5..d16378d02c 100644
--- a/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/rest/api/SimpleApiRepositoryAdapterTest.java
+++ b/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/rest/api/SimpleApiRepositoryAdapterTest.java
@@ -31,7 +31,7 @@
import org.sonatype.nexus.repository.Type;
import org.sonatype.nexus.repository.config.Configuration;
import org.sonatype.nexus.repository.config.ConfigurationConstants;
-import org.sonatype.nexus.common.db.DatabaseCheck;
+import org.sonatype.nexus.repository.db.DatabaseCheck;
import org.sonatype.nexus.repository.manager.internal.RepositoryImpl;
import org.sonatype.nexus.repository.rest.api.model.AbstractApiRepository;
import org.sonatype.nexus.repository.rest.api.model.CleanupPolicyAttributes;
diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/RebuildAssetUploadMetadataTaskDescriptor.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/RebuildAssetUploadMetadataTaskDescriptor.java
index e0ea3b84c7..c93d19eb42 100644
--- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/RebuildAssetUploadMetadataTaskDescriptor.java
+++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/RebuildAssetUploadMetadataTaskDescriptor.java
@@ -17,7 +17,6 @@
import javax.inject.Singleton;
import org.sonatype.nexus.common.node.NodeAccess;
-import org.sonatype.nexus.common.upgrade.AvailabilityVersion;
import org.sonatype.nexus.scheduling.TaskDescriptorSupport;
/**
@@ -25,7 +24,6 @@
*
* @since 3.6
*/
-@AvailabilityVersion(from = "1.0")
@Named
@Singleton
public class RebuildAssetUploadMetadataTaskDescriptor
diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/internal/StorageFacetCleanupTaskDescriptor.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/internal/StorageFacetCleanupTaskDescriptor.java
index d22101cc6b..97360d957c 100644
--- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/internal/StorageFacetCleanupTaskDescriptor.java
+++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/internal/StorageFacetCleanupTaskDescriptor.java
@@ -16,13 +16,11 @@
import javax.inject.Named;
import javax.inject.Singleton;
-import org.sonatype.nexus.common.upgrade.AvailabilityVersion;
import org.sonatype.nexus.scheduling.TaskDescriptorSupport;
/**
* @since 3.2.1
*/
-@AvailabilityVersion(from = "1.0")
@Named
@Singleton
public class StorageFacetCleanupTaskDescriptor
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/APIConstants.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/APIConstants.java
index 175d712657..eba5994913 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/APIConstants.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/APIConstants.java
@@ -31,11 +31,4 @@ private APIConstants() {
public static final String BETA_API_PREFIX = "/beta";
public static final String INTERNAL_API_PREFIX = "/internal";
-
- /**
- * Mime type for versionless REST API URLs which indicates that the Content-Type is V1 from the endpoint.
- *
- * @see Swagger 2.0 Mime Types
- */
- public static final String APPLICATION_NEXUS_V1 = "application/vnd.sonatype.nexus.v1+json";
}
diff --git a/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/PostStartupTaskSchedulerImpl.java b/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/PostStartupTaskSchedulerImpl.java
index 0aa7f369da..04cc431fc3 100644
--- a/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/PostStartupTaskSchedulerImpl.java
+++ b/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/PostStartupTaskSchedulerImpl.java
@@ -47,12 +47,7 @@ public PostStartupTaskSchedulerImpl(final TaskScheduler scheduler) {
@Override
public void schedule(final TaskConfiguration configuration) {
- if (this.isStarted()) {
- scheduleTask(configuration);
- }
- else {
- configurations.add(configuration);
- }
+ configurations.add(configuration);
}
@Override
diff --git a/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImpl.java b/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImpl.java
index c94f6bd435..258fa5794d 100644
--- a/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImpl.java
+++ b/components/nexus-scheduling/src/main/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImpl.java
@@ -18,13 +18,13 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import org.sonatype.goodies.common.ComponentSupport;
-import org.sonatype.nexus.common.db.DatabaseCheck;
import org.sonatype.nexus.scheduling.Task;
import org.sonatype.nexus.scheduling.TaskConfiguration;
import org.sonatype.nexus.scheduling.TaskDescriptor;
@@ -43,9 +43,9 @@
/**
* Default {@link TaskFactory} implementation.
- *
+ *
* Resolves {@link TaskDescriptor} components via {@link BeanLocator} singleton components.
- *
+ *
* Resolves {@link Task} components via {@link BeanLocator} lookup by {@link TaskDescriptor#getType()}.
*
* @since 3.0
@@ -58,20 +58,14 @@ public class TaskFactoryImpl
{
private final BeanLocator beanLocator;
- private final DatabaseCheck databaseCheck;
-
/**
* Map of descriptor-id to descriptor instance.
*/
private final Map taskDefinitions = Maps.newConcurrentMap();
@Inject
- public TaskFactoryImpl(
- final BeanLocator beanLocator,
- final DatabaseCheck databaseCheck)
- {
+ public TaskFactoryImpl(final BeanLocator beanLocator) {
this.beanLocator = checkNotNull(beanLocator);
- this.databaseCheck = checkNotNull(databaseCheck);
// watch for TaskDescriptor components
beanLocator.watch(Key.get(TaskDescriptor.class, Named.class), new TaskDescriptorMediator(), this);
@@ -86,9 +80,8 @@ private static class TaskDefinition
private final BeanEntry beanEntry;
- private TaskDefinition(
- final TaskDescriptor descriptor,
- final BeanEntry beanEntry)
+ private TaskDefinition(final TaskDescriptor descriptor,
+ final BeanEntry beanEntry)
{
this.descriptor = checkNotNull(descriptor);
this.beanEntry = checkNotNull(beanEntry);
@@ -138,7 +131,6 @@ void addDescriptor(final TaskDescriptor descriptor) {
entry.getImplementationClass().getName());
return;
}
-
log.debug("Adding task type-id: {} -> {}", typeId, entry.getImplementationClass().getName());
TaskDefinition prevTaskDefinition = taskDefinitions.put(typeId, new TaskDefinition(descriptor, entry));
if (prevTaskDefinition != null) {
@@ -160,9 +152,9 @@ void removeDescriptor(final String typeId) {
}
/**
- * Creates a new instance of Task having provided type-id, by using {@link BeanEntry#getProvider()}, hence new
- * instance is created every time (tasks are enforced to not be singletons, see
- * {@link #addDescriptor(TaskDescriptor)}.
+ * Creates a new instance of Task having provided type-id, by using {@link BeanEntry#getProvider()}, hence
+ * new instance is created every time (tasks are enforced to not be singletons, see {@link
+ * #addDescriptor(TaskDescriptor)}.
*/
@VisibleForTesting
Task newInstance(final String typeId) {
@@ -176,10 +168,7 @@ Task newInstance(final String typeId) {
@Override
public List getDescriptors() {
return Collections.unmodifiableList(
- taskDefinitions.values().stream()
- .map(d -> d.descriptor)
- .filter(d -> databaseCheck.isAllowedByVersion(d.getClass()))
- .collect(Collectors.toList())
+ taskDefinitions.values().stream().map(d -> d.descriptor).collect(Collectors.toList())
);
}
@@ -188,10 +177,6 @@ public List getDescriptors() {
public TaskDescriptor findDescriptor(final String typeId) {
TaskDefinition taskDefinition = taskDefinitions.get(typeId);
if (taskDefinition != null) {
- if (!databaseCheck.isAllowedByVersion(taskDefinition.descriptor.getClass())) {
- return null;
- }
-
return taskDefinition.descriptor;
}
return null;
diff --git a/components/nexus-scheduling/src/test/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImplTest.groovy b/components/nexus-scheduling/src/test/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImplTest.groovy
index 16283a4d64..a2fe7c4091 100644
--- a/components/nexus-scheduling/src/test/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImplTest.groovy
+++ b/components/nexus-scheduling/src/test/java/org/sonatype/nexus/scheduling/internal/TaskFactoryImplTest.groovy
@@ -15,7 +15,6 @@ package org.sonatype.nexus.scheduling.internal
import java.lang.annotation.Annotation
import org.sonatype.goodies.testsupport.TestSupport
-import org.sonatype.nexus.common.db.DatabaseCheck
import org.sonatype.nexus.scheduling.TaskConfiguration
import org.sonatype.nexus.scheduling.TaskInfo
@@ -44,9 +43,6 @@ class TaskFactoryImplTest
@Mock
private TaskInfo taskInfo
- @Mock
- private DatabaseCheck databaseCheck
-
private TaskFactoryImpl underTest
@Before
@@ -55,8 +51,7 @@ class TaskFactoryImplTest
when(simpleTaskBeanEntry.getImplementationClass()).thenReturn(SimpleTask)
when(simpleTaskBeanEntry.getProvider()).thenReturn(Providers.of(new SimpleTask()))
when(beanLocator.locate(any(Key))).thenReturn(Collections.singletonList(simpleTaskBeanEntry))
- when(databaseCheck.isAllowedByVersion(any())).thenReturn(true)
- underTest = new TaskFactoryImpl(beanLocator, databaseCheck)
+ underTest = new TaskFactoryImpl(beanLocator)
}
@Test
diff --git a/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKey.java b/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKey.java
index 4fe0906474..744dcd7ecc 100644
--- a/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKey.java
+++ b/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKey.java
@@ -28,19 +28,4 @@ public interface ApiKey
PrincipalCollection getPrincipals();
OffsetDateTime getCreated();
-
- default String getPrimaryPrincipal() {
- if (getPrincipals() == null) {
- return null;
- }
- return getPrincipals().getPrimaryPrincipal().toString();
- }
-
- void setApiKey(char[] apiKey);
-
- void setDomain(String domain);
-
- void setPrincipals(PrincipalCollection principals);
-
- void setCreated(OffsetDateTime created);
}
diff --git a/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKeyStore.java b/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKeyStore.java
index 53ab475c52..b80e3b1224 100644
--- a/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKeyStore.java
+++ b/components/nexus-security/src/main/java/org/sonatype/nexus/security/authc/apikey/ApiKeyStore.java
@@ -72,11 +72,6 @@ default void persistApiKey(final String domain, final PrincipalCollection princi
*/
Collection browseByCreatedDate(String domain, OffsetDateTime date);
- /**
- * Browse tokens in the domain (paginated)
- */
- Collection browsePaginated(String domain, int page, int pageSize);
-
/**
* Count all the keys for the provided domain
*/
@@ -113,21 +108,4 @@ default void persistApiKey(final String domain, final PrincipalCollection princi
* Remove all expired API-Keys
*/
void deleteApiKeys(OffsetDateTime expiration);
-
- /**
- * Updates an existing API-key.
- */
- void updateApiKey(ApiKey from, ApiKey to);
-
- /**
- * Creates a new {@link ApiKey} instance (default)
- */
- default ApiKey newApiKey(String domain, PrincipalCollection principals, char[] apiKey) {
- return newApiKey(domain, principals, apiKey, OffsetDateTime.now());
- }
-
- /**
- * Creates a new {@link ApiKey} instance
- */
- ApiKey newApiKey(String domain, PrincipalCollection principals, char[] apiKey, OffsetDateTime created);
}
diff --git a/components/nexus-security/src/main/java/org/sonatype/nexus/security/internal/UserManagerImpl.java b/components/nexus-security/src/main/java/org/sonatype/nexus/security/internal/UserManagerImpl.java
index 9332c51337..ab339ced83 100644
--- a/components/nexus-security/src/main/java/org/sonatype/nexus/security/internal/UserManagerImpl.java
+++ b/components/nexus-security/src/main/java/org/sonatype/nexus/security/internal/UserManagerImpl.java
@@ -306,11 +306,6 @@ public Set searchUsers(final UserSearchCriteria criteria) {
return users;
}
- @Override
- public boolean isRealmConfigured() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
private SecuritySystem getSecuritySystem() {
return this.securitySystem;
}
diff --git a/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/ConfiguredUsersUserManager.java b/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/ConfiguredUsersUserManager.java
index d00a6e7941..c3ef057393 100644
--- a/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/ConfiguredUsersUserManager.java
+++ b/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/ConfiguredUsersUserManager.java
@@ -156,9 +156,4 @@ protected boolean matchesCriteria(final String userId,
public String getAuthenticationRealmName() {
return null;
}
-
- @Override
- public boolean isRealmConfigured() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
}
diff --git a/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/UserManager.java b/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/UserManager.java
index 6a30f99788..64265c0d16 100644
--- a/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/UserManager.java
+++ b/components/nexus-security/src/main/java/org/sonatype/nexus/security/user/UserManager.java
@@ -83,9 +83,4 @@ public interface UserManager
* Update a users password.
*/
void changePassword(String userId, String newPassword) throws UserNotFoundException;
-
- /**
- * Returns true if associated realm is configured, false otherwise.
- */
- boolean isRealmConfigured();
}
diff --git a/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManager.java b/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManager.java
index a325611a92..709790a804 100644
--- a/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManager.java
+++ b/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManager.java
@@ -82,9 +82,4 @@ public User getUser(String userId) throws UserNotFoundException {
public User getUser(final String userId, final Set roleIds) throws UserNotFoundException {
return getUser(userId);
}
-
- @Override
- public boolean isRealmConfigured() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
}
diff --git a/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManagerSupport.java b/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManagerSupport.java
index 1533bffa11..2b0be9650d 100644
--- a/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManagerSupport.java
+++ b/components/nexus-security/src/test/java/org/sonatype/nexus/security/user/MockUserManagerSupport.java
@@ -89,9 +89,4 @@ protected Set getUsers() {
public void changePassword(String userId, String newPassword) throws UserNotFoundException {
// empty
}
-
- @Override
- public boolean isRealmConfigured() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
}
diff --git a/components/nexus-ui-plugin/src/frontend/src/interface/ExtJS.js b/components/nexus-ui-plugin/src/frontend/src/interface/ExtJS.js
index 2bc596ebc1..6686201f66 100644
--- a/components/nexus-ui-plugin/src/frontend/src/interface/ExtJS.js
+++ b/components/nexus-ui-plugin/src/frontend/src/interface/ExtJS.js
@@ -232,34 +232,4 @@ export default class {
return value;
}
-
- /**
- * A hook that automatically re-evaluates whenever any state is changed
- * @param getValue - A function to get the value from the state subsystem
- * @returns {unknown}
- */
- static usePermission(getValue, dependencies) {
- const [value, setValue] = useState(getValue());
-
- useEffect(() => {
- function handleChange() {
- const newValue = getValue();
- if (value !== newValue) {
- setValue(newValue);
- }
- }
-
- const permissionsController = Ext.getApplication().getController('Permissions');
- permissionsController.on('changed', handleChange);
-
- const stateController = Ext.getApplication().getController('State');
- stateController.on('userchanged', handleChange);
- return () => {
- permissionsController.un('changed', handleChange);
- stateController.un('userchanged', handleChange);
- }
- }, [value, ...(dependencies ?? [])]);
-
- return value;
- }
}
diff --git a/components/nexus-upgrade/pom.xml b/components/nexus-upgrade/pom.xml
index 191fe4b135..2739ae18ae 100644
--- a/components/nexus-upgrade/pom.xml
+++ b/components/nexus-upgrade/pom.xml
@@ -33,11 +33,6 @@
nexus-common
-