CE-132 oap-sso: user: replace PK: email -> id

oap-application/oap-application/src/main/java/oap/application/ModuleHelper.java

@@ -286,7 +286,10 @@ private static void loadOnlyMainModuleAndDependsOn( ModuleItemTree modules,
 
                 modules.remove( module );
 
-                loadOnlyMainModuleAndDependsOn( modules, moduleItem.module.dependsOn, loaded );
+                if( !moduleItem.module.dependsOn.isEmpty() ) {
+                    log.debug( "[loadOnlyMainModuleAndDependsOn] module {} -> dependsOn {}", moduleItem.getName(), moduleItem.module.dependsOn );
+                    loadOnlyMainModuleAndDependsOn( modules, moduleItem.module.dependsOn, loaded );
+                }
             }
         }
     }

oap-http/oap-http-test/src/test/java/oap/http/server/nio/health/HealthHttpHandlerTest.java

@@ -24,9 +24,6 @@
 
 package oap.http.server.nio.health;
 
-//import oap.application.module.Module;
-//import oap.application.testng.KernelFixture;
-
 import oap.http.server.nio.NioHttpServer;
 import oap.http.test.HttpAsserts;
 import oap.testng.Fixtures;
@@ -40,16 +37,6 @@
 import static oap.http.test.HttpAsserts.assertGet;
 
 public class HealthHttpHandlerTest extends Fixtures {
-    public HealthHttpHandlerTest() {
-//        fixture( new KernelFixture(
-//            urlOfTestResource( getClass(), "application.test.conf" ),
-//            Lists.concat(
-//                List.of( urlOfTestResource( getClass(), "oap-module.oap" ) ),
-//                Module.CONFIGURATION.urlsFromClassPath()
-//            )
-//        ) );
-    }
-
     @Test
     public void health() throws IOException {
         int httpPort = Ports.getFreePort( getClass() );

oap-http/oap-http/pom.xml

@@ -81,10 +81,11 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp-jvm</artifactId>
-            <!-- Remove after OkHttp 5.3.0 with updated BOM. -->
-            <version>5.1.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp-java-net-cookiejar</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

oap-http/oap-http/src/main/java/oap/http/Client.java

@@ -441,17 +441,18 @@ private CompletableFuture<Response> execute( HttpUriRequest request, Map<String,
                                                  ThrowingRunnable asyncRunnable ) {
         headers.forEach( ( name, value ) -> request.setHeader( name, value == null ? "" : value.toString() ) );
 
-        var completableFuture = new CompletableFuture<Response>();
+        CompletableFuture<Response> completableFuture = new CompletableFuture<Response>();
 
         client.execute( request, new FutureCallback<>() {
             @Override
             public void completed( HttpResponse response ) {
                 try {
-                    var responseHeaders = headers( response );
+                    List<Pair<String, String>> responseHeaders = headers( response );
                     Response result;
                     if( response.getEntity() != null ) {
                         var entity = response.getEntity();
                         result = new Response(
+                            request.getURI().toString(),
                             response.getStatusLine().getStatusCode(),
                             response.getStatusLine().getReasonPhrase(),
                             responseHeaders,
@@ -461,6 +462,7 @@ public void completed( HttpResponse response ) {
                             entity.getContent()
                         );
                     } else result = new Response(
+                        request.getURI().toString(),
                         response.getStatusLine().getStatusCode(),
                         response.getStatusLine().getReasonPhrase(),
                         responseHeaders
@@ -560,23 +562,25 @@ public void close() {
 
     @ToString( exclude = { "inputStream", "content" }, doNotUseGetters = true )
     public static class Response implements Closeable, AutoCloseable {
+        public final String url;
         public final int code;
         public final String reasonPhrase;
         public final String contentType;
         public final List<Pair<String, String>> headers;
         private InputStream inputStream;
         private volatile byte[] content = null;
 
-        public Response( int code, String reasonPhrase, List<Pair<String, String>> headers, @Nonnull String contentType, InputStream inputStream ) {
+        public Response( String url, int code, String reasonPhrase, List<Pair<String, String>> headers, @Nonnull String contentType, InputStream inputStream ) {
+            this.url = url;
             this.code = code;
             this.reasonPhrase = reasonPhrase;
             this.headers = headers;
             this.contentType = Objects.requireNonNull( contentType );
             this.inputStream = inputStream;
         }
 
-        public Response( int code, String reasonPhrase, List<Pair<String, String>> headers ) {
-            this( code, reasonPhrase, headers, BiStream.of( headers )
+        public Response( String url, int code, String reasonPhrase, List<Pair<String, String>> headers ) {
+            this( url, code, reasonPhrase, headers, BiStream.of( headers )
                 .filter( ( name, value ) -> "Content-type".equalsIgnoreCase( name ) )
                 .mapToObj( ( name, value ) -> value )
                 .findAny()

oap-http/oap-http/src/main/java/oap/http/InputStreamRequestBody.java

@@ -0,0 +1,35 @@
+package oap.http;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.BufferedSink;
+import okio.Okio;
+import okio.Source;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class InputStreamRequestBody extends RequestBody {
+    private final MediaType mediaType;
+    private final InputStream inputStream;
+
+    public InputStreamRequestBody( MediaType mediaType, InputStream inputStream ) {
+        this.mediaType = mediaType;
+        this.inputStream = inputStream;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return mediaType;
+    }
+
+    // You can override contentLength() if you know the length in advance for better performance/features (e.g., S3 uploads).
+    // If you don't override it, OkHttp will use chunked transfer encoding for large bodies.
+
+    @Override
+    public void writeTo( BufferedSink sink ) throws IOException {
+        try( Source source = Okio.source( inputStream ) ) {
+            sink.writeAll( source );
+        }
+    }
+}

oap-http/oap-pnio-v3/src/main/java/oap/http/pniov3/PnioResponseBuffer.java

@@ -28,21 +28,26 @@
 
 import javax.annotation.concurrent.NotThreadSafe;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 @NotThreadSafe
 public class PnioResponseBuffer {
     public int length;
-    byte[] buffer;
+    public byte[] buffer;
 
     public PnioResponseBuffer( int capacity ) {
         this.buffer = new byte[capacity];
         this.length = 0;
     }
 
     public String string() {
-        return new String( buffer, 0, length );
+        return new String( buffer, 0, length, UTF_8 );
+    }
+
+    public ByteBuffer byteBuffer() {
+        return ByteBuffer.wrap( buffer, 0, length );
     }
 
     public boolean isEmpty() {

oap-jpath/src/main/java/oap/jpath/JPath.java

@@ -43,7 +43,7 @@ public static void evaluate( String expression, Map<String, Object> variables, J
     }
 
     public void evaluate( String expression, JPathOutput output ) {
-        var jPathParser = new JPathParser( new BufferedTokenStream( new JPathLexer( new ANTLRInputStream( expression ) ) ) );
+        JPathParser jPathParser = new JPathParser( new BufferedTokenStream( new JPathLexer( new ANTLRInputStream( expression ) ) ) );
 
         jPathParser.expr().expression.evaluate( variables, output );
     }

oap-jpath/src/main/java/oap/jpath/MapPointer.java

@@ -37,7 +37,7 @@ public MapPointer( Map<Object, Object> map ) {
     @Override
     public Pointer resolve( AbstractPathNode n ) {
         if( n.type == PathType.FIELD ) {
-            var ret = v.get( n.name );
+            Object ret = v.get( n.name );
             return ret != null ? Pointer.get( ret ) : NullPointer.INSTANCE;
         }
         return super.resolve( n );

oap-jpath/src/main/java/oap/jpath/PathExpression.java

@@ -40,7 +40,7 @@ public void add( AbstractPathNode path ) {
     @SuppressWarnings( "unchecked" )
     public void evaluate( Map<String, Object> variables, JPathOutput output ) {
         Pointer pointer = new MapPointer( ( Map<Object, Object> ) ( Object ) variables );
-        for( var n : list ) pointer = pointer.resolve( n );
+        for( AbstractPathNode n : list ) pointer = pointer.resolve( n );
         output.write( pointer );
     }
 }

oap-stdlib-test/src/main/java/oap/json/testng/JsonAsserts.java

@@ -43,9 +43,9 @@
 import static oap.io.content.ContentReader.ofJson;
 import static oap.io.content.ContentReader.ofString;
 import static oap.json.Binder.json;
+import static oap.testng.Asserts.assertString;
 import static oap.testng.Asserts.contentOfTestResource;
 import static oap.util.Pair.__;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class JsonAsserts {
     @Deprecated
@@ -143,7 +143,7 @@ public JsonAssertion isEqualTo( String expected, Map<String, Object> substitutio
                 .map( JsonAssertion::deepSort, JsonAssertion::deepSort )
                 .map( e -> json.marshal( e.isLeft() ? e.leftValue : e.rightValue, true ) );
 
-            assertThat( actualJson ).isEqualTo( expectedJson );
+            assertString( actualJson ).isEqualTo( expectedJson );
 
             return this;
         }
@@ -167,7 +167,7 @@ public JsonAssertion isEqualTo( String expected, Function<String, String> substi
                 .map( JsonAssertion::deepSort, JsonAssertion::deepSort )
                 .map( e -> json.marshal( e.isLeft() ? e.leftValue : e.rightValue, true ) );
 
-            assertThat( actualJson ).isEqualTo( expectedJson );
+            assertString( actualJson ).isEqualTo( expectedJson );
 
             return this;
         }
@@ -189,13 +189,13 @@ public JsonAssertion isStructurallyEqualToResource( Class<?> contextClass, Strin
         }
 
         private JsonAssertion isEqualCanonically( Class<?> clazz, String actual, String expected ) {
-            assertThat( json.canonicalizeWithDefaultPrettyPrinter( clazz, actual ) )
+            assertString( json.canonicalizeWithDefaultPrettyPrinter( clazz, actual ) )
                 .isEqualTo( json.canonicalizeWithDefaultPrettyPrinter( clazz, expected ) );
             return this;
         }
 
         private JsonAssertion isEqualCanonically( TypeRef<?> typeRef, String actual, String expected ) {
-            assertThat( json.canonicalizeWithDefaultPrettyPrinter( typeRef, actual ) )
+            assertString( json.canonicalizeWithDefaultPrettyPrinter( typeRef, actual ) )
                 .isEqualTo( json.canonicalizeWithDefaultPrettyPrinter( typeRef, expected ) );
             return this;
         }

oap-stdlib/pom.xml

@@ -305,5 +305,26 @@
             <artifactId>spotbugs-annotations</artifactId>
             <version>${oap.deps.spotbugs}</version>
         </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>${oap.deps.netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>${oap.deps.netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>${oap.deps.netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${oap.deps.netty.version}</version>
+        </dependency>
     </dependencies>
 </project>

oap-storage/oap-storage-mongo-test/src/main/java/oap/storage/mongo/MongoFixture.java

@@ -29,9 +29,12 @@
 import de.bwaldvogel.mongo.backend.memory.MemoryBackend;
 import lombok.extern.slf4j.Slf4j;
 import oap.testng.AbstractFixture;
+import oap.util.Lists;
 import org.bson.Document;
 import org.jetbrains.annotations.NotNull;
 
+import java.net.InetSocketAddress;
+import java.util.List;
 import java.util.Map;
 
 import static oap.testng.Asserts.contentOfTestResource;
@@ -71,7 +74,7 @@ protected void before() {
 
         this.server = createMongoServer();
         log.info( "mongo port = {}", port );
-        this.server.bind( HOST, port );
+        this.server.bind( new InetSocketAddress( port ) );
         this.mongoClient = createMongoClient();
     }
 
@@ -81,8 +84,8 @@ public MongoClient createMongoClient() {
     }
 
     @NotNull
-    public MongoClient createMongoClient( String migrationPackage ) {
-        return new MongoClient( getConnectionString(), migrationPackage );
+    public MongoClient createMongoClient( String migrationPackage, String... migrationPackages ) {
+        return new MongoClient( getConnectionString(), Lists.concat( List.of( migrationPackage ), List.of( migrationPackages ) ) );
     }
 
     @NotNull
@@ -97,7 +100,7 @@ public String getConnectionString( String database ) {
 
     @NotNull
     protected MongoServer createMongoServer() {
-        return new MongoServer( new MemoryBackend().version( ServerVersion.MONGO_4_0 ) );
+        return new MongoServer( new MemoryBackend().version( ServerVersion.MONGO_5_0 ) );
     }
 
     @Override

oap-storage/oap-storage-mongo/pom.xml

@@ -56,16 +56,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-exec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-            <version>${oap.deps.netty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-            <version>${oap.deps.netty.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.mongock</groupId>
             <artifactId>mongock-standalone</artifactId>
@@ -77,6 +67,13 @@
             <version>${oap.deps.mongock.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>oap</groupId>
+            <artifactId>oap-stdlib-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

oap-storage/oap-storage-mongo/src/main/java/oap/storage/MongoPersistence.java

@@ -136,7 +136,7 @@ protected void processRecords( CountDownLatch cdl ) {
     @Override
     protected void load() {
         log.debug( "loading data from {}", collection.getNamespace() );
-        Consumer<Metadata<T>> cons = metadata -> storage.memory.put( storage.identifier.get( metadata.object ), metadata );
+        Consumer<Metadata<T>> cons = metadata -> storage.memory.put( storage.identifier.getOrInit( metadata.object, _ -> false ), metadata );
         log.info( "Loading documents from [{}] MongoDB table", collection.getNamespace() );
         collection.find().forEach( cons );
         log.info( storage.size() + " object(s) loaded." );

oap-storage/oap-storage-mongo/src/main/java/oap/storage/mongo/MigrationUtils.java

@@ -0,0 +1,27 @@
+package oap.storage.mongo;
+
+import org.apache.commons.lang3.StringUtils;
+import org.bson.Document;
+
+public class MigrationUtils {
+    public static String getString( Document document, String key ) {
+        String[] keys = StringUtils.split( key, "." );
+
+        Document current = document;
+        Object lastValue = null;
+
+        for( String field : keys ) {
+            if( lastValue != null ) {
+                if( lastValue instanceof Document doc ) {
+                    current = doc;
+                } else {
+                    return null;
+                }
+            }
+
+            lastValue = current.get( field );
+        }
+
+        return ( String ) lastValue;
+    }
+}