From a369647bcab858d1f5a7d7bb74811b3500d8e6de Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Tue, 18 Feb 2014 10:16:31 +0100 Subject: [PATCH] Fix license headers --- .../BasicEncodedRESTValidationStrategy.java | 17 ++++++++++++++ .../utils/rest/RESTValidationStrategy.java | 19 ++++++++++++++- .../utils/rest/RESTServiceConnectorTest.java | 23 ++++++++++++++++--- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/utils/src/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java b/utils/src/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java index e522852ba5e..d6bbd667172 100644 --- a/utils/src/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java +++ b/utils/src/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java @@ -1,3 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 com.cloud.utils.rest; import java.io.IOException; diff --git a/utils/src/com/cloud/utils/rest/RESTValidationStrategy.java b/utils/src/com/cloud/utils/rest/RESTValidationStrategy.java index cb25614ddec..15b8be13c32 100644 --- a/utils/src/com/cloud/utils/rest/RESTValidationStrategy.java +++ b/utils/src/com/cloud/utils/rest/RESTValidationStrategy.java @@ -1,3 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 com.cloud.utils.rest; import java.io.IOException; @@ -101,7 +118,7 @@ public class RESTValidationStrategy { */ protected void login(final String protocol, final HttpClient client) - throws CloudstackRESTException { + throws CloudstackRESTException { String url; if (host == null || host.isEmpty() || user == null || user.isEmpty() || password == null || password.isEmpty()) { diff --git a/utils/test/com/cloud/utils/rest/RESTServiceConnectorTest.java b/utils/test/com/cloud/utils/rest/RESTServiceConnectorTest.java index d406f94c123..ac535ce4c3b 100644 --- a/utils/test/com/cloud/utils/rest/RESTServiceConnectorTest.java +++ b/utils/test/com/cloud/utils/rest/RESTServiceConnectorTest.java @@ -1,3 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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 com.cloud.utils.rest; import static org.junit.Assert.assertTrue; @@ -35,9 +52,9 @@ public class RESTServiceConnectorTest { protected static final String UUID_JSON_RESPONSE = "{\"uuid\" : \"aaaa\"}"; protected static final String SEC_PROFILE_JSON_RESPONSE = "{\"uuid\" : \"aaaa\"," - + "\"display_name\" : \"myTestName\"," - + "\"href\" : \"myTestHref\"," - + "\"schema\" : \"myTestSchema\"}"; + + "\"display_name\" : \"myTestName\"," + + "\"href\" : \"myTestHref\"," + + "\"schema\" : \"myTestSchema\"}"; protected static final String SEC_PROFILE_LIST_JSON_RESPONSE = "{\"results\" : [{\"uuid\" : \"aaaa\"," + "\"display_name\" : \"myTestName\","