forked from Commonjava/indy
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FIX multiple type of npm bin fieldd deserialization issue
- Loading branch information
Showing
7 changed files
with
171 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
addons/pkg-npm/common/src/test/resources/metadata/version-bin-1.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| { | ||
| "name": "json", | ||
| "description": "a 'json' command for massaging and processing JSON on the command line", | ||
| "version": "9.0.5", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git://github.com/trentm/json.git" | ||
| }, | ||
| "author": "Trent Mick <[email protected]> (http://trentm.com)", | ||
| "main": "./lib/json.js", | ||
| "directories": { | ||
| "man": "./man/man1" | ||
| }, | ||
| "bin": "./lib/json.js", | ||
| "scripts": { | ||
| "test": "make test" | ||
| }, | ||
| "engines": { | ||
| "node": ">=0.10.0" | ||
| }, | ||
| "keywords": ["json", "jsontool", "filter", "command", "shell"], | ||
| "devDependencies": { | ||
| "uglify-js": "1.1.x", | ||
| "nodeunit": "0.8.x", | ||
| "ansidiff": "1.0", | ||
| "ben": "0.0.x", | ||
| "async": "0.1.22", | ||
| "semver": "1.1.0" | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
addons/pkg-npm/common/src/test/resources/metadata/version-bin-2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "name": "json", | ||
| "description": "a 'json' command for massaging and processing JSON on the command line", | ||
| "version": "9.0.6", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git://github.com/trentm/json.git" | ||
| }, | ||
| "author": "Trent Mick <[email protected]> (http://trentm.com)", | ||
| "main": "./lib/json.js", | ||
| "man": ["./man/man1/json.1"], | ||
| "bin": "./lib/json.js", | ||
| "scripts": { | ||
| "test": "make test" | ||
| }, | ||
| "engines": { | ||
| "node": ">=0.10.0" | ||
| }, | ||
| "keywords": ["json", "jsontool", "filter", "command", "shell"], | ||
| "devDependencies": { | ||
| "uglify-js": "1.1.x", | ||
| "nodeunit": "0.8.x", | ||
| "ansidiff": "1.0", | ||
| "ben": "0.0.x", | ||
| "async": "0.1.22", | ||
| "semver": "1.1.0" | ||
| } | ||
| } |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
...-java/src/main/java/org/commonjava/indy/pkg/npm/model/converter/ObjectToBinConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /** | ||
| * Copyright (C) 2011-2023 Red Hat, Inc. (https://github.com/Commonjava/indy) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.commonjava.indy.pkg.npm.model.converter; | ||
|
|
||
| import com.fasterxml.jackson.databind.util.StdConverter; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class ObjectToBinConverter | ||
| extends StdConverter<Object, Map<String, String>> | ||
| { | ||
|
|
||
| public static final String SINGLE_BIN = "SINGLE_BIN"; | ||
|
|
||
| @Override | ||
| public Map<String, String> convert( Object o ) | ||
| { | ||
| if ( o instanceof Map ) | ||
| { | ||
| return (Map<String, String>) o; | ||
| } | ||
| // Use SPDX expressions, ref https://docs.npmjs.com/cli/v7/configuring-npm/package-json | ||
| // parse String value to Map value | ||
| Map<String, String> result = new HashMap<>(); | ||
| result.put( SINGLE_BIN, o.toString() ); | ||
| return result; | ||
| } | ||
| } |