Skip to content

Commit bd05d1a

Browse files
goofballLogicgoofballLogic
authored
Merge branch 'master' into feature/release-workflow
2 parents 2ab7e59 + 215ae2a commit bd05d1a

15 files changed

+27
-26
lines changed

‎src/json-ld.net/Core/Context.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class Context : JObject
2222

2323
JObject termDefinitions;
2424

25-
public JObject inverse = null;
25+
internal JObject inverse = null;
2626

2727
public Context() : this(new JsonLdOptions())
2828
{
@@ -68,7 +68,7 @@ private void Init(JsonLdOptions options)
6868
/// <param name="activeProperty"></param>
6969
/// <param name="element"></param>
7070
/// <returns></returns>
71-
public virtual JToken CompactValue(string activeProperty, JObject value)
71+
internal virtual JToken CompactValue(string activeProperty, JObject value)
7272
{
7373
var dict = (IDictionary<string, JToken>)value;
7474
// 1)
@@ -137,7 +137,7 @@ public virtual JToken CompactValue(string activeProperty, JObject value)
137137
/// <returns></returns>
138138
/// <exception cref="JsonLdError">JsonLdError</exception>
139139
/// <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)
141141
{
142142
if (remoteContexts == null)
143143
{
@@ -318,7 +318,7 @@ public virtual JsonLD.Core.Context Parse(JToken localContext, List<string> remot
318318
}
319319

320320
/// <exception cref="JsonLD.Core.JsonLdError"></exception>
321-
public virtual JsonLD.Core.Context Parse(JToken localContext)
321+
internal virtual JsonLD.Core.Context Parse(JToken localContext)
322322
{
323323
return this.Parse(localContext, new List<string>());
324324
}
@@ -952,7 +952,7 @@ public object Clone()
952952
/// already generated for the given active context.
953953
/// </remarks>
954954
/// <returns>the inverse context.</returns>
955-
public virtual JObject GetInverse()
955+
internal virtual JObject GetInverse()
956956
{
957957
// lazily create inverse
958958
if (inverse != null)
@@ -1144,7 +1144,7 @@ private string SelectTerm(string iri, JArray containers, string typeLanguage
11441144
/// <remarks>Retrieve container mapping.</remarks>
11451145
/// <param name="property"></param>
11461146
/// <returns></returns>
1147-
public virtual string GetContainer(string property)
1147+
internal virtual string GetContainer(string property)
11481148
{
11491149
// TODO(sblom): Do java semantics of get() on a Map return null if property is null?
11501150
if (property == null)
@@ -1169,7 +1169,7 @@ public virtual string GetContainer(string property)
11691169
return (string)td["@container"];
11701170
}
11711171

1172-
public virtual bool IsReverseProperty(string property)
1172+
internal virtual bool IsReverseProperty(string property)
11731173
{
11741174
if (property == null)
11751175
{
@@ -1218,7 +1218,7 @@ internal virtual JObject GetTermDefinition(string key)
12181218
}
12191219

12201220
/// <exception cref="JsonLD.Core.JsonLdError"></exception>
1221-
public virtual JToken ExpandValue(string activeProperty, JToken value)
1221+
internal virtual JToken ExpandValue(string activeProperty, JToken value)
12221222
{
12231223
JObject rval = new JObject();
12241224
JObject td = GetTermDefinition(activeProperty);
@@ -1272,7 +1272,7 @@ public virtual JToken ExpandValue(string activeProperty, JToken value)
12721272
}
12731273

12741274
/// <exception cref="JsonLD.Core.JsonLdError"></exception>
1275-
public virtual JObject GetContextValue(string activeProperty, string @string)
1275+
internal virtual JObject GetContextValue(string activeProperty, string @string)
12761276
{
12771277
throw new JsonLdError(JsonLdError.Error.NotImplemented, "getContextValue is only used by old code so far and thus isn't implemented"
12781278
);

‎src/json-ld.net/Core/DocumentLoader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public virtual RemoteDocument LoadDocument(string url)
2121
try
2222
{
2323
HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(url);
24-
req.Accept = AcceptHeader;
24+
req.Accept = _acceptHeader;
2525
resp = (HttpWebResponse)req.GetResponse();
2626
bool isJsonld = resp.Headers[HttpResponseHeader.ContentType] == "application/ld+json";
2727
if (!resp.Headers[HttpResponseHeader.ContentType].Contains("json"))
@@ -91,7 +91,7 @@ public virtual RemoteDocument LoadDocument(string url)
9191

9292
/// <summary>An HTTP Accept header that prefers JSONLD.</summary>
9393
/// <remarks>An HTTP Accept header that prefers JSONLD.</remarks>
94-
public const string AcceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1";
94+
private const string _acceptHeader = "application/ld+json, application/json;q=0.9, application/javascript;q=0.5, text/javascript;q=0.5, text/plain;q=0.2, */*;q=0.1";
9595

9696
// private static volatile IHttpClient httpClient;
9797

‎src/json-ld.net/Core/JSONLDConsts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace JsonLD.Core
44
{
55
/// <summary>URI Constants used in the JSON-LD parser.</summary>
66
/// <remarks>URI Constants used in the JSON-LD parser.</remarks>
7-
public sealed class JSONLDConsts
7+
internal sealed class JSONLDConsts
88
{
99
public const string RdfSyntaxNs = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
1010

‎src/json-ld.net/Core/JsonLdError.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ public class JsonLdError : Exception
1111
private JsonLdError.Error type;
1212
internal JObject details = null;
1313

14-
public JsonLdError(JsonLdError.Error type, object detail, Exception innerException)
14+
internal JsonLdError(JsonLdError.Error type, object detail, Exception innerException)
1515
: base(detail == null ? string.Empty : detail.ToString(), innerException)
1616
{
1717
// TODO: pretty toString (e.g. print whole json objects)
1818
this.type = type;
1919
}
2020

21-
public JsonLdError(JsonLdError.Error type, object detail)
21+
internal JsonLdError(JsonLdError.Error type, object detail)
2222
: base(detail == null ? string.Empty : detail.ToString())
2323
{
2424
// TODO: pretty toString (e.g. print whole json objects)
2525
this.type = type;
2626
}
2727

28-
public JsonLdError(JsonLdError.Error type)
28+
internal JsonLdError(JsonLdError.Error type)
2929
: base(string.Empty)
3030
{
3131
this.type = type;
@@ -171,7 +171,7 @@ public override string ToString()
171171
}
172172
}
173173

174-
public virtual JsonLdError SetType(JsonLdError.Error error)
174+
internal virtual JsonLdError SetType(JsonLdError.Error error)
175175
{
176176
this.type = error;
177177
return this;

‎src/json-ld.net/Core/JsonLdUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace JsonLD.Core
1010
{
11-
public class JsonLdUtils
11+
internal class JsonLdUtils
1212
{
1313
private const int MaxContextUrls = 10;
1414

‎src/json-ld.net/Core/RDFDatasetUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace JsonLD.Core
88
{
9-
public class RDFDatasetUtils
9+
internal class RDFDatasetUtils
1010
{
1111
/// <summary>Creates an array of RDF triples for the given graph.</summary>
1212
/// <remarks>Creates an array of RDF triples for the given graph.</remarks>

‎src/json-ld.net/Core/UniqueNamer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace JsonLD.Core
66
{
7-
public class UniqueNamer
7+
internal class UniqueNamer
88
{
99
private readonly string prefix;
1010

‎src/json-ld.net/Impl/NQuadRDFParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace JsonLD.Impl
66
{
7-
public class NQuadRDFParser : IRDFParser
7+
internal class NQuadRDFParser : IRDFParser
88
{
99
/// <exception cref="JsonLD.Core.JsonLdError"></exception>
1010
public virtual RDFDataset Parse(JToken input)

‎src/json-ld.net/Impl/NQuadTripleCallback.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace JsonLD.Impl
66
{
7-
public class NQuadTripleCallback : IJSONLDTripleCallback
7+
internal class NQuadTripleCallback : IJSONLDTripleCallback
88
{
99
public virtual object Call(RDFDataset dataset)
1010
{

‎src/json-ld.net/Impl/TurtleRDFParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace JsonLD.Impl
1111
/// TODO: this probably needs to be changed to use a proper parser/lexer
1212
/// </summary>
1313
/// <author>Tristan</author>
14-
public class TurtleRDFParser : IRDFParser
14+
internal class TurtleRDFParser : IRDFParser
1515
{
1616
internal class Regex
1717
{

‎src/json-ld.net/Impl/TurtleTripleCallback.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace JsonLD.Impl
66
{
7-
public class TurtleTripleCallback : IJSONLDTripleCallback
7+
internal class TurtleTripleCallback : IJSONLDTripleCallback
88
{
99
private const int MaxLineLength = 160;
1010

‎src/json-ld.net/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414
// to COM components. If you need to access a type in this assembly from
1515
// COM, set the ComVisible attribute to true on that type.
1616
[assembly: ComVisible(false)]
17+
[assembly: InternalsVisibleTo("json-ld.net.tests")]

‎src/json-ld.net/Util/JSONUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace JsonLD.Util
1010
{
1111
/// <summary>A bunch of functions to make loading JSON easy</summary>
1212
/// <author>tristan</author>
13-
public class JSONUtils
13+
internal class JSONUtils
1414
{
1515
/// <summary>An HTTP Accept header that prefers JSONLD.</summary>
1616
/// <remarks>An HTTP Accept header that prefers JSONLD.</remarks>

‎src/json-ld.net/Util/Obj.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace JsonLD.Util
66
{
7-
public class Obj
7+
internal class Obj
88
{
99
/// <summary>
1010
/// Used to make getting values from maps embedded in maps embedded in maps

‎src/json-ld.net/Util/URL.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace JsonLD.Util
99
{
10-
public class URL
10+
internal class URL
1111
{
1212
public string href = string.Empty;
1313

0 commit comments

Comments
 (0)