diff options
author | Seshu Kumar M <seshu.kumar.m@huawei.com> | 2019-04-19 05:00:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-04-19 05:00:49 +0000 |
commit | 8a90956821744c35a5abc4a992f53c32775f5ae3 (patch) | |
tree | f45cf4eef822608375ee222da4072c1e9647d6bb | |
parent | 9184e705234ba2d957549577ef70b929d271ae01 (diff) | |
parent | bfe857b92bc8d4305200b3f120ad61527bffac98 (diff) |
Merge "Change license and remove unnecessary code."
3 files changed, 3 insertions, 28 deletions
diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java index 193ce29..2a2c0de 100644 --- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java +++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java @@ -21,7 +21,6 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; public class Resource { - //{"resource_id": "23b55841eedd41e99d5f3f32149ca086", "timestamp": "2013-03-03T15:19:00", "project_id": "23b55841eedd41e99d5f3f32149ca086", "user_id": null, "metadata": {}} @JsonProperty("resource_id") private String resource; diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java index 7afde63..9f2a6ca 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java @@ -14,29 +14,6 @@ * ============LICENSE_END========================================================= */ -/* - * ============LICENSE_START========================================== - * =================================================================== - * Copyright © 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 and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - * - */ - package com.woorea.openstack.keystone.model; import java.util.Map; diff --git a/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java b/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java index 663152c..05147bc 100644 --- a/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java +++ b/swift-client/src/main/java/com/woorea/openstack/swift/api/ContainersResource.java @@ -52,7 +52,6 @@ public class ContainersResource { public class List extends OpenStackRequest<java.util.List<Container>> { public List() { - //return target.request(MediaType.APPLICATION_JSON).get(new GenericType<List<Container>>(){}); } } @@ -61,7 +60,7 @@ public class ContainersResource { public class Create extends OpenStackRequest<Container> { public Create(String containerName) { - //return target.path(containerName).request().method("PUT",Entity.text("*")); + } } @@ -71,7 +70,7 @@ public class ContainersResource { private String containerName; public Show(String containerName) { -// return target.path(containerName).request(MediaType.APPLICATION_JSON).head(); + } } @@ -82,7 +81,7 @@ public class ContainersResource { public Delete(String containerName) { this.containerName = containerName; - //return target.path(containerName).request(MediaType.APPLICATION_JSON).delete(); + } } |