diff --git a/common/src/main/java/com/microsoft/alm/helpers/Action.java b/common/src/main/java/com/microsoft/alm/common/helpers/Action.java similarity index 90% rename from common/src/main/java/com/microsoft/alm/helpers/Action.java rename to common/src/main/java/com/microsoft/alm/common/helpers/Action.java index 727c031c..f5701edd 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/Action.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/Action.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; /** * Represents a method that accepts one argument. diff --git a/common/src/main/java/com/microsoft/alm/helpers/BitConverter.java b/common/src/main/java/com/microsoft/alm/common/helpers/BitConverter.java similarity index 96% rename from common/src/main/java/com/microsoft/alm/helpers/BitConverter.java rename to common/src/main/java/com/microsoft/alm/common/helpers/BitConverter.java index d9d4dc2c..19cc1580 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/BitConverter.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/BitConverter.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; /** * Equivalent to .NET's BitConverter class diff --git a/common/src/main/java/com/microsoft/alm/helpers/Debug.java b/common/src/main/java/com/microsoft/alm/common/helpers/Debug.java similarity index 98% rename from common/src/main/java/com/microsoft/alm/helpers/Debug.java rename to common/src/main/java/com/microsoft/alm/common/helpers/Debug.java index dfe22ba0..3c6abd30 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/Debug.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/Debug.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import javax.swing.JFrame; import javax.swing.JOptionPane; diff --git a/common/src/main/java/com/microsoft/alm/helpers/Environment.java b/common/src/main/java/com/microsoft/alm/common/helpers/Environment.java similarity index 98% rename from common/src/main/java/com/microsoft/alm/helpers/Environment.java rename to common/src/main/java/com/microsoft/alm/common/helpers/Environment.java index 50e1e46f..615f2e37 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/Environment.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/Environment.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.io.File; import java.net.InetAddress; diff --git a/common/src/main/java/com/microsoft/alm/helpers/Func.java b/common/src/main/java/com/microsoft/alm/common/helpers/Func.java similarity index 92% rename from common/src/main/java/com/microsoft/alm/helpers/Func.java rename to common/src/main/java/com/microsoft/alm/common/helpers/Func.java index 9e1e80b1..96c42596 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/Func.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/Func.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; /** * Represents a function that accepts one argument and produces a result. diff --git a/common/src/main/java/com/microsoft/alm/helpers/Guid.java b/common/src/main/java/com/microsoft/alm/common/helpers/Guid.java similarity index 97% rename from common/src/main/java/com/microsoft/alm/helpers/Guid.java rename to common/src/main/java/com/microsoft/alm/common/helpers/Guid.java index 601d732d..98a0fd90 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/Guid.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/Guid.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/common/src/main/java/com/microsoft/alm/helpers/HttpClient.java b/common/src/main/java/com/microsoft/alm/common/helpers/HttpClient.java similarity index 97% rename from common/src/main/java/com/microsoft/alm/helpers/HttpClient.java rename to common/src/main/java/com/microsoft/alm/common/helpers/HttpClient.java index 72e522ed..dfbb02f8 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/HttpClient.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/HttpClient.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/common/src/main/java/com/microsoft/alm/helpers/HttpClientImpl.java b/common/src/main/java/com/microsoft/alm/common/helpers/HttpClientImpl.java similarity index 99% rename from common/src/main/java/com/microsoft/alm/helpers/HttpClientImpl.java rename to common/src/main/java/com/microsoft/alm/common/helpers/HttpClientImpl.java index b02cb126..d23efa59 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/HttpClientImpl.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/HttpClientImpl.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/microsoft/alm/helpers/HttpResponse.java b/common/src/main/java/com/microsoft/alm/common/helpers/HttpResponse.java similarity index 87% rename from common/src/main/java/com/microsoft/alm/helpers/HttpResponse.java rename to common/src/main/java/com/microsoft/alm/common/helpers/HttpResponse.java index 9aa9c561..9d7eef7f 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/HttpResponse.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/HttpResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; /** * Struct class to carry http call responses diff --git a/common/src/main/java/com/microsoft/alm/helpers/IOHelper.java b/common/src/main/java/com/microsoft/alm/common/helpers/IOHelper.java similarity index 97% rename from common/src/main/java/com/microsoft/alm/helpers/IOHelper.java rename to common/src/main/java/com/microsoft/alm/common/helpers/IOHelper.java index e6b05f48..d7a3d714 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/IOHelper.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/IOHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.io.BufferedReader; import java.io.Closeable; diff --git a/common/src/main/java/com/microsoft/alm/helpers/IteratorExtensions.java b/common/src/main/java/com/microsoft/alm/common/helpers/IteratorExtensions.java similarity index 90% rename from common/src/main/java/com/microsoft/alm/helpers/IteratorExtensions.java rename to common/src/main/java/com/microsoft/alm/common/helpers/IteratorExtensions.java index 2aa2a9f8..e62eae2c 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/IteratorExtensions.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/IteratorExtensions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.util.Iterator; diff --git a/common/src/main/java/com/microsoft/alm/helpers/LoggingHelper.java b/common/src/main/java/com/microsoft/alm/common/helpers/LoggingHelper.java similarity index 95% rename from common/src/main/java/com/microsoft/alm/helpers/LoggingHelper.java rename to common/src/main/java/com/microsoft/alm/common/helpers/LoggingHelper.java index 46b800b8..b7c00ad0 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/LoggingHelper.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/LoggingHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import org.slf4j.Logger; diff --git a/common/src/main/java/com/microsoft/alm/helpers/NotImplementedException.java b/common/src/main/java/com/microsoft/alm/common/helpers/NotImplementedException.java similarity index 95% rename from common/src/main/java/com/microsoft/alm/helpers/NotImplementedException.java rename to common/src/main/java/com/microsoft/alm/common/helpers/NotImplementedException.java index 0fbfd351..d72f3cf1 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/NotImplementedException.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/NotImplementedException.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; public class NotImplementedException extends RuntimeException { private final int workItemNumber; diff --git a/common/src/main/java/com/microsoft/alm/helpers/ObjectExtensions.java b/common/src/main/java/com/microsoft/alm/common/helpers/ObjectExtensions.java similarity index 94% rename from common/src/main/java/com/microsoft/alm/helpers/ObjectExtensions.java rename to common/src/main/java/com/microsoft/alm/common/helpers/ObjectExtensions.java index 55bfd76e..e01f0707 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/ObjectExtensions.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/ObjectExtensions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; public class ObjectExtensions { /** diff --git a/common/src/main/java/com/microsoft/alm/helpers/Path.java b/common/src/main/java/com/microsoft/alm/common/helpers/Path.java similarity index 98% rename from common/src/main/java/com/microsoft/alm/helpers/Path.java rename to common/src/main/java/com/microsoft/alm/common/helpers/Path.java index 550b0fee..6efa10b4 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/Path.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/Path.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.io.File; diff --git a/common/src/main/java/com/microsoft/alm/helpers/PropertyBag.java b/common/src/main/java/com/microsoft/alm/common/helpers/PropertyBag.java similarity index 97% rename from common/src/main/java/com/microsoft/alm/helpers/PropertyBag.java rename to common/src/main/java/com/microsoft/alm/common/helpers/PropertyBag.java index f4724980..d5af74b0 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/PropertyBag.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/PropertyBag.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.util.LinkedHashMap; diff --git a/common/src/main/java/com/microsoft/alm/helpers/QueryString.java b/common/src/main/java/com/microsoft/alm/common/helpers/QueryString.java similarity index 88% rename from common/src/main/java/com/microsoft/alm/helpers/QueryString.java rename to common/src/main/java/com/microsoft/alm/common/helpers/QueryString.java index f1712025..3dee8958 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/QueryString.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/QueryString.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.util.LinkedHashMap; diff --git a/common/src/main/java/com/microsoft/alm/helpers/ScopeSet.java b/common/src/main/java/com/microsoft/alm/common/helpers/ScopeSet.java similarity index 93% rename from common/src/main/java/com/microsoft/alm/helpers/ScopeSet.java rename to common/src/main/java/com/microsoft/alm/common/helpers/ScopeSet.java index ecbd7694..99c45220 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/ScopeSet.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/ScopeSet.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.util.Arrays; import java.util.TreeSet; diff --git a/common/src/main/java/com/microsoft/alm/helpers/SettingsHelper.java b/common/src/main/java/com/microsoft/alm/common/helpers/SettingsHelper.java similarity index 99% rename from common/src/main/java/com/microsoft/alm/helpers/SettingsHelper.java rename to common/src/main/java/com/microsoft/alm/common/helpers/SettingsHelper.java index 51a06162..ca2147ea 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/SettingsHelper.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/SettingsHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/microsoft/alm/helpers/SimpleJson.java b/common/src/main/java/com/microsoft/alm/common/helpers/SimpleJson.java similarity index 99% rename from common/src/main/java/com/microsoft/alm/helpers/SimpleJson.java rename to common/src/main/java/com/microsoft/alm/common/helpers/SimpleJson.java index 9b67385a..98ce4a66 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/SimpleJson.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/SimpleJson.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.util.LinkedHashMap; import java.util.Map; diff --git a/common/src/main/java/com/microsoft/alm/helpers/StringContent.java b/common/src/main/java/com/microsoft/alm/common/helpers/StringContent.java similarity index 98% rename from common/src/main/java/com/microsoft/alm/helpers/StringContent.java rename to common/src/main/java/com/microsoft/alm/common/helpers/StringContent.java index 793856f1..6e41d4dc 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/StringContent.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/StringContent.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.io.IOException; import java.io.OutputStream; diff --git a/common/src/main/java/com/microsoft/alm/helpers/StringHelper.java b/common/src/main/java/com/microsoft/alm/common/helpers/StringHelper.java similarity index 99% rename from common/src/main/java/com/microsoft/alm/helpers/StringHelper.java rename to common/src/main/java/com/microsoft/alm/common/helpers/StringHelper.java index 0067a62a..87fbdd59 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/StringHelper.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/StringHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.nio.charset.Charset; diff --git a/common/src/main/java/com/microsoft/alm/helpers/SystemHelper.java b/common/src/main/java/com/microsoft/alm/common/helpers/SystemHelper.java similarity index 95% rename from common/src/main/java/com/microsoft/alm/helpers/SystemHelper.java rename to common/src/main/java/com/microsoft/alm/common/helpers/SystemHelper.java index 3a5b9880..ece0cd46 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/SystemHelper.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/SystemHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; /** * System utilities diff --git a/common/src/main/java/com/microsoft/alm/helpers/UriHelper.java b/common/src/main/java/com/microsoft/alm/common/helpers/UriHelper.java similarity index 99% rename from common/src/main/java/com/microsoft/alm/helpers/UriHelper.java rename to common/src/main/java/com/microsoft/alm/common/helpers/UriHelper.java index 83f8b463..bc2a0122 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/UriHelper.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/UriHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/common/src/main/java/com/microsoft/alm/helpers/XmlHelper.java b/common/src/main/java/com/microsoft/alm/common/helpers/XmlHelper.java similarity index 98% rename from common/src/main/java/com/microsoft/alm/helpers/XmlHelper.java rename to common/src/main/java/com/microsoft/alm/common/helpers/XmlHelper.java index 23a9ebaa..448f2142 100644 --- a/common/src/main/java/com/microsoft/alm/helpers/XmlHelper.java +++ b/common/src/main/java/com/microsoft/alm/common/helpers/XmlHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/common/src/main/java/com/microsoft/alm/secret/Credential.java b/common/src/main/java/com/microsoft/alm/common/secret/Credential.java similarity index 96% rename from common/src/main/java/com/microsoft/alm/secret/Credential.java rename to common/src/main/java/com/microsoft/alm/common/secret/Credential.java index b6940709..6a7ea7e9 100644 --- a/common/src/main/java/com/microsoft/alm/secret/Credential.java +++ b/common/src/main/java/com/microsoft/alm/common/secret/Credential.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.ObjectExtensions; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.XmlHelper; +import com.microsoft.alm.common.helpers.ObjectExtensions; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.XmlHelper; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/common/src/main/java/com/microsoft/alm/secret/Secret.java b/common/src/main/java/com/microsoft/alm/common/secret/Secret.java similarity index 91% rename from common/src/main/java/com/microsoft/alm/secret/Secret.java rename to common/src/main/java/com/microsoft/alm/common/secret/Secret.java index c021169c..54cedea4 100644 --- a/common/src/main/java/com/microsoft/alm/secret/Secret.java +++ b/common/src/main/java/com/microsoft/alm/common/secret/Secret.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.UriHelper; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.UriHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/microsoft/alm/secret/Token.java b/common/src/main/java/com/microsoft/alm/common/secret/Token.java similarity index 97% rename from common/src/main/java/com/microsoft/alm/secret/Token.java rename to common/src/main/java/com/microsoft/alm/common/secret/Token.java index 8c4cddbf..e9c2b996 100644 --- a/common/src/main/java/com/microsoft/alm/secret/Token.java +++ b/common/src/main/java/com/microsoft/alm/common/secret/Token.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.Guid; -import com.microsoft.alm.helpers.NotImplementedException; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.XmlHelper; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.Guid; +import com.microsoft.alm.common.helpers.NotImplementedException; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.XmlHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/common/src/main/java/com/microsoft/alm/secret/TokenPair.java b/common/src/main/java/com/microsoft/alm/common/secret/TokenPair.java similarity index 96% rename from common/src/main/java/com/microsoft/alm/secret/TokenPair.java rename to common/src/main/java/com/microsoft/alm/common/secret/TokenPair.java index 380c4d14..b86703eb 100644 --- a/common/src/main/java/com/microsoft/alm/secret/TokenPair.java +++ b/common/src/main/java/com/microsoft/alm/common/secret/TokenPair.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.PropertyBag; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.XmlHelper; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.PropertyBag; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.XmlHelper; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/common/src/main/java/com/microsoft/alm/secret/TokenScope.java b/common/src/main/java/com/microsoft/alm/common/secret/TokenScope.java similarity index 93% rename from common/src/main/java/com/microsoft/alm/secret/TokenScope.java rename to common/src/main/java/com/microsoft/alm/common/secret/TokenScope.java index 899bbd93..c7e85352 100644 --- a/common/src/main/java/com/microsoft/alm/secret/TokenScope.java +++ b/common/src/main/java/com/microsoft/alm/common/secret/TokenScope.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.ScopeSet; -import com.microsoft.alm.helpers.StringHelper; +import com.microsoft.alm.common.helpers.ScopeSet; +import com.microsoft.alm.common.helpers.StringHelper; public abstract class TokenScope { private static final String[] EmptyStringArray = new String[0]; diff --git a/common/src/main/java/com/microsoft/alm/secret/TokenType.java b/common/src/main/java/com/microsoft/alm/common/secret/TokenType.java similarity index 97% rename from common/src/main/java/com/microsoft/alm/secret/TokenType.java rename to common/src/main/java/com/microsoft/alm/common/secret/TokenType.java index 392dd7b8..21cb296d 100644 --- a/common/src/main/java/com/microsoft/alm/secret/TokenType.java +++ b/common/src/main/java/com/microsoft/alm/common/secret/TokenType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/com/microsoft/alm/secret/VsoTokenScope.java b/common/src/main/java/com/microsoft/alm/common/secret/VsoTokenScope.java similarity index 97% rename from common/src/main/java/com/microsoft/alm/secret/VsoTokenScope.java rename to common/src/main/java/com/microsoft/alm/common/secret/VsoTokenScope.java index 86a1e966..d73007f2 100644 --- a/common/src/main/java/com/microsoft/alm/secret/VsoTokenScope.java +++ b/common/src/main/java/com/microsoft/alm/common/secret/VsoTokenScope.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.ScopeSet; -import com.microsoft.alm.helpers.StringHelper; +import com.microsoft.alm.common.helpers.ScopeSet; +import com.microsoft.alm.common.helpers.StringHelper; import java.util.Arrays; import java.util.Iterator; diff --git a/common/src/main/java/com/microsoft/alm/storage/InsecureFileBackedCredentialStore.java b/common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackedCredentialStore.java similarity index 86% rename from common/src/main/java/com/microsoft/alm/storage/InsecureFileBackedCredentialStore.java rename to common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackedCredentialStore.java index 991a45d8..8779ab90 100644 --- a/common/src/main/java/com/microsoft/alm/storage/InsecureFileBackedCredentialStore.java +++ b/common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackedCredentialStore.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.storage; +package com.microsoft.alm.common.storage; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.secret.Credential; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.microsoft.alm.helpers.LoggingHelper.logError; +import static com.microsoft.alm.common.helpers.LoggingHelper.logError; public class InsecureFileBackedCredentialStore implements SecretStore { diff --git a/common/src/main/java/com/microsoft/alm/storage/InsecureFileBackedTokenStore.java b/common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackedTokenStore.java similarity index 86% rename from common/src/main/java/com/microsoft/alm/storage/InsecureFileBackedTokenStore.java rename to common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackedTokenStore.java index 5f972686..4d05647f 100644 --- a/common/src/main/java/com/microsoft/alm/storage/InsecureFileBackedTokenStore.java +++ b/common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackedTokenStore.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.storage; +package com.microsoft.alm.common.storage; -import com.microsoft.alm.secret.Token; +import com.microsoft.alm.common.secret.Token; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.microsoft.alm.helpers.LoggingHelper.logError; +import static com.microsoft.alm.common.helpers.LoggingHelper.logError; public class InsecureFileBackedTokenStore implements SecretStore { diff --git a/common/src/main/java/com/microsoft/alm/storage/InsecureFileBackend.java b/common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackend.java similarity index 96% rename from common/src/main/java/com/microsoft/alm/storage/InsecureFileBackend.java rename to common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackend.java index 8e1327f7..b51619da 100644 --- a/common/src/main/java/com/microsoft/alm/storage/InsecureFileBackend.java +++ b/common/src/main/java/com/microsoft/alm/common/storage/InsecureFileBackend.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.storage; - -import com.microsoft.alm.helpers.Environment; -import com.microsoft.alm.helpers.IOHelper; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.helpers.XmlHelper; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Token; +package com.microsoft.alm.common.storage; + +import com.microsoft.alm.common.helpers.Environment; +import com.microsoft.alm.common.helpers.IOHelper; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.helpers.XmlHelper; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Token; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Map; -import static com.microsoft.alm.helpers.LoggingHelper.logError; +import static com.microsoft.alm.common.helpers.LoggingHelper.logError; class InsecureFileBackend { diff --git a/common/src/main/java/com/microsoft/alm/storage/InsecureInMemoryStore.java b/common/src/main/java/com/microsoft/alm/common/storage/InsecureInMemoryStore.java similarity index 91% rename from common/src/main/java/com/microsoft/alm/storage/InsecureInMemoryStore.java rename to common/src/main/java/com/microsoft/alm/common/storage/InsecureInMemoryStore.java index 2469282a..8c8c3de9 100644 --- a/common/src/main/java/com/microsoft/alm/storage/InsecureInMemoryStore.java +++ b/common/src/main/java/com/microsoft/alm/common/storage/InsecureInMemoryStore.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.storage; +package com.microsoft.alm.common.storage; -import com.microsoft.alm.secret.Secret; +import com.microsoft.alm.common.secret.Secret; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/common/src/main/java/com/microsoft/alm/storage/SecretStore.java b/common/src/main/java/com/microsoft/alm/common/storage/SecretStore.java similarity index 95% rename from common/src/main/java/com/microsoft/alm/storage/SecretStore.java rename to common/src/main/java/com/microsoft/alm/common/storage/SecretStore.java index e675c309..b2f8468e 100644 --- a/common/src/main/java/com/microsoft/alm/storage/SecretStore.java +++ b/common/src/main/java/com/microsoft/alm/common/storage/SecretStore.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.storage; +package com.microsoft.alm.common.storage; -import com.microsoft.alm.secret.Secret; +import com.microsoft.alm.common.secret.Secret; /** * Secret store to hold the credentials. diff --git a/common/src/test/groovy/com/microsoft/alm/helpers/PropertyBagTest.groovy b/common/src/test/groovy/com/microsoft/alm/helpers/PropertyBagTest.groovy index 5972cf30..23e719c2 100644 --- a/common/src/test/groovy/com/microsoft/alm/helpers/PropertyBagTest.groovy +++ b/common/src/test/groovy/com/microsoft/alm/helpers/PropertyBagTest.groovy @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers +package com.microsoft.alm.common.helpers import groovy.transform.CompileStatic import org.junit.Test diff --git a/common/src/test/groovy/com/microsoft/alm/helpers/SimpleJsonTest.groovy b/common/src/test/groovy/com/microsoft/alm/helpers/SimpleJsonTest.groovy index 329ae19b..68eeb211 100644 --- a/common/src/test/groovy/com/microsoft/alm/helpers/SimpleJsonTest.groovy +++ b/common/src/test/groovy/com/microsoft/alm/helpers/SimpleJsonTest.groovy @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers +package com.microsoft.alm.common.helpers import groovy.transform.CompileStatic import org.junit.Assert diff --git a/common/src/test/java/com/microsoft/alm/helpers/BitConverterTest.java b/common/src/test/java/com/microsoft/alm/common/helpers/BitConverterTest.java similarity index 82% rename from common/src/test/java/com/microsoft/alm/helpers/BitConverterTest.java rename to common/src/test/java/com/microsoft/alm/common/helpers/BitConverterTest.java index b040b3fc..49e52753 100644 --- a/common/src/test/java/com/microsoft/alm/helpers/BitConverterTest.java +++ b/common/src/test/java/com/microsoft/alm/common/helpers/BitConverterTest.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; +import com.microsoft.alm.common.helpers.BitConverter; import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/com/microsoft/alm/helpers/GuidTest.java b/common/src/test/java/com/microsoft/alm/common/helpers/GuidTest.java similarity index 97% rename from common/src/test/java/com/microsoft/alm/helpers/GuidTest.java rename to common/src/test/java/com/microsoft/alm/common/helpers/GuidTest.java index ab2a6ed4..93a15cfd 100644 --- a/common/src/test/java/com/microsoft/alm/helpers/GuidTest.java +++ b/common/src/test/java/com/microsoft/alm/common/helpers/GuidTest.java @@ -1,8 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; +import com.microsoft.alm.common.helpers.Guid; +import com.microsoft.alm.common.helpers.BitConverter; import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/com/microsoft/alm/helpers/IOHelperTest.java b/common/src/test/java/com/microsoft/alm/common/helpers/IOHelperTest.java similarity index 95% rename from common/src/test/java/com/microsoft/alm/helpers/IOHelperTest.java rename to common/src/test/java/com/microsoft/alm/common/helpers/IOHelperTest.java index 16ce09b3..e0873370 100644 --- a/common/src/test/java/com/microsoft/alm/helpers/IOHelperTest.java +++ b/common/src/test/java/com/microsoft/alm/common/helpers/IOHelperTest.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; +import com.microsoft.alm.common.helpers.IOHelper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/common/src/test/java/com/microsoft/alm/helpers/PathTest.java b/common/src/test/java/com/microsoft/alm/common/helpers/PathTest.java similarity index 95% rename from common/src/test/java/com/microsoft/alm/helpers/PathTest.java rename to common/src/test/java/com/microsoft/alm/common/helpers/PathTest.java index d454f2f2..5d3f00a0 100644 --- a/common/src/test/java/com/microsoft/alm/helpers/PathTest.java +++ b/common/src/test/java/com/microsoft/alm/common/helpers/PathTest.java @@ -1,8 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; +import com.microsoft.alm.common.helpers.Path; +import com.microsoft.alm.common.helpers.StringHelper; import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/com/microsoft/alm/helpers/StringHelperTest.java b/common/src/test/java/com/microsoft/alm/common/helpers/StringHelperTest.java similarity index 98% rename from common/src/test/java/com/microsoft/alm/helpers/StringHelperTest.java rename to common/src/test/java/com/microsoft/alm/common/helpers/StringHelperTest.java index 906a8ff0..4f52da34 100644 --- a/common/src/test/java/com/microsoft/alm/helpers/StringHelperTest.java +++ b/common/src/test/java/com/microsoft/alm/common/helpers/StringHelperTest.java @@ -1,8 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.Func; import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/com/microsoft/alm/helpers/UriHelperTest.java b/common/src/test/java/com/microsoft/alm/common/helpers/UriHelperTest.java similarity index 98% rename from common/src/test/java/com/microsoft/alm/helpers/UriHelperTest.java rename to common/src/test/java/com/microsoft/alm/common/helpers/UriHelperTest.java index a607dbf6..fe2dd556 100644 --- a/common/src/test/java/com/microsoft/alm/helpers/UriHelperTest.java +++ b/common/src/test/java/com/microsoft/alm/common/helpers/UriHelperTest.java @@ -1,8 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; +import com.microsoft.alm.common.helpers.UriHelper; +import com.microsoft.alm.common.helpers.QueryString; import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/com/microsoft/alm/helpers/XmlHelperTest.java b/common/src/test/java/com/microsoft/alm/common/helpers/XmlHelperTest.java similarity index 92% rename from common/src/test/java/com/microsoft/alm/helpers/XmlHelperTest.java rename to common/src/test/java/com/microsoft/alm/common/helpers/XmlHelperTest.java index 5a351f27..93314fe1 100644 --- a/common/src/test/java/com/microsoft/alm/helpers/XmlHelperTest.java +++ b/common/src/test/java/com/microsoft/alm/common/helpers/XmlHelperTest.java @@ -1,8 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.helpers; +package com.microsoft.alm.common.helpers; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.XmlHelper; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; diff --git a/common/src/test/java/com/microsoft/alm/secret/CredentialTest.java b/common/src/test/java/com/microsoft/alm/common/secret/CredentialTest.java similarity index 91% rename from common/src/test/java/com/microsoft/alm/secret/CredentialTest.java rename to common/src/test/java/com/microsoft/alm/common/secret/CredentialTest.java index e27e5a3d..27dff30f 100644 --- a/common/src/test/java/com/microsoft/alm/secret/CredentialTest.java +++ b/common/src/test/java/com/microsoft/alm/common/secret/CredentialTest.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.StringHelperTest; -import com.microsoft.alm.helpers.XmlHelper; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.helpers.StringHelperTest; +import com.microsoft.alm.common.helpers.XmlHelper; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; diff --git a/common/src/test/java/com/microsoft/alm/secret/TokenPairTest.java b/common/src/test/java/com/microsoft/alm/common/secret/TokenPairTest.java similarity index 93% rename from common/src/test/java/com/microsoft/alm/secret/TokenPairTest.java rename to common/src/test/java/com/microsoft/alm/common/secret/TokenPairTest.java index 032edea0..cb878465 100644 --- a/common/src/test/java/com/microsoft/alm/secret/TokenPairTest.java +++ b/common/src/test/java/com/microsoft/alm/common/secret/TokenPairTest.java @@ -1,10 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; +package com.microsoft.alm.common.secret; -import com.microsoft.alm.helpers.StringHelperTest; -import com.microsoft.alm.helpers.XmlHelper; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.helpers.StringHelperTest; +import com.microsoft.alm.common.helpers.XmlHelper; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; diff --git a/common/src/test/java/com/microsoft/alm/secret/TokenTest.java b/common/src/test/java/com/microsoft/alm/common/secret/TokenTest.java similarity index 93% rename from common/src/test/java/com/microsoft/alm/secret/TokenTest.java rename to common/src/test/java/com/microsoft/alm/common/secret/TokenTest.java index 28252f57..7244fdde 100644 --- a/common/src/test/java/com/microsoft/alm/secret/TokenTest.java +++ b/common/src/test/java/com/microsoft/alm/common/secret/TokenTest.java @@ -1,12 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.secret; - -import com.microsoft.alm.helpers.BitConverter; -import com.microsoft.alm.helpers.Guid; -import com.microsoft.alm.helpers.StringHelperTest; -import com.microsoft.alm.helpers.XmlHelper; +package com.microsoft.alm.common.secret; + +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; +import com.microsoft.alm.common.helpers.BitConverter; +import com.microsoft.alm.common.helpers.Guid; +import com.microsoft.alm.common.helpers.StringHelperTest; +import com.microsoft.alm.common.helpers.XmlHelper; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; diff --git a/common/src/test/java/com/microsoft/alm/storage/InsecureFileBackendIT.java b/common/src/test/java/com/microsoft/alm/common/storage/InsecureFileBackendIT.java similarity index 92% rename from common/src/test/java/com/microsoft/alm/storage/InsecureFileBackendIT.java rename to common/src/test/java/com/microsoft/alm/common/storage/InsecureFileBackendIT.java index 39741c4c..1e3bc986 100644 --- a/common/src/test/java/com/microsoft/alm/storage/InsecureFileBackendIT.java +++ b/common/src/test/java/com/microsoft/alm/common/storage/InsecureFileBackendIT.java @@ -1,8 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.storage; +package com.microsoft.alm.common.storage; +import com.microsoft.alm.common.storage.InsecureFileBackend; import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/com/microsoft/alm/storage/InsecureFileBackendTest.java b/common/src/test/java/com/microsoft/alm/common/storage/InsecureFileBackendTest.java similarity index 93% rename from common/src/test/java/com/microsoft/alm/storage/InsecureFileBackendTest.java rename to common/src/test/java/com/microsoft/alm/common/storage/InsecureFileBackendTest.java index 659b72bb..2b17767e 100644 --- a/common/src/test/java/com/microsoft/alm/storage/InsecureFileBackendTest.java +++ b/common/src/test/java/com/microsoft/alm/common/storage/InsecureFileBackendTest.java @@ -1,12 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See License.txt in the project root. -package com.microsoft.alm.storage; +package com.microsoft.alm.common.storage; -import com.microsoft.alm.helpers.IOHelper; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.storage.InsecureFileBackend; +import com.microsoft.alm.common.helpers.IOHelper; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/main/java/com/microsoft/alm/auth/Authenticator.java b/core/src/main/java/com/microsoft/alm/auth/Authenticator.java index aa76415f..78e9deeb 100644 --- a/core/src/main/java/com/microsoft/alm/auth/Authenticator.java +++ b/core/src/main/java/com/microsoft/alm/auth/Authenticator.java @@ -3,11 +3,11 @@ package com.microsoft.alm.auth; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Secret; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.secret.VsoTokenScope; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Secret; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.secret.VsoTokenScope; import java.net.URI; @@ -35,14 +35,14 @@ public interface Authenticator { /** * Get the converter that maps URIs to secret key names * - * @return an implementation of {@link com.microsoft.alm.secret.Secret.IUriNameConversion} + * @return an implementation of {@link com.microsoft.alm.common.secret.Secret.IUriNameConversion} */ Secret.IUriNameConversion getUriToKeyConversion(); /** * Set the converter that maps URIs to secret key names * - * @param conversion an implementation of {@link com.microsoft.alm.secret.Secret.IUriNameConversion} + * @param conversion an implementation of {@link com.microsoft.alm.common.secret.Secret.IUriNameConversion} */ void setUriToKeyConversion(final Secret.IUriNameConversion conversion); diff --git a/core/src/main/java/com/microsoft/alm/auth/BaseAuthenticator.java b/core/src/main/java/com/microsoft/alm/auth/BaseAuthenticator.java index 80a7d69f..ae85a1d6 100644 --- a/core/src/main/java/com/microsoft/alm/auth/BaseAuthenticator.java +++ b/core/src/main/java/com/microsoft/alm/auth/BaseAuthenticator.java @@ -3,13 +3,13 @@ package com.microsoft.alm.auth; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Secret; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.secret.VsoTokenScope; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Secret; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.secret.VsoTokenScope; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.storage.SecretStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/microsoft/alm/auth/HttpClientFactory.java b/core/src/main/java/com/microsoft/alm/auth/HttpClientFactory.java index d7286777..423218d3 100644 --- a/core/src/main/java/com/microsoft/alm/auth/HttpClientFactory.java +++ b/core/src/main/java/com/microsoft/alm/auth/HttpClientFactory.java @@ -4,8 +4,8 @@ package com.microsoft.alm.auth; import com.microsoft.alm.auth.oauth.Global; -import com.microsoft.alm.helpers.HttpClient; -import com.microsoft.alm.helpers.HttpClientImpl; +import com.microsoft.alm.common.helpers.HttpClient; +import com.microsoft.alm.common.helpers.HttpClientImpl; public class HttpClientFactory { diff --git a/core/src/main/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticator.java b/core/src/main/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticator.java index 0e8cb540..be258356 100644 --- a/core/src/main/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticator.java +++ b/core/src/main/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticator.java @@ -5,10 +5,10 @@ import com.microsoft.alm.auth.BaseAuthenticator; import com.microsoft.alm.auth.PromptBehavior; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.storage.InsecureInMemoryStore; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.storage.InsecureInMemoryStore; +import com.microsoft.alm.common.storage.SecretStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/microsoft/alm/auth/basic/CredentialPrompt.java b/core/src/main/java/com/microsoft/alm/auth/basic/CredentialPrompt.java index 8a465652..766aa052 100644 --- a/core/src/main/java/com/microsoft/alm/auth/basic/CredentialPrompt.java +++ b/core/src/main/java/com/microsoft/alm/auth/basic/CredentialPrompt.java @@ -3,7 +3,7 @@ package com.microsoft.alm.auth.basic; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.secret.Credential; import java.net.URI; diff --git a/core/src/main/java/com/microsoft/alm/auth/basic/DefaultCredentialPrompt.java b/core/src/main/java/com/microsoft/alm/auth/basic/DefaultCredentialPrompt.java index bda32a6c..817cf203 100644 --- a/core/src/main/java/com/microsoft/alm/auth/basic/DefaultCredentialPrompt.java +++ b/core/src/main/java/com/microsoft/alm/auth/basic/DefaultCredentialPrompt.java @@ -3,7 +3,7 @@ package com.microsoft.alm.auth.basic; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.secret.Credential; import javax.swing.JFrame; import javax.swing.JLabel; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/AzureAuthority.java b/core/src/main/java/com/microsoft/alm/auth/oauth/AzureAuthority.java index fdde848c..444191c3 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/AzureAuthority.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/AzureAuthority.java @@ -4,14 +4,14 @@ package com.microsoft.alm.auth.oauth; import com.microsoft.alm.auth.PromptBehavior; -import com.microsoft.alm.helpers.*; +import com.microsoft.alm.common.helpers.*; import com.microsoft.alm.oauth2.useragent.AuthorizationException; import com.microsoft.alm.oauth2.useragent.AuthorizationResponse; import com.microsoft.alm.oauth2.useragent.UserAgent; import com.microsoft.alm.oauth2.useragent.UserAgentImpl; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlow.java b/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlow.java index 9b361a10..ce6b89e8 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlow.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlow.java @@ -3,7 +3,7 @@ package com.microsoft.alm.auth.oauth; -import com.microsoft.alm.helpers.QueryString; +import com.microsoft.alm.common.helpers.QueryString; public class AzureDeviceFlow extends DeviceFlowImpl { private String resource; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlowResponse.java b/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlowResponse.java index e95e90be..fadceadf 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlowResponse.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/AzureDeviceFlowResponse.java @@ -3,7 +3,7 @@ package com.microsoft.alm.auth.oauth; -import com.microsoft.alm.helpers.PropertyBag; +import com.microsoft.alm.common.helpers.PropertyBag; import java.net.URI; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlow.java b/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlow.java index dd1ba16d..44b9dfef 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlow.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlow.java @@ -4,7 +4,7 @@ package com.microsoft.alm.auth.oauth; import com.microsoft.alm.oauth2.useragent.AuthorizationException; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenPair; import java.net.URI; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowImpl.java b/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowImpl.java index 64ccd51c..d4a5c010 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowImpl.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowImpl.java @@ -3,15 +3,15 @@ package com.microsoft.alm.auth.oauth; -import com.microsoft.alm.helpers.HttpClient; -import com.microsoft.alm.helpers.HttpResponse; -import com.microsoft.alm.helpers.PropertyBag; -import com.microsoft.alm.helpers.QueryString; -import com.microsoft.alm.helpers.StringContent; -import com.microsoft.alm.helpers.StringHelper; +import com.microsoft.alm.common.helpers.HttpClient; +import com.microsoft.alm.common.helpers.HttpResponse; +import com.microsoft.alm.common.helpers.PropertyBag; +import com.microsoft.alm.common.helpers.QueryString; +import com.microsoft.alm.common.helpers.StringContent; +import com.microsoft.alm.common.helpers.StringHelper; import com.microsoft.alm.oauth2.useragent.AuthorizationException; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenPair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowResponse.java b/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowResponse.java index 7d752e96..48d18760 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowResponse.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/DeviceFlowResponse.java @@ -3,7 +3,7 @@ package com.microsoft.alm.auth.oauth; -import com.microsoft.alm.helpers.PropertyBag; +import com.microsoft.alm.common.helpers.PropertyBag; import java.net.URI; import java.util.Calendar; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/OAuth2Authenticator.java b/core/src/main/java/com/microsoft/alm/auth/oauth/OAuth2Authenticator.java index 3d61d64b..768a6d9d 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/OAuth2Authenticator.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/OAuth2Authenticator.java @@ -7,17 +7,17 @@ import com.microsoft.alm.auth.PromptBehavior; import com.microsoft.alm.auth.oauth.helper.AzureAuthorityProvider; import com.microsoft.alm.auth.oauth.helper.SwtJarLoader; -import com.microsoft.alm.helpers.Action; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.HttpClient; -import com.microsoft.alm.helpers.HttpClientImpl; -import com.microsoft.alm.helpers.SettingsHelper; -import com.microsoft.alm.helpers.StringHelper; +import com.microsoft.alm.common.helpers.Action; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.HttpClient; +import com.microsoft.alm.common.helpers.HttpClientImpl; +import com.microsoft.alm.common.helpers.SettingsHelper; +import com.microsoft.alm.common.helpers.StringHelper; import com.microsoft.alm.oauth2.useragent.AuthorizationException; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.storage.InsecureInMemoryStore; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.storage.InsecureInMemoryStore; +import com.microsoft.alm.common.storage.SecretStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +27,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; -import static com.microsoft.alm.helpers.LoggingHelper.logError; +import static com.microsoft.alm.common.helpers.LoggingHelper.logError; public class OAuth2Authenticator extends BaseAuthenticator { diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/UserIdentifier.java b/core/src/main/java/com/microsoft/alm/auth/oauth/UserIdentifier.java index 7a1e9d78..5ccdd280 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/UserIdentifier.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/UserIdentifier.java @@ -3,7 +3,7 @@ package com.microsoft.alm.auth.oauth; -import com.microsoft.alm.helpers.StringHelper; +import com.microsoft.alm.common.helpers.StringHelper; /** * Contains identifier for a user. diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/helper/FileHashHelper.java b/core/src/main/java/com/microsoft/alm/auth/oauth/helper/FileHashHelper.java index 7949f1b7..38efe56f 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/helper/FileHashHelper.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/helper/FileHashHelper.java @@ -3,7 +3,7 @@ package com.microsoft.alm.auth.oauth.helper; -import com.microsoft.alm.helpers.IOHelper; +import com.microsoft.alm.common.helpers.IOHelper; import java.io.File; import java.io.FileInputStream; diff --git a/core/src/main/java/com/microsoft/alm/auth/oauth/helper/SwtJarLoader.java b/core/src/main/java/com/microsoft/alm/auth/oauth/helper/SwtJarLoader.java index 48e90bcf..9376f696 100644 --- a/core/src/main/java/com/microsoft/alm/auth/oauth/helper/SwtJarLoader.java +++ b/core/src/main/java/com/microsoft/alm/auth/oauth/helper/SwtJarLoader.java @@ -3,8 +3,8 @@ package com.microsoft.alm.auth.oauth.helper; -import com.microsoft.alm.helpers.IOHelper; -import com.microsoft.alm.helpers.SystemHelper; +import com.microsoft.alm.common.helpers.IOHelper; +import com.microsoft.alm.common.helpers.SystemHelper; import com.microsoft.alm.oauth2.useragent.StandardWidgetToolkitProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/microsoft/alm/auth/pat/VsoAzureAuthority.java b/core/src/main/java/com/microsoft/alm/auth/pat/VsoAzureAuthority.java index 1134635f..1f275439 100644 --- a/core/src/main/java/com/microsoft/alm/auth/pat/VsoAzureAuthority.java +++ b/core/src/main/java/com/microsoft/alm/auth/pat/VsoAzureAuthority.java @@ -5,15 +5,15 @@ import com.microsoft.alm.auth.oauth.AzureAuthority; import com.microsoft.alm.auth.oauth.Global; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.Guid; -import com.microsoft.alm.helpers.HttpClient; -import com.microsoft.alm.helpers.StringContent; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.UriHelper; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; -import com.microsoft.alm.secret.VsoTokenScope; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.Guid; +import com.microsoft.alm.common.helpers.HttpClient; +import com.microsoft.alm.common.helpers.StringContent; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.UriHelper; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; +import com.microsoft.alm.common.secret.VsoTokenScope; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/microsoft/alm/auth/pat/VstsPatAuthenticator.java b/core/src/main/java/com/microsoft/alm/auth/pat/VstsPatAuthenticator.java index 19a68276..22ea0e0e 100644 --- a/core/src/main/java/com/microsoft/alm/auth/pat/VstsPatAuthenticator.java +++ b/core/src/main/java/com/microsoft/alm/auth/pat/VstsPatAuthenticator.java @@ -9,13 +9,13 @@ import com.microsoft.alm.auth.PromptBehavior; import com.microsoft.alm.auth.oauth.Global; import com.microsoft.alm.auth.oauth.OAuth2Authenticator; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.HttpClient; -import com.microsoft.alm.helpers.HttpClientImpl; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.secret.VsoTokenScope; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.HttpClient; +import com.microsoft.alm.common.helpers.HttpClientImpl; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.secret.VsoTokenScope; +import com.microsoft.alm.common.storage.SecretStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/test/groovy/com/microsoft/alm/auth/oauth/AzureDeviceFlowTest.groovy b/core/src/test/groovy/com/microsoft/alm/auth/oauth/AzureDeviceFlowTest.groovy index 04052cf7..613c8ce2 100644 --- a/core/src/test/groovy/com/microsoft/alm/auth/oauth/AzureDeviceFlowTest.groovy +++ b/core/src/test/groovy/com/microsoft/alm/auth/oauth/AzureDeviceFlowTest.groovy @@ -3,8 +3,8 @@ package com.microsoft.alm.auth.oauth -import com.microsoft.alm.secret.TokenPair -import com.microsoft.alm.secret.TokenType +import com.microsoft.alm.common.secret.TokenPair +import com.microsoft.alm.common.secret.TokenType import groovy.transform.CompileStatic import org.junit.Ignore import org.junit.Test diff --git a/core/src/test/groovy/com/microsoft/alm/auth/oauth/DeviceFlowImplTest.groovy b/core/src/test/groovy/com/microsoft/alm/auth/oauth/DeviceFlowImplTest.groovy index 39591f73..9059aa39 100644 --- a/core/src/test/groovy/com/microsoft/alm/auth/oauth/DeviceFlowImplTest.groovy +++ b/core/src/test/groovy/com/microsoft/alm/auth/oauth/DeviceFlowImplTest.groovy @@ -9,7 +9,7 @@ import com.github.tomakehurst.wiremock.http.Response import com.github.tomakehurst.wiremock.junit.WireMockRule import com.github.tomakehurst.wiremock.stubbing.Scenario import com.microsoft.alm.oauth2.useragent.AuthorizationException -import com.microsoft.alm.secret.TokenType +import com.microsoft.alm.common.secret.TokenType import groovy.transform.CompileStatic import org.junit.After import org.junit.Assert diff --git a/core/src/test/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticatorTest.java b/core/src/test/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticatorTest.java index 7915fafa..ad6b9980 100644 --- a/core/src/test/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticatorTest.java +++ b/core/src/test/java/com/microsoft/alm/auth/basic/BasicAuthAuthenticatorTest.java @@ -4,8 +4,8 @@ package com.microsoft.alm.auth.basic; import com.microsoft.alm.auth.PromptBehavior; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.storage.SecretStore; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; diff --git a/core/src/test/java/com/microsoft/alm/auth/oauth/AzureAuthorityTest.java b/core/src/test/java/com/microsoft/alm/auth/oauth/AzureAuthorityTest.java index b7c9298d..80f94889 100644 --- a/core/src/test/java/com/microsoft/alm/auth/oauth/AzureAuthorityTest.java +++ b/core/src/test/java/com/microsoft/alm/auth/oauth/AzureAuthorityTest.java @@ -4,10 +4,10 @@ package com.microsoft.alm.auth.oauth; import com.microsoft.alm.auth.PromptBehavior; -import com.microsoft.alm.helpers.Action; -import com.microsoft.alm.helpers.StringContent; +import com.microsoft.alm.common.helpers.Action; +import com.microsoft.alm.common.helpers.StringContent; import com.microsoft.alm.oauth2.useragent.AuthorizationException; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenPair; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/com/microsoft/alm/auth/oauth/OAuth2AuthenticatorTest.java b/core/src/test/java/com/microsoft/alm/auth/oauth/OAuth2AuthenticatorTest.java index f103e0bf..aceedc28 100644 --- a/core/src/test/java/com/microsoft/alm/auth/oauth/OAuth2AuthenticatorTest.java +++ b/core/src/test/java/com/microsoft/alm/auth/oauth/OAuth2AuthenticatorTest.java @@ -4,10 +4,10 @@ package com.microsoft.alm.auth.oauth; import com.microsoft.alm.auth.oauth.helper.AzureAuthorityProvider; -import com.microsoft.alm.helpers.Action; +import com.microsoft.alm.common.helpers.Action; import com.microsoft.alm.oauth2.useragent.AuthorizationException; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.storage.SecretStore; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/com/microsoft/alm/auth/pat/VstsPatAuthenticatorTest.java b/core/src/test/java/com/microsoft/alm/auth/pat/VstsPatAuthenticatorTest.java index 528f4394..ba8d82af 100644 --- a/core/src/test/java/com/microsoft/alm/auth/pat/VstsPatAuthenticatorTest.java +++ b/core/src/test/java/com/microsoft/alm/auth/pat/VstsPatAuthenticatorTest.java @@ -5,11 +5,11 @@ import com.microsoft.alm.auth.PromptBehavior; import com.microsoft.alm.auth.oauth.OAuth2Authenticator; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.secret.TokenType; -import com.microsoft.alm.secret.VsoTokenScope; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenType; +import com.microsoft.alm.common.secret.VsoTokenScope; +import com.microsoft.alm.common.storage.SecretStore; import org.junit.Before; import org.junit.Test; diff --git a/providers/src/main/java/com/microsoft/alm/provider/JaxrsClientProvider.java b/providers/src/main/java/com/microsoft/alm/provider/JaxrsClientProvider.java index 523c1c9d..6709780c 100644 --- a/providers/src/main/java/com/microsoft/alm/provider/JaxrsClientProvider.java +++ b/providers/src/main/java/com/microsoft/alm/provider/JaxrsClientProvider.java @@ -5,12 +5,12 @@ import com.microsoft.alm.auth.Authenticator; import com.microsoft.alm.auth.PromptBehavior; -import com.microsoft.alm.helpers.SettingsHelper; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.ObjectExtensions; +import com.microsoft.alm.common.helpers.SettingsHelper; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.ObjectExtensions; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; diff --git a/providers/src/main/java/com/microsoft/alm/provider/Options.java b/providers/src/main/java/com/microsoft/alm/provider/Options.java index a24c489b..37518f29 100644 --- a/providers/src/main/java/com/microsoft/alm/provider/Options.java +++ b/providers/src/main/java/com/microsoft/alm/provider/Options.java @@ -3,7 +3,7 @@ package com.microsoft.alm.provider; -import com.microsoft.alm.secret.VsoTokenScope; +import com.microsoft.alm.common.secret.VsoTokenScope; public class Options { diff --git a/providers/src/main/java/com/microsoft/alm/provider/UserPasswordCredentialProvider.java b/providers/src/main/java/com/microsoft/alm/provider/UserPasswordCredentialProvider.java index 79fb6803..776b8edd 100644 --- a/providers/src/main/java/com/microsoft/alm/provider/UserPasswordCredentialProvider.java +++ b/providers/src/main/java/com/microsoft/alm/provider/UserPasswordCredentialProvider.java @@ -5,10 +5,10 @@ import com.microsoft.alm.auth.Authenticator; import com.microsoft.alm.auth.PromptBehavior; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.helpers.Debug; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.helpers.Debug; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sample/src/main/java/com/microsoft/alm/auth/sample/App.java b/sample/src/main/java/com/microsoft/alm/auth/sample/App.java index 171ae777..81efe89f 100644 --- a/sample/src/main/java/com/microsoft/alm/auth/sample/App.java +++ b/sample/src/main/java/com/microsoft/alm/auth/sample/App.java @@ -7,19 +7,19 @@ import com.microsoft.alm.auth.oauth.DeviceFlowResponse; import com.microsoft.alm.auth.oauth.OAuth2Authenticator; import com.microsoft.alm.auth.pat.VstsPatAuthenticator; -import com.microsoft.alm.helpers.Action; +import com.microsoft.alm.common.helpers.Action; import com.microsoft.alm.provider.JaxrsClientProvider; import com.microsoft.alm.provider.Options; import com.microsoft.alm.provider.UserPasswordCredentialProvider; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Secret; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.secret.VsoTokenScope; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Secret; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.secret.VsoTokenScope; import com.microsoft.alm.sourcecontrol.webapi.GitHttpClient; import com.microsoft.alm.sourcecontrol.webapi.model.GitRepository; -import com.microsoft.alm.storage.InsecureInMemoryStore; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.storage.InsecureInMemoryStore; +import com.microsoft.alm.common.storage.SecretStore; import com.microsoft.alm.storage.StorageProvider; import com.microsoft.alm.storage.StorageProvider.SecureOption; import com.microsoft.visualstudio.services.account.Account; diff --git a/storage/src/main/java/com/microsoft/alm/storage/StorageProvider.java b/storage/src/main/java/com/microsoft/alm/storage/StorageProvider.java index 1d0ef58c..e03a1e88 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/StorageProvider.java +++ b/storage/src/main/java/com/microsoft/alm/storage/StorageProvider.java @@ -3,12 +3,16 @@ package com.microsoft.alm.storage; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Secret; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Secret; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.storage.InsecureFileBackedCredentialStore; +import com.microsoft.alm.common.storage.InsecureFileBackedTokenStore; +import com.microsoft.alm.common.storage.InsecureInMemoryStore; +import com.microsoft.alm.common.storage.SecretStore; import com.microsoft.alm.storage.macosx.KeychainSecurityBackedCredentialStore; import com.microsoft.alm.storage.macosx.KeychainSecurityBackedTokenPairStore; import com.microsoft.alm.storage.macosx.KeychainSecurityBackedTokenStore; diff --git a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStore.java b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStore.java index 5b3027bf..94f13d53 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStore.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.macosx; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.storage.SecretStore; public class KeychainSecurityBackedCredentialStore extends KeychainSecurityCliStore implements SecretStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStore.java b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStore.java index 5fc8bdc2..c60fdd76 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStore.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.macosx; -import com.microsoft.alm.secret.TokenPair; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.TokenPair; +import com.microsoft.alm.common.storage.SecretStore; public class KeychainSecurityBackedTokenPairStore extends KeychainSecurityCliStore implements SecretStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStore.java b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStore.java index 0f8e4397..54ebc22f 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStore.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.macosx; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.storage.SecretStore; public class KeychainSecurityBackedTokenStore extends KeychainSecurityCliStore implements SecretStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityCliStore.java b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityCliStore.java index 344d7823..8696a619 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityCliStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/macosx/KeychainSecurityCliStore.java @@ -4,16 +4,16 @@ package com.microsoft.alm.storage.macosx; -import com.microsoft.alm.helpers.Func; -import com.microsoft.alm.helpers.IOHelper; -import com.microsoft.alm.helpers.StringHelper; +import com.microsoft.alm.common.helpers.Func; +import com.microsoft.alm.common.helpers.IOHelper; +import com.microsoft.alm.common.helpers.StringHelper; import com.microsoft.alm.oauth2.useragent.subprocess.DefaultProcessFactory; import com.microsoft.alm.oauth2.useragent.subprocess.ProcessCoordinator; import com.microsoft.alm.oauth2.useragent.subprocess.TestableProcess; import com.microsoft.alm.oauth2.useragent.subprocess.TestableProcessFactory; -import com.microsoft.alm.secret.Credential; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.secret.Credential; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenPair; import java.io.BufferedReader; import java.io.IOException; diff --git a/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStore.java b/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStore.java index 80c99bf1..bee47202 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStore.java @@ -3,10 +3,10 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.XmlHelper; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.XmlHelper; +import com.microsoft.alm.common.secret.Credential; import com.microsoft.alm.storage.posix.internal.GnomeKeyringBackedSecureStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +18,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import static com.microsoft.alm.helpers.LoggingHelper.logError; +import static com.microsoft.alm.common.helpers.LoggingHelper.logError; public class GnomeKeyringBackedCredentialStore extends GnomeKeyringBackedSecureStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStore.java b/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStore.java index f5dac312..9dd2f034 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStore.java @@ -3,22 +3,13 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.XmlHelper; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.secret.TokenPair; import com.microsoft.alm.storage.posix.internal.GnomeKeyringBackedSecureStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import static com.microsoft.alm.helpers.LoggingHelper.logError; +import static com.microsoft.alm.common.helpers.LoggingHelper.logError; public class GnomeKeyringBackedTokenPairStore extends GnomeKeyringBackedSecureStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStore.java b/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStore.java index 90debb50..59599bba 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStore.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import com.microsoft.alm.storage.posix.internal.GnomeKeyringBackedSecureStore; public class GnomeKeyringBackedTokenStore extends GnomeKeyringBackedSecureStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/posix/internal/GnomeKeyringBackedSecureStore.java b/storage/src/main/java/com/microsoft/alm/storage/posix/internal/GnomeKeyringBackedSecureStore.java index aadd38c7..dc7e84cb 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/posix/internal/GnomeKeyringBackedSecureStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/posix/internal/GnomeKeyringBackedSecureStore.java @@ -3,11 +3,11 @@ package com.microsoft.alm.storage.posix.internal; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.SettingsHelper; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.Secret; -import com.microsoft.alm.storage.SecretStore; +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.helpers.SettingsHelper; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.Secret; +import com.microsoft.alm.common.storage.SecretStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStore.java b/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStore.java index d30d437c..c6db8676 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStore.java @@ -3,7 +3,7 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.secret.Credential; import com.microsoft.alm.storage.windows.internal.CredManagerBackedSecureStore; public class CredManagerBackedCredentialStore extends CredManagerBackedSecureStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStore.java b/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStore.java index ab5eefb7..797472db 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStore.java @@ -3,7 +3,7 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenPair; import com.microsoft.alm.storage.windows.internal.CredManagerBackedSecureStore; public class CredManagerBackedTokenPairStore extends CredManagerBackedSecureStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStore.java b/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStore.java index ee21f6d0..778341b5 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStore.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import com.microsoft.alm.storage.windows.internal.CredManagerBackedSecureStore; public class CredManagerBackedTokenStore extends CredManagerBackedSecureStore { diff --git a/storage/src/main/java/com/microsoft/alm/storage/windows/internal/CredManagerBackedSecureStore.java b/storage/src/main/java/com/microsoft/alm/storage/windows/internal/CredManagerBackedSecureStore.java index 4b4f2cff..f536a204 100644 --- a/storage/src/main/java/com/microsoft/alm/storage/windows/internal/CredManagerBackedSecureStore.java +++ b/storage/src/main/java/com/microsoft/alm/storage/windows/internal/CredManagerBackedSecureStore.java @@ -3,11 +3,10 @@ package com.microsoft.alm.storage.windows.internal; -import com.microsoft.alm.helpers.Debug; -import com.microsoft.alm.helpers.StringHelper; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.Secret; -import com.microsoft.alm.storage.SecretStore; + +import com.microsoft.alm.common.helpers.Debug; +import com.microsoft.alm.common.secret.Secret; +import com.microsoft.alm.common.storage.SecretStore; import com.sun.jna.LastErrorException; import com.sun.jna.Memory; import com.sun.jna.Pointer; @@ -16,7 +15,9 @@ import java.util.Arrays; -import static com.microsoft.alm.helpers.LoggingHelper.logError; +import static com.microsoft.alm.common.helpers.LoggingHelper.logError; +import com.microsoft.alm.common.helpers.StringHelper; +import com.microsoft.alm.common.helpers.SystemHelper; /** * This class exposes functions to interact with Windows Credential Manager diff --git a/storage/src/test/groovy/com/microsoft/alm/storage/macosx/KeychainSecurityCliStoreTest.groovy b/storage/src/test/groovy/com/microsoft/alm/storage/macosx/KeychainSecurityCliStoreTest.groovy index 545ef66a..49491e80 100644 --- a/storage/src/test/groovy/com/microsoft/alm/storage/macosx/KeychainSecurityCliStoreTest.groovy +++ b/storage/src/test/groovy/com/microsoft/alm/storage/macosx/KeychainSecurityCliStoreTest.groovy @@ -3,13 +3,13 @@ package com.microsoft.alm.storage.macosx -import com.microsoft.alm.helpers.Environment -import com.microsoft.alm.helpers.StringHelper +import com.microsoft.alm.common.helpers.Environment +import com.microsoft.alm.common.helpers.StringHelper import com.microsoft.alm.oauth2.useragent.subprocess.DefaultProcessFactory import com.microsoft.alm.oauth2.useragent.subprocess.TestableProcessFactory -import com.microsoft.alm.secret.Credential -import com.microsoft.alm.secret.Token -import com.microsoft.alm.secret.TokenType +import com.microsoft.alm.common.secret.Credential +import com.microsoft.alm.common.secret.Token +import com.microsoft.alm.common.secret.TokenType import groovy.transform.CompileStatic import org.junit.Ignore import org.junit.Test diff --git a/storage/src/test/java/com/microsoft/alm/storage/StorageProviderTest.java b/storage/src/test/java/com/microsoft/alm/storage/StorageProviderTest.java index 631dff94..3f5bb1e5 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/StorageProviderTest.java +++ b/storage/src/test/java/com/microsoft/alm/storage/StorageProviderTest.java @@ -3,7 +3,8 @@ package com.microsoft.alm.storage; -import com.microsoft.alm.secret.Token; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.storage.SecretStore; import com.microsoft.alm.storage.StorageProvider.NonPersistentStoreGenerator; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStoreIT.java index f6a2684f..2c850d57 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedCredentialStoreIT.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.macosx; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.Credential; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStoreIT.java index 2eb91569..915ee4d5 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenPairStoreIT.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.macosx; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.TokenPair; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStoreIT.java index 0f734530..40724aa7 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/macosx/KeychainSecurityBackedTokenStoreIT.java @@ -3,9 +3,9 @@ package com.microsoft.alm.storage.macosx; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreIT.java index 8cd4a6d3..141776d1 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreIT.java @@ -3,7 +3,7 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.secret.Credential; import com.microsoft.alm.storage.posix.internal.GnomeKeyringBackedSecureStore; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreTest.java b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreTest.java index 5c5c7359..9600dd67 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreTest.java +++ b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedCredentialStoreTest.java @@ -3,7 +3,7 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.secret.Credential; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreIT.java index c2fa8a7e..fcdd288c 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreIT.java @@ -3,7 +3,7 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenPair; import com.microsoft.alm.storage.posix.internal.GnomeKeyringBackedSecureStore; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreTest.java b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreTest.java index 8e469d44..779a0b1d 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreTest.java +++ b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenPairStoreTest.java @@ -3,7 +3,7 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.secret.TokenPair; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreIT.java index 61631b14..686c9227 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreIT.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import com.microsoft.alm.storage.posix.internal.GnomeKeyringBackedSecureStore; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreTest.java b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreTest.java index 6a074a66..b7ad0355 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreTest.java +++ b/storage/src/test/java/com/microsoft/alm/storage/posix/GnomeKeyringBackedTokenStoreTest.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.posix; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreIT.java index 5a8260b5..4956edf0 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreIT.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.Credential; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreTest.java b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreTest.java index dc4328a7..10c35407 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreTest.java +++ b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedCredentialStoreTest.java @@ -3,14 +3,11 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.secret.Credential; +import com.microsoft.alm.common.secret.Credential; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; public class CredManagerBackedCredentialStoreTest { diff --git a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStoreIT.java index e7625439..2f802a99 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenPairStoreIT.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.TokenPair; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.TokenPair; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreIT.java b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreIT.java index 564ff5eb..7dac5663 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreIT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreIT.java @@ -3,9 +3,9 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.helpers.SystemHelper; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.helpers.SystemHelper; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreTest.java b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreTest.java index 5d8fcb6b..a137e351 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreTest.java +++ b/storage/src/test/java/com/microsoft/alm/storage/windows/CredManagerBackedTokenStoreTest.java @@ -3,8 +3,8 @@ package com.microsoft.alm.storage.windows; -import com.microsoft.alm.secret.Token; -import com.microsoft.alm.secret.TokenType; +import com.microsoft.alm.common.secret.Token; +import com.microsoft.alm.common.secret.TokenType; import org.junit.Before; import org.junit.Test; diff --git a/storage/src/test/java/com/microsoft/alm/storage/windows/internal/CredAdvapi32IT.java b/storage/src/test/java/com/microsoft/alm/storage/windows/internal/CredAdvapi32IT.java index 48bacbcc..c36ddf9d 100644 --- a/storage/src/test/java/com/microsoft/alm/storage/windows/internal/CredAdvapi32IT.java +++ b/storage/src/test/java/com/microsoft/alm/storage/windows/internal/CredAdvapi32IT.java @@ -3,7 +3,7 @@ package com.microsoft.alm.storage.windows.internal; -import com.microsoft.alm.helpers.SystemHelper; +import com.microsoft.alm.common.helpers.SystemHelper; import com.sun.jna.LastErrorException; import com.sun.jna.Memory; import com.sun.jna.Pointer;