From d9d83654c421942f4ef17fa9e7d89beeb89059d4 Mon Sep 17 00:00:00 2001 From: Ryan O'Neill Date: Mon, 24 Aug 2015 15:49:27 -0400 Subject: [PATCH] package name change --- .../main/java/com/typesafe/config/Config.java | 20 +-- .../typesafe/config/ConfigBeanFactory.java | 4 +- .../com/typesafe/config/ConfigException.java | 4 +- .../com/typesafe/config/ConfigFactory.java | 10 +- .../typesafe/config/ConfigIncludeContext.java | 2 +- .../com/typesafe/config/ConfigIncluder.java | 2 +- .../config/ConfigIncluderClasspath.java | 2 +- .../typesafe/config/ConfigIncluderFile.java | 2 +- .../typesafe/config/ConfigIncluderURL.java | 2 +- .../java/com/typesafe/config/ConfigList.java | 2 +- .../com/typesafe/config/ConfigMemorySize.java | 2 +- .../com/typesafe/config/ConfigMergeable.java | 4 +- .../com/typesafe/config/ConfigObject.java | 2 +- .../com/typesafe/config/ConfigOrigin.java | 2 +- .../typesafe/config/ConfigOriginFactory.java | 4 +- .../typesafe/config/ConfigParseOptions.java | 2 +- .../com/typesafe/config/ConfigParseable.java | 2 +- .../typesafe/config/ConfigRenderOptions.java | 2 +- .../typesafe/config/ConfigResolveOptions.java | 4 +- .../com/typesafe/config/ConfigSyntax.java | 6 +- .../java/com/typesafe/config/ConfigUtil.java | 4 +- .../java/com/typesafe/config/ConfigValue.java | 2 +- .../typesafe/config/ConfigValueFactory.java | 4 +- .../com/typesafe/config/ConfigValueType.java | 2 +- .../config/impl/AbstractConfigNode.java | 4 +- .../config/impl/AbstractConfigNodeValue.java | 2 +- .../config/impl/AbstractConfigObject.java | 16 +-- .../config/impl/AbstractConfigValue.java | 14 +-- .../typesafe/config/impl/ConfigBeanImpl.java | 20 +-- .../typesafe/config/impl/ConfigBoolean.java | 6 +- .../config/impl/ConfigConcatenation.java | 12 +- .../config/impl/ConfigConditional.java | 6 +- .../config/impl/ConfigDelayedMerge.java | 12 +- .../config/impl/ConfigDelayedMergeObject.java | 14 +-- .../config/impl/ConfigDocumentParser.java | 4 +- .../typesafe/config/impl/ConfigDouble.java | 6 +- .../com/typesafe/config/impl/ConfigImpl.java | 24 ++-- .../typesafe/config/impl/ConfigImplUtil.java | 10 +- .../config/impl/ConfigIncludeKind.java | 2 +- .../com/typesafe/config/impl/ConfigInt.java | 6 +- .../com/typesafe/config/impl/ConfigLong.java | 6 +- .../typesafe/config/impl/ConfigNodeArray.java | 2 +- .../config/impl/ConfigNodeComment.java | 4 +- .../config/impl/ConfigNodeComplexValue.java | 2 +- .../config/impl/ConfigNodeConcatenation.java | 2 +- .../config/impl/ConfigNodeConditional.java | 2 +- .../typesafe/config/impl/ConfigNodeField.java | 4 +- .../config/impl/ConfigNodeInclude.java | 2 +- .../config/impl/ConfigNodeObject.java | 6 +- .../typesafe/config/impl/ConfigNodePath.java | 4 +- .../typesafe/config/impl/ConfigNodeRoot.java | 8 +- .../config/impl/ConfigNodeSimpleValue.java | 4 +- .../config/impl/ConfigNodeSingleToken.java | 4 +- .../com/typesafe/config/impl/ConfigNull.java | 8 +- .../typesafe/config/impl/ConfigNumber.java | 6 +- .../typesafe/config/impl/ConfigParser.java | 4 +- .../typesafe/config/impl/ConfigReference.java | 10 +- .../typesafe/config/impl/ConfigString.java | 8 +- .../com/typesafe/config/impl/Container.java | 4 +- .../config/impl/DefaultTransformer.java | 4 +- .../com/typesafe/config/impl/FromMapMode.java | 2 +- .../typesafe/config/impl/FullIncluder.java | 10 +- .../com/typesafe/config/impl/MemoKey.java | 2 +- .../typesafe/config/impl/MergeableValue.java | 6 +- .../com/typesafe/config/impl/OriginType.java | 2 +- .../com/typesafe/config/impl/Parseable.java | 8 +- .../java/com/typesafe/config/impl/Path.java | 4 +- .../com/typesafe/config/impl/PathBuilder.java | 4 +- .../com/typesafe/config/impl/PathParser.java | 10 +- .../config/impl/PropertiesParser.java | 6 +- .../config/impl/ReplaceableMergeStack.java | 2 +- .../typesafe/config/impl/ResolveContext.java | 8 +- .../typesafe/config/impl/ResolveMemos.java | 2 +- .../typesafe/config/impl/ResolveResult.java | 4 +- .../typesafe/config/impl/ResolveSource.java | 6 +- .../typesafe/config/impl/ResolveStatus.java | 2 +- .../config/impl/SerializedConfigValue.java | 16 +-- .../typesafe/config/impl/SimpleConfig.java | 22 ++-- .../config/impl/SimpleConfigDocument.java | 8 +- .../config/impl/SimpleConfigList.java | 14 +-- .../config/impl/SimpleConfigObject.java | 12 +- .../config/impl/SimpleConfigOrigin.java | 8 +- .../config/impl/SimpleIncludeContext.java | 8 +- .../typesafe/config/impl/SimpleIncluder.java | 24 ++-- .../config/impl/SubstitutionExpression.java | 2 +- .../java/com/typesafe/config/impl/Token.java | 6 +- .../com/typesafe/config/impl/TokenType.java | 2 +- .../com/typesafe/config/impl/Tokenizer.java | 8 +- .../java/com/typesafe/config/impl/Tokens.java | 8 +- .../com/typesafe/config/impl/Unmergeable.java | 2 +- .../config/parser/ConfigDocument.java | 4 +- .../config/parser/ConfigDocumentFactory.java | 16 +-- .../typesafe/config/parser/ConfigNode.java | 6 +- .../test/java/beanconfig/ArraysConfig.java | 10 +- .../src/test/java/beanconfig/BytesConfig.java | 2 +- .../test/java/beanconfig/StringsConfig.java | 2 +- .../UnsupportedListElementConfig.java | 2 +- .../beanconfig/UnsupportedMapKeyConfig.java | 2 +- .../beanconfig/UnsupportedMapValueConfig.java | 2 +- .../test/java/beanconfig/ValuesConfig.java | 8 +- config/src/test/scala/ApiExamples.scala | 2 +- config/src/test/scala/Profiling.scala | 6 +- config/src/test/scala/Rendering.scala | 4 +- .../config/impl/ConcatenationTest.scala | 20 +-- .../typesafe/config/impl/ConfParserTest.scala | 4 +- .../config/impl/ConfigBeanFactoryTest.scala | 6 +- .../impl/ConfigDocumentParserTest.scala | 4 +- .../config/impl/ConfigDocumentTest.scala | 8 +- .../config/impl/ConfigMemorySizeTest.scala | 4 +- .../typesafe/config/impl/ConfigNodeTest.scala | 4 +- .../config/impl/ConfigSubstitutionTest.scala | 12 +- .../com/typesafe/config/impl/ConfigTest.scala | 24 ++-- .../config/impl/ConfigValueTest.scala | 116 +++++++++--------- .../config/impl/EquivalentsTest.scala | 4 +- .../com/typesafe/config/impl/HttpTest.scala | 10 +- .../com/typesafe/config/impl/JsonTest.scala | 4 +- .../com/typesafe/config/impl/PathTest.scala | 4 +- .../typesafe/config/impl/PropertiesTest.scala | 12 +- .../typesafe/config/impl/PublicApiTest.scala | 6 +- .../com/typesafe/config/impl/TestUtils.scala | 14 +-- .../com/typesafe/config/impl/TokenTest.scala | 2 +- .../typesafe/config/impl/TokenizerTest.scala | 4 +- .../com/typesafe/config/impl/ToyHttp.scala | 2 +- .../typesafe/config/impl/UnitParserTest.scala | 6 +- .../com/typesafe/config/impl/UtilTest.scala | 2 +- .../typesafe/config/impl/ValidationTest.scala | 8 +- .../complex-app/src/main/java/ComplexApp.java | 2 +- .../simple-app/src/main/java/SimpleApp.java | 2 +- .../main/java/simplelib/SimpleLibContext.java | 2 +- .../src/main/scala/ComplexApp.scala | 2 +- .../simple-app/src/main/scala/SimpleApp.scala | 2 +- .../src/main/scala/simplelib/SimpleLib.scala | 2 +- project/Build.scala | 6 +- project/linksource.scala | 4 +- 134 files changed, 466 insertions(+), 464 deletions(-) diff --git a/config/src/main/java/com/typesafe/config/Config.java b/config/src/main/java/com/typesafe/config/Config.java index 68031861..827068de 100644 --- a/config/src/main/java/com/typesafe/config/Config.java +++ b/config/src/main/java/com/typesafe/config/Config.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.time.Duration; import java.util.List; @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; * *

* You can find an example app and library on + * href="https://github.com.twitter_typesafehub/config/tree/master/examples">on * GitHub. Also be sure to read the package overview which * describes the big picture as shown in those examples. @@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit; * in a JSON object; it's just a string that's the key in a map. A "path" is a * parseable expression with a syntax and it refers to a series of keys. Path * expressions are described in the spec for + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">spec for * Human-Optimized Config Object Notation. In brief, a path is * period-separated so "a.b.c" looks for key c in object b in object a in the * root object. Sometimes double quotes are needed around special characters in @@ -108,7 +108,7 @@ import java.util.concurrent.TimeUnit; *

* Substitutions are the ${foo.bar} syntax in config * files, described in the specification. Resolving substitutions replaces these references with real * values. * @@ -187,7 +187,7 @@ public interface Config extends ConfigMergeable { /** * Returns a replacement config with all substitutions (the * ${foo.bar} syntax, see the + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">the * spec) resolved. Substitutions are looked up using this * Config as the root object, that is, a substitution * ${foo.bar} will be replaced with the result of @@ -652,7 +652,7 @@ public interface Config extends ConfigMergeable { * the value is already a number, then it's left alone; if it's a string, * it's parsed understanding unit suffixes such as "128K", as documented in * the the + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">the * spec. * * @param path @@ -672,7 +672,7 @@ public interface Config extends ConfigMergeable { * the value is already a number, then it's left alone; if it's a string, * it's parsed understanding unit suffixes such as "128K", as documented in * the the + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">the * spec. * * @since 1.3.0 @@ -693,7 +693,7 @@ public interface Config extends ConfigMergeable { * Get value as a duration in milliseconds. If the value is already a * number, then it's left alone; if it's a string, it's parsed understanding * units suffixes like "10m" or "5ns" as documented in the the + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">the * spec. * * @deprecated As of release 1.1, replaced by {@link #getDuration(String, TimeUnit)} @@ -736,7 +736,7 @@ public interface Config extends ConfigMergeable { * number, then it's taken as milliseconds and then converted to the * requested TimeUnit; if it's a string, it's parsed understanding units * suffixes like "10m" or "5ns" as documented in the the + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">the * spec. * * @since 1.2.0 @@ -760,7 +760,7 @@ public interface Config extends ConfigMergeable { * already a number, then it's taken as milliseconds; if it's * a string, it's parsed understanding units suffixes like * "10m" or "5ns" as documented in the the + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">the * spec. This method never returns null. * * @since 1.3.0 diff --git a/config/src/main/java/com/typesafe/config/ConfigBeanFactory.java b/config/src/main/java/com/typesafe/config/ConfigBeanFactory.java index 66d957be..658021fe 100644 --- a/config/src/main/java/com/typesafe/config/ConfigBeanFactory.java +++ b/config/src/main/java/com/typesafe/config/ConfigBeanFactory.java @@ -1,6 +1,6 @@ -package com.typesafe.config; +package com.twitter_typesafe.config; -import com.typesafe.config.impl.ConfigBeanImpl; +import com.twitter_typesafe.config.impl.ConfigBeanImpl; /** * Factory for automatically creating a Java class from a {@link Config}. diff --git a/config/src/main/java/com/typesafe/config/ConfigException.java b/config/src/main/java/com/typesafe/config/ConfigException.java index 58d54170..fd0eef28 100644 --- a/config/src/main/java/com/typesafe/config/ConfigException.java +++ b/config/src/main/java/com/typesafe/config/ConfigException.java @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Field; -import com.typesafe.config.impl.ConfigImplUtil; +import com.twitter_typesafe.config.impl.ConfigImplUtil; /** * All exceptions thrown by the library are subclasses of diff --git a/config/src/main/java/com/typesafe/config/ConfigFactory.java b/config/src/main/java/com/typesafe/config/ConfigFactory.java index 6c4dd3a0..12b373a5 100644 --- a/config/src/main/java/com/typesafe/config/ConfigFactory.java +++ b/config/src/main/java/com/typesafe/config/ConfigFactory.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.io.File; import java.io.Reader; @@ -11,8 +11,8 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Callable; -import com.typesafe.config.impl.ConfigImpl; -import com.typesafe.config.impl.Parseable; +import com.twitter_typesafe.config.impl.ConfigImpl; +import com.twitter_typesafe.config.impl.Parseable; /** * Contains static methods for creating {@link Config} instances. @@ -29,7 +29,7 @@ import com.typesafe.config.impl.Parseable; * from a resource and nothing else. * *

You can find an example app and library on + * href="https://github.com.twitter_typesafehub/config/tree/master/examples">on * GitHub. Also be sure to read the package * overview which describes the big picture as shown in those @@ -615,7 +615,7 @@ public final class ConfigFactory { /** * Converts a Java {@link java.util.Properties} object to a * {@link ConfigObject} using the rules documented in the HOCON + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">HOCON * spec. The keys in the Properties object are split on the * period character '.' and treated as paths. The values will all end up as * string values. If you have both "a=foo" and "a.b=bar" in your properties diff --git a/config/src/main/java/com/typesafe/config/ConfigIncludeContext.java b/config/src/main/java/com/typesafe/config/ConfigIncludeContext.java index 725d8f20..1b1206ad 100644 --- a/config/src/main/java/com/typesafe/config/ConfigIncludeContext.java +++ b/config/src/main/java/com/typesafe/config/ConfigIncludeContext.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** diff --git a/config/src/main/java/com/typesafe/config/ConfigIncluder.java b/config/src/main/java/com/typesafe/config/ConfigIncluder.java index f0c44059..baf90077 100644 --- a/config/src/main/java/com/typesafe/config/ConfigIncluder.java +++ b/config/src/main/java/com/typesafe/config/ConfigIncluder.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * Implement this interface and provide an instance to diff --git a/config/src/main/java/com/typesafe/config/ConfigIncluderClasspath.java b/config/src/main/java/com/typesafe/config/ConfigIncluderClasspath.java index ce34b7c4..23706f87 100644 --- a/config/src/main/java/com/typesafe/config/ConfigIncluderClasspath.java +++ b/config/src/main/java/com/typesafe/config/ConfigIncluderClasspath.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * Implement this in addition to {@link ConfigIncluder} if you want to diff --git a/config/src/main/java/com/typesafe/config/ConfigIncluderFile.java b/config/src/main/java/com/typesafe/config/ConfigIncluderFile.java index 1099d8c2..35fabd87 100644 --- a/config/src/main/java/com/typesafe/config/ConfigIncluderFile.java +++ b/config/src/main/java/com/typesafe/config/ConfigIncluderFile.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.io.File; diff --git a/config/src/main/java/com/typesafe/config/ConfigIncluderURL.java b/config/src/main/java/com/typesafe/config/ConfigIncluderURL.java index 737c320b..de43191d 100644 --- a/config/src/main/java/com/typesafe/config/ConfigIncluderURL.java +++ b/config/src/main/java/com/typesafe/config/ConfigIncluderURL.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.net.URL; diff --git a/config/src/main/java/com/typesafe/config/ConfigList.java b/config/src/main/java/com/typesafe/config/ConfigList.java index 01eca152..c7f69143 100644 --- a/config/src/main/java/com/typesafe/config/ConfigList.java +++ b/config/src/main/java/com/typesafe/config/ConfigList.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.util.List; diff --git a/config/src/main/java/com/typesafe/config/ConfigMemorySize.java b/config/src/main/java/com/typesafe/config/ConfigMemorySize.java index 322b2c82..95cbe3f2 100644 --- a/config/src/main/java/com/typesafe/config/ConfigMemorySize.java +++ b/config/src/main/java/com/typesafe/config/ConfigMemorySize.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * An immutable class representing an amount of memory. Use diff --git a/config/src/main/java/com/typesafe/config/ConfigMergeable.java b/config/src/main/java/com/typesafe/config/ConfigMergeable.java index 7af36f7b..2c244683 100644 --- a/config/src/main/java/com/typesafe/config/ConfigMergeable.java +++ b/config/src/main/java/com/typesafe/config/ConfigMergeable.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * Marker for types whose instances can be merged, that is {@link Config} and @@ -27,7 +27,7 @@ public interface ConfigMergeable { * *

* The semantics of merging are described in the spec + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">spec * for HOCON. Merging typically occurs when either the same object is * created twice in the same file, or two config files are both loaded. For * example: diff --git a/config/src/main/java/com/typesafe/config/ConfigObject.java b/config/src/main/java/com/typesafe/config/ConfigObject.java index 37287fc1..46c32d78 100644 --- a/config/src/main/java/com/typesafe/config/ConfigObject.java +++ b/config/src/main/java/com/typesafe/config/ConfigObject.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.util.Map; diff --git a/config/src/main/java/com/typesafe/config/ConfigOrigin.java b/config/src/main/java/com/typesafe/config/ConfigOrigin.java index 152e6058..4326ecf2 100644 --- a/config/src/main/java/com/typesafe/config/ConfigOrigin.java +++ b/config/src/main/java/com/typesafe/config/ConfigOrigin.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.net.URL; import java.util.List; diff --git a/config/src/main/java/com/typesafe/config/ConfigOriginFactory.java b/config/src/main/java/com/typesafe/config/ConfigOriginFactory.java index fc1ba30d..77d3aa9d 100644 --- a/config/src/main/java/com/typesafe/config/ConfigOriginFactory.java +++ b/config/src/main/java/com/typesafe/config/ConfigOriginFactory.java @@ -1,8 +1,8 @@ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.net.URL; -import com.typesafe.config.impl.ConfigImpl; +import com.twitter_typesafe.config.impl.ConfigImpl; /** * This class contains some static factory methods for building a {@link diff --git a/config/src/main/java/com/typesafe/config/ConfigParseOptions.java b/config/src/main/java/com/typesafe/config/ConfigParseOptions.java index e1c1a770..a73b9f5c 100644 --- a/config/src/main/java/com/typesafe/config/ConfigParseOptions.java +++ b/config/src/main/java/com/typesafe/config/ConfigParseOptions.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** diff --git a/config/src/main/java/com/typesafe/config/ConfigParseable.java b/config/src/main/java/com/typesafe/config/ConfigParseable.java index b63801a8..1b2bfacb 100644 --- a/config/src/main/java/com/typesafe/config/ConfigParseable.java +++ b/config/src/main/java/com/typesafe/config/ConfigParseable.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** diff --git a/config/src/main/java/com/typesafe/config/ConfigRenderOptions.java b/config/src/main/java/com/typesafe/config/ConfigRenderOptions.java index 7b07fabd..07cde979 100644 --- a/config/src/main/java/com/typesafe/config/ConfigRenderOptions.java +++ b/config/src/main/java/com/typesafe/config/ConfigRenderOptions.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** *

diff --git a/config/src/main/java/com/typesafe/config/ConfigResolveOptions.java b/config/src/main/java/com/typesafe/config/ConfigResolveOptions.java index 2b714041..61e0c700 100644 --- a/config/src/main/java/com/typesafe/config/ConfigResolveOptions.java +++ b/config/src/main/java/com/typesafe/config/ConfigResolveOptions.java @@ -1,12 +1,12 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * A set of options related to resolving substitutions. Substitutions use the * ${foo.bar} syntax and are documented in the HOCON + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">HOCON * spec. *

* Typically this class would be used with the method diff --git a/config/src/main/java/com/typesafe/config/ConfigSyntax.java b/config/src/main/java/com/typesafe/config/ConfigSyntax.java index ed560296..c0b59565 100644 --- a/config/src/main/java/com/typesafe/config/ConfigSyntax.java +++ b/config/src/main/java/com/typesafe/config/ConfigSyntax.java @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * The syntax of a character stream (JSON, HOCON + * href="https://github.com.twitter_typesafehub/config/blob/master/HOCON.md">HOCON * aka ".conf", or Java properties). @@ -21,7 +21,7 @@ public enum ConfigSyntax { JSON, /** * The JSON-superset HOCON format. Associated with the .conf file extension * and application/hocon Content-Type. */ diff --git a/config/src/main/java/com/typesafe/config/ConfigUtil.java b/config/src/main/java/com/typesafe/config/ConfigUtil.java index 37e394f4..b5145f41 100644 --- a/config/src/main/java/com/typesafe/config/ConfigUtil.java +++ b/config/src/main/java/com/typesafe/config/ConfigUtil.java @@ -1,8 +1,8 @@ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.util.List; -import com.typesafe.config.impl.ConfigImplUtil; +import com.twitter_typesafe.config.impl.ConfigImplUtil; /** * Contains static utility methods. diff --git a/config/src/main/java/com/typesafe/config/ConfigValue.java b/config/src/main/java/com/typesafe/config/ConfigValue.java index b507a616..77f24267 100644 --- a/config/src/main/java/com/typesafe/config/ConfigValue.java +++ b/config/src/main/java/com/typesafe/config/ConfigValue.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * An immutable value, following the JSON type diff --git a/config/src/main/java/com/typesafe/config/ConfigValueFactory.java b/config/src/main/java/com/typesafe/config/ConfigValueFactory.java index 38abd0f4..b06feb9b 100644 --- a/config/src/main/java/com/typesafe/config/ConfigValueFactory.java +++ b/config/src/main/java/com/typesafe/config/ConfigValueFactory.java @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; import java.util.Map; -import com.typesafe.config.impl.ConfigImpl; +import com.twitter_typesafe.config.impl.ConfigImpl; /** * This class holds some static factory methods for building {@link ConfigValue} diff --git a/config/src/main/java/com/typesafe/config/ConfigValueType.java b/config/src/main/java/com/typesafe/config/ConfigValueType.java index a15774d3..bb922b9c 100644 --- a/config/src/main/java/com/typesafe/config/ConfigValueType.java +++ b/config/src/main/java/com/typesafe/config/ConfigValueType.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config; +package com.twitter_typesafe.config; /** * The type of a configuration value (following the */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.parser.ConfigNode; +import com.twitter_typesafe.config.parser.ConfigNode; import java.util.Collection; abstract class AbstractConfigNode implements ConfigNode { diff --git a/config/src/main/java/com/typesafe/config/impl/AbstractConfigNodeValue.java b/config/src/main/java/com/typesafe/config/impl/AbstractConfigNodeValue.java index 107e6679..84902eb2 100644 --- a/config/src/main/java/com/typesafe/config/impl/AbstractConfigNodeValue.java +++ b/config/src/main/java/com/typesafe/config/impl/AbstractConfigNodeValue.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; // This is required if we want // to be referencing the AbstractConfigNode class in implementation rather than the diff --git a/config/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java b/config/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java index a98515de..f634db3d 100644 --- a/config/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java +++ b/config/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Arrays; @@ -9,13 +9,13 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigMergeable; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValue; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigMergeable; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigValueType; abstract class AbstractConfigObject extends AbstractConfigValue implements ConfigObject, Container { final private SimpleConfig config; diff --git a/config/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java b/config/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java index 90db9242..1fbeb3c5 100644 --- a/config/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java +++ b/config/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Collection; @@ -9,12 +9,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigMergeable; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigMergeable; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValue; /** * diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigBeanImpl.java b/config/src/main/java/com/typesafe/config/impl/ConfigBeanImpl.java index f53ab5f0..c4cbfddd 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigBeanImpl.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigBeanImpl.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.beans.BeanInfo; import java.beans.IntrospectionException; @@ -14,17 +14,17 @@ import java.util.List; import java.util.Map; import java.time.Duration; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigList; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigMemorySize; -import com.typesafe.config.ConfigValue; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.Config; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigList; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigMemorySize; +import com.twitter_typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigValueType; /** * Internal implementation detail, not ABI stable, do not touch. - * For use only by the {@link com.typesafe.config} package. + * For use only by the {@link com.twitter_typesafe.config} package. */ public class ConfigBeanImpl { @@ -252,4 +252,4 @@ public class ConfigBeanImpl { return false; } -} \ No newline at end of file +} diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigBoolean.java b/config/src/main/java/com/typesafe/config/impl/ConfigBoolean.java index 46f0d30c..263a43bb 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigBoolean.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigBoolean.java @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigValueType; final class ConfigBoolean extends AbstractConfigValue implements Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigConcatenation.java b/config/src/main/java/com/typesafe/config/impl/ConfigConcatenation.java index 1ed7b94c..1bbbb607 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigConcatenation.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigConcatenation.java @@ -1,15 +1,15 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValueType; /** * A ConfigConcatenation represents a list of values to be concatenated (see the diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java b/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java index 56a0a390..7bb0d7ab 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigConditional.java @@ -1,10 +1,10 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; import java.util.Map; -public class ConfigConditional { +final class ConfigConditional { private SubstitutionExpression left; private AbstractConfigValue right; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java index e67a5fff..6a8ad7e6 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java @@ -1,17 +1,17 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValueType; /** * The issue here is that we want to first merge our stack of config files, and @@ -339,4 +339,4 @@ final class ConfigDelayedMerge extends AbstractConfigValue implements Unmergeabl sb.append("# ) end of unresolved merge\n"); } } -} \ No newline at end of file +} diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java index 7aa3ef97..23a62b6f 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Collection; @@ -9,12 +9,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigList; -import com.typesafe.config.ConfigMergeable; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigList; +import com.twitter_typesafe.config.ConfigMergeable; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValue; // This is just like ConfigDelayedMerge except we know statically // that it will turn out to be an object. diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigDocumentParser.java b/config/src/main/java/com/typesafe/config/impl/ConfigDocumentParser.java index 42735ce3..4b4ee33e 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigDocumentParser.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigDocumentParser.java @@ -1,11 +1,11 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.*; -import com.typesafe.config.*; +import com.twitter_typesafe.config.*; final class ConfigDocumentParser { static ConfigNodeRoot parse(Iterator tokens, ConfigOrigin origin, ConfigParseOptions options) { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigDouble.java b/config/src/main/java/com/typesafe/config/impl/ConfigDouble.java index 9a97f4ee..5e8e6134 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigDouble.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigDouble.java @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigValueType; final class ConfigDouble extends ConfigNumber implements Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java b/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java index e441204a..7267e6c6 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.File; import java.lang.ref.WeakReference; @@ -16,20 +16,20 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Callable; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigIncluder; -import com.typesafe.config.ConfigMemorySize; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigParseOptions; -import com.typesafe.config.ConfigParseable; -import com.typesafe.config.ConfigValue; -import com.typesafe.config.impl.SimpleIncluder.NameSource; +import com.twitter_typesafe.config.Config; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigIncluder; +import com.twitter_typesafe.config.ConfigMemorySize; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigParseOptions; +import com.twitter_typesafe.config.ConfigParseable; +import com.twitter_typesafe.config.ConfigValue; +import com.twitter_typesafe.config.impl.SimpleIncluder.NameSource; /** * Internal implementation detail, not ABI stable, do not touch. - * For use only by the {@link com.typesafe.config} package. + * For use only by the {@link com.twitter_typesafe.config} package. */ public class ConfigImpl { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigImplUtil.java b/config/src/main/java/com/typesafe/config/impl/ConfigImplUtil.java index 26f0ffcf..7a06e224 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigImplUtil.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigImplUtil.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.DataOutputStream; import java.io.File; @@ -13,12 +13,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; /** * Internal implementation detail, not ABI stable, do not touch. - * For use only by the {@link com.typesafe.config} package. + * For use only by the {@link com.twitter_typesafe.config} package. */ final public class ConfigImplUtil { static boolean equalsHandlingNull(Object a, Object b) { @@ -233,4 +233,4 @@ final public class ConfigImplUtil { } return nameBuilder.toString(); } -} \ No newline at end of file +} diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigIncludeKind.java b/config/src/main/java/com/typesafe/config/impl/ConfigIncludeKind.java index 65d596fb..78f21495 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigIncludeKind.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigIncludeKind.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; enum ConfigIncludeKind { URL, FILE, CLASSPATH, HEURISTIC diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigInt.java b/config/src/main/java/com/typesafe/config/impl/ConfigInt.java index 5f9e1f04..be98566f 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigInt.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigInt.java @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigValueType; final class ConfigInt extends ConfigNumber implements Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigLong.java b/config/src/main/java/com/typesafe/config/impl/ConfigLong.java index 90087d58..551564e6 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigLong.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigLong.java @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigValueType; final class ConfigLong extends ConfigNumber implements Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeArray.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeArray.java index 46500b52..7cbe4e92 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeArray.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeArray.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeComment.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeComment.java index b8371907..6b519a42 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeComment.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeComment.java @@ -1,7 +1,7 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; final class ConfigNodeComment extends ConfigNodeSingleToken { ConfigNodeComment(Token comment) { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeComplexValue.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeComplexValue.java index c899ee01..9ba5f3e7 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeComplexValue.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeComplexValue.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.*; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeConcatenation.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeConcatenation.java index 419cea6b..b3527c2a 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeConcatenation.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeConcatenation.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java index ad95bb4a..3d9b3bdf 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeField.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeField.java index 10ba3742..5db10ae6 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeField.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeField.java @@ -1,9 +1,9 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; import java.util.ArrayList; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeInclude.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeInclude.java index 467c2b08..6bc94c49 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeInclude.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeInclude.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeObject.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeObject.java index 1f2aae96..db119a78 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeObject.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeObject.java @@ -1,6 +1,6 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigSyntax; +import com.twitter_typesafe.config.ConfigSyntax; import java.util.ArrayList; import java.util.Collection; @@ -278,4 +278,4 @@ final class ConfigNodeObject extends ConfigNodeComplexValue { Path path = PathParser.parsePathNode(desiredPath, flavor).value(); return changeValueOnPath(path, null, flavor); } -} \ No newline at end of file +} diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodePath.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodePath.java index 00b866df..fddd95d8 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodePath.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodePath.java @@ -1,9 +1,9 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; import java.util.ArrayList; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeRoot.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeRoot.java index c84c16f5..f3d36b42 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeRoot.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeRoot.java @@ -1,8 +1,8 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigSyntax; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigSyntax; import java.util.ArrayList; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeSimpleValue.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeSimpleValue.java index 5165b20e..95d791ea 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeSimpleValue.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeSimpleValue.java @@ -1,9 +1,9 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; import java.util.Collection; import java.util.Collections; diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNodeSingleToken.java b/config/src/main/java/com/typesafe/config/impl/ConfigNodeSingleToken.java index 4c63195a..2c88a32a 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNodeSingleToken.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNodeSingleToken.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Collection; import java.util.Collections; @@ -18,4 +18,4 @@ class ConfigNodeSingleToken extends AbstractConfigNode { } protected Token token() { return token; } -} \ No newline at end of file +} diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNull.java b/config/src/main/java/com/typesafe/config/impl/ConfigNull.java index 38e3651d..e664ad5c 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNull.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNull.java @@ -1,14 +1,14 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValueType; /** * This exists because sometimes null is not the same as missing. Specifically, diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigNumber.java b/config/src/main/java/com/typesafe/config/impl/ConfigNumber.java index a90b89b9..62c74b0a 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigNumber.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigNumber.java @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; abstract class ConfigNumber extends AbstractConfigValue implements Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigParser.java b/config/src/main/java/com/typesafe/config/impl/ConfigParser.java index 9beafc06..6b4545b1 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigParser.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigParser.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.File; import java.net.MalformedURLException; @@ -14,7 +14,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import com.typesafe.config.*; +import com.twitter_typesafe.config.*; final class ConfigParser { static AbstractConfigValue parse(ConfigNodeRoot document, diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigReference.java b/config/src/main/java/com/typesafe/config/impl/ConfigReference.java index 8d3c7c0c..51ac1ef6 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigReference.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigReference.java @@ -1,12 +1,12 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Collection; import java.util.Collections; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValueType; /** * ConfigReference replaces ConfigReference (the older class kept for back diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigString.java b/config/src/main/java/com/typesafe/config/impl/ConfigString.java index 89cc2789..e2620e2a 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigString.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigString.java @@ -1,14 +1,14 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValueType; abstract class ConfigString extends AbstractConfigValue implements Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/Container.java b/config/src/main/java/com/typesafe/config/impl/Container.java index 73a40391..461e8117 100644 --- a/config/src/main/java/com/typesafe/config/impl/Container.java +++ b/config/src/main/java/com/typesafe/config/impl/Container.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2014 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; /** * An AbstractConfigValue which contains other values. Java has no way to @@ -9,7 +9,7 @@ package com.typesafe.config.impl; * AbstractConfigValue an interface which would be aggravating. But we can say * we are a ConfigValue. */ -interface Container extends com.typesafe.config.ConfigValue { +interface Container extends com.twitter_typesafe.config.ConfigValue { /** * Replace a child of this value. CAUTION if replacement is null, delete the * child, which may also delete the parent, or make the parent into a diff --git a/config/src/main/java/com/typesafe/config/impl/DefaultTransformer.java b/config/src/main/java/com/typesafe/config/impl/DefaultTransformer.java index b51ceb25..0a19f2c8 100644 --- a/config/src/main/java/com/typesafe/config/impl/DefaultTransformer.java +++ b/config/src/main/java/com/typesafe/config/impl/DefaultTransformer.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.ArrayList; import java.util.Collections; @@ -9,7 +9,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Map; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigValueType; /** * Default automatic type transformations. diff --git a/config/src/main/java/com/typesafe/config/impl/FromMapMode.java b/config/src/main/java/com/typesafe/config/impl/FromMapMode.java index 764a4566..9d21e173 100644 --- a/config/src/main/java/com/typesafe/config/impl/FromMapMode.java +++ b/config/src/main/java/com/typesafe/config/impl/FromMapMode.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; enum FromMapMode { KEYS_ARE_PATHS, KEYS_ARE_KEYS diff --git a/config/src/main/java/com/typesafe/config/impl/FullIncluder.java b/config/src/main/java/com/typesafe/config/impl/FullIncluder.java index cd6c9adf..5deeec9f 100644 --- a/config/src/main/java/com/typesafe/config/impl/FullIncluder.java +++ b/config/src/main/java/com/typesafe/config/impl/FullIncluder.java @@ -1,12 +1,12 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigIncluder; -import com.typesafe.config.ConfigIncluderClasspath; -import com.typesafe.config.ConfigIncluderFile; -import com.typesafe.config.ConfigIncluderURL; +import com.twitter_typesafe.config.ConfigIncluder; +import com.twitter_typesafe.config.ConfigIncluderClasspath; +import com.twitter_typesafe.config.ConfigIncluderFile; +import com.twitter_typesafe.config.ConfigIncluderURL; interface FullIncluder extends ConfigIncluder, ConfigIncluderFile, ConfigIncluderURL, ConfigIncluderClasspath { diff --git a/config/src/main/java/com/typesafe/config/impl/MemoKey.java b/config/src/main/java/com/typesafe/config/impl/MemoKey.java index cd843dad..48a4b14e 100644 --- a/config/src/main/java/com/typesafe/config/impl/MemoKey.java +++ b/config/src/main/java/com/typesafe/config/impl/MemoKey.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; /** The key used to memoize already-traversed nodes when resolving substitutions */ final class MemoKey { diff --git a/config/src/main/java/com/typesafe/config/impl/MergeableValue.java b/config/src/main/java/com/typesafe/config/impl/MergeableValue.java index 38dba70c..33f7a3d8 100644 --- a/config/src/main/java/com/typesafe/config/impl/MergeableValue.java +++ b/config/src/main/java/com/typesafe/config/impl/MergeableValue.java @@ -1,7 +1,7 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigMergeable; -import com.typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigMergeable; +import com.twitter_typesafe.config.ConfigValue; interface MergeableValue extends ConfigMergeable { // converts a Config to its root object and a ConfigValue to itself diff --git a/config/src/main/java/com/typesafe/config/impl/OriginType.java b/config/src/main/java/com/typesafe/config/impl/OriginType.java index c78b5ee0..91b190e5 100644 --- a/config/src/main/java/com/typesafe/config/impl/OriginType.java +++ b/config/src/main/java/com/typesafe/config/impl/OriginType.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; // caution: ordinals used in serialization enum OriginType { diff --git a/config/src/main/java/com/typesafe/config/impl/Parseable.java b/config/src/main/java/com/typesafe/config/impl/Parseable.java index 9f66af19..8f4b9cd3 100644 --- a/config/src/main/java/com/typesafe/config/impl/Parseable.java +++ b/config/src/main/java/com/typesafe/config/impl/Parseable.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.BufferedReader; import java.io.File; @@ -21,12 +21,12 @@ import java.net.URL; import java.net.URLConnection; import java.util.*; -import com.typesafe.config.*; -import com.typesafe.config.parser.*; +import com.twitter_typesafe.config.*; +import com.twitter_typesafe.config.parser.*; /** * Internal implementation detail, not ABI stable, do not touch. - * For use only by the {@link com.typesafe.config} package. + * For use only by the {@link com.twitter_typesafe.config} package. * The point of this class is to avoid "propagating" each * overload on "thing which can be parsed" through multiple * interfaces. Most interfaces can have just one overload that diff --git a/config/src/main/java/com/typesafe/config/impl/Path.java b/config/src/main/java/com/typesafe/config/impl/Path.java index d39a57c6..9b94a389 100644 --- a/config/src/main/java/com/typesafe/config/impl/Path.java +++ b/config/src/main/java/com/typesafe/config/impl/Path.java @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.*; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; final class Path { diff --git a/config/src/main/java/com/typesafe/config/impl/PathBuilder.java b/config/src/main/java/com/typesafe/config/impl/PathBuilder.java index ede6c663..76fcb900 100644 --- a/config/src/main/java/com/typesafe/config/impl/PathBuilder.java +++ b/config/src/main/java/com/typesafe/config/impl/PathBuilder.java @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Stack; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; final class PathBuilder { // the keys are kept "backward" (top of stack is end of path) diff --git a/config/src/main/java/com/typesafe/config/impl/PathParser.java b/config/src/main/java/com/typesafe/config/impl/PathParser.java index 8961cb71..7e052eb8 100644 --- a/config/src/main/java/com/typesafe/config/impl/PathParser.java +++ b/config/src/main/java/com/typesafe/config/impl/PathParser.java @@ -1,12 +1,12 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigSyntax; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigSyntax; +import com.twitter_typesafe.config.ConfigValueType; import java.io.StringReader; import java.util.*; diff --git a/config/src/main/java/com/typesafe/config/impl/PropertiesParser.java b/config/src/main/java/com/typesafe/config/impl/PropertiesParser.java index 5bc630da..639fc14a 100644 --- a/config/src/main/java/com/typesafe/config/impl/PropertiesParser.java +++ b/config/src/main/java/com/typesafe/config/impl/PropertiesParser.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.IOException; import java.io.Reader; @@ -15,8 +15,8 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; final class PropertiesParser { static AbstractConfigObject parse(Reader reader, diff --git a/config/src/main/java/com/typesafe/config/impl/ReplaceableMergeStack.java b/config/src/main/java/com/typesafe/config/impl/ReplaceableMergeStack.java index 8425a5a3..85eba20c 100644 --- a/config/src/main/java/com/typesafe/config/impl/ReplaceableMergeStack.java +++ b/config/src/main/java/com/typesafe/config/impl/ReplaceableMergeStack.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; /** * Implemented by a merge stack (ConfigDelayedMerge, ConfigDelayedMergeObject) diff --git a/config/src/main/java/com/typesafe/config/impl/ResolveContext.java b/config/src/main/java/com/typesafe/config/impl/ResolveContext.java index cf669912..f0c7ec90 100644 --- a/config/src/main/java/com/typesafe/config/impl/ResolveContext.java +++ b/config/src/main/java/com/typesafe/config/impl/ResolveContext.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Collections; import java.util.IdentityHashMap; @@ -6,9 +6,9 @@ import java.util.List; import java.util.ArrayList; import java.util.Set; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigResolveOptions; -import com.typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigResolveOptions; +import com.twitter_typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve; final class ResolveContext { final private ResolveMemos memos; diff --git a/config/src/main/java/com/typesafe/config/impl/ResolveMemos.java b/config/src/main/java/com/typesafe/config/impl/ResolveMemos.java index cf98a900..f271a0cc 100644 --- a/config/src/main/java/com/typesafe/config/impl/ResolveMemos.java +++ b/config/src/main/java/com/typesafe/config/impl/ResolveMemos.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.HashMap; import java.util.Map; diff --git a/config/src/main/java/com/typesafe/config/impl/ResolveResult.java b/config/src/main/java/com/typesafe/config/impl/ResolveResult.java index 28e26c00..4fa805c2 100644 --- a/config/src/main/java/com/typesafe/config/impl/ResolveResult.java +++ b/config/src/main/java/com/typesafe/config/impl/ResolveResult.java @@ -1,6 +1,6 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigException; // value is allowed to be null final class ResolveResult { diff --git a/config/src/main/java/com/typesafe/config/impl/ResolveSource.java b/config/src/main/java/com/typesafe/config/impl/ResolveSource.java index 6b864dd9..1886e168 100644 --- a/config/src/main/java/com/typesafe/config/impl/ResolveSource.java +++ b/config/src/main/java/com/typesafe/config/impl/ResolveSource.java @@ -1,7 +1,7 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; -import com.typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.impl.AbstractConfigValue.NotPossibleToResolve; /** * This class is the source for values for a substitution like ${foo}. diff --git a/config/src/main/java/com/typesafe/config/impl/ResolveStatus.java b/config/src/main/java/com/typesafe/config/impl/ResolveStatus.java index 96fd5625..d1af3249 100644 --- a/config/src/main/java/com/typesafe/config/impl/ResolveStatus.java +++ b/config/src/main/java/com/typesafe/config/impl/ResolveStatus.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/impl/SerializedConfigValue.java b/config/src/main/java/com/typesafe/config/impl/SerializedConfigValue.java index 4dc1747a..c2b9f9f6 100644 --- a/config/src/main/java/com/typesafe/config/impl/SerializedConfigValue.java +++ b/config/src/main/java/com/typesafe/config/impl/SerializedConfigValue.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ByteArrayOutputStream; import java.io.DataInput; @@ -20,13 +20,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigList; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigValue; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.Config; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigList; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigValueType; /** * Deliberately shoving all the serialization code into this class instead of diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleConfig.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfig.java index 2d76efb6..de9c8d21 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleConfig.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleConfig.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; @@ -17,16 +17,16 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigList; -import com.typesafe.config.ConfigMemorySize; -import com.typesafe.config.ConfigMergeable; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigResolveOptions; -import com.typesafe.config.ConfigValue; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.Config; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigList; +import com.twitter_typesafe.config.ConfigMemorySize; +import com.twitter_typesafe.config.ConfigMergeable; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigResolveOptions; +import com.twitter_typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigValueType; /** * One thing to keep in mind in the future: as Collection-like APIs are added diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleConfigDocument.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigDocument.java index 86f56d99..b6cb261a 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleConfigDocument.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleConfigDocument.java @@ -1,7 +1,7 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.*; -import com.typesafe.config.parser.ConfigDocument; +import com.twitter_typesafe.config.*; +import com.twitter_typesafe.config.parser.ConfigDocument; import java.io.StringReader; import java.util.Iterator; @@ -60,4 +60,4 @@ final class SimpleConfigDocument implements ConfigDocument { public int hashCode() { return render().hashCode(); } -} \ No newline at end of file +} diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java index 31f088f6..55a86542 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; @@ -11,12 +11,12 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigList; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValue; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigList; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigValueType; final class SimpleConfigList extends AbstractConfigValue implements ConfigList, Container, Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java index 7f437f37..9f901f34 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.ObjectStreamException; import java.io.Serializable; @@ -16,11 +16,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigRenderOptions; -import com.typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigRenderOptions; +import com.twitter_typesafe.config.ConfigValue; final class SimpleConfigObject extends AbstractConfigObject implements Serializable { diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java index a3dc3e4d..66c046af 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.File; import java.io.IOException; @@ -15,9 +15,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.impl.SerializedConfigValue.SerializedField; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.impl.SerializedConfigValue.SerializedField; // it would be cleaner to have a class hierarchy for various origin types, // but was hoping this would be enough simpler to be a little messy. eh. diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleIncludeContext.java b/config/src/main/java/com/typesafe/config/impl/SimpleIncludeContext.java index 73ef3004..c983e36a 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleIncludeContext.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleIncludeContext.java @@ -1,11 +1,11 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigIncludeContext; -import com.typesafe.config.ConfigParseOptions; -import com.typesafe.config.ConfigParseable; +import com.twitter_typesafe.config.ConfigIncludeContext; +import com.twitter_typesafe.config.ConfigParseOptions; +import com.twitter_typesafe.config.ConfigParseable; class SimpleIncludeContext implements ConfigIncludeContext { diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java b/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java index 2cde2f92..0fcfa6bd 100644 --- a/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java +++ b/config/src/main/java/com/typesafe/config/impl/SimpleIncluder.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.File; import java.net.MalformedURLException; @@ -9,17 +9,17 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigFactory; -import com.typesafe.config.ConfigIncludeContext; -import com.typesafe.config.ConfigIncluder; -import com.typesafe.config.ConfigIncluderClasspath; -import com.typesafe.config.ConfigIncluderFile; -import com.typesafe.config.ConfigIncluderURL; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigParseOptions; -import com.typesafe.config.ConfigParseable; -import com.typesafe.config.ConfigSyntax; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigFactory; +import com.twitter_typesafe.config.ConfigIncludeContext; +import com.twitter_typesafe.config.ConfigIncluder; +import com.twitter_typesafe.config.ConfigIncluderClasspath; +import com.twitter_typesafe.config.ConfigIncluderFile; +import com.twitter_typesafe.config.ConfigIncluderURL; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigParseOptions; +import com.twitter_typesafe.config.ConfigParseable; +import com.twitter_typesafe.config.ConfigSyntax; class SimpleIncluder implements FullIncluder { diff --git a/config/src/main/java/com/typesafe/config/impl/SubstitutionExpression.java b/config/src/main/java/com/typesafe/config/impl/SubstitutionExpression.java index d839bd65..7bf1b974 100644 --- a/config/src/main/java/com/typesafe/config/impl/SubstitutionExpression.java +++ b/config/src/main/java/com/typesafe/config/impl/SubstitutionExpression.java @@ -1,4 +1,4 @@ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; final class SubstitutionExpression { diff --git a/config/src/main/java/com/typesafe/config/impl/Token.java b/config/src/main/java/com/typesafe/config/impl/Token.java index af1321a3..3f660ade 100644 --- a/config/src/main/java/com/typesafe/config/impl/Token.java +++ b/config/src/main/java/com/typesafe/config/impl/Token.java @@ -1,10 +1,10 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; class Token { final private TokenType tokenType; diff --git a/config/src/main/java/com/typesafe/config/impl/TokenType.java b/config/src/main/java/com/typesafe/config/impl/TokenType.java index c095c65d..0df8ca4c 100644 --- a/config/src/main/java/com/typesafe/config/impl/TokenType.java +++ b/config/src/main/java/com/typesafe/config/impl/TokenType.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; enum TokenType { START, diff --git a/config/src/main/java/com/typesafe/config/impl/Tokenizer.java b/config/src/main/java/com/typesafe/config/impl/Tokenizer.java index f1e61a34..e93cb2a7 100644 --- a/config/src/main/java/com/typesafe/config/impl/Tokenizer.java +++ b/config/src/main/java/com/typesafe/config/impl/Tokenizer.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.io.IOException; import java.io.Reader; @@ -11,9 +11,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigSyntax; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigSyntax; final class Tokenizer { // this exception should not leave this file diff --git a/config/src/main/java/com/typesafe/config/impl/Tokens.java b/config/src/main/java/com/typesafe/config/impl/Tokens.java index ef2061c6..6d3c7d2e 100644 --- a/config/src/main/java/com/typesafe/config/impl/Tokens.java +++ b/config/src/main/java/com/typesafe/config/impl/Tokens.java @@ -1,13 +1,13 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.List; -import com.typesafe.config.ConfigException; -import com.typesafe.config.ConfigOrigin; -import com.typesafe.config.ConfigValueType; +import com.twitter_typesafe.config.ConfigException; +import com.twitter_typesafe.config.ConfigOrigin; +import com.twitter_typesafe.config.ConfigValueType; /* FIXME the way the subclasses of Token are private with static isFoo and accessors is kind of ridiculous. */ final class Tokens { diff --git a/config/src/main/java/com/typesafe/config/impl/Unmergeable.java b/config/src/main/java/com/typesafe/config/impl/Unmergeable.java index 0028f2e0..287be6b0 100644 --- a/config/src/main/java/com/typesafe/config/impl/Unmergeable.java +++ b/config/src/main/java/com/typesafe/config/impl/Unmergeable.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2011-2012 Typesafe Inc. */ -package com.typesafe.config.impl; +package com.twitter_typesafe.config.impl; import java.util.Collection; diff --git a/config/src/main/java/com/typesafe/config/parser/ConfigDocument.java b/config/src/main/java/com/typesafe/config/parser/ConfigDocument.java index e8ca605b..3f04ae49 100644 --- a/config/src/main/java/com/typesafe/config/parser/ConfigDocument.java +++ b/config/src/main/java/com/typesafe/config/parser/ConfigDocument.java @@ -1,6 +1,6 @@ -package com.typesafe.config.parser; +package com.twitter_typesafe.config.parser; -import com.typesafe.config.ConfigValue; +import com.twitter_typesafe.config.ConfigValue; /** * Represents an individual HOCON or JSON file, preserving all diff --git a/config/src/main/java/com/typesafe/config/parser/ConfigDocumentFactory.java b/config/src/main/java/com/typesafe/config/parser/ConfigDocumentFactory.java index 223a5a13..5f705612 100644 --- a/config/src/main/java/com/typesafe/config/parser/ConfigDocumentFactory.java +++ b/config/src/main/java/com/typesafe/config/parser/ConfigDocumentFactory.java @@ -1,15 +1,15 @@ -package com.typesafe.config.parser; +package com.twitter_typesafe.config.parser; -import com.typesafe.config.ConfigParseOptions; +import com.twitter_typesafe.config.ConfigParseOptions; -import com.typesafe.config.impl.Parseable; +import com.twitter_typesafe.config.impl.Parseable; import java.io.File; import java.io.Reader; /** * Factory for creating {@link - * com.typesafe.config.parser.ConfigDocument} instances. + * com.twitter_typesafe.config.parser.ConfigDocument} instances. */ public final class ConfigDocumentFactory { @@ -21,7 +21,7 @@ public final class ConfigDocumentFactory { * @param options * parse options to control how the reader is interpreted * @return the parsed configuration - * @throws com.typesafe.config.ConfigException on IO or parse errors + * @throws com.twitter_typesafe.config.ConfigException on IO or parse errors */ public static ConfigDocument parseReader(Reader reader, ConfigParseOptions options) { return Parseable.newReader(reader, options).parseConfigDocument(); @@ -35,7 +35,7 @@ public final class ConfigDocumentFactory { * @param reader * the reader to parse * @return the parsed configuration - * @throws com.typesafe.config.ConfigException on IO or parse errors + * @throws com.twitter_typesafe.config.ConfigException on IO or parse errors */ public static ConfigDocument parseReader(Reader reader) { return parseReader(reader, ConfigParseOptions.defaults()); @@ -49,7 +49,7 @@ public final class ConfigDocumentFactory { * @param options * parse options to control how the file is interpreted * @return the parsed configuration - * @throws com.typesafe.config.ConfigException on IO or parse errors + * @throws com.twitter_typesafe.config.ConfigException on IO or parse errors */ public static ConfigDocument parseFile(File file, ConfigParseOptions options) { return Parseable.newFile(file, options).parseConfigDocument(); @@ -63,7 +63,7 @@ public final class ConfigDocumentFactory { * @param file * the file to parse * @return the parsed configuration - * @throws com.typesafe.config.ConfigException on IO or parse errors + * @throws com.twitter_typesafe.config.ConfigException on IO or parse errors */ public static ConfigDocument parseFile(File file) { return parseFile(file, ConfigParseOptions.defaults()); diff --git a/config/src/main/java/com/typesafe/config/parser/ConfigNode.java b/config/src/main/java/com/typesafe/config/parser/ConfigNode.java index 43ac3f51..15e1d6ef 100644 --- a/config/src/main/java/com/typesafe/config/parser/ConfigNode.java +++ b/config/src/main/java/com/typesafe/config/parser/ConfigNode.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.parser; +package com.twitter_typesafe.config.parser; /** * A node in the syntax tree for a HOCON or JSON document. @@ -10,8 +10,8 @@ package com.typesafe.config.parser; * Note: at present there is no way to obtain an instance of this interface, so * please ignore it. A future release will make syntax tree nodes available in * the public API. If you are interested in working on it, please see: https://github.com/typesafehub/config/issues/300 + * href="https://github.com.twitter_typesafehub/config/issues/300" + * >https://github.com.twitter_typesafehub/config/issues/300 * *

* Because this object is immutable, it is safe to use from multiple threads and diff --git a/config/src/test/java/beanconfig/ArraysConfig.java b/config/src/test/java/beanconfig/ArraysConfig.java index 155ec5bc..195f5a2d 100644 --- a/config/src/test/java/beanconfig/ArraysConfig.java +++ b/config/src/test/java/beanconfig/ArraysConfig.java @@ -3,10 +3,10 @@ package beanconfig; import java.util.List; import java.time.Duration; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigMemorySize; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigValue; +import com.twitter_typesafe.config.Config; +import com.twitter_typesafe.config.ConfigMemorySize; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigValue; public class ArraysConfig { @@ -136,4 +136,4 @@ public class ArraysConfig { public void setOfStringBean(List ofStringBean) { this.ofStringBean = ofStringBean; } -} \ No newline at end of file +} diff --git a/config/src/test/java/beanconfig/BytesConfig.java b/config/src/test/java/beanconfig/BytesConfig.java index 975cb2ed..aa988710 100644 --- a/config/src/test/java/beanconfig/BytesConfig.java +++ b/config/src/test/java/beanconfig/BytesConfig.java @@ -1,6 +1,6 @@ package beanconfig; -import com.typesafe.config.ConfigMemorySize; +import com.twitter_typesafe.config.ConfigMemorySize; public class BytesConfig { diff --git a/config/src/test/java/beanconfig/StringsConfig.java b/config/src/test/java/beanconfig/StringsConfig.java index fce28bfd..334fb116 100644 --- a/config/src/test/java/beanconfig/StringsConfig.java +++ b/config/src/test/java/beanconfig/StringsConfig.java @@ -42,4 +42,4 @@ public class StringsConfig { public String toString() { return "StringsConfig(" + abcd + "," + yes + ")"; } -} \ No newline at end of file +} diff --git a/config/src/test/java/beanconfig/UnsupportedListElementConfig.java b/config/src/test/java/beanconfig/UnsupportedListElementConfig.java index 3ce68f8a..161641a1 100644 --- a/config/src/test/java/beanconfig/UnsupportedListElementConfig.java +++ b/config/src/test/java/beanconfig/UnsupportedListElementConfig.java @@ -13,4 +13,4 @@ public class UnsupportedListElementConfig { public void setUri(List uri) { this.uri = uri; } -} \ No newline at end of file +} diff --git a/config/src/test/java/beanconfig/UnsupportedMapKeyConfig.java b/config/src/test/java/beanconfig/UnsupportedMapKeyConfig.java index 52e8b4bd..ca9ee6bd 100644 --- a/config/src/test/java/beanconfig/UnsupportedMapKeyConfig.java +++ b/config/src/test/java/beanconfig/UnsupportedMapKeyConfig.java @@ -13,4 +13,4 @@ public class UnsupportedMapKeyConfig { this.map = map; } -} \ No newline at end of file +} diff --git a/config/src/test/java/beanconfig/UnsupportedMapValueConfig.java b/config/src/test/java/beanconfig/UnsupportedMapValueConfig.java index 97a5af63..600b6214 100644 --- a/config/src/test/java/beanconfig/UnsupportedMapValueConfig.java +++ b/config/src/test/java/beanconfig/UnsupportedMapValueConfig.java @@ -13,4 +13,4 @@ public class UnsupportedMapValueConfig { this.map = map; } -} \ No newline at end of file +} diff --git a/config/src/test/java/beanconfig/ValuesConfig.java b/config/src/test/java/beanconfig/ValuesConfig.java index f0a0eb7b..30a41794 100644 --- a/config/src/test/java/beanconfig/ValuesConfig.java +++ b/config/src/test/java/beanconfig/ValuesConfig.java @@ -2,10 +2,10 @@ package beanconfig; import java.util.Map; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigList; -import com.typesafe.config.ConfigObject; -import com.typesafe.config.ConfigValue; +import com.twitter_typesafe.config.Config; +import com.twitter_typesafe.config.ConfigList; +import com.twitter_typesafe.config.ConfigObject; +import com.twitter_typesafe.config.ConfigValue; // test bean for various "uncooked" values public class ValuesConfig { diff --git a/config/src/test/scala/ApiExamples.scala b/config/src/test/scala/ApiExamples.scala index 2a6fce76..da58aa65 100644 --- a/config/src/test/scala/ApiExamples.scala +++ b/config/src/test/scala/ApiExamples.scala @@ -3,7 +3,7 @@ */ import org.junit.Assert._ import org.junit._ -import com.typesafe.config._ +import com.twitter_typesafe.config._ import scala.collection.JavaConverters._ import scala.collection.mutable import language.implicitConversions diff --git a/config/src/test/scala/Profiling.scala b/config/src/test/scala/Profiling.scala index 5cd412ef..85913fd3 100644 --- a/config/src/test/scala/Profiling.scala +++ b/config/src/test/scala/Profiling.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigException +import com.twitter_typesafe.config.Config +import com.twitter_typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigException import java.util.concurrent.TimeUnit import scala.annotation.tailrec diff --git a/config/src/test/scala/Rendering.scala b/config/src/test/scala/Rendering.scala index 0d8be469..75b356f4 100644 --- a/config/src/test/scala/Rendering.scala +++ b/config/src/test/scala/Rendering.scala @@ -1,5 +1,5 @@ -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigRenderOptions +import com.twitter_typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigRenderOptions object RenderExample extends App { val formatted = args.contains("--formatted") diff --git a/config/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala index a21c8cb3..ead665e5 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala @@ -1,15 +1,15 @@ /** * Copyright (C) 2012 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigResolveOptions -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigValue +import com.twitter_typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigResolveOptions +import com.twitter_typesafe.config.Config +import com.twitter_typesafe.config.ConfigFactory import scala.collection.JavaConverters._ class ConcatenationTest extends TestUtils { @@ -360,7 +360,7 @@ class ConcatenationTest extends TestUtils { assertTrue(e.getMessage.contains("did not find")) } - // from https://github.com/typesafehub/config/issues/177 + // from https://github.com.twitter_typesafehub/config/issues/177 @Test def arrayConcatenationInDoubleNestedDelayedMerge() { val unresolved = parseConfig("""d { x = [] }, c : ${d}, c { x += 1, x += 2 }""") @@ -368,7 +368,7 @@ class ConcatenationTest extends TestUtils { assertEquals(Seq(1, 2), conf.getIntList("c.x").asScala) } - // from https://github.com/typesafehub/config/issues/177 + // from https://github.com.twitter_typesafehub/config/issues/177 @Test def arrayConcatenationAsPartOfDelayedMerge() { val unresolved = parseConfig(""" c { x: [], x : ${c.x}[1], x : ${c.x}[2] }""") @@ -376,7 +376,7 @@ class ConcatenationTest extends TestUtils { assertEquals(Seq(1, 2), conf.getIntList("c.x").asScala) } - // from https://github.com/typesafehub/config/issues/177 + // from https://github.com.twitter_typesafehub/config/issues/177 @Test def arrayConcatenationInDoubleNestedDelayedMerge2() { val unresolved = parseConfig("""d { x = [] }, c : ${d}, c { x : ${c.x}[1], x : ${c.x}[2] }""") @@ -384,7 +384,7 @@ class ConcatenationTest extends TestUtils { assertEquals(Seq(1, 2), conf.getIntList("c.x").asScala) } - // from https://github.com/typesafehub/config/issues/177 + // from https://github.com.twitter_typesafehub/config/issues/177 @Test def arrayConcatenationInTripleNestedDelayedMerge() { val unresolved = parseConfig("""{ r: { d.x=[] }, q: ${r}, q : { d { x = [] }, c : ${q.d}, c { x : ${q.c.x}[1], x : ${q.c.x}[2] } } }""") diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala index 958da0e7..37d29466 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ import java.io.Reader import java.io.StringReader -import com.typesafe.config._ +import com.twitter_typesafe.config._ import java.util.HashMap import scala.collection.JavaConverters._ import java.io.File diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala index 5c0a8ab7..16096a28 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala @@ -1,9 +1,9 @@ /** * Copyright (C) 2013 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl -import com.typesafe.config._ +import com.twitter_typesafe.config._ import java.io.{ InputStream, InputStreamReader } import java.time.Duration; @@ -209,4 +209,4 @@ class ConfigBeanFactoryTest extends TestUtils { } } -} \ No newline at end of file +} diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala index 20460754..fa76e551 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala @@ -1,6 +1,6 @@ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl -import com.typesafe.config.{ ConfigException, ConfigSyntax, ConfigParseOptions } +import com.twitter_typesafe.config.{ ConfigException, ConfigSyntax, ConfigParseOptions } import org.junit.Assert._ import org.junit.Test diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala index a72a970e..542d06bb 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala @@ -1,10 +1,10 @@ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import java.io.{ BufferedReader, FileReader } import java.nio.file.{ Paths, Files } -import com.typesafe.config._ -import com.typesafe.config.parser._ +import com.twitter_typesafe.config._ +import com.twitter_typesafe.config.parser._ import org.junit.Assert._ import org.junit.Test @@ -455,4 +455,4 @@ class ConfigDocumentTest extends TestUtils { assertEquals("{ a : {\n \"a\" : 1,\n \"b\" : 2\n } }", configDocument.withValue("a", configVal).render) } -} \ No newline at end of file +} diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigMemorySizeTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigMemorySizeTest.scala index f98e6d4f..7748e5e9 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigMemorySizeTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigMemorySizeTest.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2015 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigMemorySize +import com.twitter_typesafe.config.ConfigMemorySize class ConfigMemorySizeTest extends TestUtils { diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigNodeTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigNodeTest.scala index 80b7f71d..db638b7b 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigNodeTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigNodeTest.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit.Test @@ -229,4 +229,4 @@ class ConfigNodeTest extends TestUtils { assertEquals(finalText, newNode.render()) } -} \ No newline at end of file +} diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala index ffbb16fc..f01bd9f9 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala @@ -1,15 +1,15 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigValue -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigResolveOptions -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigValue +import com.twitter_typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigResolveOptions +import com.twitter_typesafe.config.Config +import com.twitter_typesafe.config.ConfigFactory class ConfigSubstitutionTest extends TestUtils { diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala index 2d451540..92ceeea9 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala @@ -1,25 +1,25 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigValue -import com.typesafe.config.Config -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigValue +import com.twitter_typesafe.config.Config +import com.twitter_typesafe.config.ConfigObject +import com.twitter_typesafe.config.ConfigException import java.util.concurrent.TimeUnit import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigResolveOptions +import com.twitter_typesafe.config.ConfigResolveOptions import java.io.File import java.util.concurrent.TimeUnit.{ SECONDS, NANOSECONDS, MICROSECONDS, MILLISECONDS, MINUTES, DAYS, HOURS } -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigMergeable -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigSyntax -import com.typesafe.config.ConfigValueFactory +import com.twitter_typesafe.config.ConfigParseOptions +import com.twitter_typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigMergeable +import com.twitter_typesafe.config.ConfigRenderOptions +import com.twitter_typesafe.config.ConfigSyntax +import com.twitter_typesafe.config.ConfigValueFactory class ConfigTest extends TestUtils { diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala index 9b2ea32d..83960d81 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala @@ -1,22 +1,22 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigValue +import com.twitter_typesafe.config.ConfigValue import java.util.Collections import java.net.URL import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigObject -import com.typesafe.config.ConfigList -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigValueType -import com.typesafe.config.ConfigOrigin -import com.typesafe.config.ConfigRenderOptions -import com.typesafe.config.ConfigValueFactory -import com.typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigObject +import com.twitter_typesafe.config.ConfigList +import com.twitter_typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigValueType +import com.twitter_typesafe.config.ConfigOrigin +import com.twitter_typesafe.config.ConfigRenderOptions +import com.twitter_typesafe.config.ConfigValueFactory +import com.twitter_typesafe.config.ConfigFactory class ConfigValueTest extends TestUtils { @@ -51,10 +51,10 @@ class ConfigValueTest extends TestUtils { @Test def configIntSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_902000000_-050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000009020000002A0002_4_20103" + - "000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_9020000" + + "00_-0500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000009020000" + + "002A0002_4_20103000000010001_x" val a = intValue(42) val b = checkSerializable(expectedSerialization, a) assertEquals(42, b.unwrapped) @@ -74,10 +74,10 @@ class ConfigValueTest extends TestUtils { @Test def configLongSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_E02000000_9050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000015030000000080000029000A" + - "_2_1_4_7_4_8_3_6_8_90103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_E020000" + + "00_90500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000015030000" + + "000080000029000A_2_1_4_7_4_8_3_6_8_90103000000010001_x" val a = longValue(Integer.MAX_VALUE + 42L) val b = checkSerializable(expectedSerialization, a) @@ -111,10 +111,10 @@ class ConfigValueTest extends TestUtils { @Test def configDoubleSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w3F02000000_3050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n09000000010001040000000F0440091EB8_QEB851F0004" + - "_3_._1_40103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w3F020000" + + "00_30500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n09000000010001040000000F044009" + + "1EB8_QEB851F0004_3_._1_40103000000010001_x" val a = doubleValue(3.14) val b = checkSerializable(expectedSerialization, a) @@ -137,9 +137,10 @@ class ConfigValueTest extends TestUtils { @Test def configNullSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_10200000025050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000001000103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_1020000" + + "00250500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000001000103" + + "000000010001_x" val a = nullValue() val b = checkSerializable(expectedSerialization, a) @@ -149,9 +150,10 @@ class ConfigValueTest extends TestUtils { @Test def configBooleanSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_20200000026050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n09000000010001040000000201010103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_2020000" + + "00260500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000002010101" + + "03000000010001_x" val a = boolValue(true) val b = checkSerializable(expectedSerialization, a) @@ -161,10 +163,10 @@ class ConfigValueTest extends TestUtils { @Test def configStringSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_F02000000_:050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000016050013_T_h_e_ _q_u_i_c" + - "_k_ _b_r_o_w_n_ _f_o_x0103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_F020000" + + "00_:0500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n090000000100010400000016050013" + + "_T_h_e_ _q_u_i_c_k_ _b_r_o_w_n_ _f_o_x0103000000010001_x" val a = stringValue("The quick brown fox") val b = checkSerializable(expectedSerialization, a) @@ -215,11 +217,11 @@ class ConfigValueTest extends TestUtils { @Test def java6ConfigObjectSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + - "000101040000000802000000010001_1010001_c050000000101040000000802000000030001_301" + - "0001_b050000000101040000000802000000020001_2010103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z020000" + + "00_n0500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J070000" + + "00030001_a050000000101040000000802000000010001_1010001_b050000000101040000000802" + + "000000020001_2010001_c050000000101040000000802000000030001_3010103000000010001_x" val aMap = configMap("a" -> 1, "b" -> 2, "c" -> 3) val a = new SimpleConfigObject(fakeOrigin(), aMap) @@ -232,11 +234,11 @@ class ConfigValueTest extends TestUtils { @Test def java6ConfigConfigSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + - "000101040000000802000000010001_1010001_c050000000101040000000802000000030001_301" + - "0001_b050000000101040000000802000000020001_2010103000000010101_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z020000" + + "00_n0500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J070000" + + "00030001_a050000000101040000000802000000010001_1010001_b050000000101040000000802" + + "000000020001_2010001_c050000000101040000000802000000030001_3010103000000010101_x" val aMap = configMap("a" -> 1, "b" -> 2, "c" -> 3) val a = new SimpleConfigObject(fakeOrigin(), aMap) @@ -249,11 +251,11 @@ class ConfigValueTest extends TestUtils { @Test def configObjectSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + - "000101040000000802000000010001_1010001_b050000000101040000000802000000020001_201" + - "0001_c050000000101040000000802000000030001_3010103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z020000" + + "00_n0500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J070000" + + "00030001_a050000000101040000000802000000010001_1010001_b050000000101040000000802" + + "000000020001_2010001_c050000000101040000000802000000030001_3010103000000010001_x" val aMap = configMap("a" -> 1, "b" -> 2, "c" -> 3) val a = new SimpleConfigObject(fakeOrigin(), aMap) @@ -266,11 +268,11 @@ class ConfigValueTest extends TestUtils { @Test def configConfigSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z02000000_n050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J07000000030001_a050000" + - "000101040000000802000000010001_1010001_b050000000101040000000802000000020001_201" + - "0001_c050000000101040000000802000000030001_3010103000000010101_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_z020000" + + "00_n0500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_J070000" + + "00030001_a050000000101040000000802000000010001_1010001_b050000000101040000000802" + + "000000020001_2010001_c050000000101040000000802000000030001_3010103000000010101_x" val aMap = configMap("a" -> 1, "b" -> 2, "c" -> 3) val a = new SimpleConfigObject(fakeOrigin(), aMap) @@ -296,11 +298,11 @@ class ConfigValueTest extends TestUtils { @Test def configListSerializable() { val expectedSerialization = "" + - "ACED0005_s_r00_._c_o_m_._t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l_._S_e_r_i_a_l_i" + - "_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_q02000000_e050000001906" + - "0000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_A0600000003050000000101" + - "040000000802000000010001_101050000000101040000000802000000020001_201050000000101" + - "040000000802000000030001_3010103000000010001_x" + "ACED0005_s_r00_6_c_o_m_._t_w_i_t_t_e_r5F_t_y_p_e_s_a_f_e_._c_o_n_f_i_g_._i_m_p_l" + + "_._S_e_r_i_a_l_i_z_e_d_C_o_n_f_i_g_V_a_l_u_e00000000000000010C0000_x_p_w_q020000" + + "00_e0500000019060000000D000B_f_a_k_e_ _o_r_i_g_i_n0900000001000104000000_A060000" + + "0003050000000101040000000802000000010001_101050000000101040000000802000000020001" + + "_201050000000101040000000802000000030001_3010103000000010001_x" val aScalaSeq = Seq(1, 2, 3) map { intValue(_): AbstractConfigValue } val aList = new SimpleConfigList(fakeOrigin(), aScalaSeq.asJava) val bList = checkSerializable(expectedSerialization, aList) diff --git a/config/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala b/config/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala index 3dd6d993..dad4d33f 100644 --- a/config/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala @@ -1,14 +1,14 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ import net.liftweb.{ json => lift } import java.io.Reader import java.io.StringReader -import com.typesafe.config._ +import com.twitter_typesafe.config._ import java.util.HashMap import java.io.File import org.junit.runner.RunWith diff --git a/config/src/test/scala/com/typesafe/config/impl/HttpTest.scala b/config/src/test/scala/com/typesafe/config/impl/HttpTest.scala index 4cd56f06..9c7bc760 100644 --- a/config/src/test/scala/com/typesafe/config/impl/HttpTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/HttpTest.scala @@ -1,13 +1,13 @@ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ import org.junit.BeforeClass import java.net.URL -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigSyntax -import com.typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigParseOptions +import com.twitter_typesafe.config.ConfigSyntax +import com.twitter_typesafe.config.ConfigException class HttpTest extends TestUtils { import HttpTest._ diff --git a/config/src/test/scala/com/typesafe/config/impl/JsonTest.scala b/config/src/test/scala/com/typesafe/config/impl/JsonTest.scala index 6ba421f7..e312d6b6 100644 --- a/config/src/test/scala/com/typesafe/config/impl/JsonTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/JsonTest.scala @@ -1,14 +1,14 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ import net.liftweb.{ json => lift } import java.io.Reader import java.io.StringReader -import com.typesafe.config._ +import com.twitter_typesafe.config._ import java.util.HashMap import java.util.Collections diff --git a/config/src/test/scala/com/typesafe/config/impl/PathTest.scala b/config/src/test/scala/com/typesafe/config/impl/PathTest.scala index 20a4d626..d487f02d 100644 --- a/config/src/test/scala/com/typesafe/config/impl/PathTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/PathTest.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ import scala.collection.JavaConverters._ -import com.typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigException class PathTest extends TestUtils { diff --git a/config/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala b/config/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala index 75cfe0fe..5aa9e8cd 100644 --- a/config/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala @@ -1,16 +1,16 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ import java.util.{ Date, Properties } -import com.typesafe.config.Config -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigException -import com.typesafe.config.ConfigResolveOptions +import com.twitter_typesafe.config.Config +import com.twitter_typesafe.config.ConfigParseOptions +import com.twitter_typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigResolveOptions class PropertiesTest extends TestUtils { @Test diff --git a/config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala b/config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala index e0bc395a..a1dd2037 100644 --- a/config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ import scala.collection.JavaConverters._ -import com.typesafe.config._ +import com.twitter_typesafe.config._ import java.util.Collections import java.util.TreeSet import java.io.File @@ -1029,7 +1029,7 @@ class PublicApiTest extends TestUtils { @Test def heuristicIncludeChecksClasspath(): Unit = { - // from https://github.com/typesafehub/config/issues/188 + // from https://github.com.twitter_typesafehub/config/issues/188 withScratchDirectory("heuristicIncludeChecksClasspath") { dir => val f = new File(dir, "foo.conf") writeFile(f, """ diff --git a/config/src/test/scala/com/typesafe/config/impl/TestUtils.scala b/config/src/test/scala/com/typesafe/config/impl/TestUtils.scala index 581a7355..b5770d05 100644 --- a/config/src/test/scala/com/typesafe/config/impl/TestUtils.scala +++ b/config/src/test/scala/com/typesafe/config/impl/TestUtils.scala @@ -1,17 +1,17 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigOrigin +import com.twitter_typesafe.config.ConfigOrigin import java.io.Reader import java.io.StringReader -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.Config -import com.typesafe.config.ConfigSyntax -import com.typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigParseOptions +import com.twitter_typesafe.config.Config +import com.twitter_typesafe.config.ConfigSyntax +import com.twitter_typesafe.config.ConfigFactory import java.io.File import java.io.ByteArrayOutputStream import java.io.ObjectOutputStream @@ -22,7 +22,7 @@ import scala.annotation.tailrec import java.net.URL import java.util.concurrent.Executors import java.util.concurrent.Callable -import com.typesafe.config._ +import com.twitter_typesafe.config._ import scala.reflect.ClassTag import scala.reflect.classTag import scala.collection.JavaConverters._ diff --git a/config/src/test/scala/com/typesafe/config/impl/TokenTest.scala b/config/src/test/scala/com/typesafe/config/impl/TokenTest.scala index 0a84ae3c..1e2fae94 100644 --- a/config/src/test/scala/com/typesafe/config/impl/TokenTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/TokenTest.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ diff --git a/config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala b/config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala index 54e72513..a08d6882 100644 --- a/config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit.Test -import com.typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigException import language.implicitConversions class TokenizerTest extends TestUtils { diff --git a/config/src/test/scala/com/typesafe/config/impl/ToyHttp.scala b/config/src/test/scala/com/typesafe/config/impl/ToyHttp.scala index 0bf39c2c..d7e713b6 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ToyHttp.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ToyHttp.scala @@ -1,4 +1,4 @@ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import java.net.ServerSocket import java.net.InetSocketAddress diff --git a/config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala b/config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala index 12a1ce52..ce2d2844 100644 --- a/config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala @@ -1,11 +1,11 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config._ +import com.twitter_typesafe.config._ import java.util.concurrent.TimeUnit class UnitParserTest extends TestUtils { @@ -40,7 +40,7 @@ class UnitParserTest extends TestUtils { assertTrue(e2.getMessage().contains("duration number")) } - // https://github.com/typesafehub/config/issues/117 + // https://github.com.twitter_typesafehub/config/issues/117 // this broke because "1d" is a valid double for parseDouble @Test def parseOneDayAsMilliseconds(): Unit = { diff --git a/config/src/test/scala/com/typesafe/config/impl/UtilTest.scala b/config/src/test/scala/com/typesafe/config/impl/UtilTest.scala index 3067865f..95ccf3d4 100644 --- a/config/src/test/scala/com/typesafe/config/impl/UtilTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/UtilTest.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ diff --git a/config/src/test/scala/com/typesafe/config/impl/ValidationTest.scala b/config/src/test/scala/com/typesafe/config/impl/ValidationTest.scala index 6dce7bfe..865e481f 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ValidationTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ValidationTest.scala @@ -1,13 +1,13 @@ /** * Copyright (C) 2011 Typesafe Inc. */ -package com.typesafe.config.impl +package com.twitter_typesafe.config.impl import org.junit.Assert._ import org.junit._ -import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigParseOptions -import com.typesafe.config.ConfigException +import com.twitter_typesafe.config.ConfigFactory +import com.twitter_typesafe.config.ConfigParseOptions +import com.twitter_typesafe.config.ConfigException import scala.collection.JavaConverters._ import scala.io.Source diff --git a/examples/java/complex-app/src/main/java/ComplexApp.java b/examples/java/complex-app/src/main/java/ComplexApp.java index 447b0908..35352f08 100644 --- a/examples/java/complex-app/src/main/java/ComplexApp.java +++ b/examples/java/complex-app/src/main/java/ComplexApp.java @@ -1,4 +1,4 @@ -import com.typesafe.config.*; +import com.twitter_typesafe.config.*; import simplelib.*; class ComplexApp { diff --git a/examples/java/simple-app/src/main/java/SimpleApp.java b/examples/java/simple-app/src/main/java/SimpleApp.java index bc4a148e..f3d4954f 100644 --- a/examples/java/simple-app/src/main/java/SimpleApp.java +++ b/examples/java/simple-app/src/main/java/SimpleApp.java @@ -1,4 +1,4 @@ -import com.typesafe.config.*; +import com.twitter_typesafe.config.*; import simplelib.*; class SimpleApp { diff --git a/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java b/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java index 690fb16f..5252bef4 100644 --- a/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java +++ b/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java @@ -1,6 +1,6 @@ package simplelib; -import com.typesafe.config.*; +import com.twitter_typesafe.config.*; // Whenever you write a library, allow people to supply a Config but // also default to ConfigFactory.load if they don't supply one. diff --git a/examples/scala/complex-app/src/main/scala/ComplexApp.scala b/examples/scala/complex-app/src/main/scala/ComplexApp.scala index 507da8cb..f1f40af1 100644 --- a/examples/scala/complex-app/src/main/scala/ComplexApp.scala +++ b/examples/scala/complex-app/src/main/scala/ComplexApp.scala @@ -1,4 +1,4 @@ -import com.typesafe.config._ +import com.twitter_typesafe.config._ import simplelib._ object ComplexApp extends App { diff --git a/examples/scala/simple-app/src/main/scala/SimpleApp.scala b/examples/scala/simple-app/src/main/scala/SimpleApp.scala index 9e0c02a0..b6c76f94 100644 --- a/examples/scala/simple-app/src/main/scala/SimpleApp.scala +++ b/examples/scala/simple-app/src/main/scala/SimpleApp.scala @@ -1,4 +1,4 @@ -import com.typesafe.config._ +import com.twitter_typesafe.config._ import simplelib._ object SimpleApp extends App { diff --git a/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala b/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala index 06b03c0a..16e0bd51 100644 --- a/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala +++ b/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala @@ -1,6 +1,6 @@ package simplelib -import com.typesafe.config._ +import com.twitter_typesafe.config._ // Whenever you write a library, allow people to supply a Config but // also default to ConfigFactory.load if they don't supply one. diff --git a/project/Build.scala b/project/Build.scala index e17e788d..02bf3f5f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -18,11 +18,11 @@ object ConfigBuild extends Build { ) object sonatype extends PublishToSonatype { - def projectUrl = "https://github.com/typesafehub/config" + def projectUrl = "https://github.com.typesafehub/config" def developerId = "havocp" def developerName = "Havoc Pennington" def developerUrl = "http://ometer.com/" - def scmUrl = "git://github.com/typesafehub/config.git" + def scmUrl = "git://github.com.typesafehub/config.git" } override val settings = super.settings ++ Seq(isSnapshot <<= isSnapshot or version(_ endsWith "-SNAPSHOT")) @@ -48,7 +48,7 @@ object ConfigBuild extends Build { sonatype.settings ++ osgiSettings ++ Seq( - OsgiKeys.exportPackage := Seq("com.typesafe.config", "com.typesafe.config.impl"), + OsgiKeys.exportPackage := Seq("com.twitter_typesafe.config", "com.twitter_typesafe.config.impl"), packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), OsgiKeys.bundle).identityMap, artifact in (Compile, packageBin) ~= { _.copy(`type` = "bundle") }, publish := sys.error("use publishSigned instead of plain publish"), diff --git a/project/linksource.scala b/project/linksource.scala index 01c3226d..2460dfc2 100644 --- a/project/linksource.scala +++ b/project/linksource.scala @@ -36,8 +36,8 @@ object LinkSourcePlugin extends AutoPlugin { private def rewriteSourceLinks(dir: File, sourceBaseUrl: String, log: Logger): Unit = { - // Convert to - // "https://github.com/typesafehub/config/blob/v1.2.1/config/src/main/java/com/typesafe/config/Config.java#L165" + // Convert to + // "https://github.com.twitter_typesafehub/config/blob/v1.2.1/config/src/main/java/com.twitter_typesafe/config/Config.java#L165" // in all .html files found underneath dir val origRegex = "href=\".*src-html/([^\"]+)\"".r def listFiles(d: File): Seq[File] = IO.listFiles(d).toSeq.flatMap { f =>