Merge pull request #4 from xenit-eu/contentgrid-namespace

Contentgrid namespace

CHANGELOG.md

@@ -10,6 +10,8 @@ Bard 1.0.0 *(UNRELEASED)*
 * Converted build system to Gradle
 * New: Inline annotation members for fields 
 * New: Supports JDK 11 (baseline) & JDK 17
+* Override whitespace for nested annotations
+* Changed package namespace to `com.contentgrid.bard`
 
 JavaPoet 1.13.0 *(2020-06-18)*
 -----------------------------

README.md

@@ -5,22 +5,22 @@
 
 `Bard` is a Java API for generating `.java` source files, forked from [square/javapoet][javapoet].
 
-Its primary purpose is to serve as the java sourcecode generator for [xenit-eu/contentcloud-scribe][scribe].
+Its primary purpose is to serve as the java sourcecode generator for [xenit-eu/contentgrid-scribe][scribe].
 
 ## Installation
 
 With Maven:
 ```xml
 <dependency>
-  <groupId>eu.xenit.contentcloud.bard</groupId>
+  <groupId>com.contentgrid.bard</groupId>
   <artifactId>bard</artifactId>
   <version>0.1.0-SNAPSHOT</version>
 </dependency>
 ```
 
 or Gradle:
 ```groovy
-compile 'eu.xenit.contentcloud.bard:0.1.0-SNAPSHOT'
+compile 'com.contentgrid.bard:0.1.0-SNAPSHOT'
 ```
 
 Snapshots of the development version are available in [Sonatype's `snapshots` repository][snapshot].
@@ -911,7 +911,7 @@ Use `$T` when referencing types in Javadoc to get automatic imports.
 
 # JavaPoet & JavaWriter
 
-Bard is a fork of [JavaPoet][javapoet]. It's the java sourcecode generator library used in [xenit-eu/contentcloud-scribe][scribe]
+Bard is a fork of [JavaPoet][javapoet]. It's the java sourcecode generator library used in [xenit-eu/contentgrid-scribe][scribe]
 
 The main reason for forking JavaPoet is to have more control over the layout of the generated code. See [#658] for example.
 There are some straight forward progress possible, when you can break the original JavaPoet API.
@@ -923,7 +923,7 @@ also better suited to composition: rather than streaming the contents of a `.jav
 top-to-bottom in a single pass, a file can be assembled as a tree of declarations.
 
  [javapoet]: https://github.com/square/javapoet
- [scribe]: https://github.com/xenit-eu/contentcloud-scribe
+ [scribe]: https://github.com/xenit-eu/contentgrid-scribe
  [#658]: https://github.com/square/javapoet/issues/658
  [snapshot]: https://oss.sonatype.org/content/repositories/snapshots/com/squareup/javapoet/
  [javadoc]: https://square.github.io/javapoet/1.x/javapoet/

gradle.properties

@@ -1,2 +1,2 @@
-group=eu.xenit.contentcloud.bard
+group=com.contentgrid.bard
 description=Bard is a Java API to generate .java source code

gradle/publish.gradle

@@ -40,13 +40,15 @@ publishing {
     repositories {
         if (version.version.isSignificant()) {
             sonatypeMavenCentral {
+                url = "https://s01.oss.sonatype.org/service/local/"
                 credentials {
                     username = project.findProperty('sonatype_username')
                     password = project.findProperty('sonatype_password')
                 }
             }
         } else {
             sonatypeSnapshots {
+                url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
                 credentials {
                     username = project.findProperty('sonatype_username')
                     password = project.findProperty('sonatype_password')

src/main/java/eu/xenit/contentcloud/bard/AnnotationSpec.java → src/main/java/com/contentgrid/bard/AnnotationSpec.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -36,9 +36,9 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.SimpleAnnotationValueVisitor8;
 
-import static eu.xenit.contentcloud.bard.Util.characterLiteralWithoutSingleQuotes;
-import static eu.xenit.contentcloud.bard.Util.checkArgument;
-import static eu.xenit.contentcloud.bard.Util.checkNotNull;
+import static com.contentgrid.bard.Util.characterLiteralWithoutSingleQuotes;
+import static com.contentgrid.bard.Util.checkArgument;
+import static com.contentgrid.bard.Util.checkNotNull;
 
 /** A generated annotation on a declaration. */
 public final class AnnotationSpec {

src/main/java/eu/xenit/contentcloud/bard/ArrayTypeName.java → src/main/java/com/contentgrid/bard/ArrayTypeName.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.GenericArrayType;
@@ -25,7 +25,7 @@
 import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.type.ArrayType;
 
-import static eu.xenit.contentcloud.bard.Util.checkNotNull;
+import static com.contentgrid.bard.Util.checkNotNull;
 
 public final class ArrayTypeName extends TypeName {
   public final TypeName componentType;

src/main/java/eu/xenit/contentcloud/bard/ClassName.java → src/main/java/com/contentgrid/bard/ClassName.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/main/java/eu/xenit/contentcloud/bard/CodeBlock.java → src/main/java/com/contentgrid/bard/CodeBlock.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.Type;

src/main/java/eu/xenit/contentcloud/bard/CodeWriter.java → src/main/java/com/contentgrid/bard/CodeWriter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,10 +31,10 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Modifier;
 
-import static eu.xenit.contentcloud.bard.Util.checkArgument;
-import static eu.xenit.contentcloud.bard.Util.checkNotNull;
-import static eu.xenit.contentcloud.bard.Util.checkState;
-import static eu.xenit.contentcloud.bard.Util.stringLiteralWithDoubleQuotes;
+import static com.contentgrid.bard.Util.checkArgument;
+import static com.contentgrid.bard.Util.checkNotNull;
+import static com.contentgrid.bard.Util.checkState;
+import static com.contentgrid.bard.Util.stringLiteralWithDoubleQuotes;
 import static java.lang.String.join;
 
 /**

src/main/java/eu/xenit/contentcloud/bard/FieldSpec.java → src/main/java/com/contentgrid/bard/FieldSpec.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -24,9 +24,9 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Modifier;
 
-import static eu.xenit.contentcloud.bard.Util.checkArgument;
-import static eu.xenit.contentcloud.bard.Util.checkNotNull;
-import static eu.xenit.contentcloud.bard.Util.checkState;
+import static com.contentgrid.bard.Util.checkArgument;
+import static com.contentgrid.bard.Util.checkNotNull;
+import static com.contentgrid.bard.Util.checkState;
 
 /** A generated field declaration. */
 public final class FieldSpec {

src/main/java/eu/xenit/contentcloud/bard/JavaFile.java → src/main/java/com/contentgrid/bard/JavaFile.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

src/main/java/eu/xenit/contentcloud/bard/LineWrapper.java → src/main/java/com/contentgrid/bard/LineWrapper.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 
-import static eu.xenit.contentcloud.bard.Util.checkNotNull;
+import static com.contentgrid.bard.Util.checkNotNull;
 
 /**
  * Implements soft line wrapping on an appendable. To use, append characters using {@link #append}

src/main/java/eu/xenit/contentcloud/bard/MethodSpec.java → src/main/java/com/contentgrid/bard/MethodSpec.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.Type;

src/main/java/eu/xenit/contentcloud/bard/NameAllocator.java → src/main/java/com/contentgrid/bard/NameAllocator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;

src/main/java/eu/xenit/contentcloud/bard/ParameterSpec.java → src/main/java/com/contentgrid/bard/ParameterSpec.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.Type;

src/main/java/eu/xenit/contentcloud/bard/ParameterizedTypeName.java → src/main/java/com/contentgrid/bard/ParameterizedTypeName.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.Modifier;

src/main/java/eu/xenit/contentcloud/bard/TypeName.java → src/main/java/com/contentgrid/bard/TypeName.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.GenericArrayType;

src/main/java/eu/xenit/contentcloud/bard/TypeSpec.java → src/main/java/com/contentgrid/bard/TypeSpec.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;

src/main/java/eu/xenit/contentcloud/bard/TypeVariableName.java → src/main/java/com/contentgrid/bard/TypeVariableName.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -28,8 +28,8 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 
-import static eu.xenit.contentcloud.bard.Util.checkArgument;
-import static eu.xenit.contentcloud.bard.Util.checkNotNull;
+import static com.contentgrid.bard.Util.checkArgument;
+import static com.contentgrid.bard.Util.checkNotNull;
 
 public final class TypeVariableName extends TypeName {
   public final String name;

src/main/java/eu/xenit/contentcloud/bard/Util.java → src/main/java/com/contentgrid/bard/Util.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/eu/xenit/contentcloud/bard/WildcardTypeName.java → src/main/java/com/contentgrid/bard/WildcardTypeName.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -26,7 +26,7 @@
 import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.type.TypeMirror;
 
-import static eu.xenit.contentcloud.bard.Util.checkArgument;
+import static com.contentgrid.bard.Util.checkArgument;
 
 public final class WildcardTypeName extends TypeName {
   public final List<TypeName> upperBounds;

src/test/java/ClassNameNoPackageTest.java

@@ -16,7 +16,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import eu.xenit.contentcloud.bard.ClassName;
+import com.contentgrid.bard.ClassName;
 import org.junit.Test;
 
 /**

src/test/java/eu/xenit/contentcloud/bard/AbstractTypesTest.java → src/test/java/com/contentgrid/bard/AbstractTypesTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.testing.compile.CompilationSubject.assertThat;

src/test/java/eu/xenit/contentcloud/bard/AnnotatedTypeNameTest.java → src/test/java/com/contentgrid/bard/AnnotatedTypeNameTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.xenit.contentcloud.bard;
+package com.contentgrid.bard;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
@@ -196,8 +196,7 @@ private void annotatedEquivalence(TypeName type) {
         .varargs()
         .build();
     assertThat(varargsMethod.toString()).isEqualTo(""
-        + "void m(\n"
-        + "    java.lang.Object @" + TUA + " []... p) {\n"
+        + "void m(java.lang.Object @" + TUA + " []... p) {\n"
         + "}\n");
   }
 
@@ -213,8 +212,7 @@ private void annotatedEquivalence(TypeName type) {
         .build();
 
     assertThat(varargsMethod.toString()).isEqualTo(""
-            + "void m(\n"
-            + "    java.lang.Object[] @" + TUA + " ... p) {\n"
+            + "void m(java.lang.Object[] @" + TUA + " ... p) {\n"
             + "}\n");
   }
 }