Merge branch 'master' into issues/21

sblom · Andrew Gibson · commit 2dc005625ca5 · 2020-10-09T16:45:39.000+01:00
diff --git a/src/json-ld.net/Core/Context.cs b/src/json-ld.net/Core/Context.cs
@@ -22,7 +22,7 @@ public class Context : JObject
 
 		JObject termDefinitions;
 
-		public JObject inverse = null;
+		internal JObject inverse = null;
 
 		public Context() : this(new JsonLdOptions())
 		{
@@ -68,7 +68,7 @@ private void Init(JsonLdOptions options)
 		/// <param name="activeProperty"></param>
 		/// <param name="element"></param>
 		/// <returns></returns>
-		public virtual JToken CompactValue(string activeProperty, JObject value)
+		internal virtual JToken CompactValue(string activeProperty, JObject value)
 		{
             var dict = (IDictionary<string, JToken>)value;
 			// 1)
@@ -137,7 +137,7 @@ public virtual JToken CompactValue(string activeProperty, JObject value)
 		/// <returns></returns>
 		/// <exception cref="JsonLdError">JsonLdError</exception>
 		/// <exception cref="JsonLD.Core.JsonLdError"></exception>
-		public virtual JsonLD.Core.Context Parse(JToken localContext, List<string> remoteContexts)
+		internal virtual JsonLD.Core.Context Parse(JToken localContext, List<string> remoteContexts)
 		{
 			if (remoteContexts == null)
 			{
@@ -318,7 +318,7 @@ public virtual JsonLD.Core.Context Parse(JToken localContext, List<string> remot
 		}
 
 		/// <exception cref="JsonLD.Core.JsonLdError"></exception>
-		public virtual JsonLD.Core.Context Parse(JToken localContext)
+		internal virtual JsonLD.Core.Context Parse(JToken localContext)
 		{
 			return this.Parse(localContext, new List<string>());
 		}
@@ -952,7 +952,7 @@ public object Clone()
 		/// already generated for the given active context.
 		/// </remarks>
 		/// <returns>the inverse context.</returns>
-		public virtual JObject GetInverse()
+		internal virtual JObject GetInverse()
 		{
 			// lazily create inverse
 			if (inverse != null)
@@ -1144,7 +1144,7 @@ private string SelectTerm(string iri, JArray containers, string typeLanguage
 		/// <remarks>Retrieve container mapping.</remarks>
 		/// <param name="property"></param>
 		/// <returns></returns>
-		public virtual string GetContainer(string property)
+		internal virtual string GetContainer(string property)
 		{
             // TODO(sblom): Do java semantics of get() on a Map return null if property is null?
             if (property == null)
@@ -1169,7 +1169,7 @@ public virtual string GetContainer(string property)
 			return (string)td["@container"];
 		}
 
-		public virtual bool IsReverseProperty(string property)
+		internal virtual bool IsReverseProperty(string property)
 		{
             if (property == null)
             {
@@ -1218,7 +1218,7 @@ internal virtual JObject GetTermDefinition(string key)
 		}
 
 		/// <exception cref="JsonLD.Core.JsonLdError"></exception>
-		public virtual JToken ExpandValue(string activeProperty, JToken value)
+		internal virtual JToken ExpandValue(string activeProperty, JToken value)
 		{
 			JObject rval = new JObject();
 			JObject td = GetTermDefinition(activeProperty);
@@ -1272,7 +1272,7 @@ public virtual JToken ExpandValue(string activeProperty, JToken value)
 		}
 
 		/// <exception cref="JsonLD.Core.JsonLdError"></exception>
-        public virtual JObject GetContextValue(string activeProperty, string @string)
+        internal virtual JObject GetContextValue(string activeProperty, string @string)
 		{
 			throw new JsonLdError(JsonLdError.Error.NotImplemented, "getContextValue is only used by old code so far and thus isn't implemented"
 				);
diff --git a/src/json-ld.net/Core/JSONLDConsts.cs b/src/json-ld.net/Core/JSONLDConsts.cs
@@ -4,7 +4,7 @@ namespace JsonLD.Core
 {
     /// <summary>URI Constants used in the JSON-LD parser.</summary>
     /// <remarks>URI Constants used in the JSON-LD parser.</remarks>
-    public sealed class JSONLDConsts
+    internal sealed class JSONLDConsts
     {
         public const string RdfSyntaxNs = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 
diff --git a/src/json-ld.net/Core/JsonLdError.cs b/src/json-ld.net/Core/JsonLdError.cs
@@ -11,21 +11,21 @@ public class JsonLdError : Exception
         private JsonLdError.Error type;
         internal JObject details = null;
 
-        public JsonLdError(JsonLdError.Error type, object detail, Exception innerException)
+        internal JsonLdError(JsonLdError.Error type, object detail, Exception innerException)
             : base(detail == null ? string.Empty : detail.ToString(), innerException)
         {
             // TODO: pretty toString (e.g. print whole json objects)
             this.type = type;
         }
 
-        public JsonLdError(JsonLdError.Error type, object detail)
+        internal JsonLdError(JsonLdError.Error type, object detail)
             : base(detail == null ? string.Empty : detail.ToString())
         {
             // TODO: pretty toString (e.g. print whole json objects)
             this.type = type;
         }
 
-        public JsonLdError(JsonLdError.Error type)
+        internal JsonLdError(JsonLdError.Error type)
             : base(string.Empty)
         {
             this.type = type;
@@ -171,7 +171,7 @@ public override string ToString()
             }
         }
 
-        public virtual JsonLdError SetType(JsonLdError.Error error)
+        internal virtual JsonLdError SetType(JsonLdError.Error error)
         {
             this.type = error;
             return this;
diff --git a/src/json-ld.net/Core/JsonLdUtils.cs b/src/json-ld.net/Core/JsonLdUtils.cs
@@ -8,7 +8,7 @@
 
 namespace JsonLD.Core
 {
-    public class JsonLdUtils
+    internal class JsonLdUtils
     {
         private const int MaxContextUrls = 10;
 
diff --git a/src/json-ld.net/Core/RDFDatasetUtils.cs b/src/json-ld.net/Core/RDFDatasetUtils.cs
@@ -6,7 +6,7 @@
 
 namespace JsonLD.Core
 {
-    public class RDFDatasetUtils
+    internal class RDFDatasetUtils
     {
         /// <summary>Creates an array of RDF triples for the given graph.</summary>
         /// <remarks>Creates an array of RDF triples for the given graph.</remarks>
diff --git a/src/json-ld.net/Core/UniqueNamer.cs b/src/json-ld.net/Core/UniqueNamer.cs
@@ -4,7 +4,7 @@
 
 namespace JsonLD.Core
 {
-    public class UniqueNamer
+    internal class UniqueNamer
     {
         private readonly string prefix;
 
diff --git a/src/json-ld.net/Impl/NQuadRDFParser.cs b/src/json-ld.net/Impl/NQuadRDFParser.cs
@@ -4,7 +4,7 @@
 
 namespace JsonLD.Impl
 {
-    public class NQuadRDFParser : IRDFParser
+    internal class NQuadRDFParser : IRDFParser
     {
         /// <exception cref="JsonLD.Core.JsonLdError"></exception>
         public virtual RDFDataset Parse(JToken input)
diff --git a/src/json-ld.net/Impl/NQuadTripleCallback.cs b/src/json-ld.net/Impl/NQuadTripleCallback.cs
@@ -4,7 +4,7 @@
 
 namespace JsonLD.Impl
 {
-    public class NQuadTripleCallback : IJSONLDTripleCallback
+    internal class NQuadTripleCallback : IJSONLDTripleCallback
     {
         public virtual object Call(RDFDataset dataset)
         {
diff --git a/src/json-ld.net/Impl/TurtleRDFParser.cs b/src/json-ld.net/Impl/TurtleRDFParser.cs
@@ -11,7 +11,7 @@ namespace JsonLD.Impl
     /// TODO: this probably needs to be changed to use a proper parser/lexer
     /// </summary>
     /// <author>Tristan</author>
-    public class TurtleRDFParser : IRDFParser
+    internal class TurtleRDFParser : IRDFParser
     {
         internal class Regex
         {
diff --git a/src/json-ld.net/Impl/TurtleTripleCallback.cs b/src/json-ld.net/Impl/TurtleTripleCallback.cs
@@ -4,7 +4,7 @@
 
 namespace JsonLD.Impl
 {
-    public class TurtleTripleCallback : IJSONLDTripleCallback
+    internal class TurtleTripleCallback : IJSONLDTripleCallback
     {
         private const int MaxLineLength = 160;
 
diff --git a/src/json-ld.net/Properties/AssemblyInfo.cs b/src/json-ld.net/Properties/AssemblyInfo.cs
@@ -14,3 +14,4 @@
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
+[assembly: InternalsVisibleTo("json-ld.net.tests")]
diff --git a/src/json-ld.net/Util/JSONUtils.cs b/src/json-ld.net/Util/JSONUtils.cs
@@ -13,7 +13,7 @@ namespace JsonLD.Util
 {
     /// <summary>A bunch of functions to make loading JSON easy</summary>
     /// <author>tristan</author>
-    public class JSONUtils
+    internal class JSONUtils
     {
         static JSONUtils()
         {
diff --git a/src/json-ld.net/Util/Obj.cs b/src/json-ld.net/Util/Obj.cs
@@ -4,7 +4,7 @@
 
 namespace JsonLD.Util
 {
-    public class Obj
+    internal class Obj
     {
         /// <summary>
         /// Used to make getting values from maps embedded in maps embedded in maps
diff --git a/src/json-ld.net/Util/URL.cs b/src/json-ld.net/Util/URL.cs
@@ -7,7 +7,7 @@
 
 namespace JsonLD.Util
 {
-    public class URL
+    internal class URL
     {
         public string href = string.Empty;
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class Context : JObject`
`22`	`22`
`23`	`23`	`JObject termDefinitions;`
`24`	`24`
`25`		`- public JObject inverse = null;`
	`25`	`+ internal JObject inverse = null;`
`26`	`26`
`27`	`27`	`public Context() : this(new JsonLdOptions())`
`28`	`28`	`{`
`@@ -68,7 +68,7 @@ private void Init(JsonLdOptions options)`
`68`	`68`	`/// <param name="activeProperty"></param>`
`69`	`69`	`/// <param name="element"></param>`
`70`	`70`	`/// <returns></returns>`
`71`		`- public virtual JToken CompactValue(string activeProperty, JObject value)`
	`71`	`+ internal virtual JToken CompactValue(string activeProperty, JObject value)`
`72`	`72`	`{`
`73`	`73`	`var dict = (IDictionary<string, JToken>)value;`
`74`	`74`	`// 1)`
`@@ -137,7 +137,7 @@ public virtual JToken CompactValue(string activeProperty, JObject value)`
`137`	`137`	`/// <returns></returns>`
`138`	`138`	`/// <exception cref="JsonLdError">JsonLdError</exception>`
`139`	`139`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`140`		`- public virtual JsonLD.Core.Context Parse(JToken localContext, List<string> remoteContexts)`
	`140`	`+ internal virtual JsonLD.Core.Context Parse(JToken localContext, List<string> remoteContexts)`
`141`	`141`	`{`
`142`	`142`	`if (remoteContexts == null)`
`143`	`143`	`{`
`@@ -318,7 +318,7 @@ public virtual JsonLD.Core.Context Parse(JToken localContext, List<string> remot`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`321`		`- public virtual JsonLD.Core.Context Parse(JToken localContext)`
	`321`	`+ internal virtual JsonLD.Core.Context Parse(JToken localContext)`
`322`	`322`	`{`
`323`	`323`	`return this.Parse(localContext, new List<string>());`
`324`	`324`	`}`
`@@ -952,7 +952,7 @@ public object Clone()`
`952`	`952`	`/// already generated for the given active context.`
`953`	`953`	`/// </remarks>`
`954`	`954`	`/// <returns>the inverse context.</returns>`
`955`		`- public virtual JObject GetInverse()`
	`955`	`+ internal virtual JObject GetInverse()`
`956`	`956`	`{`
`957`	`957`	`// lazily create inverse`
`958`	`958`	`if (inverse != null)`
`@@ -1144,7 +1144,7 @@ private string SelectTerm(string iri, JArray containers, string typeLanguage`
`1144`	`1144`	`/// <remarks>Retrieve container mapping.</remarks>`
`1145`	`1145`	`/// <param name="property"></param>`
`1146`	`1146`	`/// <returns></returns>`
`1147`		`- public virtual string GetContainer(string property)`
	`1147`	`+ internal virtual string GetContainer(string property)`
`1148`	`1148`	`{`
`1149`	`1149`	`// TODO(sblom): Do java semantics of get() on a Map return null if property is null?`
`1150`	`1150`	`if (property == null)`
`@@ -1169,7 +1169,7 @@ public virtual string GetContainer(string property)`
`1169`	`1169`	`return (string)td["@container"];`
`1170`	`1170`	`}`
`1171`	`1171`
`1172`		`- public virtual bool IsReverseProperty(string property)`
	`1172`	`+ internal virtual bool IsReverseProperty(string property)`
`1173`	`1173`	`{`
`1174`	`1174`	`if (property == null)`
`1175`	`1175`	`{`
`@@ -1218,7 +1218,7 @@ internal virtual JObject GetTermDefinition(string key)`
`1218`	`1218`	`}`
`1219`	`1219`
`1220`	`1220`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`1221`		`- public virtual JToken ExpandValue(string activeProperty, JToken value)`
	`1221`	`+ internal virtual JToken ExpandValue(string activeProperty, JToken value)`
`1222`	`1222`	`{`
`1223`	`1223`	`JObject rval = new JObject();`
`1224`	`1224`	`JObject td = GetTermDefinition(activeProperty);`
`@@ -1272,7 +1272,7 @@ public virtual JToken ExpandValue(string activeProperty, JToken value)`
`1272`	`1272`	`}`
`1273`	`1273`
`1274`	`1274`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`1275`		`- public virtual JObject GetContextValue(string activeProperty, string @string)`
	`1275`	`+ internal virtual JObject GetContextValue(string activeProperty, string @string)`
`1276`	`1276`	`{`
`1277`	`1277`	`throw new JsonLdError(JsonLdError.Error.NotImplemented, "getContextValue is only used by old code so far and thus isn't implemented"`
`1278`	`1278`	`);`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace JsonLD.Core`
`4`	`4`	`{`
`5`	`5`	`/// <summary>URI Constants used in the JSON-LD parser.</summary>`
`6`	`6`	`/// <remarks>URI Constants used in the JSON-LD parser.</remarks>`
`7`		`- public sealed class JSONLDConsts`
	`7`	`+ internal sealed class JSONLDConsts`
`8`	`8`	`{`
`9`	`9`	`public const string RdfSyntaxNs = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -11,21 +11,21 @@ public class JsonLdError : Exception`
`11`	`11`	`private JsonLdError.Error type;`
`12`	`12`	`internal JObject details = null;`
`13`	`13`
`14`		`- public JsonLdError(JsonLdError.Error type, object detail, Exception innerException)`
	`14`	`+ internal JsonLdError(JsonLdError.Error type, object detail, Exception innerException)`
`15`	`15`	`: base(detail == null ? string.Empty : detail.ToString(), innerException)`
`16`	`16`	`{`
`17`	`17`	`// TODO: pretty toString (e.g. print whole json objects)`
`18`	`18`	`this.type = type;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public JsonLdError(JsonLdError.Error type, object detail)`
	`21`	`+ internal JsonLdError(JsonLdError.Error type, object detail)`
`22`	`22`	`: base(detail == null ? string.Empty : detail.ToString())`
`23`	`23`	`{`
`24`	`24`	`// TODO: pretty toString (e.g. print whole json objects)`
`25`	`25`	`this.type = type;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public JsonLdError(JsonLdError.Error type)`
	`28`	`+ internal JsonLdError(JsonLdError.Error type)`
`29`	`29`	`: base(string.Empty)`
`30`	`30`	`{`
`31`	`31`	`this.type = type;`
`@@ -171,7 +171,7 @@ public override string ToString()`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`- public virtual JsonLdError SetType(JsonLdError.Error error)`
	`174`	`+ internal virtual JsonLdError SetType(JsonLdError.Error error)`
`175`	`175`	`{`
`176`	`176`	`this.type = error;`
`177`	`177`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace JsonLD.Core`
`10`	`10`	`{`
`11`		`- public class JsonLdUtils`
	`11`	`+ internal class JsonLdUtils`
`12`	`12`	`{`
`13`	`13`	`private const int MaxContextUrls = 10;`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace JsonLD.Core`
`8`	`8`	`{`
`9`		`- public class RDFDatasetUtils`
	`9`	`+ internal class RDFDatasetUtils`
`10`	`10`	`{`
`11`	`11`	`/// <summary>Creates an array of RDF triples for the given graph.</summary>`
`12`	`12`	`/// <remarks>Creates an array of RDF triples for the given graph.</remarks>`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace JsonLD.Core`
`6`	`6`	`{`
`7`		`- public class UniqueNamer`
	`7`	`+ internal class UniqueNamer`
`8`	`8`	`{`
`9`	`9`	`private readonly string prefix;`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace JsonLD.Impl`
`6`	`6`	`{`
`7`		`- public class NQuadRDFParser : IRDFParser`
	`7`	`+ internal class NQuadRDFParser : IRDFParser`
`8`	`8`	`{`
`9`	`9`	`/// <exception cref="JsonLD.Core.JsonLdError"></exception>`
`10`	`10`	`public virtual RDFDataset Parse(JToken input)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace JsonLD.Impl`
`6`	`6`	`{`
`7`		`- public class NQuadTripleCallback : IJSONLDTripleCallback`
	`7`	`+ internal class NQuadTripleCallback : IJSONLDTripleCallback`
`8`	`8`	`{`
`9`	`9`	`public virtual object Call(RDFDataset dataset)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace JsonLD.Impl`
`11`	`11`	`/// TODO: this probably needs to be changed to use a proper parser/lexer`
`12`	`12`	`/// </summary>`
`13`	`13`	`/// <author>Tristan</author>`
`14`		`- public class TurtleRDFParser : IRDFParser`
	`14`	`+ internal class TurtleRDFParser : IRDFParser`
`15`	`15`	`{`
`16`	`16`	`internal class Regex`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace JsonLD.Impl`
`6`	`6`	`{`
`7`		`- public class TurtleTripleCallback : IJSONLDTripleCallback`
	`7`	`+ internal class TurtleTripleCallback : IJSONLDTripleCallback`
`8`	`8`	`{`
`9`	`9`	`private const int MaxLineLength = 160;`
`10`	`10`