diff --git a/slizaa-server/pom.xml b/slizaa-server/pom.xml index 35fcaee..bb689d2 100644 --- a/slizaa-server/pom.xml +++ b/slizaa-server/pom.xml @@ -37,7 +37,6 @@ slizaa-server-service-configuration - slizaa-server-service-extensions slizaa-server-service-backend slizaa-server-service-svg slizaa-server-service-slizaa diff --git a/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/AbstractGraphDatabaseCommandComponent.java b/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/AbstractGraphDatabaseCommandComponent.java index 98eba1e..0f97b47 100644 --- a/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/AbstractGraphDatabaseCommandComponent.java +++ b/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/AbstractGraphDatabaseCommandComponent.java @@ -17,16 +17,11 @@ */ package io.codekontor.slizaa.server.command; -import io.codekontor.slizaa.server.descr.ContentDefinition; -import io.codekontor.slizaa.server.descr.GraphDatabase; -import io.codekontor.slizaa.server.descr.HierarchicalGraph; import io.codekontor.slizaa.server.service.backend.IBackendService; import io.codekontor.slizaa.server.service.backend.IModifiableBackendService; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.IExtensionService; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; import io.codekontor.slizaa.server.service.slizaa.IGraphDatabase; import io.codekontor.slizaa.server.service.slizaa.ISlizaaService; -import io.codekontor.slizaa.server.spec.HierarchicalGraphSpec; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.shell.table.*; @@ -46,9 +41,6 @@ public abstract class AbstractGraphDatabaseCommandComponent { @Autowired private IBackendService _backendService; - @Autowired - private IExtensionService _extensionService; - protected ISlizaaService slizaaService() { return _slizaaService; } @@ -65,10 +57,6 @@ protected IBackendService backendService() { return _backendService; } - protected IExtensionService extensionService() { - return _extensionService; - } - @NotNull protected Object dumpGraphDatabases() { @@ -130,14 +118,7 @@ protected String dumpContentDefinitionProviderFactories() { */ protected String checkBackendConfigured() { if (!_slizaaService.getBackendService().hasInstalledExtensions()) { - StringBuilder message = new StringBuilder(); - message - .append("The Slizaa Server has not been configured properly: There are not installed backend extensions.\n"); - message.append(dumpAvailableExtensions()); - if (_modifiableBackendService != null) { - message.append("You can install backend extensions using the command 'installExtensions'."); - } - return cannotExecuteCommand(message.toString()); + return cannotExecuteCommand("The Slizaa Server has not been configured properly: There are no installed backend extensions.\n"); } return null; } @@ -165,15 +146,6 @@ protected String cannotExecuteCommand(String msg) { return stringBuffer.toString(); } - protected String dumpAvailableExtensions() { - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("Available Backend Extensions:\n"); - extensionService().getExtensions().forEach(extension -> { - stringBuffer.append(formatExtension(extension)); - }); - return stringBuffer.toString(); - } - protected String formatExtension(IExtension extension) { return String.format(" - %1$s_%2$s (Symbolic name: %1$s, version: %2$s)\n", extension.getSymbolicName(), extension.getVersion()); diff --git a/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/ExtensionIdentifier.java b/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/ExtensionIdentifier.java index 6f35300..83b8e6d 100644 --- a/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/ExtensionIdentifier.java +++ b/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/ExtensionIdentifier.java @@ -18,8 +18,8 @@ package io.codekontor.slizaa.server.command; import com.google.common.base.Preconditions; -import io.codekontor.slizaa.server.service.extensions.IExtensionIdentifier; -import io.codekontor.slizaa.server.service.extensions.Version; +import io.codekontor.slizaa.server.service.backend.extensions.IExtensionIdentifier; +import io.codekontor.slizaa.server.service.backend.extensions.Version; public class ExtensionIdentifier implements IExtensionIdentifier { diff --git a/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/SlizaaBackendCommands.java b/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/SlizaaBackendCommands.java index 132e308..2b52a93 100644 --- a/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/SlizaaBackendCommands.java +++ b/slizaa-server/slizaa-server-command/src/main/java/io/codekontor/slizaa/server/command/SlizaaBackendCommands.java @@ -17,8 +17,8 @@ */ package io.codekontor.slizaa.server.command; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.IExtensionIdentifier; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtensionIdentifier; import org.springframework.shell.Availability; import org.springframework.shell.standard.*; @@ -29,19 +29,6 @@ @ShellCommandGroup("Slizaa Backend Commands") public class SlizaaBackendCommands extends AbstractGraphDatabaseCommandComponent{ - @ShellMethod(value = "List all available backend extensions.", key="listAvailableExtensions") - @ShellMethodAvailability("availabilityCheck") - public String listAvailableExtensions() { - - // - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("Available Backend Extensions:\n"); - extensionService().getExtensions().forEach(extension -> { - stringBuffer.append(formatExtension(extension)); - }); - return stringBuffer.toString(); - } - @ShellMethod(value = "List installed extensions.", key="listInstalledExtensions") public String listInstalledExtensions() { @@ -54,45 +41,4 @@ public String listInstalledExtensions() { return stringBuffer.toString(); } - - @ShellMethod(value = "Install backend extensions.", key="installExtensions") - @ShellMethodAvailability("availabilityCheck") - public String installExtensions(String[] extensions) { - - // fail fast - if (!hasModifiableBackendService()) { - return cannotExecuteCommand("Backend is not modifiable."); - } - - // - List extensionIdList = new ArrayList<>(); - - for (int i = 0; i < extensions.length; i++) { - String extension = extensions[i]; - String[] split = extension.split("_"); - if (split.length != 2) { - return cannotExecuteCommand(String.format("Invalid parameter value '%s'.", extension)); - } - extensionIdList.add(new ExtensionIdentifier(split[0], split[1])); - } - - // - List extensionsToInstall = extensionService().getExtensions(extensionIdList); - modifiableBackendService().installExtensions(extensionsToInstall); - - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("Installed Backend Extensions:\n"); - modifiableBackendService().getInstalledExtensions().forEach(extension -> { - stringBuffer.append(formatExtension(extension)); - }); - - - return stringBuffer.toString(); - } - - public Availability availabilityCheck() { - return modifiableBackendService() != null - ? Availability.available() - : Availability.unavailable("an offline backend is not modifiable."); - } } \ No newline at end of file diff --git a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/serverconfig/ServerConfigMutation.java b/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/serverconfig/ServerConfigMutation.java deleted file mode 100644 index 03de655..0000000 --- a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/serverconfig/ServerConfigMutation.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * slizaa-server-graphql - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package io.codekontor.slizaa.server.graphql.serverconfig; - -import java.util.List; -import java.util.stream.Collectors; - -import io.codekontor.slizaa.server.service.backend.IBackendService; -import io.codekontor.slizaa.server.service.backend.IModifiableBackendService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import com.coxautodev.graphql.tools.GraphQLMutationResolver; - -import io.codekontor.slizaa.server.service.extensions.ExtensionIdentifier; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.IExtensionIdentifier; -import io.codekontor.slizaa.server.service.slizaa.ISlizaaService; - -@Component -public class ServerConfigMutation implements GraphQLMutationResolver { - - @Autowired - private ISlizaaService slizaaService; - - /** - *

- *

- * - * @return - */ - public List installServerExtensions(List serverExtensions) { - - // retrieve the extensions... - List extensionIds = serverExtensions.stream() - .map(ext -> new ExtensionIdentifier(ext.getSymbolicName(), ext.getVersion())).collect(Collectors.toList()); - - List extensions = slizaaService.getExtensionService().getExtensions(extensionIds); - - // ... and install it - IBackendService backendService = slizaaService.getBackendService(); - - if (backendService instanceof IModifiableBackendService) { - ((IModifiableBackendService) backendService).installExtensions(extensions); - } - - // - return extensions.stream().map(ext -> new ServerExtension(ext.getSymbolicName(), ext.getVersion().toString())) - .collect(Collectors.toList()); - } -} diff --git a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/serverconfig/ServerConfigQuery.java b/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/serverconfig/ServerConfigQuery.java index 4e30d9e..2188286 100644 --- a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/serverconfig/ServerConfigQuery.java +++ b/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/serverconfig/ServerConfigQuery.java @@ -50,10 +50,4 @@ public ServerConfiguration serverConfiguration() { // return new ServerConfiguration(installedServerExtensions); } - - public List availableServerExtensions() { - return slizaaService.getExtensionService().getExtensions().stream() - .map(ext -> new ServerExtension(ext.getSymbolicName(), ext.getVersion().toString())) - .collect(Collectors.toList()); - } } diff --git a/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-server-config.graphqls b/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-server-config.graphqls index 9a23297..938f520 100644 --- a/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-server-config.graphqls +++ b/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-server-config.graphqls @@ -31,13 +31,4 @@ extend type Query { # Returns the server configuration serverConfiguration: ServerConfiguration! - - # Returns the available server extensions - availableServerExtensions: [ServerExtension]! -} - -extend type Mutation { - - # Installs the specified server extensions. - installServerExtensions(extensions: [ServerExtensionIdentifier]): [ServerExtension]! } diff --git a/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServer.java b/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServer.java index 606eaca..eff9619 100644 --- a/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServer.java +++ b/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServer.java @@ -17,16 +17,7 @@ */ package io.codekontor.slizaa.server; -import io.codekontor.slizaa.server.command.EnableSlizaaServerCommandModule; -import io.codekontor.slizaa.server.graphql.EnableGraphqlModule; -import io.codekontor.slizaa.server.service.backend.EnableBackendServiceModule; -import io.codekontor.slizaa.server.service.configuration.EnableConfigurationModule; -import io.codekontor.slizaa.server.service.extensions.EnableExtensionsModule; -import io.codekontor.slizaa.server.service.selection.EnableSelectionServiceModule; -import io.codekontor.slizaa.server.service.slizaa.EnableSlizaaServiceModule; -import io.codekontor.slizaa.server.service.svg.EnableSvgServiceModule; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; /** * diff --git a/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServerConfiguration.java b/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServerConfiguration.java index e4ce1ac..7dc5147 100644 --- a/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServerConfiguration.java +++ b/slizaa-server/slizaa-server-main/src/main/java/io/codekontor/slizaa/server/SlizaaServerConfiguration.java @@ -21,7 +21,6 @@ import io.codekontor.slizaa.server.graphql.EnableGraphqlModule; import io.codekontor.slizaa.server.service.backend.EnableBackendServiceModule; import io.codekontor.slizaa.server.service.configuration.EnableConfigurationModule; -import io.codekontor.slizaa.server.service.extensions.EnableExtensionsModule; import io.codekontor.slizaa.server.service.selection.EnableSelectionServiceModule; import io.codekontor.slizaa.server.service.slizaa.EnableSlizaaServiceModule; import io.codekontor.slizaa.server.service.svg.EnableSvgServiceModule; @@ -33,7 +32,6 @@ * @author Gerd Wütherich (gerd.wuetherich@codekontor.io) */ @SpringBootApplication -@EnableExtensionsModule @EnableBackendServiceModule @EnableSlizaaServiceModule @EnableGraphqlModule diff --git a/slizaa-server/slizaa-server-service-backend/pom.xml b/slizaa-server/slizaa-server-service-backend/pom.xml index acbe18b..192ffaa 100644 --- a/slizaa-server/slizaa-server-service-backend/pom.xml +++ b/slizaa-server/slizaa-server-service-backend/pom.xml @@ -33,11 +33,6 @@ slizaa-server-service-backend - - io.codekontor.slizaa - slizaa-server-service-extensions - ${project.version} - io.codekontor.slizaa slizaa-server-service-configuration @@ -74,7 +69,11 @@ io.github.classgraph classgraph - + + io.codekontor.mvnresolver + mvnresolver-uber + ${version-mvnresolver-uber} + diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendService.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendService.java index 5cb3de6..0e17063 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendService.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendService.java @@ -19,7 +19,7 @@ import java.util.List; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; /** * diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendServiceCallback.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendServiceCallback.java index 8c40f96..971f512 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendServiceCallback.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IBackendServiceCallback.java @@ -19,7 +19,7 @@ import java.util.List; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; public interface IBackendServiceCallback { diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IModifiableBackendService.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IModifiableBackendService.java index 6b78c6a..03bd333 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IModifiableBackendService.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/IModifiableBackendService.java @@ -17,7 +17,7 @@ */ package io.codekontor.slizaa.server.service.backend; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; import java.util.List; diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/ExtensionIdentifier.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/ExtensionIdentifier.java similarity index 94% rename from slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/ExtensionIdentifier.java rename to slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/ExtensionIdentifier.java index 45a9fe2..f8568f7 100644 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/ExtensionIdentifier.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/ExtensionIdentifier.java @@ -1,5 +1,5 @@ /** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools + * slizaa-server-service-backend - Slizaa Static Software Analysis Tools * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package io.codekontor.slizaa.server.service.extensions; +package io.codekontor.slizaa.server.service.backend.extensions; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtension.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/IExtension.java similarity index 88% rename from slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtension.java rename to slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/IExtension.java index 23f3bf7..f00f1cd 100644 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtension.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/IExtension.java @@ -1,5 +1,5 @@ /** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools + * slizaa-server-service-backend - Slizaa Static Software Analysis Tools * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package io.codekontor.slizaa.server.service.extensions; +package io.codekontor.slizaa.server.service.backend.extensions; import java.net.URL; import java.util.List; diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtensionIdentifier.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/IExtensionIdentifier.java similarity index 87% rename from slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtensionIdentifier.java rename to slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/IExtensionIdentifier.java index 66d181a..09d059d 100644 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtensionIdentifier.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/IExtensionIdentifier.java @@ -1,5 +1,5 @@ /** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools + * slizaa-server-service-backend - Slizaa Static Software Analysis Tools * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package io.codekontor.slizaa.server.service.extensions; +package io.codekontor.slizaa.server.service.backend.extensions; /** * diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/Version.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/Version.java similarity index 98% rename from slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/Version.java rename to slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/Version.java index 1ad6efa..4ec815a 100644 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/Version.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/Version.java @@ -1,5 +1,5 @@ /** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools + * slizaa-server-service-backend - Slizaa Static Software Analysis Tools * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package io.codekontor.slizaa.server.service.extensions; +package io.codekontor.slizaa.server.service.backend.extensions; import java.util.NoSuchElementException; import java.util.StringTokenizer; diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/directory/DirectoryBasedExtension.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/directory/DirectoryBasedExtension.java similarity index 88% rename from slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/directory/DirectoryBasedExtension.java rename to slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/directory/DirectoryBasedExtension.java index 4fa0200..cd2cc06 100644 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/directory/DirectoryBasedExtension.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/directory/DirectoryBasedExtension.java @@ -1,5 +1,5 @@ /** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools + * slizaa-server-service-backend - Slizaa Static Software Analysis Tools * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) * * This program is free software: you can redistribute it and/or modify @@ -15,12 +15,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package io.codekontor.slizaa.server.service.extensions.directory; +package io.codekontor.slizaa.server.service.backend.extensions.directory; import com.google.common.base.Preconditions; -import io.codekontor.slizaa.server.service.extensions.ExtensionIdentifier; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.Version; +import io.codekontor.slizaa.server.service.backend.extensions.ExtensionIdentifier; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/mvn/MvnBasedExtension.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/mvn/MvnBasedExtension.java new file mode 100644 index 0000000..daaf2fa --- /dev/null +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/mvn/MvnBasedExtension.java @@ -0,0 +1,94 @@ +/** + * slizaa-server-service-backend - Slizaa Static Software Analysis Tools + * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package io.codekontor.slizaa.server.service.backend.extensions.mvn; + +import io.codekontor.mvnresolver.MvnResolverServiceFactoryFactory; +import io.codekontor.mvnresolver.api.IMvnResolverService; +import io.codekontor.mvnresolver.api.IMvnResolverServiceFactory; +import io.codekontor.slizaa.server.service.backend.extensions.ExtensionIdentifier; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.Version; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; + +/** + * see:https://github.com/FasterXML/jackson-docs/wiki/JacksonPolymorphicDeserialization + */ +@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") +public class MvnBasedExtension extends ExtensionIdentifier implements IExtension { + + /* - */ + @JsonProperty("dependencies") + private List _dependencies; + + /** + * Creates a new instance of type {@link MvnBasedExtension}. + */ + public MvnBasedExtension(String symbolicName, Version version) { + super(symbolicName, version); + + _dependencies = new ArrayList<>(); + } + + protected MvnBasedExtension() { + super(); + + _dependencies = new ArrayList<>(); + } + + /** + * @param mvnDependency + * @return + */ + public MvnBasedExtension withDependency(MvnDependency mvnDependency) { + _dependencies.add(checkNotNull(mvnDependency)); + return this; + } + + /** + * @return + */ + @Override + public List resolvedArtifactsToInstall() { + + // + IMvnResolverServiceFactory resolverServiceFactory = MvnResolverServiceFactoryFactory + .createNewResolverServiceFactory(); + + // + IMvnResolverService mvnResolverService = resolverServiceFactory.newMvnResolverService().create(); + IMvnResolverService.IMvnResolverJob resolverJob = mvnResolverService.newMvnResolverJob(); + _dependencies.forEach(dep -> { + IMvnResolverService.IMvnResolverJobDependency dependency = resolverJob.withDependency(dep.getDependency()); + if (dep.getExclusionPatterns() != null) { + dependency.withExclusionPatterns(dep.getExclusionPatterns().toArray(new String[0])); + } + }); + + return Arrays.asList(resolverJob.resolveToUrlArray()); + + } +} diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/mvn/MvnDependency.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/mvn/MvnDependency.java similarity index 92% rename from slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/mvn/MvnDependency.java rename to slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/mvn/MvnDependency.java index 5b370d8..7e3e58a 100644 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/mvn/MvnDependency.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/extensions/mvn/MvnDependency.java @@ -1,5 +1,5 @@ /** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools + * slizaa-server-service-backend - Slizaa Static Software Analysis Tools * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package io.codekontor.slizaa.server.service.extensions.mvn; +package io.codekontor.slizaa.server.service.backend.extensions.mvn; import java.util.Arrays; import java.util.List; diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/AbstractSlizaaServerBackendImpl.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/AbstractSlizaaServerBackendImpl.java index bff778f..62709c0 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/AbstractSlizaaServerBackendImpl.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/AbstractSlizaaServerBackendImpl.java @@ -24,19 +24,12 @@ import io.codekontor.slizaa.scanner.api.importer.IModelImporterFactory; import io.codekontor.slizaa.scanner.spi.parser.IParserFactory; import io.codekontor.slizaa.server.service.backend.IBackendService; -import io.codekontor.slizaa.server.service.backend.IBackendServiceCallback; import io.codekontor.slizaa.server.service.backend.IBackendServiceInstanceProvider; -import io.codekontor.slizaa.server.service.backend.IModifiableBackendService; -import io.codekontor.slizaa.server.service.backend.impl.dao.ISlizaaServerBackendDao; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Profile; import org.springframework.core.io.ClassPathResource; -import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/DummyBackendService.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/DummyBackendService.java index 9c999a9..20feb98 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/DummyBackendService.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/DummyBackendService.java @@ -32,9 +32,8 @@ import io.codekontor.slizaa.scanner.api.graphdb.IGraphDbFactory; import io.codekontor.slizaa.scanner.api.importer.IModelImporterFactory; import io.codekontor.slizaa.scanner.spi.parser.IParserFactory; -import io.codekontor.slizaa.server.service.backend.IBackendService; import io.codekontor.slizaa.server.service.backend.IBackendServiceInstanceProvider; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; public class DummyBackendService implements IModifiableBackendService, IBackendServiceInstanceProvider { diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/OfflineSlizaaServerBackendImpl.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/OfflineSlizaaServerBackendImpl.java index 1cc721f..b27710f 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/OfflineSlizaaServerBackendImpl.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/OfflineSlizaaServerBackendImpl.java @@ -19,8 +19,8 @@ import io.codekontor.slizaa.server.service.backend.IBackendService; import io.codekontor.slizaa.server.service.backend.IBackendServiceInstanceProvider; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.directory.DirectoryBasedExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.directory.DirectoryBasedExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/SlizaaServerBackendImpl.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/SlizaaServerBackendImpl.java index 4305c28..9d4b7b2 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/SlizaaServerBackendImpl.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/SlizaaServerBackendImpl.java @@ -20,12 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import java.io.IOException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.PostConstruct; @@ -34,21 +29,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; -import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Component; -import com.google.common.io.ByteStreams; - -import io.codekontor.slizaa.hierarchicalgraph.graphdb.mapping.spi.IMappingProvider; -import io.codekontor.slizaa.scanner.api.cypherregistry.ICypherStatementRegistry; -import io.codekontor.slizaa.scanner.api.graphdb.IGraphDbFactory; -import io.codekontor.slizaa.scanner.api.importer.IModelImporterFactory; -import io.codekontor.slizaa.scanner.spi.parser.IParserFactory; -import io.codekontor.slizaa.server.service.backend.IBackendService; import io.codekontor.slizaa.server.service.backend.IBackendServiceCallback; import io.codekontor.slizaa.server.service.backend.IBackendServiceInstanceProvider; import io.codekontor.slizaa.server.service.backend.impl.dao.ISlizaaServerBackendDao; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; /** *

diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/DefaultSlizaaServerBackendDao.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/DefaultSlizaaServerBackendDao.java index 8fe3a6c..fd208a9 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/DefaultSlizaaServerBackendDao.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/DefaultSlizaaServerBackendDao.java @@ -18,7 +18,7 @@ package io.codekontor.slizaa.server.service.backend.impl.dao; import io.codekontor.slizaa.server.service.configuration.IConfigurationService; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ExtensionsHolder.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ExtensionsHolder.java index 8d8d7e0..1ac31a6 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ExtensionsHolder.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ExtensionsHolder.java @@ -19,7 +19,7 @@ import java.util.List; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; public class ExtensionsHolder { diff --git a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ISlizaaServerBackendDao.java b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ISlizaaServerBackendDao.java index ca33251..921ca76 100644 --- a/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ISlizaaServerBackendDao.java +++ b/slizaa-server/slizaa-server-service-backend/src/main/java/io/codekontor/slizaa/server/service/backend/impl/dao/ISlizaaServerBackendDao.java @@ -17,7 +17,7 @@ */ package io.codekontor.slizaa.server.service.backend.impl.dao; -import io.codekontor.slizaa.server.service.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; import java.util.List; diff --git a/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/AbstractServerBackendTest.java b/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/AbstractServerBackendTest.java index c36f231..5520457 100644 --- a/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/AbstractServerBackendTest.java +++ b/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/AbstractServerBackendTest.java @@ -33,9 +33,8 @@ import io.codekontor.slizaa.server.service.configuration.IConfigurationService; import io.codekontor.slizaa.server.service.configuration.impl.NullConfigurationService; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.IExtensionIdentifier; -import io.codekontor.slizaa.server.service.extensions.IExtensionService; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; +import io.codekontor.slizaa.server.service.backend.extensions.IExtensionIdentifier; @RunWith(SpringRunner.class) @ContextConfiguration(classes = AbstractServerBackendTest.class) @@ -50,45 +49,5 @@ public IConfigurationService configurationService() { @Autowired protected ApplicationContext applicationContext; - - @Autowired - protected DummyExtensionService extensionService; - - /** - * - */ - @Component - public static class DummyExtensionService implements IExtensionService { - - // - private List _extensions = Collections.emptyList(); - - /** - * - * @return - */ - @Override - public List getExtensions() { - return _extensions; - } - - /** - * - * @param extensionIdentifiers - * @return - */ - @Override - public List getExtensions(List extensionIdentifiers) { - return getExtensions().stream().filter(extensionIdentifiers::contains).collect(Collectors.toList()); - } - - /** - * - * @param _extensions - */ - public void setExtensions(List _extensions) { - this._extensions = _extensions; - } - } } diff --git a/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/ServerBackend_InstallExtensionsTest.java b/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/ServerBackend_InstallExtensionsTest.java index 9ceb7c1..8da45f1 100644 --- a/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/ServerBackend_InstallExtensionsTest.java +++ b/slizaa-server/slizaa-server-service-backend/src/test/java/io/codekontor/slizaa/server/service/backend/ServerBackend_InstallExtensionsTest.java @@ -26,15 +26,15 @@ import org.springframework.test.annotation.DirtiesContext; import io.codekontor.slizaa.server.service.backend.impl.SlizaaServerBackendImpl; -import io.codekontor.slizaa.server.service.extensions.Version; -import io.codekontor.slizaa.server.service.extensions.mvn.MvnBasedExtension; -import io.codekontor.slizaa.server.service.extensions.mvn.MvnDependency; +import io.codekontor.slizaa.server.service.backend.extensions.Version; +import io.codekontor.slizaa.server.service.backend.extensions.mvn.MvnBasedExtension; +import io.codekontor.slizaa.server.service.backend.extensions.mvn.MvnDependency; public class ServerBackend_InstallExtensionsTest extends AbstractServerBackendTest { // private static MvnBasedExtension testExtension = new MvnBasedExtension("Test", new Version(1, 0, 0)) - .withDependency(new MvnDependency("io.codekontor.slizaa:slizaa-core-progressmonitor:1.0.0-SNAPSHOT")); + .withDependency(new MvnDependency("io.codekontor.slizaa:slizaa-core-progressmonitor:1.0.0.M3")); // private static MvnBasedExtension invalidExtension = new MvnBasedExtension("Missing", new Version(1, 0, 0)) diff --git a/slizaa-server/slizaa-server-service-extensions/.classpath b/slizaa-server/slizaa-server-service-extensions/.classpath deleted file mode 100644 index 5e8a55f..0000000 --- a/slizaa-server/slizaa-server-service-extensions/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/slizaa-server/slizaa-server-service-extensions/.project b/slizaa-server/slizaa-server-service-extensions/.project deleted file mode 100644 index 5728b2e..0000000 --- a/slizaa-server/slizaa-server-service-extensions/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - slizaa-server-service-extensions - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/slizaa-server/slizaa-server-service-extensions/.settings/org.eclipse.core.resources.prefs b/slizaa-server/slizaa-server-service-extensions/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647..0000000 --- a/slizaa-server/slizaa-server-service-extensions/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/slizaa-server/slizaa-server-service-extensions/.settings/org.eclipse.jdt.core.prefs b/slizaa-server/slizaa-server-service-extensions/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9c81ef9..0000000 --- a/slizaa-server/slizaa-server-service-extensions/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/slizaa-server/slizaa-server-service-extensions/LICENSE.txt b/slizaa-server/slizaa-server-service-extensions/LICENSE.txt deleted file mode 100644 index dbbe355..0000000 --- a/slizaa-server/slizaa-server-service-extensions/LICENSE.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/slizaa-server/slizaa-server-service-extensions/pom.xml b/slizaa-server/slizaa-server-service-extensions/pom.xml deleted file mode 100644 index dd92b71..0000000 --- a/slizaa-server/slizaa-server-service-extensions/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - 4.0.0 - - - io.codekontor.slizaa - slizaa-server-parent - 1.0.0-SNAPSHOT - ../../slizaa-poms/slizaa-server-parent/pom.xml - - - slizaa-server-service-extensions - - - - org.springframework - spring-context - - - com.google.guava - guava - - - org.slf4j - slf4j-api - - - com.fasterxml.jackson.core - jackson-databind - - - io.codekontor.mvnresolver - mvnresolver-uber - ${version-mvnresolver-uber} - - - - diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/EnableExtensionsModule.java b/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/EnableExtensionsModule.java deleted file mode 100644 index 7a3632d..0000000 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/EnableExtensionsModule.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package io.codekontor.slizaa.server.service.extensions; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -import java.lang.annotation.*; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE}) -@Documented -@Import(ExtensionsModuleConfiguration.class) -@Configuration -public @interface EnableExtensionsModule { -} diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/ExtensionsModuleConfiguration.java b/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/ExtensionsModuleConfiguration.java deleted file mode 100644 index b34de0b..0000000 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/ExtensionsModuleConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package io.codekontor.slizaa.server.service.extensions; - -import io.codekontor.slizaa.server.service.extensions.impl.DefaultExtensionService; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan(basePackageClasses = DefaultExtensionService.class) -public class ExtensionsModuleConfiguration { -} diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtensionService.java b/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtensionService.java deleted file mode 100644 index 115b34c..0000000 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/IExtensionService.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package io.codekontor.slizaa.server.service.extensions; - -import java.util.List; - -/** - * - */ -public interface IExtensionService { - - /** - * - * @return - */ - List getExtensions(); - - /** - * - * @return - */ - List getExtensions(List extensionIdentifiers); -} diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/VersionRange.java b/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/VersionRange.java deleted file mode 100644 index 4b19da9..0000000 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/VersionRange.java +++ /dev/null @@ -1,523 +0,0 @@ -/** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -/* - * Copyright (c) OSGi Alliance (2011, 2012). All Rights Reserved. - * - * 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 io.codekontor.slizaa.server.service.extensions; - -import java.util.NoSuchElementException; -import java.util.StringTokenizer; - -/** - * Version range. A version range is an interval describing a set of - * {@link Version versions}. - * - *

- * A range has a left (lower) endpoint and a right (upper) endpoint. Each - * endpoint can be open (excluded from the set) or closed (included in the set). - * - *

- * - * This file originally has been copied from org.osgi.core.VersionRange. - */ - -public class VersionRange { - /** - * The left endpoint is open and is excluded from the range. - *

- * The value of {@code LEFT_OPEN} is {@code '('}. - */ - public static final char LEFT_OPEN = '('; - /** - * The left endpoint is closed and is included in the range. - *

- * The value of {@code LEFT_CLOSED} is {@code '['}. - */ - public static final char LEFT_CLOSED = '['; - /** - * The right endpoint is open and is excluded from the range. - *

- * The value of {@code RIGHT_OPEN} is {@code ')'}. - */ - public static final char RIGHT_OPEN = ')'; - /** - * The right endpoint is closed and is included in the range. - *

- * The value of {@code RIGHT_CLOSED} is {@code ']'}. - */ - public static final char RIGHT_CLOSED = ']'; - - private final boolean leftClosed; - private final Version left; - private final Version right; - private final boolean rightClosed; - private final boolean empty; - - private transient String versionRangeString /* default to null */; - private transient int hash /* default to 0 */; - - private static final String LEFT_OPEN_DELIMITER = "("; - private static final String LEFT_CLOSED_DELIMITER = "["; - private static final String LEFT_DELIMITERS = LEFT_CLOSED_DELIMITER + LEFT_OPEN_DELIMITER; - private static final String RIGHT_OPEN_DELIMITER = ")"; - private static final String RIGHT_CLOSED_DELIMITER = "]"; - private static final String RIGHT_DELIMITERS = RIGHT_OPEN_DELIMITER + RIGHT_CLOSED_DELIMITER; - private static final String ENDPOINT_DELIMITER = ","; - - /** - * Creates a version range from the specified versions. - * - * @param leftType Must be either {@link #LEFT_CLOSED} or {@link #LEFT_OPEN} - * . - * @param leftEndpoint Left endpoint of range. Must not be {@code null}. - * @param rightEndpoint Right endpoint of range. May be {@code null} to - * indicate the right endpoint is Infinity. - * @param rightType Must be either {@link #RIGHT_CLOSED} or - * {@link #RIGHT_OPEN}. - * @throws IllegalArgumentException If the arguments are invalid. - */ - public VersionRange(char leftType, Version leftEndpoint, Version rightEndpoint, char rightType) { - if ((leftType != LEFT_CLOSED) && (leftType != LEFT_OPEN)) { - throw new IllegalArgumentException("invalid leftType \"" + leftType + "\""); - } - if ((rightType != RIGHT_OPEN) && (rightType != RIGHT_CLOSED)) { - throw new IllegalArgumentException("invalid rightType \"" + rightType + "\""); - } - if (leftEndpoint == null) { - throw new IllegalArgumentException("null leftEndpoint argument"); - } - leftClosed = leftType == LEFT_CLOSED; - rightClosed = rightType == RIGHT_CLOSED; - left = leftEndpoint; - right = rightEndpoint; - empty = isEmpty0(); - } - - /** - * Creates a version range from the specified string. - * - *

- * Version range string grammar: - * - * 

-	 * range ::= interval | atleast
-	 * interval ::= ( '[' | '(' ) left ',' right ( ']' | ')' )
-	 * left ::= version
-	 * right ::= version
-	 * atleast ::= version
-	 *
- * - * @param range String representation of the version range. The versions in - * the range must contain no whitespace. Other whitespace in the - * range string is ignored. - * @throws IllegalArgumentException If {@code range} is improperly - * formatted. - */ - public VersionRange(String range) { - boolean closedLeft; - boolean closedRight; - Version endpointLeft; - Version endpointRight; - - try { - StringTokenizer st = new StringTokenizer(range, LEFT_DELIMITERS, true); - String token = st.nextToken().trim(); // whitespace or left delim - if (token.length() == 0) { // leading whitespace - token = st.nextToken(); // left delim - } - closedLeft = LEFT_CLOSED_DELIMITER.equals(token); - if (!closedLeft && !LEFT_OPEN_DELIMITER.equals(token)) { - // first token is not a delimiter, so it must be "atleast" - if (st.hasMoreTokens()) { // there must be no more tokens - throw new IllegalArgumentException("invalid range \"" + range + "\": invalid format"); - } - leftClosed = true; - rightClosed = false; - left = parseVersion(token, range); - right = null; - empty = false; - return; - } - String version = st.nextToken(ENDPOINT_DELIMITER); - endpointLeft = parseVersion(version, range); - token = st.nextToken(); // consume comma - version = st.nextToken(RIGHT_DELIMITERS); - token = st.nextToken(); // right delim - closedRight = RIGHT_CLOSED_DELIMITER.equals(token); - if (!closedRight && !RIGHT_OPEN_DELIMITER.equals(token)) { - throw new IllegalArgumentException("invalid range \"" + range + "\": invalid format"); - } - endpointRight = parseVersion(version, range); - - if (st.hasMoreTokens()) { // any more tokens have to be whitespace - token = st.nextToken("").trim(); - if (token.length() != 0) { // trailing whitespace - throw new IllegalArgumentException("invalid range \"" + range + "\": invalid format"); - } - } - } catch (NoSuchElementException e) { - IllegalArgumentException iae = new IllegalArgumentException("invalid range \"" + range + "\": invalid format"); - iae.initCause(e); - throw iae; - } - - leftClosed = closedLeft; - rightClosed = closedRight; - left = endpointLeft; - right = endpointRight; - empty = isEmpty0(); - } - - /** - * Parse version component into a Version. - * - * @param version version component string - * @param range Complete range string for exception message, if any - * @return Version - */ - private static Version parseVersion(String version, String range) { - try { - return Version.parseVersion(version); - } catch (IllegalArgumentException e) { - IllegalArgumentException iae = new IllegalArgumentException("invalid range \"" + range + "\": " + e.getMessage()); - iae.initCause(e); - throw iae; - } - } - - /** - * Returns the left endpoint of this version range. - * - * @return The left endpoint. - */ - public Version getLeft() { - return left; - } - - /** - * Returns the right endpoint of this version range. - * - * @return The right endpoint. May be {@code null} which indicates the right - * endpoint is Infinity. - */ - public Version getRight() { - return right; - } - - /** - * Returns the type of the left endpoint of this version range. - * - * @return {@link #LEFT_CLOSED} if the left endpoint is closed or - * {@link #LEFT_OPEN} if the left endpoint is open. - */ - public char getLeftType() { - return leftClosed ? LEFT_CLOSED : LEFT_OPEN; - } - - /** - * Returns the type of the right endpoint of this version range. - * - * @return {@link #RIGHT_CLOSED} if the right endpoint is closed or - * {@link #RIGHT_OPEN} if the right endpoint is open. - */ - public char getRightType() { - return rightClosed ? RIGHT_CLOSED : RIGHT_OPEN; - } - - /** - * Returns whether this version range includes the specified version. - * - * @param version The version to test for inclusion in this version range. - * @return {@code true} if the specified version is included in this version - * range; {@code false} otherwise. - */ - public boolean includes(Version version) { - if (empty) { - return false; - } - if (left.compareTo(version) >= (leftClosed ? 1 : 0)) { - return false; - } - if (right == null) { - return true; - } - return right.compareTo(version) >= (rightClosed ? 0 : 1); - } - - /** - * Returns the intersection of this version range with the specified version - * ranges. - * - * @param ranges The version ranges to intersect with this version range. - * @return A version range representing the intersection of this version - * range and the specified version ranges. If no version ranges are - * specified, then this version range is returned. - */ - public VersionRange intersection(VersionRange... ranges) { - if ((ranges == null) || (ranges.length == 0)) { - return this; - } - // prime with data from this version range - boolean closedLeft = leftClosed; - boolean closedRight = rightClosed; - Version endpointLeft = left; - Version endpointRight = right; - - for (VersionRange range : ranges) { - int comparison = endpointLeft.compareTo(range.left); - if (comparison == 0) { - closedLeft = closedLeft && range.leftClosed; - } else { - if (comparison < 0) { // move endpointLeft to the right - endpointLeft = range.left; - closedLeft = range.leftClosed; - } - } - if (range.right != null) { - if (endpointRight == null) { - endpointRight = range.right; - closedRight = range.rightClosed; - } else { - comparison = endpointRight.compareTo(range.right); - if (comparison == 0) { - closedRight = closedRight && range.rightClosed; - } else { - if (comparison > 0) { // move endpointRight to the left - endpointRight = range.right; - closedRight = range.rightClosed; - } - } - } - } - } - - return new VersionRange(closedLeft ? LEFT_CLOSED : LEFT_OPEN, endpointLeft, endpointRight, closedRight ? RIGHT_CLOSED : RIGHT_OPEN); - } - - /** - * Returns whether this version range is empty. A version range is empty if - * the set of versions defined by the interval is empty. - * - * @return {@code true} if this version range is empty; {@code false} - * otherwise. - */ - public boolean isEmpty() { - return empty; - } - - /** - * Internal isEmpty behavior. - * - * @return {@code true} if this version range is empty; {@code false} - * otherwise. - */ - private boolean isEmpty0() { - if (right == null) { // infinity - return false; - } - int comparison = left.compareTo(right); - if (comparison == 0) { // endpoints equal - return !leftClosed || !rightClosed; - } - return comparison > 0; // true if left > right - } - - /** - * Returns whether this version range contains only a single version. - * - * @return {@code true} if this version range contains only a single - * version; {@code false} otherwise. - */ - public boolean isExact() { - if (empty || (right == null)) { - return false; - } - if (leftClosed) { - if (rightClosed) { - // [l,r]: exact if l == r - return left.equals(right); - } else { - // [l,r): exact if l++ >= r - Version adjacent1 = new Version(left.getMajor(), left.getMinor(), left.getMicro(), left.getQualifier() + "-"); - return adjacent1.compareTo(right) >= 0; - } - } else { - if (rightClosed) { - // (l,r] is equivalent to [l++,r]: exact if l++ == r - Version adjacent1 = new Version(left.getMajor(), left.getMinor(), left.getMicro(), left.getQualifier() + "-"); - return adjacent1.equals(right); - } else { - // (l,r) is equivalent to [l++,r): exact if (l++)++ >=r - Version adjacent2 = new Version(left.getMajor(), left.getMinor(), left.getMicro(), left.getQualifier() + "--"); - return adjacent2.compareTo(right) >= 0; - } - } - } - - /** - * Returns the string representation of this version range. - * - *

- * The format of the version range string will be a version string if the - * right end point is Infinity ({@code null}) or an interval string. - * - * @return The string representation of this version range. - */ - public String toString() { - if (versionRangeString != null) { - return versionRangeString; - } - String leftVersion = left.toString(); - if (right == null) { - StringBuffer result = new StringBuffer(leftVersion.length() + 1); - result.append(left.toString0()); - return versionRangeString = result.toString(); - } - String rightVerion = right.toString(); - StringBuffer result = new StringBuffer(leftVersion.length() + rightVerion.length() + 5); - result.append(leftClosed ? LEFT_CLOSED : LEFT_OPEN); - result.append(left.toString0()); - result.append(ENDPOINT_DELIMITER); - result.append(right.toString0()); - result.append(rightClosed ? RIGHT_CLOSED : RIGHT_OPEN); - return versionRangeString = result.toString(); - } - - /** - * Returns a hash code value for the object. - * - * @return An integer which is a hash code value for this object. - */ - public int hashCode() { - if (hash != 0) { - return hash; - } - if (empty) { - return hash = 31; - } - int h = 31 + (leftClosed ? 7 : 5); - h = 31 * h + left.hashCode(); - if (right != null) { - h = 31 * h + right.hashCode(); - h = 31 * h + (rightClosed ? 7 : 5); - } - return hash = h; - } - - /** - * Compares this {@code VersionRange} object to another object. - * - *

- * A version range is considered to be equal to another version - * range if both the endpoints and their types are equal or if both version - * ranges are {@link #isEmpty() empty}. - * - * @param object The {@code VersionRange} object to be compared. - * @return {@code true} if {@code object} is a {@code VersionRange} and is - * equal to this object; {@code false} otherwise. - */ - public boolean equals(Object object) { - if (object == this) { // quicktest - return true; - } - if (!(object instanceof VersionRange)) { - return false; - } - VersionRange other = (VersionRange) object; - if (empty && other.empty) { - return true; - } - if (right == null) { - return (leftClosed == other.leftClosed) && (other.right == null) && left.equals(other.left); - } - return (leftClosed == other.leftClosed) && (rightClosed == other.rightClosed) && left.equals(other.left) && right.equals(other.right); - } - - /** - * Returns the filter string for this version range using the specified - * attribute name. - * - * @param attributeName The attribute name to use in the returned filter - * string. - * @return A filter string for this version range using the specified - * attribute name. - * @throws IllegalArgumentException If the specified attribute name is not a - * valid attribute name. - * - * @see "Core Specification, Filters, for a description of the filter string syntax." - */ - public String toFilterString(String attributeName) { - if (attributeName.length() == 0) { - throw new IllegalArgumentException("invalid attributeName \"" + attributeName + "\""); - } - for (char ch : attributeName.toCharArray()) { - if ((ch == '=') || (ch == '>') || (ch == '<') || (ch == '~') || (ch == '(') || (ch == ')')) { - throw new IllegalArgumentException("invalid attributeName \"" + attributeName + "\""); - } - } - - StringBuffer result = new StringBuffer(128); - if (right != null) { - result.append("(&"); - } - if (leftClosed) { - result.append('('); - result.append(attributeName); - result.append(">="); - result.append(left.toString0()); - result.append(')'); - } else { - result.append("(!("); - result.append(attributeName); - result.append("<="); - result.append(left.toString0()); - result.append("))"); - } - if (right != null) { - if (rightClosed) { - result.append('('); - result.append(attributeName); - result.append("<="); - result.append(right.toString0()); - result.append(')'); - } else { - result.append("(!("); - result.append(attributeName); - result.append(">="); - result.append(right.toString0()); - result.append("))"); - } - result.append(')'); - } - - return result.toString(); - } -} diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/impl/DefaultExtensionService.java b/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/impl/DefaultExtensionService.java deleted file mode 100644 index f9e8ace..0000000 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/impl/DefaultExtensionService.java +++ /dev/null @@ -1,67 +0,0 @@ -/** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package io.codekontor.slizaa.server.service.extensions.impl; - -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.IExtensionIdentifier; -import io.codekontor.slizaa.server.service.extensions.IExtensionService; -import io.codekontor.slizaa.server.service.extensions.Version; -import io.codekontor.slizaa.server.service.extensions.mvn.MvnBasedExtension; -import io.codekontor.slizaa.server.service.extensions.mvn.MvnDependency; -import org.springframework.stereotype.Component; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * - */ -@Component -public class DefaultExtensionService implements IExtensionService { - - /* - */ - private MvnBasedExtension _jtypeExtension = new MvnBasedExtension("io.codekontor.slizaa.extensions.jtype", new Version(1, 0, 0)) - .withDependency(new MvnDependency("io.codekontor.slizaa.extensions:slizaa-extensions-jtype:1.0.0-SNAPSHOT")); - - /* - */ - private List _extensionList = Arrays.asList(_jtypeExtension); - - /** - * @return - */ - @Override - public List getExtensions() { - return Collections.unmodifiableList(_extensionList); - } - - @Override - public List getExtensions(List extensionIdentifiers) { - return _extensionList.stream().filter(ext -> extensionIdentifiers.contains(ext)).collect(Collectors.toList()); - } - - /** - * @param args - */ - public static void main(String[] args) { - - // - new DefaultExtensionService()._jtypeExtension.resolvedArtifactsToInstall().forEach(url -> System.out.println(url.toString())); - } -} diff --git a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/mvn/MvnBasedExtension.java b/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/mvn/MvnBasedExtension.java deleted file mode 100644 index 8297169..0000000 --- a/slizaa-server/slizaa-server-service-extensions/src/main/java/io/codekontor/slizaa/server/service/extensions/mvn/MvnBasedExtension.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * slizaa-server-service-extensions - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package io.codekontor.slizaa.server.service.extensions.mvn; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import io.codekontor.mvnresolver.MvnResolverServiceFactoryFactory; -import io.codekontor.mvnresolver.api.IMvnResolverService; -import io.codekontor.mvnresolver.api.IMvnResolverServiceFactory; -import io.codekontor.slizaa.server.service.extensions.ExtensionIdentifier; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.Version; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - -/** - * see:https://github.com/FasterXML/jackson-docs/wiki/JacksonPolymorphicDeserialization - */ -@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") -public class MvnBasedExtension extends ExtensionIdentifier implements IExtension { - - /* - */ - @JsonProperty("dependencies") - private List _dependencies; - - /** - * Creates a new instance of type {@link MvnBasedExtension}. - */ - public MvnBasedExtension(String symbolicName, Version version) { - super(symbolicName, version); - - _dependencies = new ArrayList<>(); - } - - protected MvnBasedExtension() { - super(); - - _dependencies = new ArrayList<>(); - } - - /** - * @param mvnDependency - * @return - */ - public MvnBasedExtension withDependency(MvnDependency mvnDependency) { - _dependencies.add(checkNotNull(mvnDependency)); - return this; - } - - /** - * @return - */ - @Override - public List resolvedArtifactsToInstall() { - - // - IMvnResolverServiceFactory resolverServiceFactory = MvnResolverServiceFactoryFactory - .createNewResolverServiceFactory(); - - // - IMvnResolverService mvnResolverService = resolverServiceFactory.newMvnResolverService().create(); - IMvnResolverService.IMvnResolverJob resolverJob = mvnResolverService.newMvnResolverJob(); - _dependencies.forEach(dep -> { - IMvnResolverService.IMvnResolverJobDependency dependency = resolverJob.withDependency(dep.getDependency()); - if (dep.getExclusionPatterns() != null) { - dependency.withExclusionPatterns(dep.getExclusionPatterns().toArray(new String[0])); - } - }); - - return Arrays.asList(resolverJob.resolveToUrlArray()); - - } -} diff --git a/slizaa-server/slizaa-server-service-slizaa/pom.xml b/slizaa-server/slizaa-server-service-slizaa/pom.xml index 0fdb237..24ed3dc 100644 --- a/slizaa-server/slizaa-server-service-slizaa/pom.xml +++ b/slizaa-server/slizaa-server-service-slizaa/pom.xml @@ -43,11 +43,6 @@ slizaa-server-service-backend ${project.version} - - io.codekontor.slizaa - slizaa-server-service-extensions - ${project.version} - io.codekontor.slizaa slizaa-server-service-configuration diff --git a/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/ISlizaaService.java b/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/ISlizaaService.java index 25594cc..c29f56d 100644 --- a/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/ISlizaaService.java +++ b/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/ISlizaaService.java @@ -22,7 +22,6 @@ import io.codekontor.slizaa.scanner.spi.contentdefinition.IContentDefinitionProviderFactory; import io.codekontor.slizaa.server.service.backend.IBackendService; -import io.codekontor.slizaa.server.service.extensions.IExtensionService; import io.codekontor.slizaa.server.service.selection.ISelectionService; import io.codekontor.slizaa.server.service.svg.ISvgService; @@ -36,8 +35,6 @@ public interface ISlizaaService { ISelectionService getSelectionService(); - IExtensionService getExtensionService(); - IBackendService getBackendService(); ISvgService getSvgService(); diff --git a/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceImpl.java b/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceImpl.java index dde1744..4715a52 100644 --- a/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceImpl.java +++ b/slizaa-server/slizaa-server-service-slizaa/src/main/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceImpl.java @@ -46,8 +46,7 @@ import io.codekontor.slizaa.server.service.backend.IBackendServiceCallback; import io.codekontor.slizaa.server.service.backend.IBackendServiceInstanceProvider; import io.codekontor.slizaa.server.service.configuration.IConfigurationService; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.extensions.IExtensionService; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; import io.codekontor.slizaa.server.service.slizaa.IGraphDatabase; import io.codekontor.slizaa.server.service.slizaa.ISlizaaService; import io.codekontor.slizaa.server.service.slizaa.internal.configuration.GraphDatabaseConfiguration; @@ -91,9 +90,6 @@ public class SlizaaServiceImpl implements ISlizaaService, IBackendServiceCallbac @Autowired private IBackendServiceInstanceProvider _backendService; - @Autowired - private IExtensionService _extensionService; - @Autowired private IConfigurationService _configurationService; @@ -199,11 +195,6 @@ public Collection> getContentDefinitionProv return _contentDefinitionProviderFactoryService.getContentDefinitionProviderFactories(); } - @Override - public IExtensionService getExtensionService() { - return _extensionService; - } - @Override public IBackendService getBackendService() { return _backendService; diff --git a/slizaa-server/slizaa-server-service-slizaa/src/test/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceTestConfiguration.java b/slizaa-server/slizaa-server-service-slizaa/src/test/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceTestConfiguration.java index 67ead2c..080619d 100644 --- a/slizaa-server/slizaa-server-service-slizaa/src/test/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceTestConfiguration.java +++ b/slizaa-server/slizaa-server-service-slizaa/src/test/java/io/codekontor/slizaa/server/service/slizaa/internal/SlizaaServiceTestConfiguration.java @@ -17,25 +17,20 @@ */ package io.codekontor.slizaa.server.service.slizaa.internal; -import io.codekontor.slizaa.server.service.selection.EnableSelectionServiceModule; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - -import io.codekontor.slizaa.server.service.backend.IBackendService; import io.codekontor.slizaa.server.service.backend.IBackendServiceInstanceProvider; import io.codekontor.slizaa.server.service.backend.impl.DummyBackendService; import io.codekontor.slizaa.server.service.configuration.EnableConfigurationModule; -import io.codekontor.slizaa.server.service.extensions.EnableExtensionsModule; +import io.codekontor.slizaa.server.service.selection.EnableSelectionServiceModule; import io.codekontor.slizaa.server.service.slizaa.EnableSlizaaServiceModule; import io.codekontor.slizaa.server.service.slizaa.internal.graphdatabase.IGraphDatabaseStateMachineContextFactory; import io.codekontor.slizaa.server.service.slizaa.internal.graphdatabase.factory.DummyGraphDatabaseStateMachineContextFactory; import io.codekontor.slizaa.server.service.svg.EnableSvgServiceModule; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; @Configuration -// @EnableBackendServiceModule -@EnableExtensionsModule @EnableConfigurationModule @EnableSlizaaServiceModule @EnableSvgServiceModule diff --git a/slizaa-server/slizaa-server-service-spec/src/main/java/io/codekontor/slizaa/service/spec/internal/SpecService.java b/slizaa-server/slizaa-server-service-spec/src/main/java/io/codekontor/slizaa/service/spec/internal/SpecService.java index 1b0cd4d..ef12590 100644 --- a/slizaa-server/slizaa-server-service-spec/src/main/java/io/codekontor/slizaa/service/spec/internal/SpecService.java +++ b/slizaa-server/slizaa-server-service-spec/src/main/java/io/codekontor/slizaa/service/spec/internal/SpecService.java @@ -28,8 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import io.codekontor.slizaa.server.service.extensions.IExtension; -import io.codekontor.slizaa.server.service.slizaa.IGraphDatabase; +import io.codekontor.slizaa.server.service.backend.extensions.IExtension; import io.codekontor.slizaa.server.service.slizaa.ISlizaaService; import io.codekontor.slizaa.service.spec.ISpecService; @@ -52,8 +51,7 @@ public void reconfigure(SlizaaServerSpec slizaaServerSpec) { public SlizaaServerSpec fetchSpec() { // server extensions - List serverExtensionSpecs = - _slizaaService.getExtensionService().getExtensions().stream().map(toServerExtensionsSpec()).collect(Collectors.toList()); + List serverExtensionSpecs =new ArrayList<>(); List graphDatabaseSpecs = new ArrayList<>();