Second round of the rename cleanup

2025-03-14 11:20:25 +08:00 · 2017-10-17 11:42:05 -05:00 · 2017-10-17 11:42:05 -05:00 · e33a00604d
commit e33a00604d
parent cfa13c114b
16 changed files with 43 additions and 43 deletions
--- a/config/build.sbt
+++ b/config/build.sbt
@ -84,7 +84,7 @@ javacOptions in (Compile, doc) ++= Seq("-group", s"Public API (version ${version

 javadocSourceBaseUrl := {
  for (gitHead <- com.typesafe.sbt.SbtGit.GitKeys.gitHeadCommit.value)
-    yield s"https://github.com/typesafehub/config/blob/$gitHead/config/src/main/java"
+    yield s"https://github.com/lightbend/config/blob/$gitHead/config/src/main/java"
 }

 javaVersionPrefix in javaVersionCheck := Some("1.8")
--- a/config/src/main/java/com/typesafe/config/Config.java
+++ b/config/src/main/java/com/typesafe/config/Config.java
@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit;
 * 
 * <p>
 * You can find an example app and library <a
- * href="https://github.com/typesafehub/config/tree/master/examples">on
+ * href="https://github.com/lightbend/config/tree/master/examples">on
 * GitHub</a>. Also be sure to read the <a
 * href="package-summary.html#package_description">package overview</a> which
 * describes the big picture as shown in those examples.
@ -56,7 +56,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 <a
- * href="https://github.com/typesafehub/config/blob/master/HOCON.md">spec for
+ * href="https://github.com/lightbend/config/blob/master/HOCON.md">spec for
 * Human-Optimized Config Object Notation</a>. 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
@ -110,7 +110,7 @@ import java.util.concurrent.TimeUnit;
 * <p>
 * <em>Substitutions</em> are the <code>${foo.bar}</code> syntax in config
 * files, described in the <a href=
- * "https://github.com/typesafehub/config/blob/master/HOCON.md#substitutions"
+ * "https://github.com/lightbend/config/blob/master/HOCON.md#substitutions"
 * >specification</a>. Resolving substitutions replaces these references with real
 * values.
 * 
@ -189,7 +189,7 @@ public interface Config extends ConfigMergeable {
    /**
     * Returns a replacement config with all substitutions (the
     * <code>${foo.bar}</code> syntax, see <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">the
     * spec</a>) resolved. Substitutions are looked up using this
     * <code>Config</code> as the root object, that is, a substitution
     * <code>${foo.bar}</code> will be replaced with the result of
@ -670,7 +670,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 <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">the
     * spec</a>.
     *
     * @param path
@ -690,7 +690,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 <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">the
     * spec</a>.
     *
     * @since 1.3.0
@ -711,7 +711,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 <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">the
     * spec</a>.
     *
     * @deprecated  As of release 1.1, replaced by {@link #getDuration(String, TimeUnit)}
@ -754,7 +754,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 <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">the
     * spec</a>.
     * 
     * @since 1.2.0
@ -778,7 +778,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 <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">the
     * spec</a>. This method never returns null.
     *
     * @since 1.3.0
@ -800,7 +800,7 @@ public interface Config extends ConfigMergeable {
     * already a number, then it's taken as days; if it's
     * a string, it's parsed understanding units suffixes like
     * "10d" or "5w" as documented in the <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">the
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">the
     * spec</a>. This method never returns null.
     *
     * @since 1.3.0
--- a/config/src/main/java/com/typesafe/config/ConfigFactory.java
+++ b/config/src/main/java/com/typesafe/config/ConfigFactory.java
@ -28,7 +28,7 @@ import java.util.concurrent.Callable;
 * from a resource and nothing else.
 *
 * <p> You can find an example app and library <a
- * href="https://github.com/typesafehub/config/tree/master/examples">on
+ * href="https://github.com/lightbend/config/tree/master/examples">on
 * GitHub</a>.  Also be sure to read the <a
 * href="package-summary.html#package_description">package
 * overview</a> which describes the big picture as shown in those
@ -570,7 +570,7 @@ public final class ConfigFactory {
    /**
     * Converts a Java {@link java.util.Properties} object to a
     * {@link ConfigObject} using the rules documented in the <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">HOCON
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">HOCON
     * spec</a>. The keys in the <code>Properties</code> 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
--- a/config/src/main/java/com/typesafe/config/ConfigMergeable.java
+++ b/config/src/main/java/com/typesafe/config/ConfigMergeable.java
@ -27,7 +27,7 @@ public interface ConfigMergeable {
     * 
     * <p>
     * The semantics of merging are described in the <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md">spec
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md">spec
     * for HOCON</a>. Merging typically occurs when either the same object is
     * created twice in the same file, or two config files are both loaded. For
     * example:
--- a/config/src/main/java/com/typesafe/config/ConfigResolveOptions.java
+++ b/config/src/main/java/com/typesafe/config/ConfigResolveOptions.java
@ -6,7 +6,7 @@ package com.typesafe.config;
 /**
 * A set of options related to resolving substitutions. Substitutions use the
 * <code>${foo.bar}</code> syntax and are documented in the <a
- * href="https://github.com/typesafehub/config/blob/master/HOCON.md">HOCON</a>
+ * href="https://github.com/lightbend/config/blob/master/HOCON.md">HOCON</a>
 * spec.
 * <p>
 * Typically this class would be used with the method
--- a/config/src/main/java/com/typesafe/config/ConfigSyntax.java
+++ b/config/src/main/java/com/typesafe/config/ConfigSyntax.java
@ -5,7 +5,7 @@ package com.typesafe.config;

 /**
 * The syntax of a character stream (<a href="http://json.org">JSON</a>, <a
- * href="https://github.com/typesafehub/config/blob/master/HOCON.md">HOCON</a>
+ * href="https://github.com/lightbend/config/blob/master/HOCON.md">HOCON</a>
 * aka ".conf", or <a href=
 * "http://download.oracle.com/javase/7/docs/api/java/util/Properties.html#load%28java.io.Reader%29"
 * >Java properties</a>).
@ -21,7 +21,7 @@ public enum ConfigSyntax {
    JSON,
    /**
     * The JSON-superset <a
-     * href="https://github.com/typesafehub/config/blob/master/HOCON.md"
+     * href="https://github.com/lightbend/config/blob/master/HOCON.md"
     * >HOCON</a> format. Associated with the <code>.conf</code> file extension
     * and <code>application/hocon</code> Content-Type.
     */
--- a/config/src/main/java/com/typesafe/config/impl/ConfigParser.java
+++ b/config/src/main/java/com/typesafe/config/impl/ConfigParser.java
@ -192,7 +192,7 @@ final class ConfigParser {

            // we really should make this work, but for now throwing an
            // exception is better than producing an incorrect result.
-            // See https://github.com/typesafehub/config/issues/160
+            // See https://github.com/lightbend/config/issues/160
            if (arrayCount > 0 && obj.resolveStatus() != ResolveStatus.RESOLVED)
                throw parseError("Due to current limitations of the config parser, when an include statement is nested inside a list value, "
                        + "${} substitutions inside the included file cannot be resolved correctly. Either move the include outside of the list value or "
@ -247,7 +247,7 @@ final class ConfigParser {
                        // we really should make this work, but for now throwing
                        // an exception is better than producing an incorrect
                        // result. See
-                        // https://github.com/typesafehub/config/issues/160
+                        // https://github.com/lightbend/config/issues/160
                        if (arrayCount > 0)
                            throw parseError("Due to current limitations of the config parser, += does not work nested inside a list. "
                                    + "+= expands to a ${} substitution and the path in ${} cannot currently refer to list elements. "
--- a/config/src/main/java/com/typesafe/config/impl/package.html
+++ b/config/src/main/java/com/typesafe/config/impl/package.html
@ -17,7 +17,7 @@ Please check out the {@link com.typesafe.config.Config public API} instead, unle
 you're interested in browsing implementation details. None of the ABI
 under <code>impl</code> has any guarantees; it will change whenever someone
 feels like changing it. If you feel you need access to something
-in <code>impl</code>, <a href="https://github.com/typesafehub/config/issues">please
+in <code>impl</code>, <a href="https://github.com/lightbend/config/issues">please
 file a feature request</a>.
 </p>

--- a/config/src/main/java/com/typesafe/config/package.html
+++ b/config/src/main/java/com/typesafe/config/package.html
@ -9,14 +9,14 @@
 <body bgcolor="white">

 <p>
-An API for loading and using configuration files, see <a href="https://github.com/typesafehub/config/">the project site</a>
+An API for loading and using configuration files, see <a href="https://github.com/lightbend/config/">the project site</a>
 for more information.
 </p>

 <p>
 Typically you would load configuration with a static method from {@link com.typesafe.config.ConfigFactory} and then use
 it with methods in the {@link com.typesafe.config.Config} interface. Configuration may be in the form of JSON files,
-Java properties, or <a href="https://github.com/typesafehub/config/blob/master/HOCON.md">HOCON files</a>; you may also
+Java properties, or <a href="https://github.com/lightbend/config/blob/master/HOCON.md">HOCON files</a>; you may also
 build your own configuration in code or from your own file formats.
 </p>

@ -26,8 +26,8 @@ its configuration in "application.conf" on the classpath.
 If you use the default configuration from {@link com.typesafe.config.ConfigFactory#load()}
 there's no need to pass a configuration to your libraries
 and frameworks, as long as they all default to this same default, which they should.
-<br/><strong>Example application code:</strong> <a href="https://github.com/typesafehub/config/tree/master/examples/java/simple-app/src/main">Java</a> and <a href="https://github.com/typesafehub/config/tree/master/examples/scala/simple-app/src/main">Scala</a>.
-<br/>Showing a couple of more special-purpose features, <strong>a more complex example:</strong> <a href="https://github.com/typesafehub/config/tree/master/examples/java/complex-app/src/main">Java</a> and <a href="https://github.com/typesafehub/config/tree/master/examples/scala/complex-app/src/main">Scala</a>.
+<br/><strong>Example application code:</strong> <a href="https://github.com/lightbend/config/tree/master/examples/java/simple-app/src/main">Java</a> and <a href="https://github.com/lightbend/config/tree/master/examples/scala/simple-app/src/main">Scala</a>.
+<br/>Showing a couple of more special-purpose features, <strong>a more complex example:</strong> <a href="https://github.com/lightbend/config/tree/master/examples/java/complex-app/src/main">Java</a> and <a href="https://github.com/lightbend/config/tree/master/examples/scala/complex-app/src/main">Scala</a>.
 </p>

 <p>
@ -36,21 +36,21 @@ A library or framework should ship a file "reference.conf" in its jar, and allow
 call {@link com.typesafe.config.ConfigFactory#load()}
 to get the default one. Typically a library might offer two constructors, one with a <code>Config</code> parameter
 and one which uses {@link com.typesafe.config.ConfigFactory#load()}.
-<br/><strong>Example library code:</strong> <a href="https://github.com/typesafehub/config/tree/master/examples/java/simple-lib/src/main">Java</a> and <a href="https://github.com/typesafehub/config/tree/master/examples/scala/simple-lib/src/main">Scala</a>.
+<br/><strong>Example library code:</strong> <a href="https://github.com/lightbend/config/tree/master/examples/java/simple-lib/src/main">Java</a> and <a href="https://github.com/lightbend/config/tree/master/examples/scala/simple-lib/src/main">Scala</a>.
 </p>

 <p>
-Check out the full <a href="https://github.com/typesafehub/config/tree/master/examples">examples directory on GitHub</a>.
+Check out the full <a href="https://github.com/lightbend/config/tree/master/examples">examples directory on GitHub</a>.
 </p>

 <p>
 What else to read:
 <ul>
 	<li>The overview documentation for interface {@link com.typesafe.config.Config}.</li>
-	<li>The <a href="https://github.com/typesafehub/config/blob/master/README.md">README</a> for the library.</li>
+	<li>The <a href="https://github.com/lightbend/config/blob/master/README.md">README</a> for the library.</li>
 	<li>If you want to use <code>.conf</code> files in addition to <code>.json</code> and <code>.properties</code>,
-	see the <a href="https://github.com/typesafehub/config/blob/master/README.md">README</a> for some short examples
-	and the full <a href="https://github.com/typesafehub/config/blob/master/HOCON.md">HOCON spec</a> for the long version.</li>
+	see the <a href="https://github.com/lightbend/config/blob/master/README.md">README</a> for some short examples
+	and the full <a href="https://github.com/lightbend/config/blob/master/HOCON.md">HOCON spec</a> for the long version.</li>
 </ul>
 </p>

--- a/config/src/main/java/com/typesafe/config/parser/ConfigNode.java
+++ b/config/src/main/java/com/typesafe/config/parser/ConfigNode.java
@ -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: <a
- * href="https://github.com/typesafehub/config/issues/300"
- * >https://github.com/typesafehub/config/issues/300</a>
+ * href="https://github.com/lightbend/config/issues/300"
+ * >https://github.com/lightbend/config/issues/300</a>
 *
 * <p>
 * Because this object is immutable, it is safe to use from multiple threads and
--- a/config/src/main/java/com/typesafe/config/parser/package.html
+++ b/config/src/main/java/com/typesafe/config/parser/package.html
@ -14,7 +14,7 @@ files. You do not want this package for everyday config in your app: see
 the <code>com.typesafe.config</code> package instead. You would use the raw
 parser if you're doing something like reading, modifying, and re-saving a config
 file. For info on the main config API this parser is a part of,
-see <a href="https://github.com/typesafehub/config/">the project site</a>.
+see <a href="https://github.com/lightbend/config/">the project site</a>.
 </p>

 <p>
--- a/config/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala
+++ b/config/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala
@ -346,7 +346,7 @@ class ConcatenationTest extends TestUtils {
    }

    // We would ideally make this case NOT throw an exception but we need to do some work
-    // to get there, see https://github.com/typesafehub/config/issues/160
+    // to get there, see https://github.com/lightbend/config/issues/160
    @Test
    def plusEqualsMultipleTimesNestedInArray() {
        val e = intercept[ConfigException.Parse] {
@ -357,7 +357,7 @@ class ConcatenationTest extends TestUtils {
    }

    // We would ideally make this case NOT throw an exception but we need to do some work
-    // to get there, see https://github.com/typesafehub/config/issues/160
+    // to get there, see https://github.com/lightbend/config/issues/160
    @Test
    def plusEqualsMultipleTimesNestedInPlusEquals() {
        val e = intercept[ConfigException.Parse] {
@ -367,7 +367,7 @@ class ConcatenationTest extends TestUtils {
        assertTrue(e.getMessage.contains("limitation"))
    }

-    // from https://github.com/typesafehub/config/issues/177
+    // from https://github.com/lightbend/config/issues/177
    @Test
    def arrayConcatenationInDoubleNestedDelayedMerge() {
        val unresolved = parseConfig("""d { x = [] }, c : ${d}, c { x += 1, x += 2 }""")
@ -375,7 +375,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/lightbend/config/issues/177
    @Test
    def arrayConcatenationAsPartOfDelayedMerge() {
        val unresolved = parseConfig(""" c { x: [], x : ${c.x}[1], x : ${c.x}[2] }""")
@ -383,7 +383,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/lightbend/config/issues/177
    @Test
    def arrayConcatenationInDoubleNestedDelayedMerge2() {
        val unresolved = parseConfig("""d { x = [] }, c : ${d}, c { x : ${c.x}[1], x : ${c.x}[2] }""")
@ -391,7 +391,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/lightbend/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] } } }""")
--- a/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
+++ b/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
@ -280,7 +280,7 @@ class ConfigValueTest extends TestUtils {
    }

    /**
-      * Reproduces the issue <a href=https://github.com/typesafehub/config/issues/461>#461</a>.
+      * Reproduces the issue <a href=https://github.com/lightbend/config/issues/461>#461</a>.
      * <p>
      * We use a custom de-/serializer that encodes String objects in a JDK-incompatible way. Encoding used here 
      * is rather simplistic: a long indicating the length in bytes (JDK uses a variable length integer) followed
--- a/config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala
+++ b/config/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala
@ -906,7 +906,7 @@ class PublicApiTest extends TestUtils {
    }

    // We would ideally make this case NOT throw an exception but we need to do some work
-    // to get there, see https://github.com/typesafehub/config/issues/160
+    // to get there, see https://github.com/lightbend/config/issues/160
    @Test
    def detectIncludeFromList() {
        val e = intercept[ConfigException.Parse] {
@ -1070,7 +1070,7 @@ class PublicApiTest extends TestUtils {

    @Test
    def heuristicIncludeChecksClasspath(): Unit = {
-        // from https://github.com/typesafehub/config/issues/188
+        // from https://github.com/lightbend/config/issues/188
        withScratchDirectory("heuristicIncludeChecksClasspath") { dir =>
            val f = new File(dir, "foo.conf")
            writeFile(f, """
--- a/config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala
+++ b/config/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala
@ -70,7 +70,7 @@ class UnitParserTest extends TestUtils {
        assertTrue(s"${e2.getMessage} was not the expected error message", e2.getMessage.contains("time unit 'seconds'"))
    }

-    // https://github.com/typesafehub/config/issues/117
+    // https://github.com/lightbend/config/issues/117
    // this broke because "1d" is a valid double for parseDouble
    @Test
    def parseOneDayAsMilliseconds(): Unit = {
--- a/project/linksource.scala
+++ b/project/linksource.scala
@ -37,7 +37,7 @@ object LinkSourcePlugin extends AutoPlugin {

  private def rewriteSourceLinks(dir: File, sourceBaseUrl: String, log: Logger): Unit = {
    // Convert <a href="../../../src-html/com/typesafe/config/Config.html#line.165"> to
-    // "https://github.com/typesafehub/config/blob/v1.2.1/config/src/main/java/com/typesafe/config/Config.java#L165"
+    // "https://github.com/lightbend/config/blob/v1.2.1/config/src/main/java/com/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 =>