Merge pull request #48 from rpmoore/master

hansdude · hansdude · commit bdafc3a5c44d · 2014-10-15T10:24:54.000-06:00
Adding in missing copyright notifications and a couple minor code cleanup items.
diff --git a/integration/src/main/java/com/spectralogic/ds3client/integration/ResourceObjectPutter.java b/integration/src/main/java/com/spectralogic/ds3client/integration/ResourceObjectPutter.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.integration;
 
 import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
diff --git a/integration/src/main/java/com/spectralogic/ds3client/integration/Util.java b/integration/src/main/java/com/spectralogic/ds3client/integration/Util.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.integration;
 
 import com.spectralogic.ds3client.Ds3Client;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientBuilder.java b/sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client;
 
 import com.spectralogic.ds3client.models.Credentials;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/HeadersImpl.java b/sdk/src/main/java/com/spectralogic/ds3client/HeadersImpl.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client;
 
 import com.spectralogic.ds3client.networking.Headers;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/WebResponseImpl.java b/sdk/src/main/java/com/spectralogic/ds3client/WebResponseImpl.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client;
 
 import com.spectralogic.ds3client.networking.Headers;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/helpers/ObjectPartTrackerImpl.java b/sdk/src/main/java/com/spectralogic/ds3client/helpers/ObjectPartTrackerImpl.java
@@ -28,7 +28,7 @@ class ObjectPartTrackerImpl implements ObjectPartTracker {
 
     public ObjectPartTrackerImpl(final String name, final Collection<ObjectPart> parts) {
         this.name = name;
-        this.parts = new TreeSet<ObjectPart>(ObjectPartComparator.instance());
+        this.parts = new TreeSet<>(ObjectPartComparator.instance());
         this.parts.addAll(parts);
         validateParts();
     }
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/helpers/options/ReadJobOptions.java b/sdk/src/main/java/com/spectralogic/ds3client/helpers/options/ReadJobOptions.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.helpers.options;
 
 import com.spectralogic.ds3client.models.bulk.Priority;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java b/sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.helpers.options;
 
 import com.spectralogic.ds3client.models.bulk.Priority;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/CommonPrefixes.java b/sdk/src/main/java/com/spectralogic/ds3client/models/CommonPrefixes.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/BulkObject.java b/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/BulkObject.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models.bulk;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/ChunkClientProcessingOrderGuarantee.java b/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/ChunkClientProcessingOrderGuarantee.java
@@ -1,8 +1,20 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models.bulk;
 
-/**
- * Created by ryanmo on 8/8/2014.
- */
 public enum ChunkClientProcessingOrderGuarantee {
     IN_ORDER, NONE
 }
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Ds3ObjectList.java b/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Ds3ObjectList.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models.bulk;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Node.java b/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Node.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models.bulk;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Priority.java b/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Priority.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models.bulk;
 
 import com.google.common.base.Function;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/RequestType.java b/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/RequestType.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models.bulk;
 
 public enum RequestType {
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/WriteOptimization.java b/sdk/src/main/java/com/spectralogic/ds3client/models/bulk/WriteOptimization.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.models.bulk;
 
 import com.google.common.base.Function;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/networking/Headers.java b/sdk/src/main/java/com/spectralogic/ds3client/networking/Headers.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.networking;
 
 public interface Headers {
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/utils/InvalidMd5Exception.java b/sdk/src/main/java/com/spectralogic/ds3client/utils/InvalidMd5Exception.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.utils;
 
 public class InvalidMd5Exception extends Exception {
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/utils/Md5Hash.java b/sdk/src/main/java/com/spectralogic/ds3client/utils/Md5Hash.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.utils;
 
 import org.apache.commons.codec.DecoderException;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/utils/ResourceUtils.java b/sdk/src/main/java/com/spectralogic/ds3client/utils/ResourceUtils.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.utils;
 
 import java.io.File;
diff --git a/sdk/src/main/java/com/spectralogic/ds3client/utils/SSLSetupException.java b/sdk/src/main/java/com/spectralogic/ds3client/utils/SSLSetupException.java
@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. 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. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.utils;
 
 public class SSLSetupException extends RuntimeException {
diff --git a/sdk/src/test/java/com/spectralogic/ds3client/HeadersImpl_Test.java b/sdk/src/test/java/com/spectralogic/ds3client/HeadersImpl_Test.java
diff --git a/sdk/src/test/java/com/spectralogic/ds3client/utils/Md5Hash_Test.java b/sdk/src/test/java/com/spectralogic/ds3client/utils/Md5Hash_Test.java
diff --git a/sdk/src/test/java/com/spectralogic/ds3client/utils/NetUtils_Test.java b/sdk/src/test/java/com/spectralogic/ds3client/utils/NetUtils_Test.java

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class ObjectPartTrackerImpl implements ObjectPartTracker {`
`28`	`28`
`29`	`29`	`public ObjectPartTrackerImpl(final String name, final Collection<ObjectPart> parts) {`
`30`	`30`	`this.name = name;`
`31`		`- this.parts = new TreeSet<ObjectPart>(ObjectPartComparator.instance());`
	`31`	`+ this.parts = new TreeSet<>(ObjectPartComparator.instance());`
`32`	`32`	`this.parts.addAll(parts);`
`33`	`33`	`validateParts();`
`34`	`34`	`}`