()
+ {
+ {
+ add(new LoggingOverridesData("logger-name", LoggerLevel.DEBUG.toString()));
+ }
+ };
when(store.readRecords()).thenReturn(data);
DatastoreLoggerOverrides overrides = new DatastoreLoggerOverrides(
@@ -190,15 +193,15 @@ public void testLoggerOverridesEventProcessed() {
eventManager.post(changeEvent);
LoggerContext context = LogbackLogManager.loggerContext();
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger(testName).getLevel(), is(Level.toLevel(testLevel))));
+ await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(context.getLogger(testName).getLevel(), is(Level.toLevel(testLevel))));
LoggerOverridesEvent resetEvent = new LoggerOverridesEvent(testName, null, Action.RESET);
resetEvent.setRemoteNodeId("nodeId");
eventManager.post(resetEvent);
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger(testName).getLevel(), is(nullValue())));
+ await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(context.getLogger(testName).getLevel(), is(nullValue())));
}
@Test
@@ -214,16 +217,14 @@ public void testResetRootLoggerEventProcessed() {
changeEvent.setRemoteNodeId("nodeId");
eventManager.post(changeEvent);
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger("ROOT").getLevel(), is(Level.DEBUG)));
+ await().atMost(10, SECONDS).untilAsserted(() -> assertThat(context.getLogger("ROOT").getLevel(), is(Level.DEBUG)));
// reset ROOT log level back to INFO
LoggerOverridesEvent resetEvent = new LoggerOverridesEvent("ROOT", null, Action.RESET);
resetEvent.setRemoteNodeId("nodeId");
eventManager.post(resetEvent);
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger("ROOT").getLevel(), is(Level.INFO)));
+ await().atMost(10, SECONDS).untilAsserted(() -> assertThat(context.getLogger("ROOT").getLevel(), is(Level.INFO)));
}
@Test
@@ -243,20 +244,20 @@ public void testResetAllLoggersEventProcessed() {
eventManager.post(changeEvent2);
// check that loggers were set.
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger("org.bar").getLevel(), is(Level.TRACE)));
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger("org.foo").getLevel(), is(Level.DEBUG)));
+ await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(context.getLogger("org.bar").getLevel(), is(Level.TRACE)));
+ await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(context.getLogger("org.foo").getLevel(), is(Level.DEBUG)));
// reset all loggers
LoggerOverridesEvent resetEvent = new LoggerOverridesEvent(null, null, Action.RESET_ALL);
resetEvent.setRemoteNodeId("nodeId");
eventManager.post(resetEvent);
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger("org.bar").getLevel(), is(nullValue())));
- await().atMost(10, SECONDS).untilAsserted(() ->
- assertThat(context.getLogger("org.foo").getLevel(), is(nullValue())));
+ await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(context.getLogger("org.bar").getLevel(), is(nullValue())));
+ await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(context.getLogger("org.foo").getLevel(), is(nullValue())));
}
@Test
diff --git a/components/nexus-blobstore-api/pom.xml b/components/nexus-blobstore-api/pom.xml
index 0a26a1e426..5e80912bd1 100644
--- a/components/nexus-blobstore-api/pom.xml
+++ b/components/nexus-blobstore-api/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-blobstore-api
diff --git a/components/nexus-blobstore-api/src/main/java/org/sonatype/nexus/blobstore/api/BlobStore.java b/components/nexus-blobstore-api/src/main/java/org/sonatype/nexus/blobstore/api/BlobStore.java
index ddcc466d66..cc2ef17465 100644
--- a/components/nexus-blobstore-api/src/main/java/org/sonatype/nexus/blobstore/api/BlobStore.java
+++ b/components/nexus-blobstore-api/src/main/java/org/sonatype/nexus/blobstore/api/BlobStore.java
@@ -21,7 +21,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.stream.Stream;
-
import javax.annotation.Nullable;
import org.sonatype.goodies.lifecycle.Lifecycle;
@@ -34,7 +33,7 @@
/**
* A generic storage bin for binary objects of all sizes.
- *
+ *
* In general, most methods can throw {@link BlobStoreException} for conditions such as network connectivity problems,
* or file IO issues, blob store misconfiguration, or internal corruption.
*
@@ -77,6 +76,7 @@ public interface BlobStore
/**
* Header whose presence indicates a temporary blob (may be handled differently by the underlying implementation).
+ *
* @since 3.1
*/
String TEMPORARY_BLOB_HEADER = "BlobStore.temporary-blob";
@@ -86,16 +86,16 @@ public interface BlobStore
* {@link BlobId} reflecting a path like structure. If the create methods in this class are called with a header with
* this key and a value of "true", the blob will be stored in the blob store using a direct file system path, using
* {@link #BLOB_NAME_HEADER} header for the tail.
- *
+ *
* For example, if the {@link #BLOB_NAME_HEADER} contains a value like "path/to/index.html", the blob will be stored
- * on disk within the blob store at a path that terminates in "path/to/index.html.bytes". Note: direct-path
- * blobs only use the unix-style path separator ('/'), even if the underlying filesystem is not.
- *
+ * on disk within the blob store at a path that terminates in "path/to/index.html.bytes". Note: direct-path blobs only
+ * use the unix-style path separator ('/'), even if the underlying filesystem is not.
+ *
* Use this feature for Blobs that:
*
*
- * - will not or cannot have a database table mapping generated {@link BlobId} to paths
- * - can be overwritten on "disk" without side effects
+ * - will not or cannot have a database table mapping generated {@link BlobId} to paths
+ * - can be overwritten on "disk" without side effects
*
*
* @since 3.8
@@ -104,7 +104,7 @@ public interface BlobStore
/**
* An associated repository name for disaster recovery purposes (which isn't required to be strictly unique)
- *
+ *
* (uses 'Bucket' prefix for legacy compatibility reasons)
*
* @since 3.25
@@ -118,11 +118,11 @@ public interface BlobStore
*
{@link #BLOB_NAME_HEADER}
* {@link #CREATED_BY_HEADER}
*
- *
+ *
* Note: if headers contains an entry with key {@link #DIRECT_PATH_BLOB_HEADER} and value true, and the
* {@link #BLOB_NAME_HEADER} matches a direct-path blob that already exists, the blob will be overwritten.
*
- * @throws BlobStoreException (or a subclass) if the input stream can't be read correctly
+ * @throws BlobStoreException (or a subclass) if the input stream can't be read correctly
* @throws IllegalArgumentException if mandatory headers are missing
*/
Blob create(InputStream blobData, Map headers);
@@ -135,9 +135,9 @@ public interface BlobStore
Blob create(InputStream blobData, Map headers, @Nullable BlobId blobId);
/**
- * Imports a blob by creating a hard link, throwing {@link BlobStoreException} if that's not supported
- * from the source file's location.
- *
+ * Imports a blob by creating a hard link, throwing {@link BlobStoreException} if that's not supported from the source
+ * file's location.
+ *
* Otherwise similar to {@link #create(InputStream, Map)} with the difference that a known file size and sha1 are
* already provided.
*
@@ -148,25 +148,25 @@ public interface BlobStore
/**
* Creates the new blob attributes
*
- * @param blobId the blob id
- * @param headers the headers of the blob, {@see BlobStore}
+ * @param blobId the blob id
+ * @param headers the headers of the blob, {@see BlobStore}
* @param blobMetrics blob metrics
*/
- default void createBlobAttributes(BlobId blobId, Map headers, BlobMetrics blobMetrics) { }
-
+ default void createBlobAttributes(BlobId blobId, Map headers, BlobMetrics blobMetrics) {
+ }
/**
* Creates the new blob attributes instance
*
- * @param blobId the blob id
- * @param headers the headers of the blob, {@see BlobStore}
+ * @param blobId the blob id
+ * @param headers the headers of the blob, {@see BlobStore}
* @param metrics blob metrics
*/
BlobAttributes createBlobAttributesInstance(BlobId blobId, Map headers, BlobMetrics metrics);
/**
- * Duplicates a blob within the blob store by copying the temp blob but with the provided headers. The blob must be
- * in this blob store; moving blobs between blob stores is not supported.
+ * Duplicates a blob within the blob store by copying the temp blob but with the provided headers. The blob must be in
+ * this blob store; moving blobs between blob stores is not supported.
*
* @since 3.1
*/
@@ -182,23 +182,23 @@ default Blob makeBlobPermanent(final BlobId blobId, final Map he
}
/**
- * Returns the corresponding {@link Blob}, or {@code null} if the blob does not exist or has been {@link #delete
- * deleted}.
+ * Returns the corresponding {@link Blob}, or {@code null} if the blob does not exist or has been
+ * {@link #delete deleted}.
*/
@Nullable
Blob get(BlobId blobId);
/**
- * Returns the corresponding {@link Blob}, or {@code null} if the blob does not exist, or has been {@link #delete
- * deleted} and {@code includeDeleted} is {@code false}).
+ * Returns the corresponding {@link Blob}, or {@code null} if the blob does not exist, or has been
+ * {@link #delete deleted} and {@code includeDeleted} is {@code false}).
*/
@Nullable
Blob get(BlobId blobId, boolean includeDeleted);
/**
- * Performs a simple existence check using the attributes path returning {@code true} if it exists and
- * {@code false} if it does not.
- *
+ * Performs a simple existence check using the attributes path returning {@code true} if it exists and {@code false}
+ * if it does not.
+ *
* This was introduced to allow existence checking of direct-path blobs in support of edge cases such as RHC.
*/
boolean exists(BlobId blobId);
@@ -218,7 +218,7 @@ default Blob makeBlobPermanent(final BlobId blobId, final Map he
boolean isBlobEmpty(BlobId blobId);
/**
- * Removes a blob from the blob store. This may not immediately delete the blob from the underlying storage
+ * Removes a blob from the blob store. This may not immediately delete the blob from the underlying storage
* mechanism, but will make it immediately unavailable to future calls to {@link BlobStore#get(BlobId)}.
*
* @return {@code true} if the blob has been deleted, {@code false} if no blob was found by that ID.
@@ -236,8 +236,8 @@ default Blob makeBlobPermanent(final BlobId blobId, final Map he
/**
* Provides access to the blob store's metrics service instance
*
- * Note: this method may not be available for all the blob store implementations
- * and, if not supported, expect a {@link UnsupportedOperationException}
+ * Note: this method may not be available for all the blob store implementations and, if not supported, expect a
+ * {@link UnsupportedOperationException}
*
*/
BlobStoreMetricsService getMetricsService();
@@ -296,15 +296,20 @@ default Blob makeBlobPermanent(final BlobId blobId, final Map he
Stream getBlobIdStream();
/**
- * Get a {@link Stream} of {@link BlobId} for blobs contained in this blob store that have been updated within the provided duration.
+ * Get a {@link Stream} of {@link BlobId} for blobs contained in this blob store that have been updated within the
+ * provided duration.
*/
Stream getBlobIdUpdatedSinceStream(Duration duration);
/**
- * Get a {@link Stream} of {@link BlobId} for blobs contained in this blob store that have been updated within the provided from date
- * and under the specified path prefix.
+ * Get a {@link Stream} of {@link BlobId} for blobs contained in this blob store that have been updated within the
+ * provided from date and under the specified path prefix.
*/
- Stream getBlobIdUpdatedSinceStream(String prefix, OffsetDateTime fromDateTime);
+ PaginatedResult getBlobIdUpdatedSinceStream(
+ String prefix,
+ OffsetDateTime fromDateTime,
+ @Nullable String continuationToken,
+ int pageSize);
/**
* Get a {@link Stream} of direct-path {@link BlobId}s under the specified path prefix.
@@ -330,10 +335,15 @@ default Blob makeBlobPermanent(final BlobId blobId, final Map he
* @return {@code true} if the blob has been successfully undeleted.
* @since 3.12
*/
- boolean undelete(@Nullable BlobStoreUsageChecker inUseChecker, BlobId blobId, BlobAttributes attributes, boolean isDryRun);
+ boolean undelete(
+ @Nullable BlobStoreUsageChecker inUseChecker,
+ BlobId blobId,
+ BlobAttributes attributes,
+ boolean isDryRun);
/**
* Identifies if the storage backed by the instance is available to be written to
+ *
* @return {@code true} if the blob store can be written to
* @since 3.14
*/
@@ -345,7 +355,9 @@ default Blob makeBlobPermanent(final BlobId blobId, final Map he
* @return {@code true} if the blob store can be a member of a group
* @since 3.14
*/
- default boolean isGroupable() { return true; }
+ default boolean isGroupable() {
+ return true;
+ }
/**
* Identifies if the instance is writable. The writable state is a configuration option and not representative of the
@@ -392,9 +404,8 @@ default Future asyncDelete(BlobId blobId) {
}
/**
- * Deletes the blob if it is indeed a Temporary blob
- * Note: This method should only called with a BlobId known to have been created as a TempBlob, implementations may
- * perform no checks if they provide no special handling.
+ * Deletes the blob if it is indeed a Temporary blob Note: This method should only called with a BlobId known to have
+ * been created as a TempBlob, implementations may perform no checks if they provide no special handling.
*
* @since 3.37
*/
@@ -407,11 +418,12 @@ default void validateCanCreateAndUpdate() throws Exception {
/**
* Flush blobstore metrics to disk, forgoing the typical wait period
+ *
* @throws IOException
*/
@VisibleForTesting
default void flushMetrics() throws IOException {
- //default impl does nothing
+ // default impl does nothing
}
/**
diff --git a/components/nexus-blobstore-api/src/main/java/org/sonatype/nexus/blobstore/api/PaginatedResult.java b/components/nexus-blobstore-api/src/main/java/org/sonatype/nexus/blobstore/api/PaginatedResult.java
new file mode 100644
index 0000000000..7761b8ed88
--- /dev/null
+++ b/components/nexus-blobstore-api/src/main/java/org/sonatype/nexus/blobstore/api/PaginatedResult.java
@@ -0,0 +1,35 @@
+/*
+ * Sonatype Nexus (TM) Open Source Version
+ * Copyright (c) 2008-present Sonatype, Inc.
+ * All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ * Eclipse Foundation. All other trademarks are the property of their respective owners.
+ */
+package org.sonatype.nexus.blobstore.api;
+
+import java.util.List;
+
+public class PaginatedResult
+{
+ private final List results;
+
+ private final String nextContinuationToken;
+
+ public PaginatedResult(List results, String nextContinuationToken) {
+ this.results = results;
+ this.nextContinuationToken = nextContinuationToken;
+ }
+
+ public List getResults() {
+ return results;
+ }
+
+ public String getNextContinuationToken() {
+ return nextContinuationToken;
+ }
+}
diff --git a/components/nexus-blobstore-file/pom.xml b/components/nexus-blobstore-file/pom.xml
index 160c356622..874bd3e496 100644
--- a/components/nexus-blobstore-file/pom.xml
+++ b/components/nexus-blobstore-file/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-blobstore-file
diff --git a/components/nexus-blobstore-file/src/main/java/org/sonatype/nexus/blobstore/file/FileBlobStore.java b/components/nexus-blobstore-file/src/main/java/org/sonatype/nexus/blobstore/file/FileBlobStore.java
index 75974e649f..e75458e3e7 100644
--- a/components/nexus-blobstore-file/src/main/java/org/sonatype/nexus/blobstore/file/FileBlobStore.java
+++ b/components/nexus-blobstore-file/src/main/java/org/sonatype/nexus/blobstore/file/FileBlobStore.java
@@ -34,6 +34,7 @@
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -41,6 +42,7 @@
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -62,6 +64,7 @@
import org.sonatype.nexus.blobstore.api.BlobStoreUsageChecker;
import org.sonatype.nexus.blobstore.api.OperationMetrics;
import org.sonatype.nexus.blobstore.api.OperationType;
+import org.sonatype.nexus.blobstore.api.PaginatedResult;
import org.sonatype.nexus.blobstore.api.RawObjectAccess;
import org.sonatype.nexus.blobstore.api.metrics.BlobStoreMetricsService;
import org.sonatype.nexus.blobstore.file.internal.BlobCollisionException;
@@ -214,7 +217,7 @@ public FileBlobStore(
@VisibleForTesting
public FileBlobStore(
- final Path contentDir, //NOSONAR
+ final Path contentDir, // NOSONAR
final BlobIdLocationResolver blobIdLocationResolver,
final FileOperations fileOperations,
final BlobStoreMetricsService metricsService,
@@ -334,7 +337,10 @@ private Path temporaryAttributePath(final BlobId id, final UUID suffix) {
@Override
@MonitoringBlobStoreMetrics(operationType = UPLOAD)
- protected Blob doCreate(final InputStream blobData, final Map headers, @Nullable final BlobId blobId)
+ protected Blob doCreate(
+ final InputStream blobData,
+ final Map headers,
+ @Nullable final BlobId blobId)
{
return create(headers, destination -> fileOperations.create(destination, blobData), blobId);
}
@@ -651,8 +657,8 @@ protected void doCompact(@Nullable final BlobStoreUsageChecker inUseChecker) {
Boolean.parseBoolean(metadata.getProperty(REBUILD_DELETED_BLOB_INDEX_KEY, "false"));
if (deletedBlobIndexRebuildRequired) {
- //this is a multi node task, i.e. it will run on all nodes simultaneously, so make sure walking the blobstore
- //is only done on one node
+ // this is a multi node task, i.e. it will run on all nodes simultaneously, so make sure walking the blobstore
+ // is only done on one node
if (!nodeAccess.isOldestNode()) {
log.info("Skipping compact without deleted blob index on this node because this is not the oldest node.");
return;
@@ -684,14 +690,13 @@ protected void doDeleteTempFiles(final Integer daysOlderThan) {
iterateFiles(getAbsoluteBlobDir().resolve(CONTENT_PREFIX).resolve(TMP).toFile(), ageFileFilter,
ageFileFilter);
filesToDelete.forEachRemaining(f -> {
- try {
- forceDelete(f);
- }
- catch (UncheckedIOException | IOException e) {
- log.error("Unable to delete temp file {}. Message was {}.", f, e.getMessage());
- }
- }
- );
+ try {
+ forceDelete(f);
+ }
+ catch (UncheckedIOException | IOException e) {
+ log.error("Unable to delete temp file {}. Message was {}.", f, e.getMessage());
+ }
+ });
}
catch (UncheckedIOException | NoSuchFileException e) {
log.debug("Tmp folder is empty: {}", e.getMessage());
@@ -704,8 +709,7 @@ protected void doDeleteTempFiles(final Integer daysOlderThan) {
}
}
- private boolean maybeCompactBlob(@Nullable final BlobStoreUsageChecker inUseChecker, final BlobId blobId)
- {
+ private boolean maybeCompactBlob(@Nullable final BlobStoreUsageChecker inUseChecker, final BlobId blobId) {
Optional attributesOption = ofNullable((FileBlobAttributes) getBlobAttributes(blobId));
if (!attributesOption.isPresent() || !undelete(inUseChecker, blobId, attributesOption.get(), false)) {
// attributes file is missing or blob id not in use, so it's safe to delete the file
@@ -771,7 +775,7 @@ private void checkExists(final Path path, final BlobId blobId) throws IOExceptio
}
/**
- * This is a simple existence check resulting from NEXUS-16729. This allows clients to perform a simple check and is
+ * This is a simple existence check resulting from NEXUS-16729. This allows clients to perform a simple check and is
* primarily intended for use in directpath scenarios.
*/
@Override
@@ -949,7 +953,7 @@ void doCompactWithDeletedBlobIndex(@Nullable final BlobStoreUsageChecker inUseCh
progressLogger.info("Elapsed time: {}, processed: {}/{}", progressLogger.getElapsed(),
counter + 1, numBlobs);
}
- //once done removing stuff, clean any empty directories left around in the directpath area
+ // once done removing stuff, clean any empty directories left around in the directpath area
pruneEmptyDirectories(progressLogger, contentDir.resolve(DIRECT_PATH_ROOT));
progressLogger.flush();
}
@@ -975,17 +979,17 @@ private void pruneEmptyDirectories(final ProgressLogIntervalHelper progressLogge
@VisibleForTesting
void doCompactWithoutDeletedBlobIndex(@Nullable final BlobStoreUsageChecker inUseChecker) throws IOException {
log.info("Begin deleted blobs processing without deleted blob index");
- //clear the deleted blob index ahead of time, so we won't lose deletes that may occur while the compact is being
- //performed
+ // clear the deleted blob index ahead of time, so we won't lose deletes that may occur while the compact is being
+ // performed
blobDeletionIndex.deleteAllRecords();
ProgressLogIntervalHelper progressLogger = new ProgressLogIntervalHelper(log, INTERVAL_IN_SECONDS);
AtomicInteger count = new AtomicInteger(0);
- //rather than using the blobId stream here, need to use a different means of walking the file tree, as
- //we are deleting items on the way through, and apparently on *nix systems, deleting files that you are about to
- //walk over causes a FileNotFoundException to be thrown and the walking stops. Overridding the visitFileFailed
- //method allows us to get past that
+ // rather than using the blobId stream here, need to use a different means of walking the file tree, as
+ // we are deleting items on the way through, and apparently on *nix systems, deleting files that you are about to
+ // walk over causes a FileNotFoundException to be thrown and the walking stops. Overridding the visitFileFailed
+ // method allows us to get past that
Files.walkFileTree(contentDir, EnumSet.of(FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor()
{
@Override
@@ -1021,7 +1025,7 @@ public FileVisitResult visitFileFailed(final Path file, final IOException exc) t
}
});
- //Do this check one final time, to preserve the functionality of throwing an exception when interrupted
+ // Do this check one final time, to preserve the functionality of throwing an exception when interrupted
checkCancellation();
progressLogger.flush();
@@ -1140,12 +1144,19 @@ public Stream getBlobIdUpdatedSinceStream(final Duration duration) {
}
@Override
- public Stream getBlobIdUpdatedSinceStream(String prefix, OffsetDateTime fromDateTime) {
+ public PaginatedResult getBlobIdUpdatedSinceStream(
+ String prefix,
+ OffsetDateTime fromDateTime,
+ @Nullable final String continuationToken,
+ final int pageSize)
+ {
DateBasedWalkFile dateBasedWalkFile = new DateBasedWalkFile(contentDir.toString(), fromDateTime);
Map dateBasedBlobIds =
dateBasedWalkFile.getBlobIdToDateRef(contentDir.resolve(prefix).toString());
- return reconciliationLogger.getBlobsCreatedSince(reconciliationLogDir, fromDateTime.toLocalDateTime(),
- dateBasedBlobIds);
+ List blobIds =
+ reconciliationLogger.getBlobsCreatedSince(reconciliationLogDir, fromDateTime.toLocalDateTime(),
+ dateBasedBlobIds).collect(Collectors.toList());
+ return new PaginatedResult<>(blobIds, null);
}
@Override
@@ -1180,7 +1191,8 @@ String toBlobName(final Path path) {
try {
String pathStr = contentDir.resolve(DIRECT_PATH_ROOT)
.relativize(path) // just the relative path part under DIRECT_PATH_ROOT
- .toString().replace(File.separatorChar, '/'); // guarantee we return unix-style paths
+ .toString()
+ .replace(File.separatorChar, '/'); // guarantee we return unix-style paths
return removeEnd(pathStr, BLOB_FILE_ATTRIBUTES_SUFFIX); // drop the .properties suffix
}
catch (Exception ex) {
@@ -1237,8 +1249,7 @@ private FileBlobAttributes getFileBlobAttributes(final BlobId blobId) {
private BlobId toBlobId(final String blobName) {
Map headers = ImmutableMap.of(
BLOB_NAME_HEADER, blobName,
- DIRECT_PATH_BLOB_HEADER, "true"
- );
+ DIRECT_PATH_BLOB_HEADER, "true");
return blobIdLocationResolver.fromHeaders(headers);
}
diff --git a/components/nexus-blobstore/pom.xml b/components/nexus-blobstore/pom.xml
index afea58fc4d..6508f747f6 100644
--- a/components/nexus-blobstore/pom.xml
+++ b/components/nexus-blobstore/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-blobstore
diff --git a/components/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/group/BlobStoreGroup.java b/components/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/group/BlobStoreGroup.java
index 53e6afd3ba..b06172fe6c 100644
--- a/components/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/group/BlobStoreGroup.java
+++ b/components/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/group/BlobStoreGroup.java
@@ -48,6 +48,7 @@
import org.sonatype.nexus.blobstore.api.BlobStoreUsageChecker;
import org.sonatype.nexus.blobstore.api.OperationMetrics;
import org.sonatype.nexus.blobstore.api.OperationType;
+import org.sonatype.nexus.blobstore.api.PaginatedResult;
import org.sonatype.nexus.blobstore.api.RawObjectAccess;
import org.sonatype.nexus.blobstore.api.UnimplementedRawObjectAccess;
import org.sonatype.nexus.blobstore.api.metrics.BlobStoreMetricsService;
@@ -155,8 +156,7 @@ private MutableConfiguration getCacheConfiguration() {
return new MutableConfiguration()
.setStoreByValue(false)
.setExpiryPolicyFactory(
- CreatedExpiryPolicy.factoryOf(new Duration(blobIdCacheTimeout.unit(), blobIdCacheTimeout.value()))
- )
+ CreatedExpiryPolicy.factoryOf(new Duration(blobIdCacheTimeout.unit(), blobIdCacheTimeout.value())))
.setManagementEnabled(true)
.setStatisticsEnabled(true);
}
@@ -256,7 +256,8 @@ public Blob get(final BlobId blobId) {
public Blob get(final BlobId blobId, final boolean includeDeleted) {
if (includeDeleted) {
// check directly without using cache
- return members.get().stream()
+ return members.get()
+ .stream()
.filter((BlobStore member) -> member.exists(blobId))
.map((BlobStore member) -> member.get(blobId, true))
.filter(Objects::nonNull)
@@ -265,8 +266,8 @@ public Blob get(final BlobId blobId, final boolean includeDeleted) {
}
else {
return locate(blobId)
- .map((BlobStore target) -> target.get(blobId, false))
- .orElse(null);
+ .map((BlobStore target) -> target.get(blobId, false))
+ .orElse(null);
}
}
@@ -274,7 +275,8 @@ public Blob get(final BlobId blobId, final boolean includeDeleted) {
@Guarded(by = STARTED)
public boolean delete(final BlobId blobId, final String reason) {
locatedBlobs.remove(blobId);
- List locations = members.get().stream()
+ List locations = members.get()
+ .stream()
.filter((BlobStore member) -> member.exists(blobId))
.collect(toList());
@@ -291,7 +293,8 @@ public boolean delete(final BlobId blobId, final String reason) {
@Guarded(by = STARTED)
public boolean deleteHard(final BlobId blobId) {
locatedBlobs.remove(blobId);
- List locations = members.get().stream()
+ List locations = members.get()
+ .stream()
.filter((BlobStore member) -> member.exists(blobId))
.collect(toList());
@@ -313,19 +316,19 @@ public BlobStoreMetricsService getMetricsService() {
@Override
@Guarded(by = STARTED)
public BlobStoreMetrics getMetrics() {
- Iterable membersMetrics = members.get().stream()
+ Iterable membersMetrics = members.get()
+ .stream()
.filter(BlobStore::isStarted)
- .map(BlobStore::getMetrics)
- ::iterator;
+ .map(BlobStore::getMetrics)::iterator;
return new BlobStoreGroupMetrics(membersMetrics);
}
@Override
public Map getOperationMetricsByType() {
Map result = new EnumMap<>(OperationType.class);
- Iterable> metrics = members.get().stream()
- .map(BlobStore::getOperationMetricsByType)
- ::iterator;
+ Iterable> metrics = members.get()
+ .stream()
+ .map(BlobStore::getOperationMetricsByType)::iterator;
for (Map metric : metrics) {
for (Entry metricsEntry : metric.entrySet()) {
OperationType type = metricsEntry.getKey();
@@ -346,9 +349,9 @@ public Map getOperationMetricsByType() {
@Override
public Map getOperationMetricsDelta() {
Map result = new EnumMap<>(OperationType.class);
- Iterable> metrics = members.get().stream()
- .map(BlobStore::getOperationMetricsDelta)
- ::iterator;
+ Iterable> metrics = members.get()
+ .stream()
+ .map(BlobStore::getOperationMetricsDelta)::iterator;
for (Map metric : metrics) {
for (Entry metricsEntry : metric.entrySet()) {
OperationType type = metricsEntry.getKey();
@@ -384,12 +387,14 @@ public synchronized void deleteTempFiles(@Nullable final Integer daysOlderThan)
}
@Override
- public boolean undelete(@Nullable final BlobStoreUsageChecker inUseChecker,
- final BlobId blobId,
- final BlobAttributes attributes,
- final boolean isDryRun)
+ public boolean undelete(
+ @Nullable final BlobStoreUsageChecker inUseChecker,
+ final BlobId blobId,
+ final BlobAttributes attributes,
+ final boolean isDryRun)
{
- return members.get().stream()
+ return members.get()
+ .stream()
.map((BlobStore member) -> member.undelete(inUseChecker, blobId, attributes, isDryRun))
.anyMatch((Boolean deleted) -> deleted);
}
@@ -427,20 +432,23 @@ public void shutdown() throws Exception {
@Override
public boolean exists(final BlobId blobId) {
- return members.get().stream()
+ return members.get()
+ .stream()
.anyMatch((BlobStore member) -> member.exists(blobId));
}
@Override
public boolean bytesExists(final BlobId blobId) {
- return members.get().stream()
+ return members.get()
+ .stream()
.anyMatch((BlobStore member) -> member.bytesExists(blobId));
}
@Override
public boolean isBlobEmpty(final BlobId blobId) {
- return members.get().stream()
- .anyMatch((BlobStore member) -> member.isBlobEmpty(blobId));
+ return members.get()
+ .stream()
+ .anyMatch((BlobStore member) -> member.isBlobEmpty(blobId));
}
@Override
@@ -451,7 +459,8 @@ public void remove() {
@Override
public Stream getBlobIdStream() {
- return members.get().stream()
+ return members.get()
+ .stream()
.map((BlobStore member) -> member.getBlobIdStream())
.flatMap(identity());
}
@@ -465,16 +474,19 @@ public Stream getBlobIdUpdatedSinceStream(final java.time.Duration durat
}
@Override
- public Stream getBlobIdUpdatedSinceStream(final String prefix, final OffsetDateTime fromDateTime) {
- return members
- .get()
- .stream()
- .flatMap((BlobStore member) -> member.getBlobIdUpdatedSinceStream(prefix, fromDateTime));
+ public PaginatedResult getBlobIdUpdatedSinceStream(
+ final String prefix,
+ final OffsetDateTime fromDateTime,
+ @Nullable final String continuationToken,
+ final int pageSize)
+ {
+ throw new UnsupportedOperationException();
}
@Override
public Stream getDirectPathBlobIdStream(final String prefix) {
- return members.get().stream()
+ return members.get()
+ .stream()
.map((BlobStore member) -> member.getDirectPathBlobIdStream(prefix))
.flatMap(identity());
}
@@ -505,7 +517,9 @@ public RawObjectAccess getRawObjectAccess() {
/**
* Supplier for thread-safe lazy initialization of members.
*/
- private class MembersSupplier implements Supplier> {
+ private class MembersSupplier
+ implements Supplier>
+ {
public List get() {
List memberList = new ArrayList<>();
for (String name : BlobStoreGroupConfigurationHelper.memberNames(blobStoreConfiguration)) {
@@ -539,11 +553,12 @@ Optional locate(final BlobId blobId) {
private BlobStore search(BlobId blobId) {
log.trace("Searching for {} in {}", blobId, members);
- return members.get().stream()
- .sorted(Comparator.comparing(BlobStore::isWritable).reversed())
- .filter((BlobStore member) -> member.exists(blobId))
- .findAny()
- .orElse(null);
+ return members.get()
+ .stream()
+ .sorted(Comparator.comparing(BlobStore::isWritable).reversed())
+ .filter((BlobStore member) -> member.exists(blobId))
+ .findAny()
+ .orElse(null);
}
@Override
@@ -561,7 +576,8 @@ public String toString() {
* @since 3.14
*/
@FunctionalInterface
- private interface CreateBlobFunction {
+ private interface CreateBlobFunction
+ {
Blob create(BlobStore blobStore);
}
}
diff --git a/components/nexus-bootstrap/pom.xml b/components/nexus-bootstrap/pom.xml
index a928d7e1f8..6feb406526 100644
--- a/components/nexus-bootstrap/pom.xml
+++ b/components/nexus-bootstrap/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-bootstrap
diff --git a/components/nexus-bootstrap/src/main/java/org/sonatype/nexus/bootstrap/Launcher.java b/components/nexus-bootstrap/src/main/java/org/sonatype/nexus/bootstrap/Launcher.java
index 7fbd949214..0c3ff4f3a4 100644
--- a/components/nexus-bootstrap/src/main/java/org/sonatype/nexus/bootstrap/Launcher.java
+++ b/components/nexus-bootstrap/src/main/java/org/sonatype/nexus/bootstrap/Launcher.java
@@ -64,8 +64,7 @@ public class Launcher
public Launcher(
final File defaultsFile,
@Nullable final File propertiesFile,
- @Nullable final File nodeNamePropertiesFile)
- throws Exception
+ @Nullable final File nodeNamePropertiesFile) throws Exception
{
configureLogging();
@@ -187,7 +186,8 @@ private Property withKeyPrefixRemoved() {
private void configureInitialLoggingOverrides(final Map props) {
LoggerContext loggerContext = loggerContext();
if (props != null) {
- props.entrySet().stream()
+ props.entrySet()
+ .stream()
.map(Property::new)
.filter(p -> p.key.startsWith(LOGGING_OVERRIDE_PREFIX))
.filter(p -> !p.value.isEmpty())
diff --git a/components/nexus-cache/pom.xml b/components/nexus-cache/pom.xml
index 6d97f0b15d..5dd9e4d684 100644
--- a/components/nexus-cache/pom.xml
+++ b/components/nexus-cache/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-cache
diff --git a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheBuilder.java b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheBuilder.java
index 03feb8a9ef..51ade5180b 100644
--- a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheBuilder.java
+++ b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheBuilder.java
@@ -21,6 +21,7 @@
/**
* Abstracts cache configurations to make using different underlying implementations easier
+ *
* @since 3.14
*/
public interface CacheBuilder
diff --git a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheHelper.java b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheHelper.java
index 03be13f869..3b2eb1162c 100644
--- a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheHelper.java
+++ b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheHelper.java
@@ -41,8 +41,10 @@ public class CacheHelper
private final Provider cacheBuilderProvider;
@Inject
- public CacheHelper(final Provider cacheManagerProvider,
- final Provider cacheBuilderProvider) {
+ public CacheHelper(
+ final Provider cacheManagerProvider,
+ final Provider cacheBuilderProvider)
+ {
this.cacheManagerProvider = checkNotNull(cacheManagerProvider);
this.cacheBuilderProvider = checkNotNull(cacheBuilderProvider);
}
@@ -52,12 +54,14 @@ private CacheManager manager() {
}
@SuppressWarnings("unchecked")
- public CacheBuilder builder() {
+ public CacheBuilder builder() {
return cacheBuilderProvider.get();
}
- public synchronized Cache maybeCreateCache(final String name,
- final MutableConfiguration mutableConfiguration) {
+ public synchronized Cache maybeCreateCache(
+ final String name,
+ final MutableConfiguration mutableConfiguration)
+ {
checkNotNull(name);
checkNotNull(mutableConfiguration);
@@ -75,7 +79,7 @@ public synchronized Cache maybeCreateCache(final String name,
return cache;
}
- public synchronized Cache getOrCreate(final CacheBuilder builder) {
+ public synchronized Cache getOrCreate(final CacheBuilder builder) {
checkNotNull(builder);
Cache cache = manager().getCache(builder.getName(), builder.getKeyType(), builder.getValueType());
@@ -91,16 +95,18 @@ public synchronized Cache getOrCreate(final CacheBuilder build
return cache;
}
- public synchronized Cache maybeCreateCache(final String name,
- final Factory expiryPolicyFactory)
+ public synchronized Cache maybeCreateCache(
+ final String name,
+ final Factory expiryPolicyFactory)
{
return maybeCreateCache(name, null, null, expiryPolicyFactory);
}
- public synchronized Cache maybeCreateCache(final String name,
- @Nullable final Class keyType,
- @Nullable final Class valueType,
- final Factory expiryPolicyFactory)
+ public synchronized Cache maybeCreateCache(
+ final String name,
+ @Nullable final Class keyType,
+ @Nullable final Class valueType,
+ final Factory expiryPolicyFactory)
{
return maybeCreateCache(name, createCacheConfig(keyType, valueType, expiryPolicyFactory));
}
diff --git a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheManager.java b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheManager.java
index fb7c4b0dae..2163897cd6 100644
--- a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheManager.java
+++ b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/CacheManager.java
@@ -27,14 +27,14 @@ public interface CacheManager
/**
* Creates the {@link NexusCache}. It may be a distributed or a local cache depending on a Nexus mode.
*
- * @param cacheName the name of the cache.
- * @param keyType the expected key type.
- * @param valueType the expected value type.
+ * @param cacheName the name of the cache.
+ * @param keyType the expected key type.
+ * @param valueType the expected value type.
* @param expiryAfter the expiration policy of the cache.
* @return the newly created {@link NexusCache}
*/
NexusCache getCache(String cacheName, Class keyType, Class valueType, Duration expiryAfter);
-
+
/**
* Destroys the {@link NexusCache} specified by cacheName.
*/
diff --git a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/NexusCache.java b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/NexusCache.java
index 18c21ad1d5..e76b6ba75e 100644
--- a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/NexusCache.java
+++ b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/NexusCache.java
@@ -34,7 +34,7 @@ public interface NexusCache
* Associates the specified value with the specified key in the cache. If the {@link NexusCache} previously
* contained a mapping for the key, the old value is replaced by the specified value.
*
- * @param key key with which the specified value is to be associated
+ * @param key key with which the specified value is to be associated
* @param value value to be associated with the specified key
*/
void put(final K key, final V value);
diff --git a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/LocalCacheManager.java b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/LocalCacheManager.java
index 8068ee9da4..cc8b2ac114 100644
--- a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/LocalCacheManager.java
+++ b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/LocalCacheManager.java
@@ -59,7 +59,7 @@ public NexusCache getCache(
return new LocalCache<>(
cacheHelper.maybeCreateCache(cacheName, keyType, valueType, CreatedExpiryPolicy.factoryOf(expiryAfter)));
}
-
+
@Override
public void destroyCache(final String cacheName) {
cacheHelper.maybeDestroyCache(cacheName);
diff --git a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheBuilder.java b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheBuilder.java
index 8cc99611f0..56eb032d9d 100644
--- a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheBuilder.java
+++ b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheBuilder.java
@@ -59,7 +59,7 @@ public Cache build(final CacheManager manager) {
builder.withExpiry(mapToEhCacheExpiry(expiryFactory.create()));
- Cache cache = manager.createCache(name, Eh107Configuration.fromEhcacheCacheConfiguration(builder));
+ Cache cache = manager.createCache(name, Eh107Configuration.fromEhcacheCacheConfiguration(builder));
manager.enableStatistics(name, statisticsEnabled);
manager.enableManagement(name, managementEnabled);
@@ -99,7 +99,7 @@ private Duration toJavaDuration(final javax.cache.expiry.Duration duration) {
return Duration.of(1, ChronoUnit.FOREVER);
}
ChronoUnit chronoUnit = null;
- switch(duration.getTimeUnit()) {
+ switch (duration.getTimeUnit()) {
case DAYS:
chronoUnit = ChronoUnit.DAYS;
break;
diff --git a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProvider.java b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProvider.java
index 938d0bb6b3..bb3f9ee902 100644
--- a/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProvider.java
+++ b/components/nexus-cache/src/main/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProvider.java
@@ -77,8 +77,7 @@ public EhCacheManagerProvider(@Nullable final URI uri) {
private CacheManager create(@Nullable final URI config) {
CachingProvider provider = Caching.getCachingProvider(
EhcacheCachingProvider.class.getName(),
- EhcacheCachingProvider.class.getClassLoader()
- );
+ EhcacheCachingProvider.class.getClassLoader());
log.info("Creating cache-manager with configuration: {}", config);
CacheManager manager = provider.getCacheManager(config, getClass().getClassLoader());
diff --git a/components/nexus-cache/src/test/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProviderTest.java b/components/nexus-cache/src/test/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProviderTest.java
index 8b912e1791..2e1057dd77 100644
--- a/components/nexus-cache/src/test/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProviderTest.java
+++ b/components/nexus-cache/src/test/java/org/sonatype/nexus/cache/internal/ehcache/EhCacheManagerProviderTest.java
@@ -79,15 +79,15 @@ public void preconfiguredCacheWithEternal() {
log(cacheManager);
assertThat(cacheManager, notNullValue());
- Cache cache = cacheManager.getCache("testEternalCache", Object.class, Object.class);
+ Cache cache = cacheManager.getCache("testEternalCache", Object.class, Object.class);
log(cache);
assertThat(cache, notNullValue());
- //log(JCacheConfiguration.class.getProtectionDomain().getCodeSource().getLocation());
- //JCacheConfiguration config = (JCacheConfiguration) cache.getConfiguration(JCacheConfiguration.class);
- //log(config.getExpiryPolicy().getExpiryForAccess());
- //log(config.getExpiryPolicy().getExpiryForAccess().isEternal());
- //log(config.getExpiryPolicy().getExpiryForAccess().isZero());
+ // log(JCacheConfiguration.class.getProtectionDomain().getCodeSource().getLocation());
+ // JCacheConfiguration config = (JCacheConfiguration) cache.getConfiguration(JCacheConfiguration.class);
+ // log(config.getExpiryPolicy().getExpiryForAccess());
+ // log(config.getExpiryPolicy().getExpiryForAccess().isEternal());
+ // log(config.getExpiryPolicy().getExpiryForAccess().isZero());
Object key = "foo";
Object value = "bar";
diff --git a/components/nexus-capability/pom.xml b/components/nexus-capability/pom.xml
index 6315d6895c..7f6427d0cc 100644
--- a/components/nexus-capability/pom.xml
+++ b/components/nexus-capability/pom.xml
@@ -21,7 +21,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-capability
diff --git a/components/nexus-cleanup-config/pom.xml b/components/nexus-cleanup-config/pom.xml
index d82ae9f66b..c3a0663d51 100644
--- a/components/nexus-cleanup-config/pom.xml
+++ b/components/nexus-cleanup-config/pom.xml
@@ -19,7 +19,7 @@
nexus-components
org.sonatype.nexus
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
4.0.0
diff --git a/components/nexus-cleanup/pom.xml b/components/nexus-cleanup/pom.xml
index 56ef78bcd8..e454586712 100644
--- a/components/nexus-cleanup/pom.xml
+++ b/components/nexus-cleanup/pom.xml
@@ -19,7 +19,7 @@
nexus-components
org.sonatype.nexus
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
4.0.0
diff --git a/components/nexus-commands/pom.xml b/components/nexus-commands/pom.xml
index a229a75e83..bfcd0e17b3 100644
--- a/components/nexus-commands/pom.xml
+++ b/components/nexus-commands/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-commands
diff --git a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/ActionRegistrar.java b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/ActionRegistrar.java
index e951513415..cfa3b3a467 100644
--- a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/ActionRegistrar.java
+++ b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/ActionRegistrar.java
@@ -45,9 +45,10 @@ public class ActionRegistrar
private final SessionFactory sessionFactory;
@Inject
- public ActionRegistrar(final BeanLocator beanLocator,
- @Nullable final SessionFactory sessionFactory,
- @Nullable final BundleContext bundleContext)
+ public ActionRegistrar(
+ final BeanLocator beanLocator,
+ @Nullable final SessionFactory sessionFactory,
+ @Nullable final BundleContext bundleContext)
{
this.beanLocator = checkNotNull(beanLocator);
this.sessionFactory = sessionFactory; // might be null during tests
diff --git a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/BeanEntryCommand.java b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/BeanEntryCommand.java
index 193304dd17..be5780c798 100644
--- a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/BeanEntryCommand.java
+++ b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/BeanEntryCommand.java
@@ -48,7 +48,7 @@ public BeanEntryCommand(final BeanLocator beanLocator, final BeanEntry clazz) {
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
Iterator> itr = beanLocator.locate(Key.get((Class) clazz)).iterator();
if (itr.hasNext()) {
return itr.next().getValue();
diff --git a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/InfoProviderMediator.java b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/InfoProviderMediator.java
index fb1184b05a..26a598102d 100644
--- a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/InfoProviderMediator.java
+++ b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/internal/InfoProviderMediator.java
@@ -34,16 +34,15 @@ public class InfoProviderMediator
implements Mediator
{
@Override
- public void add(final BeanEntry beanEntry, final BundleContext bundleContext)
- throws Exception
- {
+ public void add(final BeanEntry beanEntry, final BundleContext bundleContext) throws Exception {
log.debug("Adding: {}", beanEntry);
bundleContext.registerService(InfoProvider.class, beanEntry.getValue(), null);
}
@Override
- public void remove(final BeanEntry beanEntry, final BundleContext bundleContext)
- throws Exception
+ public void remove(
+ final BeanEntry beanEntry,
+ final BundleContext bundleContext) throws Exception
{
// TODO: implement remove
}
diff --git a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/package-info.java b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/package-info.java
index acb31a701b..520afc3e61 100644
--- a/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/package-info.java
+++ b/components/nexus-commands/src/main/java/org/sonatype/nexus/commands/package-info.java
@@ -16,4 +16,4 @@
*
* @since 3.0
*/
-package org.sonatype.nexus.commands;
\ No newline at end of file
+package org.sonatype.nexus.commands;
diff --git a/components/nexus-common/pom.xml b/components/nexus-common/pom.xml
index 4c9b238464..cfaf76cecc 100644
--- a/components/nexus-common/pom.xml
+++ b/components/nexus-common/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-common
diff --git a/components/nexus-core/pom.xml b/components/nexus-core/pom.xml
index 2c139d94ed..790f714d48 100644
--- a/components/nexus-core/pom.xml
+++ b/components/nexus-core/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-core
diff --git a/components/nexus-crypto/pom.xml b/components/nexus-crypto/pom.xml
index d034bd3244..565054b4ce 100644
--- a/components/nexus-crypto/pom.xml
+++ b/components/nexus-crypto/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-crypto
diff --git a/components/nexus-datastore-api/pom.xml b/components/nexus-datastore-api/pom.xml
index e079b521f8..cb8eada269 100644
--- a/components/nexus-datastore-api/pom.xml
+++ b/components/nexus-datastore-api/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-datastore-api
diff --git a/components/nexus-datastore-api/src/main/java/org/sonatype/nexus/datastore/api/DataStoreConfiguration.java b/components/nexus-datastore-api/src/main/java/org/sonatype/nexus/datastore/api/DataStoreConfiguration.java
index ddaa7d0def..a38a4c5fd8 100644
--- a/components/nexus-datastore-api/src/main/java/org/sonatype/nexus/datastore/api/DataStoreConfiguration.java
+++ b/components/nexus-datastore-api/src/main/java/org/sonatype/nexus/datastore/api/DataStoreConfiguration.java
@@ -96,7 +96,10 @@ public String toString() {
'}';
}
- public static Map> diff(final DataStoreConfiguration left, final DataStoreConfiguration right) {
+ public static Map> diff(
+ final DataStoreConfiguration left,
+ final DataStoreConfiguration right)
+ {
Map> results = new HashMap<>();
diff("name", left, right, DataStoreConfiguration::getName, results);
diff("source", left, right, DataStoreConfiguration::getSource, results);
@@ -105,17 +108,20 @@ public static Map> diff(final DataStoreConfiguration
Stream.concat(left.getAttributes().keySet().stream(), right.getAttributes().keySet().stream())
.distinct()
.forEach(attributeKey -> {
- Function getAttribute = (config -> config.getAttributes().getOrDefault(attributeKey, null));
+ Function getAttribute =
+ (config -> config.getAttributes().getOrDefault(attributeKey, null));
diff("attributes->" + attributeKey, left, right, getAttribute, results);
});
return results;
}
- private static void diff(final String fieldName,
- final DataStoreConfiguration a,
- final DataStoreConfiguration b,
- final Function fieldFunction,
- Map> results) {
+ private static void diff(
+ final String fieldName,
+ final DataStoreConfiguration a,
+ final DataStoreConfiguration b,
+ final Function fieldFunction,
+ Map> results)
+ {
String aField = fieldFunction.apply(a);
String bField = fieldFunction.apply(b);
@@ -133,7 +139,8 @@ private static void diff(final String fieldName,
protected Map maybeRedact(final Map attributes) {
if (attributes == null || attributes.isEmpty()) {
return attributes;
- } else {
+ }
+ else {
return transformEntries(attributes, DataStoreConfiguration::maybeRedact);
}
}
diff --git a/components/nexus-datastore-api/src/test/java/org/sonatype/nexus/datastore/api/DataStoreConfigurationTest.java b/components/nexus-datastore-api/src/test/java/org/sonatype/nexus/datastore/api/DataStoreConfigurationTest.java
index e2092e9c12..f105f88e24 100644
--- a/components/nexus-datastore-api/src/test/java/org/sonatype/nexus/datastore/api/DataStoreConfigurationTest.java
+++ b/components/nexus-datastore-api/src/test/java/org/sonatype/nexus/datastore/api/DataStoreConfigurationTest.java
@@ -88,7 +88,8 @@ public void nameAndSourceDiff() {
public void attributesDiffer() {
Map> diffMap = DataStoreConfiguration.diff(configurationA, configurationC);
assertThat(diffMap.keySet(), hasSize(5));
- assertThat(diffMap.keySet(), containsInAnyOrder("name", "source", "attributes->entry-2", "attributes->entry-3", "attributes->entry-4"));
+ assertThat(diffMap.keySet(),
+ containsInAnyOrder("name", "source", "attributes->entry-2", "attributes->entry-3", "attributes->entry-4"));
assertThat(diffMap.get("name").values(), containsInAnyOrder("configA", "configC"));
assertThat(diffMap.get("source").get("configA"), equalTo("sourceA"));
assertThat(diffMap.get("source").get("configC"), equalTo("sourceC"));
@@ -116,7 +117,6 @@ public void hideSensitiveKeys() {
assertThat(diffMap.get("attributes->key-2").values(), containsInAnyOrder(REDACTED, REDACTED));
assertThat(diffMap.get("attributes->jdbcUrl").values(), containsInAnyOrder(
format("localhost:5432/nexus?username=user&password=%s", REDACTED),
- format("localhost:5432/nexus?password=%s&username=user", REDACTED))
- );
+ format("localhost:5432/nexus?password=%s&username=user", REDACTED)));
}
}
diff --git a/components/nexus-datastore-mybatis/pom.xml b/components/nexus-datastore-mybatis/pom.xml
index 09ed8efab3..f0e72543ea 100644
--- a/components/nexus-datastore-mybatis/pom.xml
+++ b/components/nexus-datastore-mybatis/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-datastore-mybatis
diff --git a/components/nexus-datastore/pom.xml b/components/nexus-datastore/pom.xml
index 65fb285ad9..d211ea819e 100644
--- a/components/nexus-datastore/pom.xml
+++ b/components/nexus-datastore/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-datastore
diff --git a/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/ConfigStoreSupport.java b/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/ConfigStoreSupport.java
index c2b27fc9ac..02b8685119 100644
--- a/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/ConfigStoreSupport.java
+++ b/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/ConfigStoreSupport.java
@@ -40,7 +40,7 @@ public abstract class ConfigStoreSupport
private EventManager eventManager;
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
protected ConfigStoreSupport(final DataSessionSupplier sessionSupplier) {
super(sessionSupplier, DEFAULT_DATASTORE_NAME);
diff --git a/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/DataStoreConfigurationManager.java b/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/DataStoreConfigurationManager.java
index 4c25fe56e1..cf3821e3a5 100644
--- a/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/DataStoreConfigurationManager.java
+++ b/components/nexus-datastore/src/main/java/org/sonatype/nexus/datastore/DataStoreConfigurationManager.java
@@ -58,7 +58,8 @@ public Iterable load() {
Set configuredStores = new TreeSet<>(CASE_INSENSITIVE_ORDER);
// only attempt to load a named store once from the first store that has it
// (if the first attempt fails then that store is considered not available)
- return configurationSources.values().stream()
+ return configurationSources.values()
+ .stream()
.filter(DataStoreConfigurationSource::isEnabled)
.sorted(comparingInt(this::getPriority).reversed())
.flatMap(source -> stream(source.browseStoreNames())
@@ -68,11 +69,12 @@ public Iterable load() {
.collect(toImmutableList());
}
- private int getPriority(final DataStoreConfigurationSource configSource){
+ private int getPriority(final DataStoreConfigurationSource configSource) {
if (configSource.getClass().isAnnotationPresent(Priority.class)) {
Priority priority = configSource.getClass().getAnnotation(Priority.class);
return priority.value();
- } else {
+ }
+ else {
log.warn("Loaded config source {} without priority, assuming last", configSource.getName());
return Integer.MIN_VALUE;
}
diff --git a/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreConfigurationManagerTest.java b/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreConfigurationManagerTest.java
index 262479a65a..1ac246f73a 100644
--- a/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreConfigurationManagerTest.java
+++ b/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreConfigurationManagerTest.java
@@ -40,6 +40,7 @@
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+
/**
* {@link DataStoreConfigurationManager} tests.
*/
@@ -66,7 +67,9 @@ private static DataStoreConfiguration newDataStoreConfiguration(final String nam
}
@Priority(1)
- private static class NumberOneConfigSource implements DataStoreConfigurationSource {
+ private static class NumberOneConfigSource
+ implements DataStoreConfigurationSource
+ {
@Override
public String getName() {
return "numberOne";
@@ -84,7 +87,9 @@ public DataStoreConfiguration load(final String storeName) {
}
@Priority(2)
- private static class NumberTwoConfigSource implements DataStoreConfigurationSource {
+ private static class NumberTwoConfigSource
+ implements DataStoreConfigurationSource
+ {
@Override
public String getName() {
return "numberTwo";
@@ -102,7 +107,9 @@ public DataStoreConfiguration load(final String storeName) {
}
@Priority(3)
- private static class NumberThreeConfigSource implements DataStoreConfigurationSource {
+ private static class NumberThreeConfigSource
+ implements DataStoreConfigurationSource
+ {
@Override
public String getName() {
return "numberThree";
@@ -124,14 +131,21 @@ public void followsPriorityAnnotationForLoads() {
NumberOneConfigSource source1 = new NumberOneConfigSource();
NumberTwoConfigSource source2 = new NumberTwoConfigSource();
NumberThreeConfigSource source3 = new NumberThreeConfigSource();
- //Intentionally load them out of order
+ // Intentionally load them out of order
when(configurationSources.values()).thenReturn(ImmutableList.of(source1, source2, source3));
- List configs = StreamSupport.stream(underTest.load().spliterator(), false).collect(toList());
+ List configs =
+ StreamSupport.stream(underTest.load().spliterator(), false).collect(toList());
assertThat(configs, hasSize(7));
- assertThat(configs.stream().filter(dataStoreConfiguration -> dataStoreConfiguration.getSource().equals("numberThree")).count(), is(equalTo(4L)));
- assertThat(configs.stream().filter(dataStoreConfiguration -> dataStoreConfiguration.getSource().equals("numberTwo")).count(), is(equalTo(2L)));
- assertThat(configs.stream().filter(dataStoreConfiguration -> dataStoreConfiguration.getSource().equals("numberOne")).count(), is(equalTo(1L)));
+ assertThat(configs.stream()
+ .filter(dataStoreConfiguration -> dataStoreConfiguration.getSource().equals("numberThree"))
+ .count(), is(equalTo(4L)));
+ assertThat(configs.stream()
+ .filter(dataStoreConfiguration -> dataStoreConfiguration.getSource().equals("numberTwo"))
+ .count(), is(equalTo(2L)));
+ assertThat(configs.stream()
+ .filter(dataStoreConfiguration -> dataStoreConfiguration.getSource().equals("numberOne"))
+ .count(), is(equalTo(1L)));
}
@Test
diff --git a/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreSupportTest.java b/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreSupportTest.java
index fc7210d784..e353d152a1 100644
--- a/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreSupportTest.java
+++ b/components/nexus-datastore/src/test/java/org/sonatype/nexus/datastore/DataStoreSupportTest.java
@@ -135,7 +135,8 @@ public void attributesAreInterpolatedAtStart() throws Exception {
verify(underTest).doStart(eq("testStore"), captor.capture());
assertThat((Map) captor.getValue(), hasEntry("jdbcUrl", "jdbc:h2:/tmp/example/db/testStore"));
- assertThat(underTest.getConfiguration().getAttributes(), hasEntry("jdbcUrl", "jdbc:h2:${karaf.data}/db/${storeName}"));
+ assertThat(underTest.getConfiguration().getAttributes(),
+ hasEntry("jdbcUrl", "jdbc:h2:${karaf.data}/db/${storeName}"));
}
@Test
diff --git a/components/nexus-distributed-event-service-api/pom.xml b/components/nexus-distributed-event-service-api/pom.xml
index 26713b2884..3cdea467a2 100644
--- a/components/nexus-distributed-event-service-api/pom.xml
+++ b/components/nexus-distributed-event-service-api/pom.xml
@@ -21,7 +21,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
diff --git a/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/RepositoryRemoteConnectionStatusEvent.java b/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/RepositoryRemoteConnectionStatusEvent.java
index c0ca7e9127..fb94fa4793 100644
--- a/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/RepositoryRemoteConnectionStatusEvent.java
+++ b/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/RepositoryRemoteConnectionStatusEvent.java
@@ -44,8 +44,7 @@ public RepositoryRemoteConnectionStatusEvent(
@JsonProperty("remoteConnectionStatusTypeOrdinal") final int remoteConnectionStatusTypeOrdinal,
@JsonProperty("reason") final String reason,
@JsonProperty("blockedUntilMillis") final long blockedUntilMillis,
- @JsonProperty("requestUrl") final String requestUrl
- )
+ @JsonProperty("requestUrl") final String requestUrl)
{
super(UPDATED);
this.repositoryName = checkNotNull(repositoryName);
diff --git a/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SelectorConfigurationChangedEvent.java b/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SelectorConfigurationChangedEvent.java
index 74816f1a4e..38d57fba75 100644
--- a/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SelectorConfigurationChangedEvent.java
+++ b/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SelectorConfigurationChangedEvent.java
@@ -28,8 +28,7 @@ public class SelectorConfigurationChangedEvent
public static final String NAME = "SelectorConfigurationChangedEvent";
@JsonCreator
- public SelectorConfigurationChangedEvent(@JsonProperty("eventType") final EventType eventType)
- {
+ public SelectorConfigurationChangedEvent(@JsonProperty("eventType") final EventType eventType) {
super(eventType);
}
}
diff --git a/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SupportZipGenerationEvent.java b/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SupportZipGenerationEvent.java
index f0a4bdc46e..e8192f861b 100644
--- a/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SupportZipGenerationEvent.java
+++ b/components/nexus-distributed-event-service-api/src/main/java/org/sonatype/nexus/distributed/event/service/api/common/SupportZipGenerationEvent.java
@@ -25,7 +25,7 @@
* Contains the 'request' object which holds all properties for 'support zip' creation and nodeID of target node
*/
public class SupportZipGenerationEvent
- extends DistributedEventSupport
+ extends DistributedEventSupport
{
public static final String NAME = "SupportZipGenerationEvent";
@@ -36,7 +36,8 @@ public class SupportZipGenerationEvent
@JsonCreator
public SupportZipGenerationEvent(
@JsonProperty("recipientNodeId") final String recipientNodeId,
- @JsonProperty("request") final SupportZipGeneratorRequest request) {
+ @JsonProperty("request") final SupportZipGeneratorRequest request)
+ {
super(EventType.CREATED);
this.recipientNodeId = checkNotNull(recipientNodeId);
this.request = checkNotNull(request);
diff --git a/components/nexus-elasticsearch/pom.xml b/components/nexus-elasticsearch/pom.xml
index a4c3cf6747..39ca9127e4 100644
--- a/components/nexus-elasticsearch/pom.xml
+++ b/components/nexus-elasticsearch/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-elasticsearch
diff --git a/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/NodeProvider.java b/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/NodeProvider.java
index 903b07e8e9..0133bdbd3c 100644
--- a/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/NodeProvider.java
+++ b/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/NodeProvider.java
@@ -67,7 +67,7 @@ public class NodeProvider
private final ApplicationDirectories directories;
private final NodeAccess nodeAccess;
-
+
private final List plugins;
private final List pluginLocators;
@@ -75,10 +75,11 @@ public class NodeProvider
private Node node;
@Inject
- public NodeProvider(final ApplicationDirectories directories,
- final NodeAccess nodeAccess,
- @Nullable @Named("${nexus.elasticsearch.plugins}") final String plugins,
- @Nullable final List pluginLocators)
+ public NodeProvider(
+ final ApplicationDirectories directories,
+ final NodeAccess nodeAccess,
+ @Nullable @Named("${nexus.elasticsearch.plugins}") final String plugins,
+ @Nullable final List pluginLocators)
{
this.directories = checkNotNull(directories);
this.nodeAccess = checkNotNull(nodeAccess);
diff --git a/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/PluginUsingNode.java b/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/PluginUsingNode.java
index 5672921f4e..93fec215c3 100644
--- a/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/PluginUsingNode.java
+++ b/components/nexus-elasticsearch/src/main/java/org/sonatype/nexus/elasticsearch/internal/PluginUsingNode.java
@@ -33,4 +33,3 @@ public PluginUsingNode(final Settings preparedSettings, Collection
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-email
diff --git a/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailConfiguration.java b/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailConfiguration.java
index 950afef17b..d8d5bcd173 100644
--- a/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailConfiguration.java
+++ b/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailConfiguration.java
@@ -22,7 +22,7 @@
public interface EmailConfiguration
{
boolean isEnabled();
-
+
void setEnabled(boolean enabled);
String getHost();
@@ -30,7 +30,7 @@ public interface EmailConfiguration
void setHost(String host);
int getPort();
-
+
void setPort(int port);
String getUsername();
diff --git a/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailManager.java b/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailManager.java
index f95e71eeee..a62e737100 100644
--- a/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailManager.java
+++ b/components/nexus-email/src/main/java/org/sonatype/nexus/email/EmailManager.java
@@ -40,8 +40,7 @@ public interface EmailManager
/**
* Send verification email to given address using the provided password.
*/
- void sendVerification(EmailConfiguration configuration, String password, String address)
- throws EmailException;
+ void sendVerification(EmailConfiguration configuration, String password, String address) throws EmailException;
/**
* Send verification email to given address using the existing password.
diff --git a/components/nexus-email/src/main/java/org/sonatype/nexus/email/package-info.java b/components/nexus-email/src/main/java/org/sonatype/nexus/email/package-info.java
index 577d2fbf4e..4bc48fed30 100644
--- a/components/nexus-email/src/main/java/org/sonatype/nexus/email/package-info.java
+++ b/components/nexus-email/src/main/java/org/sonatype/nexus/email/package-info.java
@@ -16,4 +16,4 @@
*
* @since 3.0
*/
-package org.sonatype.nexus.email;
\ No newline at end of file
+package org.sonatype.nexus.email;
diff --git a/components/nexus-email/src/test/java/org/sonatype/nexus/email/internal/secrets/migration/EmailSecretsMigratorTests.java b/components/nexus-email/src/test/java/org/sonatype/nexus/email/internal/secrets/migration/EmailSecretsMigratorTests.java
index d8faa23934..603eb3e01d 100644
--- a/components/nexus-email/src/test/java/org/sonatype/nexus/email/internal/secrets/migration/EmailSecretsMigratorTests.java
+++ b/components/nexus-email/src/test/java/org/sonatype/nexus/email/internal/secrets/migration/EmailSecretsMigratorTests.java
@@ -42,7 +42,7 @@ public class EmailSecretsMigratorTests
@Test
public void testMigrate() {
- Secret notMigrated = getMockSecret("legacy","legacyPassword");
+ Secret notMigrated = getMockSecret("legacy", "legacyPassword");
when(emailConfiguration.getPassword()).thenReturn(notMigrated);
when(emailManager.getConfiguration()).thenReturn(emailConfiguration);
diff --git a/components/nexus-extdirect/pom.xml b/components/nexus-extdirect/pom.xml
index 262db67bbb..6109b849f6 100644
--- a/components/nexus-extdirect/pom.xml
+++ b/components/nexus-extdirect/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-extdirect
diff --git a/components/nexus-extdirect/src/main/java/org/sonatype/nexus/extdirect/package-info.java b/components/nexus-extdirect/src/main/java/org/sonatype/nexus/extdirect/package-info.java
index 4bcfb6a546..07eccb4607 100644
--- a/components/nexus-extdirect/src/main/java/org/sonatype/nexus/extdirect/package-info.java
+++ b/components/nexus-extdirect/src/main/java/org/sonatype/nexus/extdirect/package-info.java
@@ -16,4 +16,4 @@
*
* @since 3.0
*/
-package org.sonatype.nexus.extdirect;
\ No newline at end of file
+package org.sonatype.nexus.extdirect;
diff --git a/components/nexus-extender/pom.xml b/components/nexus-extender/pom.xml
index 6f016bc22d..1570e719f1 100644
--- a/components/nexus-extender/pom.xml
+++ b/components/nexus-extender/pom.xml
@@ -19,7 +19,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-extender
diff --git a/components/nexus-features/pom.xml b/components/nexus-features/pom.xml
index 9a1980873f..53bfaf70de 100644
--- a/components/nexus-features/pom.xml
+++ b/components/nexus-features/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-features
diff --git a/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesResolver.java b/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesResolver.java
index 703605f0ce..c63dc9db46 100644
--- a/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesResolver.java
+++ b/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesResolver.java
@@ -87,7 +87,8 @@ public Stream resolve(final Feature feature) {
else if (installedFeatures.add(id)) {
log.debug("Resolving feature {}", id);
return Stream.concat(
- feature.getDependencies().stream()
+ feature.getDependencies()
+ .stream()
.flatMap(d -> resolve(d.getName() + '/' + d.getVersion())),
feature.getBundles().stream());
}
diff --git a/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesWrapper.java b/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesWrapper.java
index db262e2c97..7887cf4dd9 100644
--- a/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesWrapper.java
+++ b/components/nexus-features/src/main/java/org/sonatype/nexus/features/internal/FeaturesWrapper.java
@@ -66,7 +66,7 @@ public class FeaturesWrapper
new Hashtable<>(singletonMap(SERVICE_RANKING, MAX_VALUE)); // NOSONAR: registerService API wants a Dictionary
private final FeaturesService wrapper = (FeaturesService) newProxyInstance(FeaturesService.class.getClassLoader(),
- new Class[] { FeaturesService.class }, this);
+ new Class[]{FeaturesService.class}, this);
private volatile FeaturesService delegate;
diff --git a/components/nexus-formfields/pom.xml b/components/nexus-formfields/pom.xml
index 873802222c..10ecbfe218 100644
--- a/components/nexus-formfields/pom.xml
+++ b/components/nexus-formfields/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-formfields
diff --git a/components/nexus-guice-servlet/pom.xml b/components/nexus-guice-servlet/pom.xml
index bca414a990..125b430b9e 100644
--- a/components/nexus-guice-servlet/pom.xml
+++ b/components/nexus-guice-servlet/pom.xml
@@ -19,7 +19,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-guice-servlet
diff --git a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicFilterPipeline.java b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicFilterPipeline.java
index fa21cc0a5b..2cf44d3a01 100644
--- a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicFilterPipeline.java
+++ b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicFilterPipeline.java
@@ -98,8 +98,10 @@ public synchronized void initPipeline(final ServletContext context) throws Servl
}
@Override
- public void dispatch(ServletRequest request, ServletResponse response, FilterChain proceedingFilterChain)
- throws IOException, ServletException
+ public void dispatch(
+ ServletRequest request,
+ ServletResponse response,
+ FilterChain proceedingFilterChain) throws IOException, ServletException
{
new FilterChainInvocation(filterDefinitions(), servletPipeline, proceedingFilterChain).doFilter(
withDispatcher(request, servletPipeline), response);
@@ -115,7 +117,8 @@ public void destroyPipeline() {
}
}
- private static ServletRequest withDispatcher(ServletRequest servletRequest,
+ private static ServletRequest withDispatcher(
+ ServletRequest servletRequest,
final DynamicServletPipeline servletPipeline)
{
if (!servletPipeline.hasServletsMapped()) {
diff --git a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicServletPipeline.java b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicServletPipeline.java
index 59d5d2f4fe..7facb47b39 100644
--- a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicServletPipeline.java
+++ b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/DynamicServletPipeline.java
@@ -89,8 +89,9 @@ RequestDispatcher getRequestDispatcher(final String path) {
if (servletDefinition.shouldServe(path)) {
return new RequestDispatcher()
{
- public void forward(ServletRequest servletRequest, ServletResponse servletResponse)
- throws ServletException, IOException
+ public void forward(
+ ServletRequest servletRequest,
+ ServletResponse servletResponse) throws ServletException, IOException
{
checkState(!servletResponse.isCommitted(),
"Response has been committed--you can only call forward before"
@@ -98,21 +99,23 @@ public void forward(ServletRequest servletRequest, ServletResponse servletRespon
servletResponse.resetBuffer();
- ServletRequest requestToProcess = servletRequest instanceof HttpServletRequest ?
- wrapRequest((HttpServletRequest) servletRequest, path) :
- servletRequest;
+ ServletRequest requestToProcess =
+ servletRequest instanceof HttpServletRequest ? wrapRequest((HttpServletRequest) servletRequest, path)
+ : servletRequest;
doServiceImpl(requestToProcess, servletResponse);
}
- public void include(ServletRequest servletRequest, ServletResponse servletResponse)
- throws ServletException, IOException
+ public void include(
+ ServletRequest servletRequest,
+ ServletResponse servletResponse) throws ServletException, IOException
{
doServiceImpl(servletRequest, servletResponse);
}
- private void doServiceImpl(ServletRequest servletRequest, ServletResponse servletResponse)
- throws ServletException, IOException
+ private void doServiceImpl(
+ ServletRequest servletRequest,
+ ServletResponse servletResponse) throws ServletException, IOException
{
servletRequest.setAttribute(REQUEST_DISPATCHER_REQUEST, Boolean.TRUE);
try {
diff --git a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/FilterPipelineMediator.java b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/FilterPipelineMediator.java
index b09ed026d0..0096b7a1e4 100644
--- a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/FilterPipelineMediator.java
+++ b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/FilterPipelineMediator.java
@@ -23,8 +23,9 @@
final class FilterPipelineMediator
implements Mediator
{
- public void add(final BeanEntry entry, final DynamicFilterPipeline watcher)
- throws Exception
+ public void add(
+ final BeanEntry entry,
+ final DynamicFilterPipeline watcher) throws Exception
{
// initialize pipeline before exposing via cache
final FilterPipeline pipeline = entry.getValue();
@@ -32,12 +33,13 @@ public void add(final BeanEntry entry, final Dynamic
watcher.refreshCache();
}
- public void remove(final BeanEntry entry, final DynamicFilterPipeline watcher)
- throws Exception
+ public void remove(
+ final BeanEntry entry,
+ final DynamicFilterPipeline watcher) throws Exception
{
// remove pipeline from cache before disposing
final FilterPipeline pipeline = entry.getValue();
watcher.refreshCache();
pipeline.destroyPipeline();
}
-}
\ No newline at end of file
+}
diff --git a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/PipelineLogger.java b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/PipelineLogger.java
index d1186c728c..c4c360404d 100644
--- a/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/PipelineLogger.java
+++ b/components/nexus-guice-servlet/src/main/java/com/google/inject/servlet/PipelineLogger.java
@@ -71,4 +71,4 @@ public String visit(InstanceServletBinding binding) {
private static String format(String pattern, Object element) {
return Strings.padEnd(pattern, PADDING, ' ') + ' ' + element;
}
-}
\ No newline at end of file
+}
diff --git a/components/nexus-httpclient/pom.xml b/components/nexus-httpclient/pom.xml
index 8758b78592..1beb2717ec 100644
--- a/components/nexus-httpclient/pom.xml
+++ b/components/nexus-httpclient/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-httpclient
diff --git a/components/nexus-jmx/pom.xml b/components/nexus-jmx/pom.xml
index ce5161957b..f272f92d4c 100644
--- a/components/nexus-jmx/pom.xml
+++ b/components/nexus-jmx/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-jmx
diff --git a/components/nexus-main/pom.xml b/components/nexus-main/pom.xml
index c29a9dca4a..39b1c38663 100644
--- a/components/nexus-main/pom.xml
+++ b/components/nexus-main/pom.xml
@@ -21,7 +21,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-main
diff --git a/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NexusMain.java b/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NexusMain.java
index 0ea7471cce..1e4b492088 100644
--- a/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NexusMain.java
+++ b/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NexusMain.java
@@ -27,7 +27,7 @@
public class NexusMain
extends org.apache.karaf.main.Main
{
- //Visible for testing
+ // Visible for testing
static final Version MINIMUM_JAVA_VERSION = new Version(1, 8, 0);
Logger log = Logger.getLogger(this.getClass().getName());
@@ -87,8 +87,8 @@ public static void main(final String[] args) throws Exception {
else if (!restart) {
int overriddenExitCode = Integer.getInteger("nexus.overrideExitCode", 0);
- if (overriddenExitCode!=0) {
- System.err.println("Exited with code: " + overriddenExitCode );
+ if (overriddenExitCode != 0) {
+ System.err.println("Exited with code: " + overriddenExitCode);
System.err.println("Please check the previous log messages to identify why shutdown was initiated.");
System.exit(overriddenExitCode);
}
@@ -153,7 +153,7 @@ private static void setDirectory(final String propertyName, final File parent, f
System.setProperty(propertyName, new File(parent, child).getAbsolutePath());
}
- //Visible for testing
+ // Visible for testing
static void requireMinimumJavaVersion() {
if (isNotSupportedVersion(System.getProperty("java.version"))) {
// logging is not configured yet, so use console
diff --git a/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NonResettableLogManager.java b/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NonResettableLogManager.java
index 8ea16e2bac..16bd3d67fc 100644
--- a/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NonResettableLogManager.java
+++ b/components/nexus-main/src/main/java/org/sonatype/nexus/karaf/NonResettableLogManager.java
@@ -27,6 +27,6 @@ public void reset() {
// overridden to be a noop
// reset() is called on several occasions where its standard behavior has undesired effects:
// - shortly after pax-logging has configured Logback, thereby undoing the efforts of LevelChangePropagator
- // - during JVM shutdown, thereby disabling shutdown logging from components using JUL
+ // - during JVM shutdown, thereby disabling shutdown logging from components using JUL
}
}
diff --git a/components/nexus-main/src/test/java/org/sonatype/nexus/karaf/NexusMainTest.java b/components/nexus-main/src/test/java/org/sonatype/nexus/karaf/NexusMainTest.java
index 01ed68bdf6..c04f99b649 100644
--- a/components/nexus-main/src/test/java/org/sonatype/nexus/karaf/NexusMainTest.java
+++ b/components/nexus-main/src/test/java/org/sonatype/nexus/karaf/NexusMainTest.java
@@ -42,13 +42,13 @@ public class NexusMainTest
@Rule
public final SystemErrRule systemErrRule = new SystemErrRule().enableLog();
- @SuppressWarnings("java:S2699") //sonar wants assertions, but none seem worthwhile here
+ @SuppressWarnings("java:S2699") // sonar wants assertions, but none seem worthwhile here
@Test
public void doNotExitWhenGreaterVersion() throws Exception {
requireMinimumJavaVersion();
}
- @SuppressWarnings("java:S2699") //sonar wants assertions, but none seem worthwhile here
+ @SuppressWarnings("java:S2699") // sonar wants assertions, but none seem worthwhile here
@Test
public void doNotExitWhenExactVersion() throws Exception {
setVersion(NexusMain.MINIMUM_JAVA_VERSION.toString());
@@ -63,13 +63,13 @@ public void exitOnLowerJavaVersion() throws Exception {
requireMinimumJavaVersion();
}
- @SuppressWarnings("java:S2699") //sonar wants assertions, but none seem worthwhile here
+ @SuppressWarnings("java:S2699") // sonar wants assertions, but none seem worthwhile here
@Test
public void doNotExitWhenWrongVersionButCheckDisabled() throws Exception {
runDisabledVmCheckWithVersion(LOWER);
}
- @SuppressWarnings("java:S2699") //sonar wants assertions, but none seem worthwhile here
+ @SuppressWarnings("java:S2699") // sonar wants assertions, but none seem worthwhile here
@Test
public void doNotExitWhenVmCheckDisabledAndInvalidVersion() throws Exception {
runDisabledVmCheckWithVersion(INVALID);
@@ -96,7 +96,7 @@ public void logInvalidVersionErrorWhenVmCheckDisabledAndInvalidVersion() throws
@Test
public void logExpectedExitWithNoOverriddenExitCode() throws Exception {
try (MockedConstruction ignored =
- Mockito.mockConstruction(NexusMain.class)) {
+ Mockito.mockConstruction(NexusMain.class)) {
exit.expectSystemExitWithStatus(0);
NexusMain.main(new String[0]);
}
@@ -105,7 +105,7 @@ public void logExpectedExitWithNoOverriddenExitCode() throws Exception {
@Test
public void logExpectedExitWithOverriddenExitCode() throws Exception {
try (MockedConstruction ignored =
- Mockito.mockConstruction(NexusMain.class)) {
+ Mockito.mockConstruction(NexusMain.class)) {
System.setProperty("nexus.overrideExitCode", "-42");
exit.expectSystemExitWithStatus(-42);
NexusMain.main(new String[0]);
diff --git a/components/nexus-mime/pom.xml b/components/nexus-mime/pom.xml
index 25a10ed341..43e409c34d 100644
--- a/components/nexus-mime/pom.xml
+++ b/components/nexus-mime/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-mime
diff --git a/components/nexus-oss-edition/pom.xml b/components/nexus-oss-edition/pom.xml
index 4b1613502e..a30d762e34 100644
--- a/components/nexus-oss-edition/pom.xml
+++ b/components/nexus-oss-edition/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-oss-edition
diff --git a/components/nexus-oss-edition/src/main/java/com/sonatype/nexus/edition/oss/ApplicationLicenseImpl.java b/components/nexus-oss-edition/src/main/java/com/sonatype/nexus/edition/oss/ApplicationLicenseImpl.java
index 01d2efcaaa..e6d2642398 100644
--- a/components/nexus-oss-edition/src/main/java/com/sonatype/nexus/edition/oss/ApplicationLicenseImpl.java
+++ b/components/nexus-oss-edition/src/main/java/com/sonatype/nexus/edition/oss/ApplicationLicenseImpl.java
@@ -90,4 +90,4 @@ public void refresh() {
public boolean isEvaluation() {
return false;
}
-}
\ No newline at end of file
+}
diff --git a/components/nexus-pax-exam/pom.xml b/components/nexus-pax-exam/pom.xml
index 3bcab64880..48555342c7 100644
--- a/components/nexus-pax-exam/pom.xml
+++ b/components/nexus-pax-exam/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-pax-exam
diff --git a/components/nexus-pax-logging/pom.xml b/components/nexus-pax-logging/pom.xml
index 576f89a2f2..f7eaeb1074 100644
--- a/components/nexus-pax-logging/pom.xml
+++ b/components/nexus-pax-logging/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-pax-logging
diff --git a/components/nexus-plugin-api/pom.xml b/components/nexus-plugin-api/pom.xml
index 733632b51f..703b29721b 100644
--- a/components/nexus-plugin-api/pom.xml
+++ b/components/nexus-plugin-api/pom.xml
@@ -19,7 +19,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-plugin-api
diff --git a/components/nexus-quartz/pom.xml b/components/nexus-quartz/pom.xml
index 10a90a8df2..843f95efe2 100644
--- a/components/nexus-quartz/pom.xml
+++ b/components/nexus-quartz/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-quartz
diff --git a/components/nexus-rapture/pom.xml b/components/nexus-rapture/pom.xml
index 4a7670f952..952c5dd8fa 100644
--- a/components/nexus-rapture/pom.xml
+++ b/components/nexus-rapture/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-rapture
diff --git a/components/nexus-rapture/src/main/resources/static/rapture/NX/view/MaliciousRiskOnDisk.js b/components/nexus-rapture/src/main/resources/static/rapture/NX/view/MaliciousRiskOnDisk.js
index 67b3fd788d..1407aecfff 100644
--- a/components/nexus-rapture/src/main/resources/static/rapture/NX/view/MaliciousRiskOnDisk.js
+++ b/components/nexus-rapture/src/main/resources/static/rapture/NX/view/MaliciousRiskOnDisk.js
@@ -32,13 +32,13 @@ Ext.define('NX.view.MaliciousRiskOnDisk', {
xtype: 'nx-secondary-container',
reactView: window.ReactComponents.MaliciousRiskOnDisk,
reactViewProps: {
- rerender: function(count) {
- if (count === 0) {
+ rerender: function(count, hide) {
+ if (count === 0 || hide) {
me.hide();
} else {
me.show();
}
- }
+ },
}
}
];
diff --git a/components/nexus-rapture/src/main/resources/static/rapture/NX/view/feature/Content.js b/components/nexus-rapture/src/main/resources/static/rapture/NX/view/feature/Content.js
index 68927d2af0..c93d78e7c5 100644
--- a/components/nexus-rapture/src/main/resources/static/rapture/NX/view/feature/Content.js
+++ b/components/nexus-rapture/src/main/resources/static/rapture/NX/view/feature/Content.js
@@ -69,7 +69,14 @@ Ext.define('NX.view.feature.Content', {
const isAdmin = user && user.administrator;
const shouldHideForNonAdmin = isRiskOnDiskNoneAdminOverrideEnabled && !isAdmin;
- if (isRiskOnDiskEnabled && isCurrentTitleInTitles && user && !shouldHideForNonAdmin) {
+ if (!user) {
+ document.cookie = 'MALWARE_BANNER=; expires=Thu, 26 Feb 1950 00:00:00 UTC; path=/';
+ }
+
+ const malwareBanner = document.cookie.match(/MALWARE_BANNER_STATUS=([^;]*)/);
+ const hideMalwareBanner = malwareBanner && malwareBanner[1] === 'close';
+
+ if (isRiskOnDiskEnabled && isCurrentTitleInTitles && user && !shouldHideForNonAdmin && !hideMalwareBanner) {
maliciousRiskOnDisk.setHeight(285);
maliciousRiskOnDisk.show();
maliciousRiskOnDisk.rerender();
diff --git a/components/nexus-repository-config/pom.xml b/components/nexus-repository-config/pom.xml
index 5117ac4543..7a186a6b82 100644
--- a/components/nexus-repository-config/pom.xml
+++ b/components/nexus-repository-config/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-repository-config
diff --git a/components/nexus-repository-content/pom.xml b/components/nexus-repository-content/pom.xml
index d720b7e1d0..8b339e2662 100644
--- a/components/nexus-repository-content/pom.xml
+++ b/components/nexus-repository-content/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-repository-content
diff --git a/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/blobstore/metrics/BlobStoreMetricsStoreImpl.java b/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/blobstore/metrics/BlobStoreMetricsStoreImpl.java
index e735656e7e..9d425df53c 100644
--- a/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/blobstore/metrics/BlobStoreMetricsStoreImpl.java
+++ b/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/blobstore/metrics/BlobStoreMetricsStoreImpl.java
@@ -76,7 +76,7 @@ public void initializeMetrics(String blobStoreName) {
}
catch (DuplicateKeyException e) {
log.debug("Failed to initialize blobstore metrics as they are already initialized.",
- e); //this is likely an HA race condition between multiple nodes - this is not a problem
+ e); // this is likely an HA race condition between multiple nodes - this is not a problem
}
}
}
diff --git a/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobDAO.java b/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobDAO.java
index c9b4468c41..976e9b0f0b 100644
--- a/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobDAO.java
+++ b/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobDAO.java
@@ -65,9 +65,9 @@ Continuation browseAssetBlobs(
/**
* Browse asset blobs in the content data store in a paged fashion.
*
- * @param limit maximum number of asset blobs to return
- * @param start start date
- * @param end end date
+ * @param limit maximum number of asset blobs to return
+ * @param start start date
+ * @param end end date
* @param continuationToken optional token to continue from a previous request
* @return collection of asset blobs and the next continuation token
* @see Continuation#nextContinuationToken()
@@ -109,6 +109,13 @@ Continuation browseAssetBlobsWithinDuration(
*/
boolean deleteAssetBlobBatch(@Param("blobRefIds") String[] blobRefIds);
+ /**
+ * Deletes an asset blob along with asset.
+ *
+ * @param blobRef the blob reference
+ */
+ void deleteAssetBlobWithAsset(@Param("blobRef") BlobRef blobRef);
+
/**
* Generally it is recommended that this method not be called and let stores manage this value.
*
@@ -119,7 +126,9 @@ Continuation browseAssetBlobsWithinDuration(
/**
* Sets added to repository on the asset blob.
*/
- void setAddedToRepository(@Param("blobRef") BlobRef blobRef, @Param("addedToRepository") OffsetDateTime addedToRepository);
+ void setAddedToRepository(
+ @Param("blobRef") BlobRef blobRef,
+ @Param("addedToRepository") OffsetDateTime addedToRepository);
/**
* Sets the content type on the asset
diff --git a/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobStore.java b/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobStore.java
index ed56707b8f..819932fced 100644
--- a/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobStore.java
+++ b/components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/store/AssetBlobStore.java
@@ -39,9 +39,10 @@ public class AssetBlobStore
extends ContentStoreSupport
{
@Inject
- public AssetBlobStore(final DataSessionSupplier sessionSupplier,
- @Assisted final String contentStoreName,
- @Assisted final Class daoClass)
+ public AssetBlobStore(
+ final DataSessionSupplier sessionSupplier,
+ @Assisted final String contentStoreName,
+ @Assisted final Class daoClass)
{
super(sessionSupplier, contentStoreName, daoClass);
}
@@ -56,8 +57,11 @@ public AssetBlobStore(final DataSessionSupplier sessionSupplier,
* @see Continuation#nextContinuationToken()
*/
@Transactional
- public Continuation browseUnusedAssetBlobs(final int limit,
- final int blobCreatedDelayMinute, @Nullable final String continuationToken) {
+ public Continuation browseUnusedAssetBlobs(
+ final int limit,
+ final int blobCreatedDelayMinute,
+ @Nullable final String continuationToken)
+ {
return dao().browseUnusedAssetBlobs(limit, blobCreatedDelayMinute, continuationToken);
}
@@ -94,7 +98,6 @@ public Continuation browseAssetBlobsWithinDuration(
return dao().browseAssetBlobsWithinDuration(limit, start, end, continuationToken);
}
-
/**
* Creates the given asset blob in the content data store.
*
@@ -138,6 +141,16 @@ public boolean deleteAssetBlobBatch(final String[] blobRefIds) {
return dao().deleteAssetBlobBatch(blobRefIds);
}
+ /**
+ * Deletes an asset blob along with asset.
+ *
+ * @param blobRef the blob reference
+ */
+ @Transactional
+ public void deleteAssetBlobWithAsset(final BlobRef blobRef) {
+ dao().deleteAssetBlobWithAsset(blobRef);
+ }
+
/**
* Generally it is recommended that this method not be called and let stores manage this value.
*
@@ -191,7 +204,10 @@ public void setCreatedByIP(final AssetBlob blob, final String createdByIP) {
* @return collection of asset blobs and the next continuation token
*/
@Transactional
- public Continuation browseAssetsWithLegacyBlobRef(final int limit, @Nullable final String continuationToken) {
+ public Continuation browseAssetsWithLegacyBlobRef(
+ final int limit,
+ @Nullable final String continuationToken)
+ {
return dao().browseAssetsWithLegacyBlobRef(limit, continuationToken);
}
diff --git a/components/nexus-repository-content/src/main/resources/org/sonatype/nexus/repository/content/store/AssetBlobDAO.xml b/components/nexus-repository-content/src/main/resources/org/sonatype/nexus/repository/content/store/AssetBlobDAO.xml
index 8e9b633016..73e7d9ce89 100644
--- a/components/nexus-repository-content/src/main/resources/org/sonatype/nexus/repository/content/store/AssetBlobDAO.xml
+++ b/components/nexus-repository-content/src/main/resources/org/sonatype/nexus/repository/content/store/AssetBlobDAO.xml
@@ -103,6 +103,17 @@
DELETE FROM ${format}_asset_blob WHERE blob_ref = ANY(#{blobRefIds});
+
+ DELETE
+ FROM ${format}_asset
+ WHERE asset_blob_id = (SELECT asset_blob_id
+ FROM ${format}_asset_blob
+ WHERE blob_ref = #{blobRef});
+ DELETE
+ FROM ${format}_asset_blob
+ WHERE blob_ref = #{blobRef};
+
+
UPDATE ${format}_asset_blob SET blob_created = #{blobCreated}
WHERE blob_ref = #{blobRef};
diff --git a/components/nexus-repository-services/pom.xml b/components/nexus-repository-services/pom.xml
index d2c7de9171..166d6ad67a 100644
--- a/components/nexus-repository-services/pom.xml
+++ b/components/nexus-repository-services/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-repository-services
diff --git a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/group/GroupHandler.java b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/group/GroupHandler.java
index 7bae6dc1ba..98cf3126ca 100644
--- a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/group/GroupHandler.java
+++ b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/group/GroupHandler.java
@@ -15,7 +15,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
-
import javax.annotation.Nonnull;
import javax.inject.Named;
import javax.inject.Singleton;
@@ -95,7 +94,8 @@ public Response handle(@Nonnull final Context context) throws Exception {
switch (method) {
case GET:
case HEAD: {
- final DispatchedRepositories dispatched = context.getRequest().getAttributes()
+ final DispatchedRepositories dispatched = context.getRequest()
+ .getAttributes()
.getOrCreate(DispatchedRepositories.class);
return doGet(context, dispatched);
}
@@ -108,9 +108,9 @@ public Response handle(@Nonnull final Context context) throws Exception {
/**
* Method that actually performs group GET. Override if needed.
*/
- protected Response doGet(@Nonnull final Context context,
- @Nonnull final DispatchedRepositories dispatched)
- throws Exception
+ protected Response doGet(
+ @Nonnull final Context context,
+ @Nonnull final DispatchedRepositories dispatched) throws Exception
{
final GroupFacet groupFacet = context.getRepository().facet(GroupFacet.class);
return getFirst(context, groupFacet.members(), dispatched);
@@ -120,10 +120,10 @@ protected Response doGet(@Nonnull final Context context,
* Returns the first OK response from member repositories or {@link HttpResponses#notFound()} if none of the members
* responded with OK.
*/
- protected Response getFirst(@Nonnull final Context context,
- @Nonnull final List members,
- @Nonnull final DispatchedRepositories dispatched)
- throws Exception
+ protected Response getFirst(
+ @Nonnull final Context context,
+ @Nonnull final List members,
+ @Nonnull final DispatchedRepositories dispatched) throws Exception
{
final Request request = context.getRequest();
for (Repository member : members) {
@@ -148,10 +148,10 @@ protected Response getFirst(@Nonnull final Context context,
/**
* Returns all responses from all members as a linked map, where order is group member order.
*/
- protected LinkedHashMap getAll(@Nonnull final Context context,
- @Nonnull final Iterable members,
- @Nonnull final DispatchedRepositories dispatched)
- throws Exception
+ protected LinkedHashMap getAll(
+ @Nonnull final Context context,
+ @Nonnull final Iterable members,
+ @Nonnull final DispatchedRepositories dispatched) throws Exception
{
return getAll(context.getRequest(), context, members, dispatched);
}
@@ -161,18 +161,18 @@ protected LinkedHashMap getAll(@Nonnull final Context cont
* different request then provided by the {@link Context#getRequest()} while still using the
* same {@link Context} to execute the request in.
*
- * @param request {@link Request} that could be different then the {@link Context#getRequest()}
- * @param context {@link Context}
- * @param members {@link Repository}'s
+ * @param request {@link Request} that could be different then the {@link Context#getRequest()}
+ * @param context {@link Context}
+ * @param members {@link Repository}'s
* @param dispatched {@link DispatchedRepositories}
* @return LinkedHashMap of all responses from all members where order is group member order.
* @throws Exception throw for any issues dispatching the request
*/
- protected LinkedHashMap getAll(@Nonnull final Request request,
- @Nonnull final Context context,
- @Nonnull final Iterable members,
- @Nonnull final DispatchedRepositories dispatched)
- throws Exception
+ protected LinkedHashMap getAll(
+ @Nonnull final Request request,
+ @Nonnull final Context context,
+ @Nonnull final Iterable members,
+ @Nonnull final DispatchedRepositories dispatched) throws Exception
{
final LinkedHashMap responses = Maps.newLinkedHashMap();
for (Repository member : members) {
@@ -193,7 +193,6 @@ protected LinkedHashMap getAll(@Nonnull final Request requ
return responses;
}
-
/**
* Returns standard 404 with no message. Override for format specific messaging.
*/
diff --git a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/proxy/ProxyFacetSupport.java b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/proxy/ProxyFacetSupport.java
index 380806e8fc..44c2279093 100644
--- a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/proxy/ProxyFacetSupport.java
+++ b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/proxy/ProxyFacetSupport.java
@@ -177,7 +177,7 @@ public ProxyRepositoryConfiguration getConfiguration() {
protected void configureCooperation(
final Cooperation2Factory cooperationFactory,
@Nullable @Named("local") Cooperation2Factory defaultCooperationFactory,
- @Named("${nexus.proxy.clustered.cooperation.enabled:-true}") final boolean proxyClusteredCooperationEnabled,
+ @Named("${nexus.proxy.clustered.cooperation.enabled:-false}") final boolean proxyClusteredCooperationEnabled,
@Named(DATASTORE_CLUSTERED_ENABLED_NAMED) final boolean clustered,
@Named("${nexus.proxy.cooperation.enabled:-true}") final boolean cooperationEnabled,
@Named("${nexus.proxy.cooperation.majorTimeout:-0s}") final Duration majorTimeout,
diff --git a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/rest/api/model/CargoAttributes.java b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/rest/api/model/CargoAttributes.java
new file mode 100644
index 0000000000..35db29d3ec
--- /dev/null
+++ b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/rest/api/model/CargoAttributes.java
@@ -0,0 +1,37 @@
+/*
+ * Sonatype Nexus (TM) Open Source Version
+ * Copyright (c) 2008-present Sonatype, Inc.
+ * All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ * Eclipse Foundation. All other trademarks are the property of their respective owners.
+ */
+package org.sonatype.nexus.repository.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+
+public class CargoAttributes
+{
+ public static final String REQUIRE_AUTHENTICATION = "requireAuthentication";
+
+ @ApiModelProperty(value = "Indicates if this repository requires authentication overriding anonymous access.",
+ example = "false")
+ protected final Boolean requireAuthentication;
+
+ @JsonCreator
+ public CargoAttributes(
+ @JsonProperty(REQUIRE_AUTHENTICATION) final Boolean requireAuthentication)
+ {
+ this.requireAuthentication = requireAuthentication;
+ }
+
+ public Boolean getRequireAuthentication() {
+ return requireAuthentication;
+ }
+}
diff --git a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtils.java b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtils.java
index 3561c9d603..0e7b0ea778 100644
--- a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtils.java
+++ b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtils.java
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -27,7 +28,6 @@
import org.sonatype.goodies.common.ComponentSupport;
import org.sonatype.nexus.repository.Repository;
-import org.sonatype.nexus.repository.rest.SearchMapping;
import org.sonatype.nexus.repository.rest.SearchMappings;
import org.sonatype.nexus.repository.rest.api.RepositoryManagerRESTAdapter;
import org.sonatype.nexus.repository.search.BlankValueSearchQueryFilter;
@@ -75,7 +75,7 @@ public class ElasticSearchUtils
private final RepositoryManagerRESTAdapter repoAdapter;
- private final Map searchParams;
+ private final Map searchParams = new HashMap<>();
private final Map assetSearchParams;
@@ -88,16 +88,22 @@ public class ElasticSearchUtils
private final ElasticSearchContribution blankValueElasticSearchContribution;
@Inject
- public ElasticSearchUtils(final RepositoryManagerRESTAdapter repoAdapter,
- final Map searchMappings,
- final Map searchContributions,
- final Map filterAttributes)
+ public ElasticSearchUtils(
+ final RepositoryManagerRESTAdapter repoAdapter,
+ final Map searchMappings,
+ final Map searchContributions,
+ final Map filterAttributes)
{
this.repoAdapter = checkNotNull(repoAdapter);
- this.searchParams = checkNotNull(searchMappings).entrySet().stream()
+ checkNotNull(searchMappings).entrySet()
+ .stream()
.flatMap(e -> stream(e.getValue().get().spliterator(), true))
- .collect(toMap(SearchMapping::getAlias, SearchMapping::getAttribute));
- this.assetSearchParams = searchParams.entrySet().stream()
+ .forEach(mapping -> {
+ searchParams.put(mapping.getAlias(), mapping.getAttribute());
+ searchParams.put(mapping.getAttribute(), mapping.getAttribute());
+ });
+ this.assetSearchParams = searchParams.entrySet()
+ .stream()
.filter(e -> e.getValue().startsWith(ASSET_PREFIX))
.collect(toMap(Entry::getKey, Entry::getValue));
this.searchContributions = checkNotNull(searchContributions);
@@ -124,14 +130,15 @@ public Repository getReadableRepository(final String repository) {
* Constructs a query from the provided search filters using conjunction (AND)
*/
public QueryBuilder buildQuery(final Collection searchFilters) {
- return buildQuery(searchFilters, true);
+ return buildQuery(convertFilters(searchFilters), true);
}
/**
* @since 3.15
* @param searchFilters the filters for the query
- * @param conjunction indicates the query should use conjunection (AND) rather than disjunction (OR)
- * @return a {@link QueryBuilder} for the provided search filters, the query will be generated by the {@link ElasticSearchContribution}s
+ * @param conjunction indicates the query should use conjunection (AND) rather than disjunction (OR)
+ * @return a {@link QueryBuilder} for the provided search filters, the query will be generated by the
+ * {@link ElasticSearchContribution}s
*/
public QueryBuilder buildQuery(final Collection searchFilters, final boolean conjunction) {
BoolQueryBuilder query = QueryBuilders.boolQuery();
@@ -143,7 +150,7 @@ public QueryBuilder buildQuery(final Collection searchFilters, fin
ElasticSearchContribution elasticSearchContribution = searchContributions
.getOrDefault(searchFilter.getProperty(), defaultElasticSearchContribution);
elasticSearchContribution.contribute(contribute, searchFilter.getProperty(), searchFilter.getValue());
- });
+ });
handleBlankValueFilters(contribute, searchFilters);
@@ -158,8 +165,8 @@ private void handleBlankValueFilters(
{
searchFilters.stream()
.filter(this::filter)
- .forEach(filter ->
- blankValueElasticSearchContribution.contribute(contribute, filter.getProperty(), filter.getValue()));
+ .forEach(filter -> blankValueElasticSearchContribution.contribute(contribute, filter.getProperty(),
+ filter.getValue()));
}
private boolean filter(final SearchFilter filter) {
@@ -188,12 +195,23 @@ public QueryBuilder buildQuery(final UriInfo uriInfo, final List paramet
}
private Collection convertParameters(final UriInfo uriInfo, final List keys) {
- return uriInfo.getQueryParameters().entrySet().stream()
+ return uriInfo.getQueryParameters()
+ .entrySet()
+ .stream()
.filter(entry -> !keys.contains(entry.getKey()))
.map(entry -> entry.getValue().stream().map(value -> {
String key = searchParams.getOrDefault(entry.getKey(), entry.getKey());
return new SearchFilter(key, value);
- }).collect(toSet())).flatMap(Collection::stream).collect(toSet());
+ }).collect(toSet()))
+ .flatMap(Collection::stream)
+ .collect(toSet());
+ }
+
+ private Collection convertFilters(final Collection rawFilters) {
+ return rawFilters.stream().map(filter -> {
+ String key = searchParams.getOrDefault(filter.getProperty(), filter.getProperty());
+ return new SearchFilter(key, filter.getValue());
+ }).collect(toSet());
}
@VisibleForTesting
@@ -272,18 +290,18 @@ private SortOrder getValidSortOrder(final String direction, final SortOrder defa
}
public QueryBuilder buildQuery(final SearchRequest searchRequest) {
- QueryBuilder queryBuilder = buildQuery(searchRequest.getSearchFilters(), searchRequest.isConjunction());
+ QueryBuilder queryBuilder =
+ buildQuery(convertFilters(searchRequest.getSearchFilters()), searchRequest.isConjunction());
List sortBuilders = getSortBuilders(
searchRequest.getSortField(),
- searchRequest.getSortDirection() != null ? searchRequest.getSortDirection().name() : null
- );
+ searchRequest.getSortDirection() != null ? searchRequest.getSortDirection().name() : null);
RepositoryQueryBuilder repositoryQueryBuilder = RepositoryQueryBuilder
.repositoryQuery(queryBuilder)
.sortBy(sortBuilders);
- if(searchRequest.getRepositories() != null && !searchRequest.getRepositories().isEmpty()){
+ if (searchRequest.getRepositories() != null && !searchRequest.getRepositories().isEmpty()) {
repositoryQueryBuilder.inRepositories(searchRequest.getRepositories());
}
diff --git a/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/vulnerability/exceptions/ForbiddenException.java b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/vulnerability/exceptions/ForbiddenException.java
new file mode 100644
index 0000000000..f316a256ee
--- /dev/null
+++ b/components/nexus-repository-services/src/main/java/org/sonatype/nexus/repository/vulnerability/exceptions/ForbiddenException.java
@@ -0,0 +1,28 @@
+/*
+ * Sonatype Nexus (TM) Open Source Version
+ * Copyright (c) 2008-present Sonatype, Inc.
+ * All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ * Eclipse Foundation. All other trademarks are the property of their respective owners.
+ */
+package org.sonatype.nexus.repository.vulnerability.exceptions;
+
+/**
+ * Thrown when IQ Server return 403 error code.
+ *
+ * @since 3.26
+ */
+public class ForbiddenException
+ extends RuntimeException
+{
+ private static final long serialVersionUID = -8491948572810933731L;
+
+ public ForbiddenException(final String message) {
+ super(message);
+ }
+}
diff --git a/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtilsTest.java b/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtilsTest.java
index df436bfb8d..a0d0abd24e 100644
--- a/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtilsTest.java
+++ b/components/nexus-repository-services/src/test/java/org/sonatype/nexus/repository/search/query/ElasticSearchUtilsTest.java
@@ -75,9 +75,10 @@ public void setup() {
Map searchMappings = ImmutableMap.of(
"default", () -> ImmutableList.of(
- new SearchMapping(SHA1_ALIAS, VALID_SHA1_ATTRIBUTE_NAME, "", SearchField.SHA1)
- )
- );
+ new SearchMapping(SHA1_ALIAS, VALID_SHA1_ATTRIBUTE_NAME, "", SearchField.SHA1)),
+ "testFormat", () -> ImmutableList.of(
+ new SearchMapping("format.custom", "attributes.format.custom", "", SearchField.FORMAT_FIELD_1),
+ new SearchMapping("format.test", "attributes.format.test", "", SearchField.FORMAT_FIELD_2)));
Map searchContributions = new HashMap<>();
searchContributions.put(DefaultElasticSearchContribution.NAME, new DefaultElasticSearchContribution());
@@ -133,7 +134,7 @@ public void testGetSortBuilders_byGroup() throws Exception {
}
@Test
- public void testGetSortBuilders_byGroupDescending() throws Exception{
+ public void testGetSortBuilders_byGroupDescending() throws Exception {
List sortBuilders = underTest.getSortBuilders("group", "desc");
assertThat(sortBuilders.size(), is(3));
assertSearchBuilder(sortBuilders.get(0), "group.case_insensitive", "desc");
@@ -160,7 +161,7 @@ public void testGetSortBuilders_byName() throws Exception {
}
@Test
- public void testGetSortBuilders_byNameDescending() throws Exception{
+ public void testGetSortBuilders_byNameDescending() throws Exception {
List sortBuilders = underTest.getSortBuilders("name", "desc");
assertThat(sortBuilders.size(), is(3));
assertSearchBuilder(sortBuilders.get(0), "name.case_insensitive", "desc");
@@ -185,7 +186,7 @@ public void testGetSortBuilders_byRepository() throws Exception {
}
@Test
- public void testGetSortBuilders_byRepositoryDescending() throws Exception{
+ public void testGetSortBuilders_byRepositoryDescending() throws Exception {
List sortBuilders = underTest.getSortBuilders("repository", "desc");
assertThat(sortBuilders.size(), is(1));
assertSearchBuilder(sortBuilders.get(0), "repository_name", "desc");
@@ -206,7 +207,7 @@ public void testGetSortBuilders_byRepositoryName() throws Exception {
}
@Test
- public void testGetSortBuilders_byRepositoryNameDescending() throws Exception{
+ public void testGetSortBuilders_byRepositoryNameDescending() throws Exception {
List sortBuilders = underTest.getSortBuilders("repositoryName", "desc");
assertThat(sortBuilders.size(), is(1));
assertSearchBuilder(sortBuilders.get(0), "repository_name", "desc");
@@ -227,7 +228,7 @@ public void testGetSortBuilders_byVersion() throws Exception {
}
@Test
- public void testGetSortBuilders_byVersionDescending() throws Exception{
+ public void testGetSortBuilders_byVersionDescending() throws Exception {
List sortBuilders = underTest.getSortBuilders("version", "desc");
assertThat(sortBuilders.size(), is(1));
assertSearchBuilder(sortBuilders.get(0), "normalized_version", "desc");
@@ -248,7 +249,7 @@ public void testGetSortBuilders_byOtherField() throws Exception {
}
@Test
- public void testGetSortBuilders_byOtherFieldDescending() throws Exception{
+ public void testGetSortBuilders_byOtherFieldDescending() throws Exception {
List sortBuilders = underTest.getSortBuilders("otherfield", "desc");
assertThat(sortBuilders.size(), is(1));
assertSearchBuilder(sortBuilders.get(0), "otherfield", "desc");
@@ -264,7 +265,7 @@ public void constructSameQueryForSameFilters() {
List forwards = newArrayList(a1, a2, b1, b2, c1);
List backward = newArrayList(c1, b2, b1, a2, a1);
- List mixed = newArrayList(a1, c1 ,b1, b2, a2);
+ List mixed = newArrayList(a1, c1, b1, b2, a2);
String forwardQuery = underTest.buildQuery(forwards).toString();
String backwardQuery = underTest.buildQuery(backward).toString();
@@ -275,11 +276,17 @@ public void constructSameQueryForSameFilters() {
}
@Test
- public void buildSearchRequestFromSearchFilters(){
+ public void buildSearchRequestFromSearchFilters() {
Collection searchFilters = new ArrayList<>();
searchFilters.add(new SearchFilter("keyword", "org.junit"));
searchFilters.add(new SearchFilter("repository", "maven_central"));
searchFilters.add(new SearchFilter("format", "maven"));
+ // alias should be mapped to full attribute name
+ searchFilters.add(new SearchFilter("format.custom", "testAlias"));
+ // attribute name should also be included in query
+ searchFilters.add(new SearchFilter("attributes.format.test", "testAttribute"));
+ // filters without mapping also included
+ searchFilters.add(new SearchFilter("new.prop", "aProp"));
QueryBuilder queryBuilder = underTest.buildQuery(searchFilters);
@@ -287,6 +294,18 @@ public void buildSearchRequestFromSearchFilters(){
" \"bool\" : {\n" +
" \"must\" : [ {\n" +
" \"query_string\" : {\n" +
+ " \"query\" : \"testAlias\",\n" +
+ " \"fields\" : [ \"attributes.format.custom\" ],\n" +
+ " \"lowercase_expanded_terms\" : false\n" +
+ " }\n" +
+ " }, {\n" +
+ " \"query_string\" : {\n" +
+ " \"query\" : \"testAttribute\",\n" +
+ " \"fields\" : [ \"attributes.format.test\" ],\n" +
+ " \"lowercase_expanded_terms\" : false\n" +
+ " }\n" +
+ " }, {\n" +
+ " \"query_string\" : {\n" +
" \"query\" : \"maven\",\n" +
" \"fields\" : [ \"format\" ],\n" +
" \"lowercase_expanded_terms\" : false\n" +
@@ -298,6 +317,12 @@ public void buildSearchRequestFromSearchFilters(){
" }\n" +
" }, {\n" +
" \"query_string\" : {\n" +
+ " \"query\" : \"aProp\",\n" +
+ " \"fields\" : [ \"new.prop\" ],\n" +
+ " \"lowercase_expanded_terms\" : false\n" +
+ " }\n" +
+ " }, {\n" +
+ " \"query_string\" : {\n" +
" \"query\" : \"maven_central\",\n" +
" \"fields\" : [ \"repository\" ],\n" +
" \"lowercase_expanded_terms\" : false\n" +
@@ -307,9 +332,13 @@ public void buildSearchRequestFromSearchFilters(){
"}"));
}
- private static void assertSearchBuilder(final SortBuilder sortBuilder, final String field, final String order) throws Exception {
- //see https://github.com/elastic/elasticsearch/issues/20853 as to why i can't do something simple like
-// assertThat(sortBuilder.toString(), is("somejson"));
+ private static void assertSearchBuilder(
+ final SortBuilder sortBuilder,
+ final String field,
+ final String order) throws Exception
+ {
+ // see https://github.com/elastic/elasticsearch/issues/20853 as to why i can't do something simple like
+ // assertThat(sortBuilder.toString(), is("somejson"));
assertThat(fieldNameField.get(sortBuilder), is(field));
assertThat(orderField.get(sortBuilder).toString(), is(order));
diff --git a/components/nexus-repository-view/pom.xml b/components/nexus-repository-view/pom.xml
index 55cf71bdf2..3cd1612451 100644
--- a/components/nexus-repository-view/pom.xml
+++ b/components/nexus-repository-view/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-repository-view
diff --git a/components/nexus-rest-client/pom.xml b/components/nexus-rest-client/pom.xml
index b150a69d89..b1025ca3a9 100644
--- a/components/nexus-rest-client/pom.xml
+++ b/components/nexus-rest-client/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-rest-client
diff --git a/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/RestClientConfiguration.java b/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/RestClientConfiguration.java
index 4bc14c70a9..02b35bec25 100644
--- a/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/RestClientConfiguration.java
+++ b/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/RestClientConfiguration.java
@@ -41,9 +41,10 @@ public interface Customizer
private final boolean useTrustStore;
- private RestClientConfiguration(@Nullable final Supplier httpClient,
- @Nullable final Customizer customizer,
- final boolean useTrustStore)
+ private RestClientConfiguration(
+ @Nullable final Supplier httpClient,
+ @Nullable final Customizer customizer,
+ final boolean useTrustStore)
{
this.httpClient = httpClient;
this.customizer = customizer;
diff --git a/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/internal/RestClientFactoryImpl.java b/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/internal/RestClientFactoryImpl.java
index 47e94facb5..9dc09c05e5 100644
--- a/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/internal/RestClientFactoryImpl.java
+++ b/components/nexus-rest-client/src/main/java/org/sonatype/nexus/rest/client/internal/RestClientFactoryImpl.java
@@ -52,8 +52,9 @@ public class RestClientFactoryImpl
implements RestClientFactory
{
private final LoadingCache bridgeClassLoaderCache =
- CacheBuilder.newBuilder().build(from(
- (loader) -> new BridgeClassLoader(loader, ProxyBuilder.class.getClassLoader())));
+ CacheBuilder.newBuilder()
+ .build(from(
+ (loader) -> new BridgeClassLoader(loader, ProxyBuilder.class.getClassLoader())));
private final Provider httpClient;
@@ -69,7 +70,7 @@ public Client create(final RestClientConfiguration configuration) {
try (TcclBlock tccl = TcclBlock.begin(ResteasyClientBuilder.class)) {
HttpContext httpContext = new BasicHttpContext();
if (configuration.getUseTrustStore()) {
- httpContext.setAttribute(SSLContextSelector.USE_TRUST_STORE, true);
+ httpContext.setAttribute(SSLContextSelector.USE_TRUST_STORE, true);
}
HttpClient client;
if (configuration.getHttpClient() != null) {
diff --git a/components/nexus-rest-jackson2/pom.xml b/components/nexus-rest-jackson2/pom.xml
index b4961015d3..2c0980abc2 100644
--- a/components/nexus-rest-jackson2/pom.xml
+++ b/components/nexus-rest-jackson2/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-rest-jackson2
diff --git a/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/ObjectMapperResolver.java b/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/ObjectMapperResolver.java
index 5dfa920b56..465a078fde 100644
--- a/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/ObjectMapperResolver.java
+++ b/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/ObjectMapperResolver.java
@@ -40,8 +40,8 @@
@Provider
@Produces(MediaType.APPLICATION_JSON)
public class ObjectMapperResolver
- extends ComponentSupport
- implements ContextResolver, Component
+ extends ComponentSupport
+ implements ContextResolver, Component
{
private final javax.inject.Provider mapperProvider;
diff --git a/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/package-info.java b/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/package-info.java
index 2d2769c5b1..7abb871261 100644
--- a/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/package-info.java
+++ b/components/nexus-rest-jackson2/src/main/java/org/sonatype/nexus/rest/jackson2/internal/package-info.java
@@ -16,4 +16,4 @@
*
* @since 3.0
*/
-package org.sonatype.nexus.rest.jackson2.internal;
\ No newline at end of file
+package org.sonatype.nexus.rest.jackson2.internal;
diff --git a/components/nexus-rest/pom.xml b/components/nexus-rest/pom.xml
index b3549678be..f4fe18e39a 100644
--- a/components/nexus-rest/pom.xml
+++ b/components/nexus-rest/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-rest
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ApiDocConstants.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ApiDocConstants.java
index a2c803f9e2..0a3e09a709 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ApiDocConstants.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ApiDocConstants.java
@@ -52,7 +52,8 @@ private ApiDocConstants() {
public static final String BLOBSTORE_NOT_FOUND = "Blob store not found";
- public static final String BLOBSTORE_CHANGE_NOT_ALLOWED = "You cannot change a repository’s blob store through the API";
+ public static final String BLOBSTORE_CHANGE_NOT_ALLOWED =
+ "You cannot change a repository’s blob store through the API";
public static final String BAD_REQUEST = "Bad request";
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ExceptionMapperSupport.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ExceptionMapperSupport.java
index 796a61f5d2..e0c35d7691 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ExceptionMapperSupport.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ExceptionMapperSupport.java
@@ -69,8 +69,7 @@ public Response toResponse(final E exception) {
response.getStatus(),
entity == null ? "(no entity/body)" : String.format("'%s'", entity),
exception,
- log.isDebugEnabled() ? exception : null
- );
+ log.isDebugEnabled() ? exception : null);
return response;
}
@@ -83,7 +82,7 @@ private static String generateFaultId() {
* Convert the given exception into a response.
*
* @param exception The exception to convert.
- * @param id The unique identifier generated for this fault.
+ * @param id The unique identifier generated for this fault.
*/
protected abstract Response convert(final E exception, final String id);
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/MediaTypes.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/MediaTypes.java
index 3d23258390..44c92a0a27 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/MediaTypes.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/MediaTypes.java
@@ -29,11 +29,13 @@ private MediaTypes() {
public static final String VND_VALIDATION_ERRORS_V1_XML = "application/vnd.siesta-validation-errors-v1+xml";
- public static final MediaType VND_VALIDATION_ERRORS_V1_XML_TYPE = new MediaType("application", "vnd.siesta-validation-errors-v1+xml");
+ public static final MediaType VND_VALIDATION_ERRORS_V1_XML_TYPE =
+ new MediaType("application", "vnd.siesta-validation-errors-v1+xml");
// application/vnd.siesta-validation-errors-v1+json
public static final String VND_VALIDATION_ERRORS_V1_JSON = "application/vnd.siesta-validation-errors-v1+json";
- public static final MediaType VND_VALIDATION_ERRORS_V1_JSON_TYPE = new MediaType("application", "vnd.siesta-validation-errors-v1+json");
+ public static final MediaType VND_VALIDATION_ERRORS_V1_JSON_TYPE =
+ new MediaType("application", "vnd.siesta-validation-errors-v1+json");
}
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/NotCacheable.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/NotCacheable.java
index 066f04dd3b..ebb2b1d1cd 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/NotCacheable.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/NotCacheable.java
@@ -27,7 +27,7 @@
*/
@NameBinding
@Retention(RUNTIME)
-@Target({ TYPE, METHOD })
+@Target({TYPE, METHOD})
public @interface NotCacheable
{
}
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ValidationErrorXO.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ValidationErrorXO.java
index 5f2995a4a4..5d3768689d 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ValidationErrorXO.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/ValidationErrorXO.java
@@ -62,7 +62,7 @@ public ValidationErrorXO(final String message) {
/**
* Creates a validation error for a specific value.
*
- * @param id identifier of value failing validation.
+ * @param id identifier of value failing validation.
* @param message validation description
*/
public ValidationErrorXO(final String id, final String message) {
@@ -71,7 +71,7 @@ public ValidationErrorXO(final String id, final String message) {
}
/**
- * @return identifier of value failing validation (never null). A value of "*" denotes that validation does
+ * @return identifier of value failing validation (never null). A value of "*" denotes that validation does
* not applies to a specific value.
*/
public String getId() {
@@ -124,4 +124,4 @@ public String toString() {
", message='" + message + '\'' +
'}';
}
-}
\ No newline at end of file
+}
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/WebApplicationMessageException.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/WebApplicationMessageException.java
index b5f7b4e0b9..9281723d56 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/WebApplicationMessageException.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/WebApplicationMessageException.java
@@ -35,12 +35,14 @@ public WebApplicationMessageException(final Status status, final String message)
public WebApplicationMessageException(final Status status, final Object message, final String mediaType) {
super(Response.status(checkNotNull(status))
.entity(new GenericEntity<>(new ValidationErrorXO(checkNotNull(message).toString()), ValidationErrorXO.class))
- .type(mediaType).build());
+ .type(mediaType)
+ .build());
}
public WebApplicationMessageException(int status, final Object message, final String mediaType) {
super(Response.status(status)
- .entity(new GenericEntity<>(new ValidationErrorXO(checkNotNull(message).toString()), ValidationErrorXO.class))
- .type(mediaType).build());
+ .entity(new GenericEntity<>(new ValidationErrorXO(checkNotNull(message).toString()), ValidationErrorXO.class))
+ .type(mediaType)
+ .build());
}
}
diff --git a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/package-info.java b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/package-info.java
index fcad0acaea..1c39f667a3 100644
--- a/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/package-info.java
+++ b/components/nexus-rest/src/main/java/org/sonatype/nexus/rest/package-info.java
@@ -16,4 +16,4 @@
*
* @since 3.0
*/
-package org.sonatype.nexus.rest;
\ No newline at end of file
+package org.sonatype.nexus.rest;
diff --git a/components/nexus-rest/src/test/java/org/sonatype/nexus/rest/WebApplicationMessageExceptionTest.java b/components/nexus-rest/src/test/java/org/sonatype/nexus/rest/WebApplicationMessageExceptionTest.java
index 711f6be8d9..a2468221f2 100644
--- a/components/nexus-rest/src/test/java/org/sonatype/nexus/rest/WebApplicationMessageExceptionTest.java
+++ b/components/nexus-rest/src/test/java/org/sonatype/nexus/rest/WebApplicationMessageExceptionTest.java
@@ -19,43 +19,46 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-public class WebApplicationMessageExceptionTest extends TestCase {
-
- /**
- * Method under test: {@link WebApplicationMessageException#WebApplicationMessageException(Response.Status, Object, String)}
- */
- @Test
- public void testConstructor() {
- WebApplicationMessageException exception = new WebApplicationMessageException(
- Response.Status.BAD_REQUEST, "Message", MediaType.APPLICATION_JSON);
- Response response = exception.getResponse();
-
- assertEquals(400, response.getStatus());
-
- Object entity = response.getEntity();
-
- assertTrue(entity instanceof ValidationErrorXO);
- assertEquals("Message", ((ValidationErrorXO) entity).getMessage());
- assertEquals(ValidationErrorXO.GENERIC, ((ValidationErrorXO) entity).getId());
- assertEquals(ImmutableList.of(MediaType.APPLICATION_JSON), response.getHeaders().get("Content-Type"));
- }
-
- /**
- * Method under test: {@link WebApplicationMessageException#WebApplicationMessageException(Response.Status, String)}
- */
- @Test
- public void testConstructorNoMediaType() {
- WebApplicationMessageException exception = new WebApplicationMessageException(
- Response.Status.NOT_FOUND, "Message");
- Response response = exception.getResponse();
-
- assertEquals(404, response.getStatus());
-
- Object entity = response.getEntity();
-
- assertTrue(entity instanceof ValidationErrorXO);
- assertEquals("Message", ((ValidationErrorXO) entity).getMessage());
- assertEquals(ValidationErrorXO.GENERIC, ((ValidationErrorXO) entity).getId());
- assertEquals(ImmutableList.of(MediaType.TEXT_PLAIN), response.getHeaders().get("Content-Type"));
- }
+public class WebApplicationMessageExceptionTest
+ extends TestCase
+{
+
+ /**
+ * Method under test:
+ * {@link WebApplicationMessageException#WebApplicationMessageException(Response.Status, Object, String)}
+ */
+ @Test
+ public void testConstructor() {
+ WebApplicationMessageException exception = new WebApplicationMessageException(
+ Response.Status.BAD_REQUEST, "Message", MediaType.APPLICATION_JSON);
+ Response response = exception.getResponse();
+
+ assertEquals(400, response.getStatus());
+
+ Object entity = response.getEntity();
+
+ assertTrue(entity instanceof ValidationErrorXO);
+ assertEquals("Message", ((ValidationErrorXO) entity).getMessage());
+ assertEquals(ValidationErrorXO.GENERIC, ((ValidationErrorXO) entity).getId());
+ assertEquals(ImmutableList.of(MediaType.APPLICATION_JSON), response.getHeaders().get("Content-Type"));
+ }
+
+ /**
+ * Method under test: {@link WebApplicationMessageException#WebApplicationMessageException(Response.Status, String)}
+ */
+ @Test
+ public void testConstructorNoMediaType() {
+ WebApplicationMessageException exception = new WebApplicationMessageException(
+ Response.Status.NOT_FOUND, "Message");
+ Response response = exception.getResponse();
+
+ assertEquals(404, response.getStatus());
+
+ Object entity = response.getEntity();
+
+ assertTrue(entity instanceof ValidationErrorXO);
+ assertEquals("Message", ((ValidationErrorXO) entity).getMessage());
+ assertEquals(ValidationErrorXO.GENERIC, ((ValidationErrorXO) entity).getId());
+ assertEquals(ImmutableList.of(MediaType.TEXT_PLAIN), response.getHeaders().get("Content-Type"));
+ }
}
diff --git a/components/nexus-scheduling/pom.xml b/components/nexus-scheduling/pom.xml
index 446f48df27..02601a6ecd 100644
--- a/components/nexus-scheduling/pom.xml
+++ b/components/nexus-scheduling/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-scheduling
diff --git a/components/nexus-script/pom.xml b/components/nexus-script/pom.xml
index 0d0cde351f..94123bcfc5 100644
--- a/components/nexus-script/pom.xml
+++ b/components/nexus-script/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-script
diff --git a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptCreatedEvent.java b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptCreatedEvent.java
index 4a713be68e..ec92eb73b4 100644
--- a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptCreatedEvent.java
+++ b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptCreatedEvent.java
@@ -18,7 +18,7 @@
* @since 3.1
*/
public class ScriptCreatedEvent
- extends ScriptEvent
+ extends ScriptEvent
{
public ScriptCreatedEvent(final Script script) {
super(script);
diff --git a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptDeletedEvent.java b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptDeletedEvent.java
index c0bb6d1d96..18884ea188 100644
--- a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptDeletedEvent.java
+++ b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptDeletedEvent.java
@@ -18,7 +18,7 @@
* @since 3.1
*/
public class ScriptDeletedEvent
- extends ScriptEvent
+ extends ScriptEvent
{
public ScriptDeletedEvent(final Script script) {
super(script);
diff --git a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptManager.java b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptManager.java
index 76e2a9f942..e8b82014e3 100644
--- a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptManager.java
+++ b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptManager.java
@@ -21,7 +21,8 @@
*
* @since 3.0
*/
-public interface ScriptManager extends Lifecycle
+public interface ScriptManager
+ extends Lifecycle
{
public static final String DEFAULT_TYPE = "groovy";
diff --git a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptRunEvent.java b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptRunEvent.java
index b5d957d4ff..48e32ef159 100644
--- a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptRunEvent.java
+++ b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptRunEvent.java
@@ -24,4 +24,3 @@ public ScriptRunEvent(final Script script) {
super(script);
}
}
-
diff --git a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptUpdatedEvent.java b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptUpdatedEvent.java
index 040a07691b..b9c1a96d6e 100644
--- a/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptUpdatedEvent.java
+++ b/components/nexus-script/src/main/java/org/sonatype/nexus/script/ScriptUpdatedEvent.java
@@ -18,7 +18,7 @@
* @since 3.1
*/
public class ScriptUpdatedEvent
- extends ScriptEvent
+ extends ScriptEvent
{
public ScriptUpdatedEvent(final Script script) {
super(script);
diff --git a/components/nexus-security/pom.xml b/components/nexus-security/pom.xml
index 80a1686760..072a402467 100644
--- a/components/nexus-security/pom.xml
+++ b/components/nexus-security/pom.xml
@@ -21,7 +21,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-security
diff --git a/components/nexus-selector/pom.xml b/components/nexus-selector/pom.xml
index 59c67cc519..3ac9866c48 100644
--- a/components/nexus-selector/pom.xml
+++ b/components/nexus-selector/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-selector
diff --git a/components/nexus-servlet/pom.xml b/components/nexus-servlet/pom.xml
index a8fafe139d..6d72b33cb0 100644
--- a/components/nexus-servlet/pom.xml
+++ b/components/nexus-servlet/pom.xml
@@ -19,7 +19,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-servlet
diff --git a/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/ServletHelper.java b/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/ServletHelper.java
index 901e9e14f5..9c1c91873d 100644
--- a/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/ServletHelper.java
+++ b/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/ServletHelper.java
@@ -73,7 +73,7 @@ public static boolean isDebug(final HttpServletRequest request) {
*/
public static void addNoCacheResponseHeaders(final HttpServletResponse response) {
response.setHeader(PRAGMA, "no-cache"); // HTTP/1.0
- //post-check/pre-check for IE
+ // post-check/pre-check for IE
response.setHeader(CACHE_CONTROL, "no-cache, no-store, max-age=0, must-revalidate, post-check=0, pre-check=0"); // HTTP/1.1
response.setHeader(EXPIRES, "0"); // No caching on Proxies in between client and Nexus
}
diff --git a/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/package-info.java b/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/package-info.java
index db3a5cf16e..bc1efe6594 100644
--- a/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/package-info.java
+++ b/components/nexus-servlet/src/main/java/org/sonatype/nexus/servlet/package-info.java
@@ -16,4 +16,4 @@
*
* @since 3.0
*/
-package org.sonatype.nexus.servlet;
\ No newline at end of file
+package org.sonatype.nexus.servlet;
diff --git a/components/nexus-servlet/src/test/java/org/sonatype/nexus/servlet/XFrameOptionsTest.java b/components/nexus-servlet/src/test/java/org/sonatype/nexus/servlet/XFrameOptionsTest.java
index 7c5481abcc..dada2ba8dc 100644
--- a/components/nexus-servlet/src/test/java/org/sonatype/nexus/servlet/XFrameOptionsTest.java
+++ b/components/nexus-servlet/src/test/java/org/sonatype/nexus/servlet/XFrameOptionsTest.java
@@ -35,9 +35,10 @@ public class XFrameOptionsTest
{
@Parameters
public static Collection data() {
- return Arrays.asList(new Object[][] { { "/foo/", true, "DENY" }, { "/foo/", false, "SAMEORIGIN" },
- { "/swagger-ui/", true, "SAMEORIGIN" }, { "/COPYRIGHT.html", true, "SAMEORIGIN" },
- { "/OSS-LICENSE.html", true, "SAMEORIGIN" }, { "/PRO-LICENSE.html", true, "SAMEORIGIN" }, { "/static/healthcheck-tos.html", true, "SAMEORIGIN" } });
+ return Arrays.asList(new Object[][]{{"/foo/", true, "DENY"}, {"/foo/", false, "SAMEORIGIN"},
+ {"/swagger-ui/", true, "SAMEORIGIN"}, {"/COPYRIGHT.html", true, "SAMEORIGIN"},
+ {"/OSS-LICENSE.html", true, "SAMEORIGIN"}, {"/PRO-LICENSE.html", true, "SAMEORIGIN"},
+ {"/static/healthcheck-tos.html", true, "SAMEORIGIN"}});
}
@Parameter
diff --git a/components/nexus-siesta/pom.xml b/components/nexus-siesta/pom.xml
index 9fd7acacc9..8beace7f53 100644
--- a/components/nexus-siesta/pom.xml
+++ b/components/nexus-siesta/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-siesta
diff --git a/components/nexus-ssl/pom.xml b/components/nexus-ssl/pom.xml
index edc2d5230c..2d45aadb04 100644
--- a/components/nexus-ssl/pom.xml
+++ b/components/nexus-ssl/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-ssl
diff --git a/components/nexus-supportzip-api/pom.xml b/components/nexus-supportzip-api/pom.xml
index 048bfdce1e..8f9c14afdf 100644
--- a/components/nexus-supportzip-api/pom.xml
+++ b/components/nexus-supportzip-api/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-supportzip-api
diff --git a/components/nexus-swagger/pom.xml b/components/nexus-swagger/pom.xml
index c18dcfad12..7db9d98e83 100644
--- a/components/nexus-swagger/pom.xml
+++ b/components/nexus-swagger/pom.xml
@@ -20,7 +20,7 @@
org.sonatype.nexus
nexus-components
- 3.75.0-SNAPSHOT
+ 3.76.0-SNAPSHOT
nexus-swagger
diff --git a/components/nexus-swagger/src/main/java/org/sonatype/nexus/swagger/ParameterContributor.java b/components/nexus-swagger/src/main/java/org/sonatype/nexus/swagger/ParameterContributor.java
index b2b5f0e71e..caa859228a 100644
--- a/components/nexus-swagger/src/main/java/org/sonatype/nexus/swagger/ParameterContributor.java
+++ b/components/nexus-swagger/src/main/java/org/sonatype/nexus/swagger/ParameterContributor.java
@@ -52,9 +52,10 @@ public abstract class ParameterContributor httpMethods,
- final Collection paths,
- final Collection params)
+ public ParameterContributor(
+ final Collection httpMethods,
+ final Collection paths,
+ final Collection params)
{
this.httpMethods = checkNotNull(httpMethods);
this.paths = checkNotNull(paths);
@@ -80,10 +81,11 @@ public void contribute(final Swagger swagger) {
allContributed = contributed.entrySet().stream().allMatch(Entry::getValue);
}
- private boolean contributeGetParameters(final Swagger swagger,
- final HttpMethod httpMethod,
- final String path,
- final Collection parameters)
+ private boolean contributeGetParameters(
+ final Swagger swagger,
+ final HttpMethod httpMethod,
+ final String path,
+ final Collection parameters)
{
boolean contrib = false;
Optional