[ignite-3] branch ignite-13618-javapoet updated: WIP.

[amashenkov]

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-13618-javapoet
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/ignite-13618-javapoet by this 
push:
     new 6e17af4  WIP.
6e17af4 is described below

commit 6e17af4c1cd689db7c82ebf2f4b5bc966af64655
Author: Andrew Mashenkov <andrey.mashen...@gmail.com>
AuthorDate: Tue Dec 15 18:32:21 2020 +0300

    WIP.
---
 .../internal/schema/marshaller/MarshallerUtil.java      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git 
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/MarshallerUtil.java
 
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/MarshallerUtil.java
index abb5dfb..e04fc64 100644
--- 
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/MarshallerUtil.java
+++ 
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/MarshallerUtil.java
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Set;
 import java.util.UUID;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
@@ -40,6 +41,7 @@ import javax.tools.ForwardingJavaFileManager;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
 import javax.tools.SimpleJavaFileObject;
 import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
@@ -214,17 +216,16 @@ public final class MarshallerUtil {
         @Override public ClassLoader getClassLoader(Location location) {
             return new MemoryClassLoader(classes,  
super.getClassLoader(location));
         }
-        /*
         @Override
-        public Iterable<JavaFileObject> list(Location location, String 
packageName, Set<JavaFileObject.Kind> kinds,
+        public Iterable<JavaFileObject> list(Location location, String 
packageName, Set<Kind> kinds,
             boolean recurse) throws IOException {
             final Iterable<JavaFileObject> it = super.list(location, 
packageName, kinds, recurse);
 
-            if (location == CLASS_PATH) {
+            if (location == StandardLocation.CLASS_PATH) {
                 assert kinds.contains(JavaFileObject.Kind.CLASS);
 
                 Iterable<JavaFileObject> localClasses = new Iterable<>() {
-                    @NotNull @Override public Iterator<JavaFileObject> 
iterator() {
+                    @Override public Iterator<JavaFileObject> iterator() {
                         return classes.keySet().stream().map(cn -> 
getJavaFileObjectByName(cn)).iterator();
                     }
                 };
@@ -233,15 +234,9 @@ public final class MarshallerUtil {
             }
             else
                 return it;
-        }*/
-
-
-        @Override public boolean contains(Location location, FileObject fo) 
throws IOException {
-            return super.contains(location, fo);
         }
 
-        @Override public JavaFileObject getJavaFileForInput(Location location, 
String className,
-            JavaFileObject.Kind kind) throws IOException {
+        @Override public JavaFileObject getJavaFileForInput(Location location, 
String className, Kind kind) throws IOException {
             if (location == StandardLocation.CLASS_OUTPUT) {
                 JavaFileObject javaFileObject = 
getJavaFileObjectByName(className);