/*
 * Copyright 2018-2022 B2i Healthcare Pte Ltd, http://b2i.sg
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.b2international.snowowl.core.attachments;

import java.nio.file.Path;

import com.b2international.snowowl.core.config.SnowOwlConfiguration;
import com.b2international.snowowl.core.plugin.Component;
import com.b2international.snowowl.core.setup.Environment;
import com.b2international.snowowl.core.setup.Plugin;
import com.b2international.snowowl.eventbus.IEventBus;

/**
 * @since 7.0
 */
@Component
public final class AttachmentPlugin extends Plugin {

	private static final String ATTACHMENTS_FOLDER = "attachments";

	@Override
	public void preRun(SnowOwlConfiguration configuration, Environment env) throws Exception {
		final IEventBus bus = env.service(IEventBus.class);
		
		if (env.isServer()) {
			final Path attachmentsPath = env.getDataPath().resolve(ATTACHMENTS_FOLDER);
			final DefaultAttachmentRegistry attachmentRegistry = new DefaultAttachmentRegistry(attachmentsPath);
			attachmentRegistry.register(bus);
			env.services().registerService(AttachmentRegistry.class, attachmentRegistry);
		} else {
			final AttachmentRegistryClient attachmentRegistryClient = new AttachmentRegistryClient(bus);
			env.services().registerService(AttachmentRegistry.class, attachmentRegistryClient);
		}
	}
}

@@ -1649,16 +1649,93 @@
  else %7B%0A
+%09%09%09env.services().addServiceListener(IEventBus.class, (oldBus, newBus) -%3E %7B%0A%09
 %09%09%09final
@@ -1816,22 +1816,26 @@
 yClient(
-b
+newB
 us);%0A
+%09
 %09%09%09env.s
@@ -1913,16 +1913,23 @@
 lient);%0A
+%09%09%09%7D);%0A
 %09%09%7D%0A%09%7D%0A%7D

Use service listener for AttachmentRegistryClient