diff options
Diffstat (limited to 'models-sim/models-sim-dmaap/src/main')
16 files changed, 35 insertions, 817 deletions
diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/DmaapSimException.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/DmaapSimException.java deleted file mode 100644 index aaf8980f8..000000000 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/DmaapSimException.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * ================================================================================ - * 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.sim.dmaap; - -/** - * This exception will be called if an error occurs in the DMaaP simulator. - */ -public class DmaapSimException extends Exception { - private static final long serialVersionUID = -8507246953751956974L; - - /** - * Instantiates a new exception with a message. - * - * @param message the message - */ - public DmaapSimException(final String message) { - super(message); - } - - /** - * Instantiates a new exception with a caused by exception. - * - * @param exp the exception that caused this exception to be thrown - */ - public DmaapSimException(final Exception exp) { - super(exp); - } - - /** - * Instantiates a new exception with a message and a caused by exception. - * - * @param message the message - * @param exp the exception that caused this exception to be thrown - */ - public DmaapSimException(final String message, final Exception exp) { - super(message, exp); - } -} diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/DmaapSimRuntimeException.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/DmaapSimRuntimeException.java deleted file mode 100644 index fe8b7e21b..000000000 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/DmaapSimRuntimeException.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * ================================================================================ - * 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.sim.dmaap; - -/** - * This runtime exception will be called if a runtime error occurs when using the DMaaP simulator. - */ -public class DmaapSimRuntimeException extends RuntimeException { - private static final long serialVersionUID = -8507246953751956974L; - - /** - * Instantiates a new policy pap runtime exception with a message. - * - * @param message the message - */ - public DmaapSimRuntimeException(final String message) { - super(message); - } - - /** - * Instantiates a new runtime exception with a caused by exception. - * - * @param exp the exception that caused this exception to be thrown - */ - public DmaapSimRuntimeException(final Exception exp) { - super(exp); - } - - /** - * Instantiates a new runtime exception with a message and a caused by exception. - * - * @param message the message - * @param exp the exception that caused this exception to be thrown - */ - public DmaapSimRuntimeException(final String message, final Exception exp) { - super(message, exp); - } -} diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java deleted file mode 100644 index 7c9f79b77..000000000 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java +++ /dev/null @@ -1,85 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.sim.dmaap.parameters; - -import java.io.File; -import org.onap.policy.common.parameters.ValidationResult; -import org.onap.policy.common.utils.coder.Coder; -import org.onap.policy.common.utils.coder.CoderException; -import org.onap.policy.common.utils.coder.StandardCoder; -import org.onap.policy.models.sim.dmaap.DmaapSimException; -import org.onap.policy.models.sim.dmaap.startstop.DmaapSimCommandLineArguments; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This class handles reading, parsing and validating of DMaaP simulator parameters from JSON files. - */ -public class DmaapSimParameterHandler { - - private static final Logger LOGGER = LoggerFactory.getLogger(DmaapSimParameterHandler.class); - - private final Coder coder = new StandardCoder(); - - /** - * Read the parameters from the parameter file. - * - * @param arguments the arguments passed to DMaaP simulator - * @return the parameters read from the configuration file - * @throws DmaapSimException on parameter exceptions - */ - public DmaapSimParameterGroup getParameters(final DmaapSimCommandLineArguments arguments) throws DmaapSimException { - DmaapSimParameterGroup dmaapSimParameterGroup = null; - - // Read the parameters - try { - // Read the parameters from JSON - var file = new File(arguments.getFullConfigurationFilePath()); - dmaapSimParameterGroup = coder.decode(file, DmaapSimParameterGroup.class); - } catch (final CoderException e) { - final String errorMessage = "error reading parameters from \"" + arguments.getConfigurationFilePath() - + "\"\n" + "(" + e.getClass().getSimpleName() + "):" + e.getMessage(); - LOGGER.error(errorMessage); - throw new DmaapSimException(errorMessage, e); - } - - // The JSON processing returns null if there is an empty file - if (dmaapSimParameterGroup == null) { - final String errorMessage = "no parameters found in \"" + arguments.getConfigurationFilePath() + "\""; - LOGGER.error(errorMessage); - throw new DmaapSimException(errorMessage); - } - - // validate the parameters - final ValidationResult validationResult = dmaapSimParameterGroup.validate(); - if (!validationResult.isValid()) { - String returnMessage = - "validation error(s) on parameters from \"" + arguments.getConfigurationFilePath() + "\"\n"; - returnMessage += validationResult.getResult(); - - LOGGER.error(returnMessage); - throw new DmaapSimException(returnMessage); - } - - return dmaapSimParameterGroup; - } -} diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java index 41451eb2f..8414d0718 100644 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java +++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. 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. @@ -21,11 +21,17 @@ package org.onap.policy.models.sim.dmaap.parameters; +import java.util.Properties; import lombok.Getter; +import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; +import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.onap.policy.common.parameters.ParameterGroupImpl; import org.onap.policy.common.parameters.annotations.Min; import org.onap.policy.common.parameters.annotations.NotBlank; import org.onap.policy.common.parameters.annotations.NotNull; +import org.onap.policy.models.sim.dmaap.rest.CambriaMessageBodyHandler; +import org.onap.policy.models.sim.dmaap.rest.DmaapSimRestControllerV1; +import org.onap.policy.models.sim.dmaap.rest.TextMessageBodyHandler; /** * Class to hold all parameters needed for rest server. @@ -42,4 +48,32 @@ public class RestServerParameters extends ParameterGroupImpl { public RestServerParameters() { super(RestServerParameters.class.getSimpleName()); } + + /** + * Creates a set of properties, suitable for building a REST server, from the + * parameters. + * + * @return a set of properties representing the given parameters + */ + public Properties getServerProperties() { + final var props = new Properties(); + props.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES, getName()); + + final String svcpfx = + PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + getName(); + + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_HOST_SUFFIX, getHost()); + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_PORT_SUFFIX, + Integer.toString(getPort())); + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX, + DmaapSimRestControllerV1.class.getName()); + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "false"); + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SWAGGER_SUFFIX, "false"); + + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SERIALIZATION_PROVIDER, + String.join(",", CambriaMessageBodyHandler.class.getName(), + GsonMessageBodyHandler.class.getName(), + TextMessageBodyHandler.class.getName())); + return props; + } } diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestServer.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestServer.java deleted file mode 100644 index acac1439b..000000000 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestServer.java +++ /dev/null @@ -1,82 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.sim.dmaap.rest; - -import java.util.List; -import java.util.Properties; -import org.onap.policy.common.endpoints.http.server.HttpServletServer; -import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance; -import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; -import org.onap.policy.common.gson.GsonMessageBodyHandler; -import org.onap.policy.common.utils.services.ServiceManagerContainer; -import org.onap.policy.models.sim.dmaap.parameters.RestServerParameters; - -/** - * Class to manage life cycle of DMaaP Simulator rest server. - */ -public class DmaapSimRestServer extends ServiceManagerContainer { - - private final List<HttpServletServer> servers; - - /** - * Constructor for instantiating DmaapSimRestServer. - * - * @param restServerParameters the rest server parameters - */ - public DmaapSimRestServer(final RestServerParameters restServerParameters) { - this.servers = HttpServletServerFactoryInstance.getServerFactory() - .build(getServerProperties(restServerParameters)); - - for (HttpServletServer server : this.servers) { - addAction("REST " + server.getName(), server::start, server::stop); - } - } - - /** - * Creates a set of properties, suitable for building a REST server, from the - * parameters. - * - * @param restServerParameters parameters from which to build the properties - * @return a set of properties representing the given parameters - */ - public static Properties getServerProperties(RestServerParameters restServerParameters) { - final var props = new Properties(); - props.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES, restServerParameters.getName()); - - final String svcpfx = - PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + restServerParameters.getName(); - - props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_HOST_SUFFIX, restServerParameters.getHost()); - props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_PORT_SUFFIX, - Integer.toString(restServerParameters.getPort())); - props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX, - DmaapSimRestControllerV1.class.getName()); - props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "false"); - props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SWAGGER_SUFFIX, "false"); - - props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SERIALIZATION_PROVIDER, - String.join(",", CambriaMessageBodyHandler.class.getName(), - GsonMessageBodyHandler.class.getName(), - TextMessageBodyHandler.class.getName())); - return props; - } -} diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimActivator.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimActivator.java deleted file mode 100644 index 3d4e1c66c..000000000 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimActivator.java +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.sim.dmaap.startstop; - -import org.onap.policy.common.utils.services.ServiceManagerContainer; -import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterGroup; -import org.onap.policy.models.sim.dmaap.provider.DmaapSimProvider; -import org.onap.policy.models.sim.dmaap.rest.DmaapSimRestServer; - -/** - * This class activates the DMaaP simulator as a complete service. - */ -public class DmaapSimActivator extends ServiceManagerContainer { - - /** - * Instantiate the activator for the DMaaP simulator as a complete service. - * - * @param dmaapSimParameterGroup the parameters for the DMaaP simulator service - */ - public DmaapSimActivator(final DmaapSimParameterGroup dmaapSimParameterGroup) { - super("DMaaP Simulator"); - - var provider = new DmaapSimProvider(dmaapSimParameterGroup); - DmaapSimProvider.setInstance(provider); - addAction("Sim Provider", provider::start, provider::stop); - - var restServer = new DmaapSimRestServer(dmaapSimParameterGroup.getRestServerParameters()); - addAction("REST server", restServer::start, restServer::stop); - } -} diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimCommandLineArguments.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimCommandLineArguments.java deleted file mode 100644 index 8968a2a8e..000000000 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimCommandLineArguments.java +++ /dev/null @@ -1,55 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019-2021 Nordix Foundation. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.sim.dmaap.startstop; - -import org.onap.policy.common.utils.cmd.CommandLineArgumentsHandler; -import org.onap.policy.common.utils.cmd.CommandLineException; -import org.onap.policy.models.sim.dmaap.DmaapSimRuntimeException; - -/** - * This class reads and handles command line parameters for the DMaaP simulator service. - */ -public class DmaapSimCommandLineArguments extends CommandLineArgumentsHandler { - private static final String DMAAP_SIM = "DMaaP simulator"; - - /** - * Construct the options for the CLI editor. - */ - public DmaapSimCommandLineArguments() { - super(Main.class.getName(), DMAAP_SIM); - } - - /** - * Construct the options for the CLI editor and parse in the given arguments. - * - * @param args The command line arguments - */ - public DmaapSimCommandLineArguments(final String[] args) { - this(); - - try { - parse(args); - } catch (final CommandLineException e) { - throw new DmaapSimRuntimeException("parse error on DMaaP simulator parameters", e); - } - } -} diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/Main.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/Main.java deleted file mode 100644 index 9c368e044..000000000 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/Main.java +++ /dev/null @@ -1,142 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019-2021 Nordix Foundation. - * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. 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. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.sim.dmaap.startstop; - -import java.util.Arrays; -import lombok.Getter; -import org.onap.policy.common.utils.cmd.CommandLineException; -import org.onap.policy.models.sim.dmaap.DmaapSimException; -import org.onap.policy.models.sim.dmaap.DmaapSimRuntimeException; -import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterGroup; -import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterHandler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This class initiates the DMaaP simulator component. - */ -public class Main { - - private static final Logger LOGGER = LoggerFactory.getLogger(Main.class); - - private DmaapSimActivator activator; - @Getter - private DmaapSimParameterGroup parameters; - - /** - * Instantiates the DMaap Simulator service. - * - * @param args the command line arguments - */ - public Main(final String[] args) { - final var argumentString = Arrays.toString(args); - LOGGER.info("Starting DMaaP simulator service with arguments - {}", argumentString); - - // Check the arguments - final var arguments = new DmaapSimCommandLineArguments(); - try { - // The arguments return a string if there is a message to print and we should exit - final String argumentMessage = arguments.parse(args); - if (argumentMessage != null) { - LOGGER.info(argumentMessage); - return; - } - // Validate that the arguments are sane - arguments.validate(); - } catch (final DmaapSimRuntimeException | CommandLineException e) { - LOGGER.error("start of DMaaP simulator service failed", e); - return; - } - - // Read the parameters - try { - parameters = new DmaapSimParameterHandler().getParameters(arguments); - } catch (final Exception e) { - LOGGER.error("start of DMaaP simulator service failed", e); - return; - } - - // Now, create the activator for the DMaaP Simulator service - activator = new DmaapSimActivator(parameters); - - // Start the activator - try { - activator.start(); - } catch (final RuntimeException e) { - LOGGER.error("start of DMaaP simulator service failed, used parameters are {}", Arrays.toString(args), e); - return; - } - - // Add a shutdown hook to shut everything down in an orderly manner - Runtime.getRuntime().addShutdownHook(new DmaapSimShutdownHookClass()); - LOGGER.info("Started DMaaP simulator service"); - } - - /** - * Shut down Execution. - * - * @throws DmaapSimException on shutdown errors - */ - public void shutdown() throws DmaapSimException { - // clear the parameterGroup variable - parameters = null; - - // clear the DMaaP simulator activator - if (activator != null && activator.isAlive()) { - activator.stop(); - } - } - - /** - * The Class DmaapSimShutdownHookClass terminates the DMaaP simulator service when its run method is called. - */ - private class DmaapSimShutdownHookClass extends Thread { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() - */ - @Override - public void run() { - try { - // Shutdown the DMaaP simulator service and wait for everything to stop - shutdown(); - - } catch (final RuntimeException | DmaapSimException e) { - LOGGER.warn("error occured during shut down of the DMaaP simulator service", e); - } - } - } - - /** - * The main method. - * - * @param args the arguments - */ - public static void main(final String[] args) { // NOSONAR - /* - * The arguments are validated by the constructor, thus sonar is disabled. - */ - - new Main(args); - } -} diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile b/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile deleted file mode 100644 index 495924d5b..000000000 --- a/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# Modifications Copyright (C) 2019 AT&T Intellectual Property. -# ================================================================================ -# 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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -# -# Docker file to build an image that runs the DMaaP simulator on Java 8 in alpine -# - -FROM onap/policy-jre-alpine - -LABEL maintainer="Policy Team" - -ARG POLICY_LOGS=/var/log/onap/policy/dmaap-sim - -ENV POLICY_HOME=/opt/app/policy -ENV POLICY_LOGS=${POLICY_LOGS} - -# Create DMaaP simulator user and group -# Add simulator-specific directories and set ownership as the simulator user -RUN mkdir -p ${POLICY_HOME}/dmaap-sim \ - && mkdir -p ${POLICY_HOME}/dmaap-sim/bin \ - && mkdir -p ${POLICY_LOGS} \ - && chown -R policy:policy ${POLICY_LOGS} \ - && mkdir /packages - -# Unpack the tarball -COPY policy-models-sim-dmaap-tarball.tar.gz /packages -RUN tar xvfz /packages/policy-models-sim-dmaap-tarball.tar.gz --directory ${POLICY_HOME}/dmaap-sim \ - && rm /packages/policy-models-sim-dmaap-tarball.tar.gz - -# Ensure everything has the correct permissions -# Copy examples to DMaaP simulator user area -COPY dmaap-sim.sh ${POLICY_HOME}/dmaap-sim/bin -RUN find /opt/app -type d -perm 755 \ - && find /opt/app -type f -perm 644 \ - && chmod 755 ${POLICY_HOME}/dmaap-sim/bin/* - -USER policy -ENV PATH ${POLICY_HOME}/dmaap-sim/bin:$PATH -ENTRYPOINT [ "bash", "dmaap-sim.sh" ] diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh b/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh deleted file mode 100644 index deb168f5d..000000000 --- a/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# Modifications copyright (C) 2020 Bell Canada. 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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -if [ -z "$DMAAP_SIM_HOME" ] -then - DMAAP_SIM_HOME=/opt/app/policy/dmaap-sim -fi - -JAVA_HOME=/usr/lib/jvm/java-11-openjdk -KEYSTORE="${DMAAP_SIM_HOME}/etc/ssl/policy-keystore" -KEYSTORE_PASSWD="Pol1cy_0nap" -TRUSTSTORE="${DMAAP_SIM_HOME}/etc/ssl/policy-truststore" -TRUSTSTORE_PASSWD="Pol1cy_0nap" - -if [ "$#" -eq 1 ] -then - CONFIG_FILE=$1 -else - CONFIG_FILE=${CONFIG_FILE} -fi - -if [ -z "$CONFIG_FILE" ] -then - CONFIG_FILE="$DMAAP_SIM_HOME/etc/DefaultConfig.json" -fi - -echo "DMaaP simulation configuration file: $CONFIG_FILE" - -$JAVA_HOME/bin/java \ - -cp "$DMAAP_SIM_HOME/etc:$DMAAP_SIM_HOME/lib/*" \ - -Djavax.net.ssl.keyStore="$KEYSTORE" \ - -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" \ - -Djavax.net.ssl.trustStore="$TRUSTSTORE" \ - -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" \ - org.onap.policy.models.sim.dmaap.startstop.Main \ - -c $CONFIG_FILE diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/docker_build.sh b/models-sim/models-sim-dmaap/src/main/package/docker/docker_build.sh deleted file mode 100755 index 3ec907b8e..000000000 --- a/models-sim/models-sim-dmaap/src/main/package/docker/docker_build.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# 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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -# -# Script to build a Docker file for the DMaaP simulator. The docker image -# generated by this script should NOT be placed in the ONAP nexus, it is -# only for testing purposes. -# - -if [ -z "$DMAAP_SIM_HOME" ] -then - DMAAP_SIM_HOME=`pwd` -fi - -# Check for the dockerfile -if [ ! -f "$DMAAP_SIM_HOME/src/main/package/docker/Dockerfile" ] -then - echo docker file "$DMAAP_SIM_HOME/src/main/package/docker/Dockerfile" not found - exit 1 -fi - -# Check for the start script -if [ ! -f "$DMAAP_SIM_HOME/src/main/package/docker/dmaap-sim.sh" ] -then - echo start script "$DMAAP_SIM_HOME/src/main/package/docker/dmaap-sim.sh" not found - exit 1 -fi - -# Check for the tarball -tarball_count=`ls $DMAAP_SIM_HOME/target/policy-models-sim-dmaap-*tarball.tar.gz 2> /dev/null | wc | awk '{print $1}'` -if [ "$tarball_count" -ne "1" ] -then - echo one and only one tarball should exist in the target directory - exit 2 -fi - -# Set up the docker build -rm -fr $DMAAP_SIM_HOME/target/docker -mkdir $DMAAP_SIM_HOME/target/docker -cp $DMAAP_SIM_HOME/src/main/package/docker/Dockerfile $DMAAP_SIM_HOME/target/docker -cp $DMAAP_SIM_HOME/src/main/package/docker/dmaap-sim.sh $DMAAP_SIM_HOME/target/docker -cp $DMAAP_SIM_HOME/target/policy-models-sim-dmaap-*tarball.tar.gz $DMAAP_SIM_HOME/target/docker/policy-models-sim-dmaap-tarball.tar.gz - -# Run the docker build -cd $DMAAP_SIM_HOME/target -docker build -t dmaap/simulator docker - - diff --git a/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml b/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml deleted file mode 100644 index 08e202938..000000000 --- a/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml +++ /dev/null @@ -1,69 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2019 Nordix Foundation. - Modifications copyright (C) 2020 Bell Canada. 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. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<assembly> - <id>tarball</id> - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <useProjectArtifact>true</useProjectArtifact> - <outputDirectory>/lib</outputDirectory> - <unpack>false</unpack> - <scope>runtime</scope> - <includes> - <include>*:jar</include> - </includes> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>${project.basedir}/src/main/resources - </directory> - <includes> - <include>startDmaap.sh</include> - </includes> - <outputDirectory>bin</outputDirectory> - <lineEnding>unix</lineEnding> - <fileMode>755</fileMode> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/resources/etc - </directory> - <includes> - <include>DefaultConfig.json</include> - </includes> - <outputDirectory>etc</outputDirectory> - <lineEnding>unix</lineEnding> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/resources/etc/ssl - </directory> - <includes> - <include>policy*</include> - </includes> - <outputDirectory>etc/ssl</outputDirectory> - <lineEnding>keep</lineEnding> - </fileSet> - </fileSets> -</assembly> diff --git a/models-sim/models-sim-dmaap/src/main/resources/etc/DefaultConfig.json b/models-sim/models-sim-dmaap/src/main/resources/etc/DefaultConfig.json deleted file mode 100644 index e936eb034..000000000 --- a/models-sim/models-sim-dmaap/src/main/resources/etc/DefaultConfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "DMaapSim", - "topicSweepSec": 900, - "restServerParameters": { - "host": "0.0.0.0", - "port": 3904 - } -} diff --git a/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-truststore b/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-truststore Binary files differdeleted file mode 100644 index 8834ac257..000000000 --- a/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-truststore +++ /dev/null diff --git a/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh b/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh deleted file mode 100644 index 1d04e7cb4..000000000 --- a/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# -# ============LICENSE_START======================================================= -# ONAP Policy Models -# ================================================================================ -# Copyright (C) 2019 AT&T Intellectual Property. 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. -# ============LICENSE_END========================================================= -# - -# -# Starts the DMaaP simulator using the default configuration. -# - -trap 'exit 1' ERR - -cd ${0%/*}/.. - -java -cp "lib/*" \ - org.onap.policy.models.sim.dmaap.startstop.Main -c etc/DefaultConfig.json diff --git a/models-sim/models-sim-dmaap/src/main/resources/version.txt b/models-sim/models-sim-dmaap/src/main/resources/version.txt deleted file mode 100644 index d629db844..000000000 --- a/models-sim/models-sim-dmaap/src/main/resources/version.txt +++ /dev/null @@ -1,4 +0,0 @@ -ONAP DMaaP simulator Service -Version: ${project.version} -Built (UTC): ${maven.build.timestamp} -ONAP https://wiki.onap.org
\ No newline at end of file |