Move Java world to org.bondlib.

Author: Ted Stein

compiler/src/Language/Bond/Codegen/Java/Class_java.hs

@@ -29,15 +29,15 @@ package #{javaPackage};
 
     typeDefinition Enum {..} = [lt|
 #{Java.generatedClassAnnotations}
-public final class #{declName} implements com.microsoft.bond.BondEnum<#{declName}> {
+public final class #{declName} implements org.bondlib.BondEnum<#{declName}> {
 
     public static final class Values {
         private Values() {}
 
         #{newlineSep 2 constantIntValueDecl enumConstantsWithInt}
     }
 
-    private static final class EnumBondTypeImpl extends com.microsoft.bond.EnumBondType<#{declName}> {
+    private static final class EnumBondTypeImpl extends org.bondlib.EnumBondType<#{declName}> {
 
         @Override
         public java.lang.Class<#{declName}> getValueClass() { return #{declName}.class; }
@@ -46,7 +46,7 @@ public final class #{declName} implements com.microsoft.bond.BondEnum<#{declName
         public final #{declName} getEnumValue(int value) { return get(value); }
     }
 
-    public static final com.microsoft.bond.EnumBondType<#{declName}> BOND_TYPE = new EnumBondTypeImpl();
+    public static final org.bondlib.EnumBondType<#{declName}> BOND_TYPE = new EnumBondTypeImpl();
 
     #{newlineSep 1 constantObjectDecl enumConstantsWithInt}
 
@@ -63,7 +63,7 @@ public final class #{declName} implements com.microsoft.bond.BondEnum<#{declName
     public final String getLabel() { return this.label; }
 
     @Override
-    public final com.microsoft.bond.EnumBondType<#{declName}> getBondType() { return BOND_TYPE; }
+    public final org.bondlib.EnumBondType<#{declName}> getBondType() { return BOND_TYPE; }
 
     @Override
     public final int compareTo(#{declName} o) { return this.value < o.value ? -1 : (this.value > o.value ? 1 : 0); }

compiler/src/Language/Bond/Codegen/Java/Enum_java.hs

@@ -33,9 +33,9 @@ generatedClassAnnotations = [lt|@javax.annotation.Generated("gbc")|]
 
 -- returns the qualified name of Modifier constant
 modifierConstantName :: Modifier -> Text
-modifierConstantName Optional = [lt|com.microsoft.bond.Modifier.Optional|]
-modifierConstantName Required = [lt|com.microsoft.bond.Modifier.Required|]
-modifierConstantName RequiredOptional = [lt|com.microsoft.bond.Modifier.RequiredOptional|]
+modifierConstantName Optional = [lt|org.bondlib.Modifier.Optional|]
+modifierConstantName Required = [lt|org.bondlib.Modifier.Required|]
+modifierConstantName RequiredOptional = [lt|org.bondlib.Modifier.RequiredOptional|]
 
 -- returns a value indicating whether a type is a non-enum Bond primitive type
 isPrimitiveNonEnumBondType :: Type -> Bool

compiler/src/Language/Bond/Codegen/Java/Util.hs

@@ -511,29 +511,29 @@ javaType BT_String = pure "java.lang.String"
 javaType BT_WString = pure "java.lang.String"
 javaType BT_MetaName = pure "java.lang.String"
 javaType BT_MetaFullName = pure "java.lang.String"
-javaType BT_Blob = pure "com.microsoft.bond.Blob"
+javaType BT_Blob = pure "org.bondlib.Blob"
 javaType (BT_IntTypeArg x) = pureText x
-javaType (BT_Maybe BT_Int8) = pure "com.microsoft.bond.SomethingByte"
-javaType (BT_Maybe BT_Int16) = pure "com.microsoft.bond.SomethingShort"
-javaType (BT_Maybe BT_Int32) = pure "com.microsoft.bond.SomethingInteger"
-javaType (BT_Maybe BT_Int64) = pure "com.microsoft.bond.SomethingLong"
-javaType (BT_Maybe BT_UInt8) = pure "com.microsoft.bond.SomethingByte"
-javaType (BT_Maybe BT_UInt16) = pure "com.microsoft.bond.SomethingShort"
-javaType (BT_Maybe BT_UInt32) = pure "com.microsoft.bond.SomethingInteger"
-javaType (BT_Maybe BT_UInt64) = pure "com.microsoft.bond.SomethingLong"
-javaType (BT_Maybe BT_Float) = pure "com.microsoft.bond.SomethingFloat"
-javaType (BT_Maybe BT_Double) = pure "com.microsoft.bond.SomethingDouble"
-javaType (BT_Maybe BT_Bool) = pure "com.microsoft.bond.SomethingBoolean"
+javaType (BT_Maybe BT_Int8) = pure "org.bondlib.SomethingByte"
+javaType (BT_Maybe BT_Int16) = pure "org.bondlib.SomethingShort"
+javaType (BT_Maybe BT_Int32) = pure "org.bondlib.SomethingInteger"
+javaType (BT_Maybe BT_Int64) = pure "org.bondlib.SomethingLong"
+javaType (BT_Maybe BT_UInt8) = pure "org.bondlib.SomethingByte"
+javaType (BT_Maybe BT_UInt16) = pure "org.bondlib.SomethingShort"
+javaType (BT_Maybe BT_UInt32) = pure "org.bondlib.SomethingInteger"
+javaType (BT_Maybe BT_UInt64) = pure "org.bondlib.SomethingLong"
+javaType (BT_Maybe BT_Float) = pure "org.bondlib.SomethingFloat"
+javaType (BT_Maybe BT_Double) = pure "org.bondlib.SomethingDouble"
+javaType (BT_Maybe BT_Bool) = pure "org.bondlib.SomethingBoolean"
 javaType (BT_UserDefined a@Alias {} args) = javaType (resolveAlias a args)
 javaType (BT_Maybe (BT_UserDefined a@Alias {} args)) = javaType (BT_Maybe (resolveAlias a args))
-javaType (BT_Maybe fieldType) = "com.microsoft.bond.SomethingObject<" <>> javaBoxedType fieldType <<> ">"
+javaType (BT_Maybe fieldType) = "org.bondlib.SomethingObject<" <>> javaBoxedType fieldType <<> ">"
 javaType (BT_Nullable elementType) = javaBoxedType elementType
 javaType (BT_List elementType) = "java.util.List<" <>> elementTypeName elementType <<> ">"
 javaType (BT_Vector elementType) = "java.util.List<" <>> elementTypeName elementType <<> ">"
 javaType (BT_Set elementType) = "java.util.Set<" <>> elementTypeName elementType <<> ">"
 javaType (BT_Map keyType valueType) = "java.util.Map<" <>> elementTypeName keyType <<>> ", " <>> elementTypeName valueType <<> ">"
 javaType (BT_TypeParam param) = pureText $ paramName param
-javaType (BT_Bonded structType) = "com.microsoft.bond.Bonded<" <>> javaBoxedType structType <<> ">"
+javaType (BT_Bonded structType) = "org.bondlib.Bonded<" <>> javaBoxedType structType <<> ">"
 javaType (BT_UserDefined decl args) =
     declQualifiedTypeName decl <<>> (angles <$> localWith (const javaBoxedTypeMapping) (commaSepTypeNames args))
 

compiler/src/Language/Bond/Codegen/TypeMapping.hs

@@ -2,22 +2,22 @@
 package tests;
 
 @javax.annotation.Generated("gbc")
-public class Foo<T> implements com.microsoft.bond.BondSerializable {
+public class Foo<T> implements org.bondlib.BondSerializable {
 
     public static abstract class GenericBondTypeBuilder {
 
         private GenericBondTypeBuilder() {
         }
 
-        public abstract <T> com.microsoft.bond.StructBondType<Foo<T>> makeGenericType(com.microsoft.bond.BondType<T> T);
+        public abstract <T> org.bondlib.StructBondType<Foo<T>> makeGenericType(org.bondlib.BondType<T> T);
     }
 
-    private static final class StructBondTypeImpl<T> extends com.microsoft.bond.StructBondType<Foo<T>> {
+    private static final class StructBondTypeImpl<T> extends org.bondlib.StructBondType<Foo<T>> {
 
-        static final class StructBondTypeBuilderImpl extends com.microsoft.bond.StructBondType.StructBondTypeBuilder<Foo> {
+        static final class StructBondTypeBuilderImpl extends org.bondlib.StructBondType.StructBondTypeBuilder<Foo> {
 
-            private <T> com.microsoft.bond.StructBondType<Foo<T>> makeGenericType(com.microsoft.bond.BondType<T> T) {
-                com.microsoft.bond.helpers.ArgumentHelper.ensureNotNull(T, "T");
+            private <T> org.bondlib.StructBondType<Foo<T>> makeGenericType(org.bondlib.BondType<T> T) {
+                org.bondlib.helpers.ArgumentHelper.ensureNotNull(T, "T");
                 return (StructBondTypeImpl) this.getInitializedFromCache(T);
             }
 
@@ -27,25 +27,25 @@ public final int getGenericTypeParameterCount() {
             }
 
             @Override
-            protected final com.microsoft.bond.StructBondType<Foo> buildNewInstance(com.microsoft.bond.BondType[] genericTypeArguments) {
-                return new StructBondTypeImpl(new com.microsoft.bond.GenericTypeSpecialization(genericTypeArguments));
+            protected final org.bondlib.StructBondType<Foo> buildNewInstance(org.bondlib.BondType[] genericTypeArguments) {
+                return new StructBondTypeImpl(new org.bondlib.GenericTypeSpecialization(genericTypeArguments));
             }
 
             static void register() {
                 registerStructType(Foo.class, new StructBondTypeBuilderImpl());
             }
         }
 
-        private com.microsoft.bond.StructBondType.ObjectStructField<java.util.List<java.util.List<T>>> aa;
+        private org.bondlib.StructBondType.ObjectStructField<java.util.List<java.util.List<T>>> aa;
 
-        private StructBondTypeImpl(com.microsoft.bond.GenericTypeSpecialization genericTypeSpecialization) {
+        private StructBondTypeImpl(org.bondlib.GenericTypeSpecialization genericTypeSpecialization) {
             super(genericTypeSpecialization);
         }
 
         @Override
         protected final void initialize() {
-            com.microsoft.bond.BondType<T> T = this.getGenericSpecialization().getGenericTypeArgument(0);
-            this.aa = new com.microsoft.bond.StructBondType.ObjectStructField<java.util.List<java.util.List<T>>>(this, vectorOf(vectorOf(T)), 0, "aa", com.microsoft.bond.Modifier.Optional);
+            org.bondlib.BondType<T> T = this.getGenericSpecialization().getGenericTypeArgument(0);
+            this.aa = new org.bondlib.StructBondType.ObjectStructField<java.util.List<java.util.List<T>>>(this, vectorOf(vectorOf(T)), 0, "aa", org.bondlib.Modifier.Optional);
             super.initializeBaseAndFields(null, this.aa);
         }
 
@@ -70,12 +70,12 @@ public final Foo<T> newInstance() {
         }
 
         @Override
-        protected final void serializeStructFields(com.microsoft.bond.BondType.SerializationContext context, Foo<T> value) throws java.io.IOException {
+        protected final void serializeStructFields(org.bondlib.BondType.SerializationContext context, Foo<T> value) throws java.io.IOException {
             this.aa.serialize(context, value.aa);
         }
 
         @Override
-        protected final void deserializeStructFields(com.microsoft.bond.BondType.TaggedDeserializationContext context, Foo<T> value) throws java.io.IOException {
+        protected final void deserializeStructFields(org.bondlib.BondType.TaggedDeserializationContext context, Foo<T> value) throws java.io.IOException {
             boolean __has_aa = false;
             while (this.readField(context)) {
                 switch (context.readFieldResult.id) {
@@ -92,7 +92,7 @@ protected final void deserializeStructFields(com.microsoft.bond.BondType.TaggedD
         }
 
         @Override
-        protected final void deserializeStructFields(com.microsoft.bond.BondType.UntaggedDeserializationContext context, Foo<T> value) throws java.io.IOException {
+        protected final void deserializeStructFields(org.bondlib.BondType.UntaggedDeserializationContext context, Foo<T> value) throws java.io.IOException {
             value.aa = this.aa.deserialize(context);
         }
 
@@ -112,7 +112,7 @@ protected final void cloneStructFields(Foo<T> fromValue, Foo<T> toValue) {
         final StructBondTypeImpl.StructBondTypeBuilderImpl builder = new StructBondTypeImpl.StructBondTypeBuilderImpl();
 
         @Override
-        public final <T> com.microsoft.bond.StructBondType<Foo<T>> makeGenericType(com.microsoft.bond.BondType<T> T) {
+        public final <T> org.bondlib.StructBondType<Foo<T>> makeGenericType(org.bondlib.BondType<T> T) {
             return this.builder.makeGenericType(T);
         }
     };
@@ -128,7 +128,7 @@ public static void initializeBondType() {
 
     public java.util.List<java.util.List<T>> aa;
 
-public Foo(com.microsoft.bond.StructBondType<Foo<T>> genericType) {
+public Foo(org.bondlib.StructBondType<Foo<T>> genericType) {
         super();
         this.__genericType = (StructBondTypeImpl<T>)genericType;
         this.__genericType.initializeStructFields(this);
@@ -153,7 +153,7 @@ public int hashCode() {
     }
 
     @Override
-    public com.microsoft.bond.StructBondType<? extends Foo<T>> getBondType() {
+    public org.bondlib.StructBondType<? extends Foo<T>> getBondType() {
         return this.__genericType;
     }
 }
@@ -162,15 +162,15 @@ public com.microsoft.bond.StructBondType<? extends Foo<T>> getBondType() {
 
 
 @javax.annotation.Generated("gbc")
-public final class EnumToWrap implements com.microsoft.bond.BondEnum<EnumToWrap> {
+public final class EnumToWrap implements org.bondlib.BondEnum<EnumToWrap> {
 
     public static final class Values {
         private Values() {}
 
         public static final int anEnumValue = 0;
     }
 
-    private static final class EnumBondTypeImpl extends com.microsoft.bond.EnumBondType<EnumToWrap> {
+    private static final class EnumBondTypeImpl extends org.bondlib.EnumBondType<EnumToWrap> {
 
         @Override
         public java.lang.Class<EnumToWrap> getValueClass() { return EnumToWrap.class; }
@@ -179,7 +179,7 @@ private static final class EnumBondTypeImpl extends com.microsoft.bond.EnumBondT
         public final EnumToWrap getEnumValue(int value) { return get(value); }
     }
 
-    public static final com.microsoft.bond.EnumBondType<EnumToWrap> BOND_TYPE = new EnumBondTypeImpl();
+    public static final org.bondlib.EnumBondType<EnumToWrap> BOND_TYPE = new EnumBondTypeImpl();
 
     public static final EnumToWrap anEnumValue = new EnumToWrap(Values.anEnumValue, "anEnumValue");
 
@@ -196,7 +196,7 @@ private static final class EnumBondTypeImpl extends com.microsoft.bond.EnumBondT
     public final String getLabel() { return this.label; }
 
     @Override
-    public final com.microsoft.bond.EnumBondType<EnumToWrap> getBondType() { return BOND_TYPE; }
+    public final org.bondlib.EnumBondType<EnumToWrap> getBondType() { return BOND_TYPE; }
 
     @Override
     public final int compareTo(EnumToWrap o) { return this.value < o.value ? -1 : (this.value > o.value ? 1 : 0); }
@@ -231,19 +231,19 @@ public static EnumToWrap valueOf(String str) {
 package tests;
 
 @javax.annotation.Generated("gbc")
-public class WrappingAnEnum implements com.microsoft.bond.BondSerializable {
+public class WrappingAnEnum implements org.bondlib.BondSerializable {
 
-    private static final class StructBondTypeImpl extends com.microsoft.bond.StructBondType<WrappingAnEnum> {
+    private static final class StructBondTypeImpl extends org.bondlib.StructBondType<WrappingAnEnum> {
 
-        static final class StructBondTypeBuilderImpl extends com.microsoft.bond.StructBondType.StructBondTypeBuilder<WrappingAnEnum> {
+        static final class StructBondTypeBuilderImpl extends org.bondlib.StructBondType.StructBondTypeBuilder<WrappingAnEnum> {
 
             @Override
             public final int getGenericTypeParameterCount() {
                 return 0;
             }
 
             @Override
-            protected final com.microsoft.bond.StructBondType<WrappingAnEnum> buildNewInstance(com.microsoft.bond.BondType[] genericTypeArguments) {
+            protected final org.bondlib.StructBondType<WrappingAnEnum> buildNewInstance(org.bondlib.BondType[] genericTypeArguments) {
                 return new StructBondTypeImpl(null);
             }
 
@@ -252,15 +252,15 @@ static void register() {
             }
         }
 
-        private com.microsoft.bond.StructBondType.EnumStructField<tests.EnumToWrap> aWrappedEnum;
+        private org.bondlib.StructBondType.EnumStructField<tests.EnumToWrap> aWrappedEnum;
 
-        private StructBondTypeImpl(com.microsoft.bond.GenericTypeSpecialization genericTypeSpecialization) {
+        private StructBondTypeImpl(org.bondlib.GenericTypeSpecialization genericTypeSpecialization) {
             super(genericTypeSpecialization);
         }
 
         @Override
         protected final void initialize() {
-            this.aWrappedEnum = new com.microsoft.bond.StructBondType.EnumStructField<tests.EnumToWrap>(this, tests.EnumToWrap.BOND_TYPE, 0, "aWrappedEnum", com.microsoft.bond.Modifier.Optional);
+            this.aWrappedEnum = new org.bondlib.StructBondType.EnumStructField<tests.EnumToWrap>(this, tests.EnumToWrap.BOND_TYPE, 0, "aWrappedEnum", org.bondlib.Modifier.Optional);
             super.initializeBaseAndFields(null, this.aWrappedEnum);
         }
 
@@ -285,12 +285,12 @@ public final WrappingAnEnum newInstance() {
         }
 
         @Override
-        protected final void serializeStructFields(com.microsoft.bond.BondType.SerializationContext context, WrappingAnEnum value) throws java.io.IOException {
+        protected final void serializeStructFields(org.bondlib.BondType.SerializationContext context, WrappingAnEnum value) throws java.io.IOException {
             this.aWrappedEnum.serialize(context, value.aWrappedEnum);
         }
 
         @Override
-        protected final void deserializeStructFields(com.microsoft.bond.BondType.TaggedDeserializationContext context, WrappingAnEnum value) throws java.io.IOException {
+        protected final void deserializeStructFields(org.bondlib.BondType.TaggedDeserializationContext context, WrappingAnEnum value) throws java.io.IOException {
             boolean __has_aWrappedEnum = false;
             while (this.readField(context)) {
                 switch (context.readFieldResult.id) {
@@ -307,7 +307,7 @@ protected final void deserializeStructFields(com.microsoft.bond.BondType.TaggedD
         }
 
         @Override
-        protected final void deserializeStructFields(com.microsoft.bond.BondType.UntaggedDeserializationContext context, WrappingAnEnum value) throws java.io.IOException {
+        protected final void deserializeStructFields(org.bondlib.BondType.UntaggedDeserializationContext context, WrappingAnEnum value) throws java.io.IOException {
             value.aWrappedEnum = this.aWrappedEnum.deserialize(context);
         }
 
@@ -322,7 +322,7 @@ protected final void cloneStructFields(WrappingAnEnum fromValue, WrappingAnEnum
         }
     }
 
-    public static final com.microsoft.bond.StructBondType<WrappingAnEnum> BOND_TYPE = new StructBondTypeImpl.StructBondTypeBuilderImpl().getInitializedFromCache();
+    public static final org.bondlib.StructBondType<WrappingAnEnum> BOND_TYPE = new StructBondTypeImpl.StructBondTypeBuilderImpl().getInitializedFromCache();
 
     public static void initializeBondType() {
         StructBondTypeImpl.StructBondTypeBuilderImpl.register();
@@ -359,7 +359,7 @@ public int hashCode() {
     }
 
     @Override
-    public com.microsoft.bond.StructBondType<? extends WrappingAnEnum> getBondType() {
+    public org.bondlib.StructBondType<? extends WrappingAnEnum> getBondType() {
         return BOND_TYPE;
     }
 }