summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2017-08-08 03:15:42 -0700
committerSébastien Determe <sd378r@intl.att.com>2017-08-08 12:36:25 +0000
commit50d34dacd85c7fdaf73ab9e970587243d6e79ebf (patch)
treefd28ed6098f24cc8cb2baee408311e7a431c0316 /src/main/java/org
parent249699f8fb908359213697055b66637c9baeda99 (diff)
Removal of useless files
Removal of useless files like Helloworld or unused HTML files Change-Id: Id82af9bb27eb53a7564cd42ab25960eb34bbf102 Issue-Id: CLAMP-1 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/onap/clamp/clds/jsf/JsfExampleBean.java61
-rw-r--r--src/main/java/org/onap/clamp/clds/model/CldsAsdcArtifact.java112
-rw-r--r--src/main/java/org/onap/clamp/clds/model/CldsAsdcResource.java131
-rw-r--r--src/main/java/org/onap/clamp/clds/model/CldsAsdcResourceBasicInfo.java160
-rw-r--r--src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceDetail.java142
-rw-r--r--src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceInfo.java148
-rw-r--r--src/main/java/org/onap/clamp/clds/model/HelloWorld.java50
-rw-r--r--src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogService.java101
-rw-r--r--src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogServiceImpl.java94
9 files changed, 0 insertions, 999 deletions
diff --git a/src/main/java/org/onap/clamp/clds/jsf/JsfExampleBean.java b/src/main/java/org/onap/clamp/clds/jsf/JsfExampleBean.java
deleted file mode 100644
index 5fdcedd96..000000000
--- a/src/main/java/org/onap/clamp/clds/jsf/JsfExampleBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.jsf;
-
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-import java.io.Serializable;
-import java.util.Date;
-
-@ManagedBean
-@SessionScoped
-public class JsfExampleBean implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String value;
- private Date dateValue;
-
- private static final java.text.SimpleDateFormat timestampFormat = new java.text.SimpleDateFormat("yyyy-MM-dd-HH:mm:ss");
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public Date getDateValue() {
- return dateValue;
- }
-
- public void setDateValue(Date dateValue) {
- this.dateValue = dateValue;
- }
-
- public String getDateValueText() {
- return timestampFormat.format(dateValue);
- }
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsAsdcArtifact.java b/src/main/java/org/onap/clamp/clds/model/CldsAsdcArtifact.java
deleted file mode 100644
index 43d5ab6ae..000000000
--- a/src/main/java/org/onap/clamp/clds/model/CldsAsdcArtifact.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CldsAsdcArtifact {
-
- private String artifactName;
- private String artifactType;
- private String artifactURL;
- private String artifactDescription;
- private String artifactTimeout;
- private String artifactChecksum;
- private String artifactUUID;
- private String artifactVersion;
- private String generatedFromUUID;
-
- public String getArtifactName() {
- return artifactName;
- }
-
- public void setArtifactName(String artifactName) {
- this.artifactName = artifactName;
- }
-
- public String getArtifactType() {
- return artifactType;
- }
-
- public void setArtifactType(String artifactType) {
- this.artifactType = artifactType;
- }
-
- public String getArtifactURL() {
- return artifactURL;
- }
-
- public void setArtifactURL(String artifactURL) {
- this.artifactURL = artifactURL;
- }
-
- public String getArtifactDescription() {
- return artifactDescription;
- }
-
- public void setArtifactDescription(String artifactDescription) {
- this.artifactDescription = artifactDescription;
- }
-
- public String getArtifactTimeout() {
- return artifactTimeout;
- }
-
- public void setArtifactTimeout(String artifactTimeout) {
- this.artifactTimeout = artifactTimeout;
- }
-
- public String getArtifactChecksum() {
- return artifactChecksum;
- }
-
- public void setArtifactChecksum(String artifactChecksum) {
- this.artifactChecksum = artifactChecksum;
- }
-
- public String getArtifactUUID() {
- return artifactUUID;
- }
-
- public void setArtifactUUID(String artifactUUID) {
- this.artifactUUID = artifactUUID;
- }
-
- public String getArtifactVersion() {
- return artifactVersion;
- }
-
- public void setArtifactVersion(String artifactVersion) {
- this.artifactVersion = artifactVersion;
- }
-
- public String getGeneratedFromUUID() {
- return generatedFromUUID;
- }
-
- public void setGeneratedFromUUID(String generatedFromUUID) {
- this.generatedFromUUID = generatedFromUUID;
- }
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsAsdcResource.java b/src/main/java/org/onap/clamp/clds/model/CldsAsdcResource.java
deleted file mode 100644
index 3210b696b..000000000
--- a/src/main/java/org/onap/clamp/clds/model/CldsAsdcResource.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.logging.Logger;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CldsAsdcResource implements Comparable<CldsAsdcResource> {
- private static final Logger logger = Logger.getLogger(CldsAsdcServiceInfo.class.getName());
-
- private String resourceInstanceName;
- private String resourceName;
- private String resourceInvariantUUID;
- private String resourceVersion;
- private String resoucreType;
- private String resourceUUID;
- private List<CldsAsdcArtifact> artifacts;
-
- public String getResourceInstanceName() {
- return resourceInstanceName;
- }
-
- public void setResourceInstanceName(String resourceInstanceName) {
- this.resourceInstanceName = resourceInstanceName;
- }
-
- public String getResourceName() {
- return resourceName;
- }
-
- public void setResourceName(String resourceName) {
- this.resourceName = resourceName;
- }
-
- public String getResourceInvariantUUID() {
- return resourceInvariantUUID;
- }
-
- public void setResourceInvariantUUID(String resourceInvariantUUID) {
- this.resourceInvariantUUID = resourceInvariantUUID;
- }
-
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- public void setResourceVersion(String resourceVersion) {
- this.resourceVersion = resourceVersion;
- }
-
- public String getResoucreType() {
- return resoucreType;
- }
-
- public void setResoucreType(String resoucreType) {
- this.resoucreType = resoucreType;
- }
-
- public String getResourceUUID() {
- return resourceUUID;
- }
-
- public void setResourceUUID(String resourceUUID) {
- this.resourceUUID = resourceUUID;
- }
-
- public List<CldsAsdcArtifact> getArtifacts() {
- return artifacts;
- }
-
- public void setArtifacts(List<CldsAsdcArtifact> artifacts) {
- this.artifacts = artifacts;
- }
-
- @Override
- public int compareTo(CldsAsdcResource in) {
- // Compares this object with the specified object for order.
- // Returns a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than the specified object.
-
- // first compare based on name
- int rtn = resourceInstanceName.compareToIgnoreCase(in.resourceInstanceName);
-
- if (rtn == 0) {
- BigDecimal myVersion = convertVersion(resourceVersion);
- BigDecimal inVersion = convertVersion(in.resourceVersion);
- rtn = myVersion.compareTo(inVersion);
- }
- return rtn;
- }
-
- /**
- * Convert version String into a BigDecimal
- *
- * @param versionText
- * @return
- */
- private BigDecimal convertVersion(String versionText) {
- BigDecimal rtn = new BigDecimal(0.0);
- try {
- rtn = new BigDecimal(versionText);
- } catch (NumberFormatException nfe) {
- logger.warning("ASDC version=" + versionText + " is not decimal for name=" + resourceInstanceName);
- }
- return rtn;
- }
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsAsdcResourceBasicInfo.java b/src/main/java/org/onap/clamp/clds/model/CldsAsdcResourceBasicInfo.java
deleted file mode 100644
index c66428a68..000000000
--- a/src/main/java/org/onap/clamp/clds/model/CldsAsdcResourceBasicInfo.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import java.math.BigDecimal;
-import java.util.logging.Logger;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CldsAsdcResourceBasicInfo implements Comparable<CldsAsdcResourceBasicInfo> {
- private static final Logger logger = Logger.getLogger(CldsAsdcServiceInfo.class.getName());
-
- private String uuid;
- private String invariantUUID;
- private String name;
- private String version;
- private String toscaModelURL;
- private String category;
- private String subCategory;
- private String resourceType;
- private String lifecycleState;
- private String lastUpdaterUserId;
-
- @Override
- public int compareTo(CldsAsdcResourceBasicInfo in) {
- // Compares this object with the specified object for order.
- // Returns a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than the specified object.
- // first compare based on name
- int rtn = name.compareToIgnoreCase(in.name);
-
- if (rtn == 0) {
- BigDecimal myVersion = convertVersion(version);
- BigDecimal inVersion = convertVersion(in.version);
- rtn = myVersion.compareTo(inVersion);
- }
- return rtn;
- }
-
- /**
- * Convert version String into a BigDecimal
- *
- * @param version
- * @return
- */
- private BigDecimal convertVersion(String version) {
- BigDecimal rtn = new BigDecimal(0.0);
- try {
- rtn = new BigDecimal(version);
- } catch (NumberFormatException nfe) {
- logger.warning("ASDC version=" + version + " is not decimal for name=" + name);
- }
- return rtn;
- }
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public String getInvariantUUID() {
- return invariantUUID;
- }
-
- public void setInvariantUUID(String invariantUUID) {
- this.invariantUUID = invariantUUID;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getToscaModelURL() {
- return toscaModelURL;
- }
-
- public void setToscaModelURL(String toscaModelURL) {
- this.toscaModelURL = toscaModelURL;
- }
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getSubCategory() {
- return subCategory;
- }
-
- public void setSubCategory(String subCategory) {
- this.subCategory = subCategory;
- }
-
- public String getResourceType() {
- return resourceType;
- }
-
- public void setResourceType(String resourceType) {
- this.resourceType = resourceType;
- }
-
- public String getLifecycleState() {
- return lifecycleState;
- }
-
- public void setLifecycleState(String lifecycleState) {
- this.lifecycleState = lifecycleState;
- }
-
- public String getLastUpdaterUserId() {
- return lastUpdaterUserId;
- }
-
- public void setLastUpdaterUserId(String lastUpdaterUserId) {
- this.lastUpdaterUserId = lastUpdaterUserId;
- }
-
- public Logger getLOGGER() {
- return logger;
- }
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceDetail.java b/src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceDetail.java
deleted file mode 100644
index f50e09d5f..000000000
--- a/src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceDetail.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import java.util.List;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CldsAsdcServiceDetail {
-
- private String uuid;
- private String invariantUUID;
- private String name;
- private String version;
- private String toscaModelURL;
- private String category;
- private String lifecycleState;
- private String lastUpdaterUserId;
- private String distributionStatus;
- private String lastUpdaterFullName;
- private List<CldsAsdcResource> resources;
- private List<CldsAsdcArtifact> artifacts;
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public String getInvariantUUID() {
- return invariantUUID;
- }
-
- public void setInvariantUUID(String invariantUUID) {
- this.invariantUUID = invariantUUID;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getToscaModelURL() {
- return toscaModelURL;
- }
-
- public void setToscaModelURL(String toscaModelURL) {
- this.toscaModelURL = toscaModelURL;
- }
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getLifecycleState() {
- return lifecycleState;
- }
-
- public void setLifecycleState(String lifecycleState) {
- this.lifecycleState = lifecycleState;
- }
-
- public String getLastUpdaterUserId() {
- return lastUpdaterUserId;
- }
-
- public void setLastUpdaterUserId(String lastUpdaterUserId) {
- this.lastUpdaterUserId = lastUpdaterUserId;
- }
-
- public String getDistributionStatus() {
- return distributionStatus;
- }
-
- public void setDistributionStatus(String distributionStatus) {
- this.distributionStatus = distributionStatus;
- }
-
- public String getLastUpdaterFullName() {
- return lastUpdaterFullName;
- }
-
- public void setLastUpdaterFullName(String lastUpdaterFullName) {
- this.lastUpdaterFullName = lastUpdaterFullName;
- }
-
- public List<CldsAsdcResource> getResources() {
- return resources;
- }
-
- public void setResources(List<CldsAsdcResource> resources) {
- this.resources = resources;
- }
-
- public List<CldsAsdcArtifact> getArtifacts() {
- return artifacts;
- }
-
- public void setArtifacts(List<CldsAsdcArtifact> artifacts) {
- this.artifacts = artifacts;
- }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceInfo.java b/src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceInfo.java
deleted file mode 100644
index 3ed575345..000000000
--- a/src/main/java/org/onap/clamp/clds/model/CldsAsdcServiceInfo.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.model;
-
-import java.math.BigDecimal;
-import java.util.logging.Logger;
-
-public class CldsAsdcServiceInfo implements Comparable<CldsAsdcServiceInfo> {
- private static final Logger logger = Logger.getLogger(CldsAsdcServiceInfo.class.getName());
-
- private String uuid;
- private String invariantUUID;
- private String name;
- private String version;
- private String toscaModelURL;
- private String category;
- private String lifecycleState;
- private String lastUpdaterUserId;
- private String distributionStatus;
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public String getInvariantUUID() {
- return invariantUUID;
- }
-
- public void setInvariantUUID(String invariantUUID) {
- this.invariantUUID = invariantUUID;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getToscaModelURL() {
- return toscaModelURL;
- }
-
- public void setToscaModelURL(String toscaModelURL) {
- this.toscaModelURL = toscaModelURL;
- }
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getLifecycleState() {
- return lifecycleState;
- }
-
- public void setLifecycleState(String lifecycleState) {
- this.lifecycleState = lifecycleState;
- }
-
- public String getLastUpdaterUserId() {
- return lastUpdaterUserId;
- }
-
- public void setLastUpdaterUserId(String lastUpdaterUserId) {
- this.lastUpdaterUserId = lastUpdaterUserId;
- }
-
- public String getDistributionStatus() {
- return distributionStatus;
- }
-
- public void setDistributionStatus(String distributionStatus) {
- this.distributionStatus = distributionStatus;
- }
-
- /**
- * Compare using name and then version. Version is converted to a decimal.
- */
- @Override
- public int compareTo(CldsAsdcServiceInfo in) {
- // Compares this object with the specified object for order.
- // Returns a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than the specified object.
- // first compare based on name
- int rtn = name.compareToIgnoreCase(in.name);
-
- if (rtn == 0) {
- BigDecimal myVersion = convertVersion(version);
- BigDecimal inVersion = convertVersion(in.version);
- rtn = myVersion.compareTo(inVersion);
- }
-
- return rtn;
- }
-
- /**
- * Convert version String into a BigDecimal
- *
- * @param versionText
- * @return
- */
- private BigDecimal convertVersion(String versionText) {
- try {
- return new BigDecimal(versionText);
- } catch (NumberFormatException nfe) {
- logger.warning("ASDC version=" + versionText + " is not decimal for name=" + name);
- }
- return new BigDecimal(0.0);
- }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/HelloWorld.java b/src/main/java/org/onap/clamp/clds/model/HelloWorld.java
deleted file mode 100644
index 1165f5da4..000000000
--- a/src/main/java/org/onap/clamp/clds/model/HelloWorld.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.model;
-
-public class HelloWorld {
-
- private String message;
-
- public HelloWorld() {
- // needed for deserializer
- }
-
- public HelloWorld(String message) {
- this.message = message;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- @Override
- public String toString() {
- return "message = " + getMessage();
- }
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogService.java b/src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogService.java
deleted file mode 100644
index d0ef13595..000000000
--- a/src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogService.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.service.rs;
-
-import io.swagger.annotations.Api;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-
-
-/**
- * Service to invoke example Camunda process.
- * <p>
- * Try testing by using:
- * http://[hostname]:[serverPort]/jaxrsservices/log/log-message/your-message-here
- */
-@Api(value = "/log")
-@Path("/log")
-@Produces({MediaType.TEXT_PLAIN})
-public interface JaxrsLogService {
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param logMessageText
- * @return output from service - comment on what was done
- */
- @GET
- @Path("/log-message/{logMessageText}")
- @Produces(MediaType.TEXT_PLAIN)
- String logMessage(@PathParam("logMessageText") String logMessageText, @QueryParam("javamail") String javamail, @QueryParam("springmail") String springmail, @QueryParam("commonsmail") String commonsmail);
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @return output from service - comment on what was done
- */
- @POST
- @Path("/postLogHist")
- @Produces(MediaType.TEXT_PLAIN)
- @Consumes(MediaType.APPLICATION_JSON)
- String postLogMessage(String histEventList);
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param startTime
- * @param endTime
- * @param serviceName
- * @return output from service - comment on what was done
- */
- @GET
- @Path("/createLog/{startTime}/{endTime}/{serviceName}")
- @Produces(MediaType.TEXT_PLAIN)
- String createLogMessage(@PathParam("startTime") String startTime, @PathParam("endTime") String endTime, @PathParam("serviceName") String serviceName);
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param procInstId
- * @param histEventList
- * @return output from service - comment on what was done
- */
- @GET
- @Path("/createLogHist/{procInstId}/{histEventList}")
- @Produces(MediaType.TEXT_PLAIN)
- String createLogMessageUsingHistory(@PathParam("procInstId") String procInstId, @PathParam("histEventList") String histEventList);
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param procInstId
- * @return output from service - comment on what was done
- */
- @GET
- @Path("/histLog/{procInstId}")
- @Produces(MediaType.TEXT_PLAIN)
- String CreateHistLog(@PathParam("procInstId") String procInstId);
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogServiceImpl.java b/src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogServiceImpl.java
deleted file mode 100644
index 4ef7d2e9e..000000000
--- a/src/main/java/org/onap/clamp/clds/service/rs/JaxrsLogServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.service.rs;
-
-import com.att.ajsc.common.AjscService;
-import org.onap.clamp.clds.service.LogService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * Service to invoke example Camunda process.
- * <p>
- * Try testing by using:
- * http://[hostname]:[serverPort]/services/log/log-message/your-message-here
- */
-@AjscService
-public class JaxrsLogServiceImpl implements JaxrsLogService {
-
- @Autowired
- private LogService logService;
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param logMessageText
- * @return output from service - comment on what was done
- */
- public String logMessage(String logMessageText, String javamail, String springmail, String commonsmail) {
- return logService.logMessage(logMessageText, javamail, springmail, commonsmail);
- }
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @return output from service - comment on what was done
- */
- public String postLogMessage(String histEventList) {
- return logService.postLogMessage(histEventList);
- }
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param startTime
- * @param endTime
- * @param serviceName
- * @return output from service - comment on what was done
- */
- public String createLogMessage(String startTime, String endTime, String serviceName) {
- return logService.createLogMessage(startTime, endTime, serviceName);
- }
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param procInstId
- * @param histEventList
- * @return output from service - comment on what was done
- */
- public String createLogMessageUsingHistory(String procInstId, String histEventList) {
- return logService.createLogMessageUsingHistory(procInstId, histEventList);
- }
-
- /**
- * REST service that executes example camunda process to log input message.
- *
- * @param procInstId
- * @return output from service - comment on what was done
- */
- public String CreateHistLog(String procInstId) {
- return logService.CreateHistLog(procInstId);
- }
-
-}