Skip to content
This repository has been archived by the owner. It is now read-only.

Commit 0d63710

Browse files
eed3si9need3si9n
committed
Bump to the latest Contraband
1 parent 0ffa4f9 commit 0d63710

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+449
-125
lines changed

‎src/main/contraband-java/xsbti/api/Access.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
public abstract class Access implements java.io.Serializable {
88

99

10-
public Access() {
10+
protected Access() {
1111
super();
1212

1313
}
@@ -24,7 +24,7 @@ public boolean equals(Object obj) {
2424
}
2525
}
2626
public int hashCode() {
27-
return 37 * (17 + "Access".hashCode());
27+
return 37 * (17 + "xsbti.api.Access".hashCode());
2828
}
2929
public String toString() {
3030
return "Access(" + ")";

‎src/main/contraband-java/xsbti/api/AnalyzedClass.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
package xsbti.api;
77
public final class AnalyzedClass implements java.io.Serializable {
88

9+
public static AnalyzedClass create(long _compilationTimestamp, String _name, xsbti.api.Lazy<Companions> _api, int _apiHash, NameHash[] _nameHashes, boolean _hasMacro) {
10+
return new AnalyzedClass(_compilationTimestamp, _name, _api, _apiHash, _nameHashes, _hasMacro);
11+
}
12+
public static AnalyzedClass of(long _compilationTimestamp, String _name, xsbti.api.Lazy<Companions> _api, int _apiHash, NameHash[] _nameHashes, boolean _hasMacro) {
13+
return new AnalyzedClass(_compilationTimestamp, _name, _api, _apiHash, _nameHashes, _hasMacro);
14+
}
915

1016
private long compilationTimestamp;
1117
private String name;
1218
private xsbti.api.Lazy<Companions> api;
1319
private int apiHash;
1420
private NameHash[] nameHashes;
1521
private boolean hasMacro;
16-
public AnalyzedClass(long _compilationTimestamp, String _name, xsbti.api.Lazy<Companions> _api, int _apiHash, NameHash[] _nameHashes, boolean _hasMacro) {
22+
protected AnalyzedClass(long _compilationTimestamp, String _name, xsbti.api.Lazy<Companions> _api, int _apiHash, NameHash[] _nameHashes, boolean _hasMacro) {
1723
super();
1824
compilationTimestamp = _compilationTimestamp;
1925
name = _name;

‎src/main/contraband-java/xsbti/api/Annotated.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
package xsbti.api;
77
public final class Annotated extends xsbti.api.Type {
88

9+
public static Annotated create(Type _baseType, Annotation[] _annotations) {
10+
return new Annotated(_baseType, _annotations);
11+
}
12+
public static Annotated of(Type _baseType, Annotation[] _annotations) {
13+
return new Annotated(_baseType, _annotations);
14+
}
915

1016
private Type baseType;
1117
private Annotation[] annotations;
12-
public Annotated(Type _baseType, Annotation[] _annotations) {
18+
protected Annotated(Type _baseType, Annotation[] _annotations) {
1319
super();
1420
baseType = _baseType;
1521
annotations = _annotations;
@@ -37,7 +43,7 @@ public boolean equals(Object obj) {
3743
}
3844
}
3945
public int hashCode() {
40-
return 37 * (37 * (37 * (17 + "Annotated".hashCode()) + baseType().hashCode()) + annotations().hashCode());
46+
return 37 * (37 * (37 * (17 + "xsbti.api.Annotated".hashCode()) + baseType().hashCode()) + annotations().hashCode());
4147
}
4248
public String toString() {
4349
return "Annotated(" + "baseType: " + baseType() + ", " + "annotations: " + annotations() + ")";

‎src/main/contraband-java/xsbti/api/Annotation.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
package xsbti.api;
77
public final class Annotation implements java.io.Serializable {
88

9+
public static Annotation create(Type _base, AnnotationArgument[] _arguments) {
10+
return new Annotation(_base, _arguments);
11+
}
12+
public static Annotation of(Type _base, AnnotationArgument[] _arguments) {
13+
return new Annotation(_base, _arguments);
14+
}
915

1016
private Type base;
1117
private AnnotationArgument[] arguments;
12-
public Annotation(Type _base, AnnotationArgument[] _arguments) {
18+
protected Annotation(Type _base, AnnotationArgument[] _arguments) {
1319
super();
1420
base = _base;
1521
arguments = _arguments;
@@ -37,7 +43,7 @@ public boolean equals(Object obj) {
3743
}
3844
}
3945
public int hashCode() {
40-
return 37 * (37 * (37 * (17 + "Annotation".hashCode()) + base().hashCode()) + arguments().hashCode());
46+
return 37 * (37 * (37 * (17 + "xsbti.api.Annotation".hashCode()) + base().hashCode()) + arguments().hashCode());
4147
}
4248
public String toString() {
4349
return "Annotation(" + "base: " + base() + ", " + "arguments: " + arguments() + ")";

‎src/main/contraband-java/xsbti/api/AnnotationArgument.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
package xsbti.api;
77
public final class AnnotationArgument implements java.io.Serializable {
88

9+
public static AnnotationArgument create(String _name, String _value) {
10+
return new AnnotationArgument(_name, _value);
11+
}
12+
public static AnnotationArgument of(String _name, String _value) {
13+
return new AnnotationArgument(_name, _value);
14+
}
915

1016
private String name;
1117
private String value;
12-
public AnnotationArgument(String _name, String _value) {
18+
protected AnnotationArgument(String _name, String _value) {
1319
super();
1420
name = _name;
1521
value = _value;
@@ -37,7 +43,7 @@ public boolean equals(Object obj) {
3743
}
3844
}
3945
public int hashCode() {
40-
return 37 * (37 * (37 * (17 + "AnnotationArgument".hashCode()) + name().hashCode()) + value().hashCode());
46+
return 37 * (37 * (37 * (17 + "xsbti.api.AnnotationArgument".hashCode()) + name().hashCode()) + value().hashCode());
4147
}
4248
public String toString() {
4349
return "AnnotationArgument(" + "name: " + name() + ", " + "value: " + value() + ")";

‎src/main/contraband-java/xsbti/api/ClassDefinition.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
public abstract class ClassDefinition extends xsbti.api.Definition {
88

99

10-
public ClassDefinition(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations) {
10+
protected ClassDefinition(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations) {
1111
super(_name, _access, _modifiers, _annotations);
1212

1313
}
@@ -24,7 +24,7 @@ public boolean equals(Object obj) {
2424
}
2525
}
2626
public int hashCode() {
27-
return 37 * (37 * (37 * (37 * (37 * (17 + "ClassDefinition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode());
27+
return 37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ClassDefinition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode());
2828
}
2929
public String toString() {
3030
return "ClassDefinition(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ")";

‎src/main/contraband-java/xsbti/api/ClassLike.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
package xsbti.api;
77
public final class ClassLike extends xsbti.api.Definition {
88

9+
public static ClassLike create(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, DefinitionType _definitionType, xsbti.api.Lazy<Type> _selfType, xsbti.api.Lazy<Structure> _structure, String[] _savedAnnotations, Type[] _childrenOfSealedClass, boolean _topLevel, TypeParameter[] _typeParameters) {
10+
return new ClassLike(_name, _access, _modifiers, _annotations, _definitionType, _selfType, _structure, _savedAnnotations, _childrenOfSealedClass, _topLevel, _typeParameters);
11+
}
12+
public static ClassLike of(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, DefinitionType _definitionType, xsbti.api.Lazy<Type> _selfType, xsbti.api.Lazy<Structure> _structure, String[] _savedAnnotations, Type[] _childrenOfSealedClass, boolean _topLevel, TypeParameter[] _typeParameters) {
13+
return new ClassLike(_name, _access, _modifiers, _annotations, _definitionType, _selfType, _structure, _savedAnnotations, _childrenOfSealedClass, _topLevel, _typeParameters);
14+
}
915

1016
private DefinitionType definitionType;
1117
private xsbti.api.Lazy<Type> selfType;
@@ -14,7 +20,7 @@ public final class ClassLike extends xsbti.api.Definition {
1420
private Type[] childrenOfSealedClass;
1521
private boolean topLevel;
1622
private TypeParameter[] typeParameters;
17-
public ClassLike(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, DefinitionType _definitionType, xsbti.api.Lazy<Type> _selfType, xsbti.api.Lazy<Structure> _structure, String[] _savedAnnotations, Type[] _childrenOfSealedClass, boolean _topLevel, TypeParameter[] _typeParameters) {
23+
protected ClassLike(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, DefinitionType _definitionType, xsbti.api.Lazy<Type> _selfType, xsbti.api.Lazy<Structure> _structure, String[] _savedAnnotations, Type[] _childrenOfSealedClass, boolean _topLevel, TypeParameter[] _typeParameters) {
1824
super(_name, _access, _modifiers, _annotations);
1925
definitionType = _definitionType;
2026
selfType = _selfType;

‎src/main/contraband-java/xsbti/api/ClassLikeDef.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,15 @@
66
package xsbti.api;
77
public final class ClassLikeDef extends xsbti.api.ParameterizedDefinition {
88

9+
public static ClassLikeDef create(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, DefinitionType _definitionType) {
10+
return new ClassLikeDef(_name, _access, _modifiers, _annotations, _typeParameters, _definitionType);
11+
}
12+
public static ClassLikeDef of(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, DefinitionType _definitionType) {
13+
return new ClassLikeDef(_name, _access, _modifiers, _annotations, _typeParameters, _definitionType);
14+
}
915

1016
private DefinitionType definitionType;
11-
public ClassLikeDef(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, DefinitionType _definitionType) {
17+
protected ClassLikeDef(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, DefinitionType _definitionType) {
1218
super(_name, _access, _modifiers, _annotations, _typeParameters);
1319
definitionType = _definitionType;
1420
}
@@ -44,7 +50,7 @@ public boolean equals(Object obj) {
4450
}
4551
}
4652
public int hashCode() {
47-
return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "ClassLikeDef".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + definitionType().hashCode());
53+
return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ClassLikeDef".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + definitionType().hashCode());
4854
}
4955
public String toString() {
5056
return "ClassLikeDef(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ", " + "definitionType: " + definitionType() + ")";

‎src/main/contraband-java/xsbti/api/Companions.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
package xsbti.api;
77
public final class Companions implements java.io.Serializable {
88

9+
public static Companions create(ClassLike _classApi, ClassLike _objectApi) {
10+
return new Companions(_classApi, _objectApi);
11+
}
12+
public static Companions of(ClassLike _classApi, ClassLike _objectApi) {
13+
return new Companions(_classApi, _objectApi);
14+
}
915

1016
private ClassLike classApi;
1117
private ClassLike objectApi;
12-
public Companions(ClassLike _classApi, ClassLike _objectApi) {
18+
protected Companions(ClassLike _classApi, ClassLike _objectApi) {
1319
super();
1420
classApi = _classApi;
1521
objectApi = _objectApi;
@@ -37,7 +43,7 @@ public boolean equals(Object obj) {
3743
}
3844
}
3945
public int hashCode() {
40-
return 37 * (37 * (37 * (17 + "Companions".hashCode()) + classApi().hashCode()) + objectApi().hashCode());
46+
return 37 * (37 * (37 * (17 + "xsbti.api.Companions".hashCode()) + classApi().hashCode()) + objectApi().hashCode());
4147
}
4248
public String toString() {
4349
return "Companions(" + "classApi: " + classApi() + ", " + "objectApi: " + objectApi() + ")";

‎src/main/contraband-java/xsbti/api/Constant.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
package xsbti.api;
77
public final class Constant extends xsbti.api.Type {
88

9+
public static Constant create(Type _baseType, String _value) {
10+
return new Constant(_baseType, _value);
11+
}
12+
public static Constant of(Type _baseType, String _value) {
13+
return new Constant(_baseType, _value);
14+
}
915

1016
private Type baseType;
1117
private String value;
12-
public Constant(Type _baseType, String _value) {
18+
protected Constant(Type _baseType, String _value) {
1319
super();
1420
baseType = _baseType;
1521
value = _value;
@@ -37,7 +43,7 @@ public boolean equals(Object obj) {
3743
}
3844
}
3945
public int hashCode() {
40-
return 37 * (37 * (37 * (17 + "Constant".hashCode()) + baseType().hashCode()) + value().hashCode());
46+
return 37 * (37 * (37 * (17 + "xsbti.api.Constant".hashCode()) + baseType().hashCode()) + value().hashCode());
4147
}
4248
public String toString() {
4349
return "Constant(" + "baseType: " + baseType() + ", " + "value: " + value() + ")";

‎src/main/contraband-java/xsbti/api/Def.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
package xsbti.api;
77
public final class Def extends xsbti.api.ParameterizedDefinition {
88

9+
public static Def create(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, ParameterList[] _valueParameters, Type _returnType) {
10+
return new Def(_name, _access, _modifiers, _annotations, _typeParameters, _valueParameters, _returnType);
11+
}
12+
public static Def of(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, ParameterList[] _valueParameters, Type _returnType) {
13+
return new Def(_name, _access, _modifiers, _annotations, _typeParameters, _valueParameters, _returnType);
14+
}
915

1016
private ParameterList[] valueParameters;
1117
private Type returnType;
12-
public Def(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, ParameterList[] _valueParameters, Type _returnType) {
18+
protected Def(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations, TypeParameter[] _typeParameters, ParameterList[] _valueParameters, Type _returnType) {
1319
super(_name, _access, _modifiers, _annotations, _typeParameters);
1420
valueParameters = _valueParameters;
1521
returnType = _returnType;
@@ -52,7 +58,7 @@ public boolean equals(Object obj) {
5258
}
5359
}
5460
public int hashCode() {
55-
return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "Def".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + valueParameters().hashCode()) + returnType().hashCode());
61+
return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Def".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + valueParameters().hashCode()) + returnType().hashCode());
5662
}
5763
public String toString() {
5864
return "Def(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ", " + "valueParameters: " + valueParameters() + ", " + "returnType: " + returnType() + ")";

‎src/main/contraband-java/xsbti/api/Definition.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public abstract class Definition implements java.io.Serializable {
1111
private Access access;
1212
private Modifiers modifiers;
1313
private Annotation[] annotations;
14-
public Definition(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations) {
14+
protected Definition(String _name, Access _access, Modifiers _modifiers, Annotation[] _annotations) {
1515
super();
1616
name = _name;
1717
access = _access;
@@ -42,7 +42,7 @@ public boolean equals(Object obj) {
4242
}
4343
}
4444
public int hashCode() {
45-
return 37 * (37 * (37 * (37 * (37 * (17 + "Definition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode());
45+
return 37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Definition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode());
4646
}
4747
public String toString() {
4848
return "Definition(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ")";

‎src/main/contraband-java/xsbti/api/EmptyType.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66
package xsbti.api;
77
public final class EmptyType extends xsbti.api.Type {
88

9+
public static EmptyType create() {
10+
return new EmptyType();
11+
}
12+
public static EmptyType of() {
13+
return new EmptyType();
14+
}
915

10-
public EmptyType() {
16+
protected EmptyType() {
1117
super();
1218

1319
}
@@ -24,7 +30,7 @@ public boolean equals(Object obj) {
2430
}
2531
}
2632
public int hashCode() {
27-
return 37 * (17 + "EmptyType".hashCode());
33+
return 37 * (17 + "xsbti.api.EmptyType".hashCode());
2834
}
2935
public String toString() {
3036
return "EmptyType(" + ")";

‎src/main/contraband-java/xsbti/api/Existential.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
package xsbti.api;
77
public final class Existential extends xsbti.api.Type {
88

9+
public static Existential create(Type _baseType, TypeParameter[] _clause) {
10+
return new Existential(_baseType, _clause);
11+
}
12+
public static Existential of(Type _baseType, TypeParameter[] _clause) {
13+
return new Existential(_baseType, _clause);
14+
}
915

1016
private Type baseType;
1117
private TypeParameter[] clause;
12-
public Existential(Type _baseType, TypeParameter[] _clause) {
18+
protected Existential(Type _baseType, TypeParameter[] _clause) {
1319
super();
1420
baseType = _baseType;
1521
clause = _clause;
@@ -37,7 +43,7 @@ public boolean equals(Object obj) {
3743
}
3844
}
3945
public int hashCode() {
40-
return 37 * (37 * (37 * (17 + "Existential".hashCode()) + baseType().hashCode()) + clause().hashCode());
46+
return 37 * (37 * (37 * (17 + "xsbti.api.Existential".hashCode()) + baseType().hashCode()) + clause().hashCode());
4147
}
4248
public String toString() {
4349
return "Existential(" + "baseType: " + baseType() + ", " + "clause: " + clause() + ")";

‎src/main/contraband-java/xsbti/api/ExternalDependency.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@
66
package xsbti.api;
77
public final class ExternalDependency implements java.io.Serializable {
88

9+
public static ExternalDependency create(String _sourceClassName, String _targetProductClassName, xsbti.api.AnalyzedClass _targetClass, xsbti.api.DependencyContext _context) {
10+
return new ExternalDependency(_sourceClassName, _targetProductClassName, _targetClass, _context);
11+
}
12+
public static ExternalDependency of(String _sourceClassName, String _targetProductClassName, xsbti.api.AnalyzedClass _targetClass, xsbti.api.DependencyContext _context) {
13+
return new ExternalDependency(_sourceClassName, _targetProductClassName, _targetClass, _context);
14+
}
915

1016
private String sourceClassName;
1117
private String targetProductClassName;
1218
private xsbti.api.AnalyzedClass targetClass;
1319
private xsbti.api.DependencyContext context;
14-
public ExternalDependency(String _sourceClassName, String _targetProductClassName, xsbti.api.AnalyzedClass _targetClass, xsbti.api.DependencyContext _context) {
20+
protected ExternalDependency(String _sourceClassName, String _targetProductClassName, xsbti.api.AnalyzedClass _targetClass, xsbti.api.DependencyContext _context) {
1521
super();
1622
sourceClassName = _sourceClassName;
1723
targetProductClassName = _targetProductClassName;
@@ -53,7 +59,7 @@ public boolean equals(Object obj) {
5359
}
5460
}
5561
public int hashCode() {
56-
return 37 * (37 * (37 * (37 * (37 * (17 + "ExternalDependency".hashCode()) + sourceClassName().hashCode()) + targetProductClassName().hashCode()) + targetClass().hashCode()) + context().hashCode());
62+
return 37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ExternalDependency".hashCode()) + sourceClassName().hashCode()) + targetProductClassName().hashCode()) + targetClass().hashCode()) + context().hashCode());
5763
}
5864
public String toString() {
5965
return "ExternalDependency(" + "sourceClassName: " + sourceClassName() + ", " + "targetProductClassName: " + targetProductClassName() + ", " + "targetClass: " + targetClass() + ", " + "context: " + context() + ")";

0 commit comments

Comments
 (0)