Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.67.x][kie-issues#394] Unnecessary warning when DRL file is placed in BOOT-INF/classes directory #5412

Merged
merged 2 commits into from
Aug 4, 2023
Merged

[7.67.x][kie-issues#394] Unnecessary warning when DRL file is placed in BOOT-INF/classes directory #5412

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce74bba
Fix package name comparison in Spring Boot
baldimir Jul 27, 2023
aaca35b
Fix package name comparison in Spring Boot
baldimir Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieBuilderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,18 +374,13 @@ private static boolean isFileInKieBase( KieBaseModel kieBase, String fileName, S
return true;
} else {
String folderNameForFile = lastSep > 0 ? fileName.substring( 0, lastSep ) : "";
int resourcesPos = folderNameForFile.indexOf( RESOURCES_ROOT );
if (resourcesPos >= 0) {
folderNameForFile = folderNameForFile.substring( resourcesPos + RESOURCES_ROOT.length() );
}
String pkgNameForFile = packageNameForFile( fileName, folderNameForFile, !useFolders, file );
return isPackageInKieBase( kieBase, pkgNameForFile );
}
}

private static String packageNameForFile( String fileName, String folderNameForFile, boolean discoverPackage, Supplier<InternalResource> file ) {
String packageNameFromFolder = folderNameForFile.replace( '/', '.' );

String packageNameFromFolder = getRelativePackageName(folderNameForFile.replace( '/', '.' ));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

THanks @baldimir . Could you please replace / with the filesystem separator ? We have fixed that in a lot of different places, and wherever possible I think it is better (the hardcoded use of / led to different unexpected issues on Windows machines)

if (discoverPackage) {
String packageNameForFile = packageNameFromAsset(fileName, file.get());
if (packageNameForFile != null) {
Expand Down
Loading