Skip to content

Commit 3597639

Browse files
committed
clean ups + typesafe logging in ScanningCoordinator
1 parent a479319 commit 3597639

File tree

5 files changed

+226
-177
lines changed

5 files changed

+226
-177
lines changed
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
* Copyright Red Hat Inc. and Hibernate Authors
4+
*/
5+
package org.hibernate.boot.archive.scan.internal;
6+
7+
import org.hibernate.boot.BootLogging;
8+
import org.hibernate.internal.log.SubSystemLogging;
9+
import org.jboss.logging.BasicLogger;
10+
import org.jboss.logging.Logger;
11+
import org.jboss.logging.annotations.LogMessage;
12+
import org.jboss.logging.annotations.Message;
13+
import org.jboss.logging.annotations.MessageLogger;
14+
import org.jboss.logging.annotations.ValidIdRange;
15+
16+
import java.lang.invoke.MethodHandles;
17+
import java.net.URL;
18+
19+
/**
20+
* Logging related to {@linkplain org.hibernate.boot.archive.scan.spi.Scanner scanning}.
21+
*
22+
* @author Gavin King
23+
*/
24+
@MessageLogger(projectCode = "HHH")
25+
@SubSystemLogging(
26+
name = ScannerLogger.NAME,
27+
description = "Logging related to scanning"
28+
)
29+
@ValidIdRange(min = 60000, max = 60100)
30+
public interface ScannerLogger extends BasicLogger {
31+
String NAME = BootLogging.NAME + ".scan";
32+
33+
ScannerLogger SCANNER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ScannerLogger.class, NAME );
34+
35+
@LogMessage(level = Logger.Level.WARN)
36+
@Message(id = 60001, value = "Multiple ScannerFactory services available; using '%s'")
37+
void multipleScannerFactoriesAvailable(String scannerClassName);
38+
39+
@LogMessage(level = Logger.Level.DEBUG)
40+
@Message(id = 60002, value = "No ScannerFactory available; to enable scanning add 'hibernate-scan-jandex' dependency or supply a custom ScannerFactory")
41+
void noScannerFactoryAvailable();
42+
43+
@LogMessage(level = Logger.Level.DEBUG)
44+
@Message(id = 60003, value = "Unable to resolve class [%s] named in persistence unit [%s]")
45+
void unableToResolveClass(String className, URL rootUrl);
46+
}

hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/Scanner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public interface Scanner {
3535
/**
3636
* @deprecated (since 7.0) Not used; no replacement.
3737
*/
38-
@Deprecated
39-
default void setArchiveDescriptorFactory(ArchiveDescriptorFactory archiveDescriptorFactory){
38+
@Deprecated(since = "7.0", forRemoval = true)
39+
default void setArchiveDescriptorFactory(ArchiveDescriptorFactory archiveDescriptorFactory) {
4040
throw new UnsupportedOperationException();
4141
}
4242
}

0 commit comments

Comments
 (0)