diff options
Diffstat (limited to 'models-sim/models-sim-dmaap/src/main')
3 files changed, 45 insertions, 9 deletions
diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java index d11d1b397..c954ab8dc 100644 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java +++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java @@ -129,15 +129,9 @@ public class DmaapSimProvider extends ServiceManagerContainer { List<String> lst = topic2data.computeIfAbsent(topicName, this::makeTopicData).read(consumerGroup, limit, timeoutMs); - if (lst.isEmpty() && timeoutMs > 0) { - LOGGER.debug("Topic: {}, Timed out waiting for messages: {}: {}", topicName, consumerGroup, consumerId); - return Response.status(Status.REQUEST_TIMEOUT).entity(lst).build(); - - } else { - LOGGER.debug("Topic: {}, Retrieved {} messages for: {}: {}", topicName, consumerGroup, lst.size(), - consumerId); - return Response.status(Status.OK).entity(lst).build(); - } + LOGGER.debug("Topic: {}, Retrieved {} messages for: {}: {}", topicName, lst.size(), consumerGroup, + consumerId); + return Response.status(Status.OK).entity(lst).build(); } catch (InterruptedException e) { LOGGER.warn("Topic: {}, Request for DMaaP message interrupted: {}: {}", topicName, consumerGroup, 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 index e4671f81a..8717701b6 100644 --- a/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml +++ b/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml @@ -40,6 +40,16 @@ <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 + </directory> + <includes> <include>logback.xml</include> </includes> <outputDirectory>etc</outputDirectory> diff --git a/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh b/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh new file mode 100644 index 000000000..1d04e7cb4 --- /dev/null +++ b/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh @@ -0,0 +1,32 @@ +#!/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 |