Skip to content

SXS-37: Replace net.sf.cglib with org.springframework.cglib#17

Merged
dkayiwa merged 1 commit intoopenmrs:masterfrom
wikumChamith:SXS-37
May 20, 2025
Merged

SXS-37: Replace net.sf.cglib with org.springframework.cglib#17
dkayiwa merged 1 commit intoopenmrs:masterfrom
wikumChamith:SXS-37

Conversation

@wikumChamith
Copy link
Copy Markdown
Member

@wikumChamith wikumChamith changed the title SXS=37: Replace net.sf.cglib with org.springframework.cglib SXS-\37: Replace net.sf.cglib with org.springframework.cglib May 13, 2025
@wikumChamith wikumChamith changed the title SXS-\37: Replace net.sf.cglib with org.springframework.cglib SXS-37: Replace net.sf.cglib with org.springframework.cglib May 13, 2025
@dkayiwa
Copy link
Copy Markdown
Member

dkayiwa commented May 13, 2025

Shouldn't this pull request also contain the fix for? https://pastebin.com/ky1BTRGQ

@wikumChamith
Copy link
Copy Markdown
Member Author

Shouldn't this pull request also contain the fix for? https://pastebin.com/ky1BTRGQ

I don't think it is related to this. Is it ok if we fix it in a separate PR?

@wikumChamith wikumChamith requested review from dkayiwa and ibacher May 14, 2025 09:20
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.mapper.CGLIBMapper;
import com.thoughtworks.xstream.mapper.Mapper;
import org.springframework.cglib.proxy.Enhancer;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Shouldn't this import be ordered with the other org imports?

Copy link
Copy Markdown
Member Author

@wikumChamith wikumChamith May 14, 2025

Choose a reason for hiding this comment

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

@ibacher, I updated the PR according to this. However, few places in our code base do not follow this:

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.ConverterLookup;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import org.springframework.stereotype.Component;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We should eventually fix those. Technically the import order is part of our coding standards, but it's not well-enforced across projects.

@wikumChamith
Copy link
Copy Markdown
Member Author

Shouldn't this pull request also contain the fix for? https://pastebin.com/ky1BTRGQ

This PR fixes that issue: openmrs/openmrs-module-referencemetadata#70

@dkayiwa dkayiwa merged commit 5d206c0 into openmrs:master May 20, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants