-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #739 from spyrkob/JBEAP-27267
Record licenses accepted when adding a feature pack
- Loading branch information
Showing
5 changed files
with
182 additions
and
19 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
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
47 changes: 47 additions & 0 deletions
47
prospero-common/src/main/java/org/wildfly/prospero/licenses/SortedProperties.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,47 @@ | ||
| /* | ||
| * Copyright 2024 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * 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.wildfly.prospero.licenses; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Comparator; | ||
| import java.util.Enumeration; | ||
| import java.util.Map; | ||
| import java.util.Properties; | ||
| import java.util.Set; | ||
| import java.util.TreeSet; | ||
|
|
||
| class SortedProperties extends Properties { | ||
| @Override | ||
| public Enumeration<Object> keys() { | ||
| return Collections.enumeration(keySet()); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Object> keySet() { | ||
| final Set<Object> keyList = new TreeSet<>(Comparator.comparing(Object::toString)); | ||
| keyList.addAll(super.keySet()); | ||
| return keyList; | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Map.Entry<Object, Object>> entrySet() { | ||
| final TreeSet<Map.Entry<Object, Object>> treeSet = new TreeSet<>((o1, o2) -> o1.getKey().toString().compareTo(o2.toString())); | ||
| treeSet.addAll(super.entrySet()); | ||
| return treeSet; | ||
| } | ||
| } |
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
57 changes: 57 additions & 0 deletions
57
prospero-common/src/test/java/org/wildfly/prospero/licenses/SortedPropertiesTest.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,57 @@ | ||
| /* | ||
| * Copyright 2024 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * 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.wildfly.prospero.licenses; | ||
|
|
||
| import static org.assertj.core.api.Assertions.*; | ||
|
|
||
| import java.io.FileOutputStream; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
|
|
||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
|
|
||
| public class SortedPropertiesTest { | ||
|
|
||
| @Rule | ||
| public TemporaryFolder temp = new TemporaryFolder(); | ||
|
|
||
| @Test | ||
| public void writeSortedProperties() throws Exception { | ||
| final SortedProperties properties = new SortedProperties(); | ||
|
|
||
| properties.setProperty("bbb", "bar"); | ||
| properties.setProperty("aaa", "foo"); | ||
| properties.setProperty("ddd", "212"); | ||
| properties.setProperty("ccc", "123"); | ||
|
|
||
| final Path propertiesFile = temp.newFile().toPath(); | ||
| try (FileOutputStream fos = new FileOutputStream(propertiesFile.toFile())) { | ||
| properties.store(fos, null); | ||
| } | ||
|
|
||
| // first line is going to be a comment with timestamp, need to add it to the check | ||
| final String firstLine = Files.readAllLines(propertiesFile).get(0); | ||
| assertThat(firstLine) | ||
| .startsWith("#"); | ||
| assertThat(propertiesFile) | ||
| .hasContent(firstLine + "\naaa=foo\nbbb=bar\nccc=123\nddd=212"); | ||
|
|
||
| } | ||
| } |