This is an automated email from the ASF dual-hosted git repository.
apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 8f652e9624 IGNITE-21241 Compilation fails on Windows (#3039)
8f652e9624 is described below
commit 8f652e9624dd3eb201b6578d867933167b926883
Author: Vadim Pakhnushev <8614891+valep...@users.noreply.github.com>
AuthorDate: Fri Jan 12 12:10:04 2024 +0300
IGNITE-21241 Compilation fails on Windows (#3039)
---
.../apache/ignite/internal/error/code/generators/CppGenerator.java | 3 +--
.../ignite/internal/error/code/generators/CsharpGenerator.java | 3 +--
.../ignite/internal/error/code/generators/GenericGenerator.java | 7 +++----
.../internal/error/code/processor/ErrorCodeGroupProcessor.java | 5 ++---
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CppGenerator.java
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CppGenerator.java
index 5dc10a64ca..bc251ea5bc 100644
---
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CppGenerator.java
+++
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CppGenerator.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.error.code.generators;
import java.io.IOException;
-import java.nio.file.Path;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.processing.ProcessingEnvironment;
@@ -31,7 +30,7 @@ import
org.apache.ignite.internal.error.code.processor.ErrorCodeGroupProcessorEx
public class CppGenerator extends GenericGenerator {
private static final String SuffixToChop = "_ERR";
- public CppGenerator(ProcessingEnvironment processingEnvironment, Path
outFilePath) {
+ public CppGenerator(ProcessingEnvironment processingEnvironment, String
outFilePath) {
super(processingEnvironment, outFilePath);
}
diff --git
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CsharpGenerator.java
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CsharpGenerator.java
index c378ec06df..2157741120 100644
---
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CsharpGenerator.java
+++
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/CsharpGenerator.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.error.code.generators;
import com.google.common.base.CaseFormat;
import java.io.IOException;
-import java.nio.file.Path;
import java.util.List;
import javax.annotation.processing.ProcessingEnvironment;
import
org.apache.ignite.internal.error.code.processor.ErrorCodeGroupDescriptor;
@@ -30,7 +29,7 @@ import
org.apache.ignite.internal.error.code.processor.ErrorCodeGroupDescriptor;
public class CsharpGenerator extends GenericGenerator {
private static final String SuffixToChop = "Err";
- public CsharpGenerator(ProcessingEnvironment processingEnvironment, Path
outFilePath) {
+ public CsharpGenerator(ProcessingEnvironment processingEnvironment, String
outFilePath) {
super(processingEnvironment, outFilePath);
}
diff --git
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/GenericGenerator.java
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/GenericGenerator.java
index 2a57f32808..31761364df 100644
---
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/GenericGenerator.java
+++
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/generators/GenericGenerator.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.error.code.generators;
import java.io.BufferedWriter;
import java.io.IOException;
-import java.nio.file.Path;
import java.util.List;
import javax.annotation.processing.ProcessingEnvironment;
import javax.tools.FileObject;
@@ -32,7 +31,7 @@ import
org.apache.ignite.internal.error.code.processor.ErrorCodeGroupProcessorEx
*/
public abstract class GenericGenerator implements AbstractCodeGenerator {
final ProcessingEnvironment processingEnvironment;
- final Path outFilePath;
+ final String outFilePath;
BufferedWriter writer;
static final int groupShift = 16;
@@ -45,7 +44,7 @@ public abstract class GenericGenerator implements
AbstractCodeGenerator {
line("");
}
- GenericGenerator(ProcessingEnvironment processingEnvironment, Path
outFilePath) {
+ GenericGenerator(ProcessingEnvironment processingEnvironment, String
outFilePath) {
this.processingEnvironment = processingEnvironment;
this.outFilePath = outFilePath;
}
@@ -79,7 +78,7 @@ public abstract class GenericGenerator implements
AbstractCodeGenerator {
try {
FileObject resource =
processingEnvironment.getFiler().createResource(StandardLocation.NATIVE_HEADER_OUTPUT,
"",
- outFilePath.toString());
+ outFilePath);
writer = new BufferedWriter(resource.openWriter());
generateLicense();
diff --git
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/processor/ErrorCodeGroupProcessor.java
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/processor/ErrorCodeGroupProcessor.java
index 867a578f7d..92b767c690 100644
---
a/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/processor/ErrorCodeGroupProcessor.java
+++
b/modules/error-code-annotation-processor/src/main/java/org/apache/ignite/internal/error/code/processor/ErrorCodeGroupProcessor.java
@@ -27,7 +27,6 @@ import com.sun.source.tree.TypeCastTree;
import com.sun.source.tree.VariableTree;
import com.sun.source.util.TreePathScanner;
import com.sun.source.util.Trees;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -109,8 +108,8 @@ public class ErrorCodeGroupProcessor extends
AbstractProcessor {
}
List<AbstractCodeGenerator> generators = List.of(
- new CppGenerator(processingEnv,
Path.of("cpp/ignite/common/error_codes.h")),
- new CsharpGenerator(processingEnv,
Path.of("dotnet/Apache.Ignite/ErrorCodes.g.cs"))
+ new CppGenerator(processingEnv, "cpp/ignite/common/error_codes.h"),
+ new CsharpGenerator(processingEnv,
"dotnet/Apache.Ignite/ErrorCodes.g.cs")
);
for (var generator : generators) {
