refactoring + jenkins

Author: Frode Sjovatsen

FINT.Model.Resource.Test/FINT.Model.Resource.Test.csproj

@@ -4,6 +4,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="FINT.Model.Administrasjon" Version="2.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />

FINT.Model.Resource.Test/LinkTest.cs

@@ -7,15 +7,15 @@ public class LinkTest
         [Fact]
         public void Create_Link_with_PersonResource_placeholder()
         {
-            var link = Link.with(typeof(PersonResource), new string[] { "/id" });
+            var link = Link.with(typeof(PersonResource), new string[] { "id" });
 
             Assert.Equal(link.href, "${test.person}/id");
         }
 
         [Fact]
         public void Create_Link_with_Person_placeholder()
         {
-            var link = Link.with(typeof(Person), new string[] { "/id" });
+            var link = Link.with(typeof(Person), new string[] { "id" });
 
             Assert.Equal(link.href, "${test.person}/id");
         }

FINT.Model.Resource.sln

@@ -8,6 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 ProjectSection(SolutionItems) = preProject
 	README.md = README.md
 	.gitignore = .gitignore
+	Jenkinsfile = Jenkinsfile
+	version.txt = version.txt
 EndProjectSection
 EndProject
 Global

FINT.Model.Resource/AbstractCollectionResources.cs

@@ -13,7 +13,7 @@ public abstract class AbstractCollectionResources<T>
         protected EmbeddedResources<T> Embedded = new EmbeddedResources<T>();
 
         [JsonProperty(PropertyName = "total_items")]
-        protected int TotalItems { get; set; }
+        public int TotalItems { get; set; }
 
 
         [OnSerialized]
@@ -32,22 +32,11 @@ public List<Link> GetSelfLinks()
             return Links["self"];
         }
 
-        /*
-            @JsonIgnore
-            public List<T> getContent() {
-                return new ObjectMapper().convertValue(embedded.entries, getTypeReference());
-            }
-        
-            @JsonIgnore
-            public abstract TypeReference<List<T>> getTypeReference();
-        */
-
         public List<T> GetContent()
         {
             return Embedded.Entries;
         }
 
-
         public class EmbeddedResources<T>
         {
             public EmbeddedResources()

FINT.Model.Resource/IFintLinks.cs

@@ -5,19 +5,17 @@ namespace FINT.Model.Resource
 {
     public class Link
     {
-        private Link(string verdi)
+        public Link()
         {
-            href = verdi;
         }
 
-        public string href { get; set; }
-
-        // TODO: Is this needed?
-        public void setVerdi(string verdi)
+        private Link(string verdi)
         {
             href = verdi;
         }
 
+        public string href { get; }
+
         public static Link with(string verdi)
         {
             return new Link(verdi);
@@ -34,7 +32,7 @@ private static Link with(Type placeholderClass, string path)
             var regex = new Regex("^/");
             path = regex.Replace(path, "", 1);
 
-            return new Link(string.Format("${{{0}}}/{1}", placeholder, path));
+            return new Link($"${{{placeholder}}}/{path}");
         }
 
         private static string getHrefPlaceholder(Type placeholderClass)

FINT.Model.Resource/Link.cs

@@ -0,0 +1,40 @@
+pipeline {
+  agent none
+  stages {
+    stage('Build') {
+      agent {
+        docker {
+          label 'docker'
+          image 'microsoft/dotnet'
+        }
+      }
+      steps {
+        sh 'git clean -fdx'
+        sh 'dotnet restore -s https://api.bintray.com/nuget/fint/nuget'
+        sh 'dotnet build -c Release'
+        sh 'dotnet pack -c Release'
+        stash includes: '**/Release/*.nupkg', name: 'libs'
+      }
+    }
+
+    stage('Deploy') {
+      agent {
+        docker {
+          label 'docker'
+          image 'microsoft/dotnet'
+        }
+      }
+      environment {
+        BINTRAY = credentials('fint-bintray')
+      }
+      when {
+        branch 'master'
+      }
+      steps {
+        unstash 'libs'
+        archiveArtifacts '**/*.nupkg'
+        sh "dotnet nuget push FINT.Model.Resource/bin/Release/FINT.Model.Resource.*.nupkg -k ${BINTRAY} -s https://api.bintray.com/nuget/fint/nuget"
+      }
+    }
+  }
+}

Jenkinsfile

@@ -0,0 +1 @@
+0.0.1