Skip to content

Commit c963e3b

Browse files
committed
MCR-3126 fix import order
1 parent 74070d9 commit c963e3b

10 files changed

+38
-35
lines changed

mycore-ocfl/src/main/java/org/mycore/ocfl/classification/MCROCFLClassificationEventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
package org.mycore.ocfl.classification;
2020

21+
import static org.mycore.ocfl.classification.MCROCFLClassificationTransaction.addClassificationEvent;
22+
2123
import org.apache.logging.log4j.LogManager;
2224
import org.apache.logging.log4j.Logger;
2325
import org.mycore.common.MCRException;
@@ -26,8 +28,6 @@
2628
import org.mycore.datamodel.classifications2.MCRCategory;
2729
import org.mycore.datamodel.common.MCRAbstractMetadataVersion;
2830

29-
import static org.mycore.ocfl.classification.MCROCFLClassificationTransaction.addClassificationEvent;
30-
3131
/**
3232
* @author Tobias Lenhardt [Hammer1279]
3333
*/

mycore-ocfl/src/main/java/org/mycore/ocfl/layout/MCRStorageLayoutExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818

1919
package org.mycore.ocfl.layout;
2020

21+
import org.mycore.ocfl.util.MCROCFLObjectIDPrefixHelper;
22+
2123
import io.ocfl.api.exception.OcflExtensionException;
2224
import io.ocfl.core.extension.OcflExtensionConfig;
2325
import io.ocfl.core.extension.storage.layout.OcflStorageLayoutExtension;
24-
import org.mycore.ocfl.util.MCROCFLObjectIDPrefixHelper;
2526

2627
public class MCRStorageLayoutExtension implements OcflStorageLayoutExtension {
2728

mycore-ocfl/src/main/java/org/mycore/ocfl/metadata/MCROCFLContent.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818

1919
package org.mycore.ocfl.metadata;
2020

21-
import io.ocfl.api.OcflRepository;
22-
import io.ocfl.api.model.ObjectVersionId;
23-
import org.mycore.common.content.MCRContent;
24-
2521
import java.io.IOException;
2622
import java.io.InputStream;
2723

24+
import org.mycore.common.content.MCRContent;
25+
26+
import io.ocfl.api.OcflRepository;
27+
import io.ocfl.api.model.ObjectVersionId;
28+
2829
public class MCROCFLContent extends MCRContent {
2930

3031
private OcflRepository repository;

mycore-ocfl/src/main/java/org/mycore/ocfl/metadata/migration/MCROCFLCombineComparePruner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818

1919
package org.mycore.ocfl.metadata.migration;
2020

21+
import java.io.IOException;
22+
import java.util.ArrayList;
23+
import java.util.Iterator;
24+
import java.util.List;
25+
2126
import org.apache.logging.log4j.LogManager;
2227
import org.apache.logging.log4j.Logger;
2328
import org.jdom2.Document;
2429
import org.jdom2.JDOMException;
2530
import org.mycore.common.content.MCRContent;
2631
import org.mycore.datamodel.common.MCRMetadataVersionType;
2732

28-
import java.io.IOException;
29-
import java.util.ArrayList;
30-
import java.util.Iterator;
31-
import java.util.List;
32-
3333
/**
3434
* A pruner that combines and compares revisions to decide which to keep and which to discard.
3535
* The method {@link #getMergeDecider()} should return a {@link RevisionMergeDecider} that decides if two

mycore-ocfl/src/main/java/org/mycore/ocfl/metadata/migration/MCROCFLCombineIgnoreXPathPruner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818

1919
package org.mycore.ocfl.metadata.migration;
2020

21+
import java.util.ArrayList;
22+
import java.util.Date;
23+
import java.util.List;
24+
import java.util.Objects;
25+
2126
import org.jdom2.Content;
2227
import org.jdom2.Document;
2328
import org.jdom2.Parent;
@@ -28,11 +33,6 @@
2833
import org.mycore.common.xml.MCRXMLHelper;
2934
import org.mycore.datamodel.common.MCRMetadataVersionType;
3035

31-
import java.util.ArrayList;
32-
import java.util.Date;
33-
import java.util.List;
34-
import java.util.Objects;
35-
3636
/**
3737
* A pruner that combines and compares revisions, based on an XPath expression, to decide which to keep and which to
3838
* discard.

mycore-ocfl/src/main/java/org/mycore/ocfl/metadata/migration/MCROCFLMigration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818

1919
package org.mycore.ocfl.metadata.migration;
2020

21+
import java.io.IOException;
22+
import java.util.ArrayList;
23+
import java.util.Date;
24+
import java.util.List;
25+
import java.util.stream.IntStream;
26+
2127
import org.apache.logging.log4j.LogManager;
2228
import org.apache.logging.log4j.Logger;
2329
import org.jdom2.Document;
@@ -32,12 +38,6 @@
3238
import org.mycore.datamodel.metadata.MCRObjectID;
3339
import org.mycore.ocfl.metadata.MCROCFLXMLMetadataManagerAdapter;
3440

35-
import java.io.IOException;
36-
import java.util.ArrayList;
37-
import java.util.Date;
38-
import java.util.List;
39-
import java.util.stream.IntStream;
40-
4141
public class MCROCFLMigration {
4242

4343
private static final Logger LOGGER = LogManager.getLogger();

mycore-ocfl/src/main/java/org/mycore/ocfl/metadata/migration/MCROCFLRevision.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
package org.mycore.ocfl.metadata.migration;
2020

21+
import java.util.Date;
22+
2123
import org.mycore.datamodel.common.MCRMetadataVersionType;
2224
import org.mycore.datamodel.metadata.MCRObjectID;
2325
import org.mycore.ocfl.metadata.migration.MCROCFLMigration.ContentSupplier;
2426

25-
import java.util.Date;
26-
2727
public record MCROCFLRevision(MCRMetadataVersionType type,
2828
ContentSupplier contentSupplier,
2929
String user,

mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/MCROCFLVirtualObjectProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.concurrent.ConcurrentHashMap;
3030
import java.util.concurrent.ConcurrentLinkedDeque;
3131

32-
import io.ocfl.api.model.VersionDetails;
3332
import org.mycore.datamodel.niofs.MCRVersionedPath;
3433
import org.mycore.ocfl.niofs.storage.MCROCFLTransactionalTempFileStorage;
3534
import org.mycore.ocfl.repository.MCROCFLRepository;
@@ -40,6 +39,7 @@
4039
import io.ocfl.api.model.ObjectVersionId;
4140
import io.ocfl.api.model.OcflObjectVersion;
4241
import io.ocfl.api.model.OcflObjectVersionFile;
42+
import io.ocfl.api.model.VersionDetails;
4343

4444
/**
4545
* Provides and manages virtual objects.

mycore-ocfl/src/main/java/org/mycore/ocfl/util/MCROCFLDeleteUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
// actually increases readability
2222

23-
import org.mycore.datamodel.classifications2.MCRCategoryID;
24-
import org.mycore.datamodel.metadata.MCRObjectID;
23+
import static org.mycore.common.config.MCRConfiguration2.getBoolean;
24+
import static org.mycore.common.config.MCRConfiguration2.getString;
2525

2626
import java.util.Optional;
2727

28-
import static org.mycore.common.config.MCRConfiguration2.getBoolean;
29-
import static org.mycore.common.config.MCRConfiguration2.getString;
28+
import org.mycore.datamodel.classifications2.MCRCategoryID;
29+
import org.mycore.datamodel.metadata.MCRObjectID;
3030

3131
/**
3232
* Utility Class to decide when to keep or drop the history of elements

mycore-ocfl/src/main/java/org/mycore/ocfl/util/MCROCFLMetadataVersion.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818

1919
package org.mycore.ocfl.util;
2020

21-
import jakarta.xml.bind.annotation.XmlAccessType;
22-
import jakarta.xml.bind.annotation.XmlAccessorType;
23-
import jakarta.xml.bind.annotation.XmlRootElement;
21+
import java.io.IOException;
22+
import java.util.Date;
23+
2424
import org.mycore.common.content.MCRContent;
2525
import org.mycore.datamodel.common.MCRAbstractMetadataVersion;
2626

27-
import java.io.IOException;
28-
import java.util.Date;
27+
import jakarta.xml.bind.annotation.XmlAccessType;
28+
import jakarta.xml.bind.annotation.XmlAccessorType;
29+
import jakarta.xml.bind.annotation.XmlRootElement;
2930

3031
/**
3132
* Provides information about a stored version of metadata and allows to

0 commit comments

Comments
 (0)