Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SO-1974 extension terminology selector #103

Merged
merged 26 commits into from
Jun 16, 2016
Merged

SO-1974 extension terminology selector #103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
427fca5
SO-1974 added deprecated annotation
Jun 8, 2016
318c1ef
SO-1974 added comparator for ICodeSystem
Jun 8, 2016
dac97fd
SO-1974 added predicate for selecting active code systems
Jun 10, 2016
bad83b6
SO-1974 initialization for terminology extension preferences
Jun 10, 2016
ebfe47f
SO-1974 moved preference related class to its own package
Jun 10, 2016
1597fc9
SO-1974 clients of code moving
Jun 10, 2016
8280ec7
SO-1974 exporting new package
Jun 10, 2016
8803c54
SO-1974 added POJO for extension selection pref page persistance
Jun 10, 2016
0e9c653
SO-1974 added some util predicates / functions to CodeSystemUtils
Jun 13, 2016
b6b8d9a
SO-1974 static util method for code system guava functional classes
Jun 13, 2016
f86b3d7
SO-1974 replacing anonymous inner class function
Jun 13, 2016
c86c74e
SO-1974 added util method: trying to find a branchPath's version path
Jun 13, 2016
d91cfbe
SO-1974 default extensions preference file added
Jun 14, 2016
ee7e9f9
SO-1974 compile error fix
Jun 14, 2016
faad38b
SO-1974 removing author tags from classes
Jun 15, 2016
130b9f1
SO-1974 remove extensions.xml from server side defaults
Jun 15, 2016
4840e74
SO-1974 moved guavafunctionals to interface for the sake of singletoness
Jun 15, 2016
b96529f
SO-1974 removed overcompliacted guava functional
Jun 15, 2016
56b718c
SO-1974 made field private
Jun 15, 2016
52b350f
SO-1974 ICodeSystem to IBranchPath convenience function
Jun 15, 2016
864aded
SO-1974 moved TerminologyExtensionsBootstrapFragment to UI plugin
Jun 15, 2016
6ab4c58
SO-1974 removing unnecessary preference pojo
Jun 16, 2016
5d03888
SO-1974 terminology extension: preference persistence change
Jun 16, 2016
a89f417
SO-1974 removed method
Jun 16, 2016
92c57f3
SO-1974 moved TerminologyExtensionConfiguration class to client side
Jun 16, 2016
1d594ba
SO-1974 updated manifest after class moving
Jun 16, 2016
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
Prev Previous commit
Next Next commit
SO-1974 removing author tags from classes
  • Loading branch information
Endre Kovacs committed Jun 15, 2016
commit faad38bf779778e1f88c3cd46971dee95506f4b6
1 change: 0 additions & 1 deletion ....datastore/src/com/b2international/snowowl/datastore/CodeSystemBaseVersionComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
* Comparator for ordering {@link ICodeSystem}s based on their base version,
* where {@link ICodeSystem} with {@link IBranchPath} {@link IBranchPath#MAIN_BRANCH MAIN} (if present) is considered the biggest element and {@link ICodeSystem} based on the oldest {@link ICodeSystemVersion#getEffectiveDate()} is the smallest element.
*
* @author endre
*/
public class CodeSystemBaseVersionComparator implements Comparator<ICodeSystem> {

Expand Down
5 changes: 0 additions & 5 deletions ...national.snowowl.datastore/src/com/b2international/snowowl/datastore/CodeSystemUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public class CodeSystemUtils {
* <li/> whose branch path matches the active branch's path.
*
* Note: if the active branch is a task branch, this predicate will ignore the last segment (task id part) of the active branch path.
* @author endre
*/
private static final class ActiveCodeSystemPredicate implements Predicate<ICodeSystem> {

Expand Down Expand Up @@ -102,7 +101,6 @@ public boolean apply(ICodeSystem input) {
/**
* Predicate, which selects code systems, that represent the MAIN for its terminology.
* In other words: Predicate, which doesn't let extension code systems through.
* @author endre
*/
private static final class MainCodeSystemPredicate implements Predicate<ICodeSystem> {

Expand All @@ -115,7 +113,6 @@ public boolean apply(ICodeSystem input) {

/**
* Function to turn {@link ICodeSystem} into it's short name.
* @author endre
*/
public static final class CodeSystemToShortNameFunction implements Function<ICodeSystem, String> {
Copy link
Member

Choose a reason for hiding this comment

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

Move these Function implementations to the ICodeSystem interface.


Expand All @@ -128,7 +125,6 @@ public String apply(ICodeSystem input) {

/**
* Function to turn {@link ICodeSystem} into it's repository Uuid.
* @author endre
*/
public static final class CodeSystemToRepositoryUuidFunction implements Function<ICodeSystem, String> {

Expand All @@ -141,7 +137,6 @@ public String apply(ICodeSystem input) {

/**
* Function to turn {@link ICodeSystem} into it's branch path string.
* @author endre
*/
public static final class CodeSystemToBranchPathFunction implements Function<ICodeSystem, String> {

Expand Down
1 change: 0 additions & 1 deletion ...nternational/snowowl/terminologyregistry/core/TerminologyExtensionsBootstrapFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

/**
* {@link BootstrapFragment} for creating and registering {@link TerminologyExtensionConfiguration}
* @author endre
*/
public class TerminologyExtensionsBootstrapFragment implements BootstrapFragment {
Copy link
Member

Choose a reason for hiding this comment

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

This should be part of the client, move it to the ext repository.


Expand Down
1 change: 0 additions & 1 deletion ...rnational/snowowl/terminologyregistry/core/preferences/PreferredTerminologyExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

/**
* Light weight, {@link Serializable} object for persisting the preferred terminology extension.
* @author endre
*/
public class PreferredTerminologyExtension implements Serializable {
Copy link
Member

Choose a reason for hiding this comment

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

The ICodeSystem is already Serializable, you can safely persist it and delete this one.

Copy link
Author

Choose a reason for hiding this comment

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

ICodeSystem has a storageKey field that would be unfortunate to persist, which was the reason to introduce this class

Copy link
Member

Choose a reason for hiding this comment

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

Do you need other fields than a unique identifier of the codesystem, like the shortName?

Copy link
Author

Choose a reason for hiding this comment

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

repositoyUUID and branchPath for sure
the others may not be needed

Copy link
Member

Choose a reason for hiding this comment

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

But you use the repositoryUuid as the key for the config, so you don't have to store that, and you should query the CodeSystem when you deserialize the current configuration, checking that it's still there, and when you do that, you'll get the branchPath as well, so I think this class is still unnecessary.

Copy link
Author

Choose a reason for hiding this comment

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

done


Expand Down
2 changes: 1 addition & 1 deletion ...ional/snowowl/terminologyregistry/core/preferences/TerminologyExtensionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

/**
*
* @author endre
* Preference configuration for terminology extension selection.
*/
public class TerminologyExtensionConfiguration extends PreferenceBase {
Copy link
Member

Choose a reason for hiding this comment

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

This class is still available on the server side, could you please move it to the ext repo? Thanks!


Expand Down