Skip to content

Commit

Permalink
[Update] Starion Group
Browse files Browse the repository at this point in the history
  • Loading branch information
samatstariongroup committed Apr 28, 2024
1 parent e1f4d1c commit ce1d07e
Show file tree
Hide file tree
Showing 34 changed files with 132 additions and 135 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ We would like to start with saying thank you for wanting to contribute to DEH-CS

1. [Fork](http://help.github.com/forking/) on GitHub
1. Clone your fork locally
1. Configure the upstream repo (`git remote add upstream git://github.com/RHEAGROUP/DEH-CSV`)
1. Configure the upstream repo (`git remote add upstream git://github.com/STARIONGROUP/DEH-CSV`)
1. Checkout development
1. Create a local branch (`git checkout -b myBranch`) from development
1. Work on your feature
Expand Down Expand Up @@ -44,9 +44,9 @@ When you're ready to go you should confirm that you are up to date and rebased w

1. `git push origin myBranch`
1. Send a descriptive [Pull Request](https://help.github.com/articles/creating-a-pull-request/) on GitHub - making sure you have selected the correct branch in the GitHub UI!
1. Wait for @samatrhea to merge your changes in.
1. Wait for @samatstarion to merge your changes in.

And remember; **A pull-request with tests is a pull-request that's likely to be pulled in.** :grin: Bonus points if you document your feature in our [wiki](https://github.com/RHEAGROUP/DEH-CSV/wiki) once it has been pulled in
And remember; **A pull-request with tests is a pull-request that's likely to be pulled in.** :grin: Bonus points if you document your feature in our [wiki](https://github.com/STARIONGROUP/DEH-CSV/wiki) once it has been pulled in

## Style Guidelines

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- [ ] I have written a descriptive issue title
- [ ] I have verified that I am running the latest version of the DEH-CSV
- [ ] I have searched [open](https://github.com/RHEAGROUP/DEH-CSV/issues) and [closed](https://github.com/RHEAGROUP/DEH-CSV/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
- [ ] I have searched [open](https://github.com/STARIONGROUP/DEH-CSV/issues) and [closed](https://github.com/STARIONGROUP/DEH-CSV/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported

### Description
<!-- A description of the bug or feature -->
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### Prerequisites

- [ ] I have written a descriptive pull-request title
- [ ] I have verified that there are no overlapping [pull-requests](https://github.com/RHEAGROUP/DEH-CSV/pulls) open
- [ ] I have verified that I am following the DEH-CSV [code style guidelines](https://raw.githubusercontent.com/RHEAGROUP/DEH-CSV/master/.github/CONTRIBUTING.md)
- [ ] I have verified that there are no overlapping [pull-requests](https://github.com/STARIONGROUP/DEH-CSV/pulls) open
- [ ] I have verified that I am following the DEH-CSV [code style guidelines](https://raw.githubusercontent.com/STARIONGROUP/DEH-CSV/master/.github/CONTRIBUTING.md)
- [ ] I have provided test coverage for my change (where applicable)

### Description
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CodeQuality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
dotnet-version: '8.0.x'

- name: add organization github nuget feed
run: dotnet nuget add source https://nuget.pkg.github.com/RHEAGROUP/index.json -n github -u ${{ secrets.REGISTRY_USER }} -p ${{ secrets.REGISTRY_TOKEN }} --store-password-in-clear-text
run: dotnet nuget add source https://nuget.pkg.github.com/STARIOMGROUP/index.json -n github -u ${{ secrets.REGISTRY_USER }} -p ${{ secrets.REGISTRY_TOKEN }} --store-password-in-clear-text

- name: Restore dependencies
run: dotnet restore
Expand All @@ -37,7 +37,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
dotnet tool install --global dotnet-sonarscanner
dotnet sonarscanner begin /k:"RHEAGROUP_DEH-CSV" /o:"rheagroup" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="./CoverageResults/coverage.opencover.xml"
dotnet sonarscanner begin /k:"STARIOMGROUP_DEH-CSV" /o:"stariongroup" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="./CoverageResults/coverage.opencover.xml"
- name: Build
run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fetch-depth: 2

- name: add organization github nuget feed
run: dotnet nuget add source https://nuget.pkg.github.com/RHEAGROUP/index.json -n github -u ${{ secrets.REGISTRY_USER }} -p ${{ secrets.REGISTRY_TOKEN }} --store-password-in-clear-text
run: dotnet nuget add source https://nuget.pkg.github.com/STARIONGROUP/index.json -n github -u ${{ secrets.REGISTRY_USER }} -p ${{ secrets.REGISTRY_TOKEN }} --store-password-in-clear-text

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at s.gerene@rheagroup.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at s.gerene@stariongroup.eu. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
8 changes: 4 additions & 4 deletions DEH-CSV.Tests/CsvReaderTestFixture.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="CsvReaderTestFixture.cs" company="RHEA System S.A.">
// <copyright file="CsvReaderTestFixture.cs" company="Starion Group S.A.">
//
// Copyright 2023-2024 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV.Tests
namespace STARIONGROUP.DEHCSV.Tests
{
using System;
using System.Collections.Generic;
Expand All @@ -43,7 +43,7 @@ namespace RHEAGROUP.DEHCSV.Tests

using NUnit.Framework;

using RHEAGROUP.DEHCSV.Mapping;
using STARIONGROUP.DEHCSV.Mapping;

using File = System.IO.File;

Expand Down
10 changes: 5 additions & 5 deletions DEH-CSV.Tests/CsvWriterTestFixture.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="CsvWriterTestFixture.cs" company="RHEA System S.A.">
// <copyright file="CsvWriterTestFixture.cs" company="Starion Group S.A.">
//
// Copyright 2023 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV.Tests
namespace STARIONGROUP.DEHCSV.Tests
{
using System;
using System.Collections.Generic;
Expand All @@ -34,8 +34,8 @@ namespace RHEAGROUP.DEHCSV.Tests

using NUnit.Framework;

using RHEAGROUP.DEHCSV.Mapping;
using RHEAGROUP.DEHCSV.Services;
using STARIONGROUP.DEHCSV.Mapping;
using STARIONGROUP.DEHCSV.Services;

/// <summary>
/// Suite of tests for the <see cref="CsvWriter"/> class
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ThingTimeStampedCSVWriterTestFixture.cs" company="RHEA System S.A.">
// <copyright file="ThingTimeStampedCSVWriterTestFixture.cs" company="Starion Group S.A.">
//
// Copyright 2023 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV.Tests.CustomProperties
namespace STARIONGROUP.DEHCSV.Tests.CustomProperties
{
using System;
using System.Collections.Generic;
Expand All @@ -34,9 +34,9 @@ namespace RHEAGROUP.DEHCSV.Tests.CustomProperties

using NUnit.Framework;

using RHEAGROUP.DEHCSV.CustomProperties;
using RHEAGROUP.DEHCSV.Mapping;
using RHEAGROUP.DEHCSV.Services;
using STARIONGROUP.DEHCSV.CustomProperties;
using STARIONGROUP.DEHCSV.Mapping;
using STARIONGROUP.DEHCSV.Services;

/// <summary>
/// Suite of tests for the <see cref="ThingTimeStampedCSVWriter"/> class
Expand Down
8 changes: 4 additions & 4 deletions DEH-CSV.Tests/DEH-CSV.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup Label="Copyright">
<Company>RHEA System S.A.</Company>
<Company>Starion Group S.A.</Company>
<Authors>Sam Gerené</Authors>
<Copyright>Copyright 2023 RHEA System S.A.</Copyright>
<Copyright>Copyright 2023-2024 Starion Group S.A.</Copyright>
</PropertyGroup>

<PropertyGroup Label="Package">
<Description>Nunit test suite for the RHEAGROUP.DEHCSV library</Description>
<Description>Nunit test suite for the STARIONGROUP.DEHCSV library</Description>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>RHEAGROUP.DEHCSV.Tests</RootNamespace>
<RootNamespace>STARIONGROUP.DEHCSV.Tests</RootNamespace>
<ImplicitUsings>false</ImplicitUsings>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
10 changes: 5 additions & 5 deletions DEH-CSV.Tests/Mapping/MappingProviderTestFixture.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="MappingProviderTestFixture.cs" company="RHEA System S.A.">
// <copyright file="MappingProviderTestFixture.cs" company="Starion Group S.A.">
//
// Copyright 2023 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV.Tests.Mapping
namespace STARIONGROUP.DEHCSV.Tests.Mapping
{
using System.IO;
using System.Linq;
Expand All @@ -29,8 +29,8 @@ namespace RHEAGROUP.DEHCSV.Tests.Mapping

using NUnit.Framework;

using RHEAGROUP.DEHCSV.Mapping;
using RHEAGROUP.DEHCSV.Services;
using STARIONGROUP.DEHCSV.Mapping;
using STARIONGROUP.DEHCSV.Services;

/// <summary>
/// Suite of tests for the <see cref="DataSourceSelector"/> class
Expand Down
10 changes: 5 additions & 5 deletions DEH-CSV.Tests/Services/DataSourceSelectorTestFixture.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="DataSourceSelectorTestFixture.cs" company="RHEA System S.A.">
// <copyright file="DataSourceSelectorTestFixture.cs" company="Starion Group S.A.">
//
// Copyright 2023 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV.Tests.Services
namespace STARIONGROUP.DEHCSV.Tests.Services
{
using System;
using System.IO;
Expand All @@ -27,7 +27,7 @@ namespace RHEAGROUP.DEHCSV.Tests.Services

using NUnit.Framework;

using RHEAGROUP.DEHCSV.Services;
using STARIONGROUP.DEHCSV.Services;

/// <summary>
/// Suite of tests for the <see cref="DataSourceSelector"/> class
Expand Down Expand Up @@ -78,7 +78,7 @@ public void Verify_that_when_a_http_uri_is_provided_a_file_dal_is_returned()
[Test]
public void verify_that_when_an_unsupported_uri_is_provided_an_excetion_is_thrown()
{
var uri = new Uri("atom://www.rheagroup.com");
var uri = new Uri("atom://www.stariongroup.eu");

Assert.That(() => this.dataSourceSelector.Select(uri), Throws.TypeOf<ArgumentException>()
.With.Message.EqualTo("The URI scheme is not supported: atom"));
Expand Down
8 changes: 4 additions & 4 deletions DEH-CSV.Tests/Services/IterationReaderTestFixture.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="IterationReaderTestFixture.cs" company="RHEA System S.A.">
// <copyright file="IterationReaderTestFixture.cs" company="Starion Group S.A.">
//
// Copyright 2023 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV.Tests.Services
namespace STARIONGROUP.DEHCSV.Tests.Services
{
using System;
using System.IO;
Expand All @@ -31,7 +31,7 @@ namespace RHEAGROUP.DEHCSV.Tests.Services

using NUnit.Framework;

using RHEAGROUP.DEHCSV.Services;
using STARIONGROUP.DEHCSV.Services;

/// <summary>
/// Suite of tests for the <see cref="IterationReader"/> class
Expand Down
7 changes: 3 additions & 4 deletions DEH-CSV.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">Field, Property, Event, Method</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> -------------------------------------------------------------------------------------------------
&lt;copyright file="${File.FileName}" company="RHEA System S.A."&gt;
&lt;copyright file="${File.FileName}" company="Starion Group S.A."&gt;

Copyright 2023-${CurrentDate.Year} RHEA System S.A.
Copyright 2023-${CurrentDate.Year} Starion Group S.A.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -26,5 +26,4 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=DEHCSV/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=DEHREQIF/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ECSS/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=RHEAGROUP/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ECSS/@EntryIndexedValue">True</s:Boolean>
10 changes: 5 additions & 5 deletions DEH-CSV/CsvReader.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="CsvReader.cs" company="RHEA System S.A.">
// <copyright file="CsvReader.cs" company="Starion Group S.A.">
//
// Copyright 2023-2024 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV
namespace STARIONGROUP.DEHCSV
{
using System;
using System.Collections;
Expand All @@ -40,8 +40,8 @@ namespace RHEAGROUP.DEHCSV

using Microsoft.Extensions.Logging;

using RHEAGROUP.DEHCSV.Helpers;
using RHEAGROUP.DEHCSV.Mapping;
using STARIONGROUP.DEHCSV.Helpers;
using STARIONGROUP.DEHCSV.Mapping;

/// <summary>
/// The purpose of the <see cref="CsvReader" /> is to read CSV files and transform the content to
Expand Down
10 changes: 5 additions & 5 deletions DEH-CSV/CsvWriter.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="CsvWriter.cs" company="RHEA System S.A.">
// <copyright file="CsvWriter.cs" company="Starion Group S.A.">
//
// Copyright 2023 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV
namespace STARIONGROUP.DEHCSV
{
using System;
using System.Collections.Generic;
Expand All @@ -35,8 +35,8 @@ namespace RHEAGROUP.DEHCSV
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;

using RHEAGROUP.DEHCSV.CustomProperties;
using RHEAGROUP.DEHCSV.Mapping;
using STARIONGROUP.DEHCSV.CustomProperties;
using STARIONGROUP.DEHCSV.Mapping;

/// <summary>
/// The purpose of the <see cref="CsvWriter"/> is to write CSV files based on the provided
Expand Down
8 changes: 4 additions & 4 deletions DEH-CSV/CustomProperties/ICustomPropertyEvaluator.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ICustomPropertyEvaluator.cs" company="RHEA System S.A.">
// <copyright file="ICustomPropertyEvaluator.cs" company="Starion Group S.A.">
//
// Copyright 2023 RHEA System S.A.
// Copyright 2023-2024 Starion Group S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,11 +18,11 @@
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace RHEAGROUP.DEHCSV.CustomProperties
namespace STARIONGROUP.DEHCSV.CustomProperties
{
using CDP4Common.CommonData;

using RHEAGROUP.DEHCSV.Mapping;
using STARIONGROUP.DEHCSV.Mapping;

/// <summary>
/// The purpose of the <see cref="ICustomPropertyEvaluator"/> interface is to support
Expand Down

0 comments on commit ce1d07e

Please sign in to comment.