add ProjectIdBridge

Author: yaauie

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/common/ProjectIdBridge.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.logstashbridge.common;
+
+import org.elasticsearch.cluster.metadata.ProjectId;
+import org.elasticsearch.logstashbridge.StableBridgeAPI;
+
+public interface ProjectIdBridge extends StableBridgeAPI<ProjectId> {
+    String id();
+
+    static ProjectIdBridge fromInternal(final ProjectId projectId) {
+        return new ProxyInternal(projectId);
+    }
+
+    static ProjectIdBridge fromId(final String id) {
+        final ProjectId internal = ProjectId.fromId(id);
+        return new ProxyInternal(internal);
+    }
+
+    static ProjectIdBridge getDefault() {
+        return ProxyInternal.DEFAULT;
+    }
+
+    class ProxyInternal implements ProjectIdBridge {
+        private final ProjectId internalDelegate;
+
+        static final ProjectIdBridge.ProxyInternal DEFAULT = new ProjectIdBridge.ProxyInternal(ProjectId.DEFAULT);
+
+        public ProxyInternal(ProjectId internalDelegate) {
+            this.internalDelegate = internalDelegate;
+        }
+
+        @Override
+        public String id() {
+            return toInternal().id();
+        }
+
+        @Override
+        public ProjectId toInternal() {
+            return this.internalDelegate;
+        }
+    }
+}

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/ingest/ProcessorBridge.java

@@ -15,6 +15,7 @@
 import org.elasticsearch.ingest.IngestService;
 import org.elasticsearch.ingest.Processor;
 import org.elasticsearch.logstashbridge.StableBridgeAPI;
+import org.elasticsearch.logstashbridge.common.ProjectIdBridge;
 import org.elasticsearch.logstashbridge.env.EnvironmentBridge;
 import org.elasticsearch.logstashbridge.script.ScriptServiceBridge;
 import org.elasticsearch.logstashbridge.threadpool.ThreadPoolBridge;
@@ -178,22 +179,23 @@ public Processor.Parameters toInternal() {
      * An external bridge for {@link Processor.Factory}
      */
     interface Factory extends StableBridgeAPI<Processor.Factory> {
-        @Deprecated // supply ProjectId
+
+        @Deprecated // supply ProjectIdBridge
         default ProcessorBridge create(
             Map<String, ProcessorBridge.Factory> registry,
             String processorTag,
             String description,
             Map<String, Object> config
         ) throws Exception {
-            return this.create(registry, processorTag, description, config, ProjectId.DEFAULT);
+            return this.create(registry, processorTag, description, config, ProjectIdBridge.getDefault());
         }
 
         ProcessorBridge create(
             Map<String, ProcessorBridge.Factory> registry,
             String processorTag,
             String description,
             Map<String, Object> config,
-            ProjectId projectId
+            ProjectIdBridge projectId
         ) throws Exception;
 
         static Factory fromInternal(final Processor.Factory delegate) {
@@ -218,10 +220,11 @@ public ProcessorBridge create(
                 final String processorTag,
                 final String description,
                 final Map<String, Object> config,
-                final ProjectId projectId
+                final ProjectIdBridge bridgedProjectId
             ) throws Exception {
                 final Map<String, Processor.Factory> internalRegistry = StableBridgeAPI.toInternal(registry);
                 final Processor.Factory internalFactory = toInternal();
+                final ProjectId projectId = bridgedProjectId.toInternal();
                 final Processor internalProcessor = internalFactory.create(internalRegistry, processorTag, description, config, projectId);
                 return ProcessorBridge.fromInternal(internalProcessor);
             }
@@ -260,14 +263,15 @@ public Processor create(
                 ) throws Exception {
                     final Map<String, ProcessorBridge.Factory> bridgedProcessorFactories = StableBridgeAPI.fromInternal(
                         processorFactories,
-                        ProcessorBridge.Factory.ProxyInternal::new
+                        ProcessorBridge.Factory::fromInternal
                     );
+                    final ProjectIdBridge bridgedProjectId = ProjectIdBridge.fromInternal(projectId);
                     final ProcessorBridge bridgedProcessor = AbstractExternal.this.create(
                         bridgedProcessorFactories,
                         tag,
                         description,
                         config,
-                        projectId
+                        bridgedProjectId
                     );
                     return bridgedProcessor.toInternal();
                 }