Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
* (Portions) Copyright (c) 2018 Payara Foundation and/or its affiliates.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No (Portions) please

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the legal implication of such a "Portions" line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "(Portions)" word just makes the Glassfish Copyright plugin check fail. Multiple Copyright lines passes. We have discussed this with the previous Payara PR.

*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -19,15 +20,13 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;

import javax.inject.Singleton;
import javax.ws.rs.ext.ParamConverter;
import javax.ws.rs.ext.ParamConverterProvider;

import javax.inject.Singleton;

/**
* An aggregate {@link ParamConverterProvider param converter provider} that loads all
* the registered {@link ParamConverterProvider} implementations.
Expand All @@ -49,7 +48,7 @@ public class ParamConverterFactory implements ParamConverterProvider {

ParamConverterFactory(Set<ParamConverterProvider> providers, Set<ParamConverterProvider> customProviders) {

Set<ParamConverterProvider> copyProviders = new HashSet<>(providers);
Set<ParamConverterProvider> copyProviders = new LinkedHashSet<>(providers);
converterProviders = new ArrayList<>();
converterProviders.addAll(customProviders);
copyProviders.removeAll(customProviders);
Expand Down