Hotfix/APPEALS-30802 (#279)

* Adding new java jar file that replaces the ourdated and vulnerable 1.2.14 per OKR 2 recomendations * Removes the old file that is replaced by the updated version 2.3.2 for Java 6 * Fixing linting errors * Fixing linting error * Error when running tests. equivalent-xml is no longer available. --------- Co-authored-by: Matthew Thornton <[email protected]>
department-of-veterans-affairs · Sep 27, 2023 · 9807d9c · 9807d9c
1 parent 42a98dd
commit 9807d9c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/java/log4j-1.2.14.jar b/java/log4j-1.2.14.jar
diff --git a/java/log4j-2.3.2.jar b/java/log4j-2.3.2.jar
diff --git a/lib/vbms/requests/update_contention.rb b/lib/vbms/requests/update_contention.rb
@@ -68,7 +68,7 @@ def soap_doc
                   id: special_issue[:id],
                   contentionId: special_issue[:contention_id]
                 ) do
-                   xml["cdm"].specificRating(special_issue[:specific_rating])
+                  xml["cdm"].specificRating(special_issue[:specific_rating])
                 end
               end
 

diff --git a/lib/vbms/responses/contention.rb b/lib/vbms/responses/contention.rb
@@ -5,7 +5,7 @@ module Responses
     class Contention < OpenStruct
       def self.create_from_xml(xml, key: :list_of_contentions)
         data = XMLHelper.convert_to_hash(xml.to_xml)[key]
-                
+
         new(
           id: data[:@id],
           text: Nokogiri::HTML.fragment(data[:@title]).text,
@@ -29,8 +29,8 @@ def self.create_from_xml(xml, key: :list_of_contentions)
         )
       end
 
-      def self.create_issues(*issues) 
-        issues.compact.flatten.map{|issue| VBMS::Responses::Issue.create(issue)}
+      def self.create_issues(*issues)
+        issues.compact.flatten.map { |issue| VBMS::Responses::Issue.create(issue) }
       end
     end
   end

diff --git a/lib/vbms/responses/issue.rb b/lib/vbms/responses/issue.rb
@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
 module VBMS
-    module Responses
-      class Issue < OpenStruct
-        def self.create(data)
-
-          new(
-            id: data[:@id],
-            contention_id: data[:@contention_id],
-            inferred: data[:@inferred],
-            narrative: data[:@narrative],
-            code: data[:@type_cd],
-            specific_rating: data[:specific_rating]
-          )
-        end
+  module Responses
+    class Issue < OpenStruct
+      def self.create(data)
+        new(
+          id: data[:@id],
+          contention_id: data[:@contention_id],
+          inferred: data[:@inferred],
+          narrative: data[:@narrative],
+          code: data[:@type_cd],
+          specific_rating: data[:specific_rating]
+        )
       end
     end
   end
+end
diff --git a/spec/requests/update_contention_spec.rb b/spec/requests/update_contention_spec.rb
@@ -94,7 +94,7 @@
         expect(contention["id"]).to eq(contention_hash[:id])
         expect(contention["claimId"]).to eq(contention_hash[:claim_id])
         expect(contention["fileNumber"]).to eq(contention_hash[:file_number])
-        
+
         issues = contention.xpath("//cdm:issue")
         expect(issues.length).to eq(contention_hash[:special_issues].length)
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -10,7 +10,7 @@
 require "vbms"
 require "nokogiri"
 require "rspec/matchers"
-require "equivalent-xml"
+# require "equivalent-xml"
 require "pry"
 require "httplog" if ENV["CONNECT_VBMS_HTTPLOG"] && ENV["CONNECT_VBMS_HTTPLOG"] == 1
 require "byebug" if RUBY_PLATFORM != "java"